X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/97a4b4dbf628a627e3c2d5689be89265f56074df..3bbce140c762cb8f3aaf9526e835aaa72cdec632:/main.cpp

diff --git a/main.cpp b/main.cpp
index fe584f7..ccd11bd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,25 +19,35 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "misc.h"
 #include "options.h"
 #include "process.h"
+#include "statistics.h"
 #include "timer.h"
+#include "tracing.h"
 #include "version.h"
 
-// Failure exit status
-enum {
-    EXIT_NO_FAILURE    = 0x00,  // no error
-    EXIT_FAILURE_ARGS  = 0x01,  // bad arguments
-    EXIT_FAILURE_INIT  = 0x02,  // failed to initialize simulator
-    EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
-    EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
-};
+namespace {
+    // Failure exit status
+    enum {
+        EXIT_NO_FAILURE    = 0x00,  // no error
+        EXIT_FAILURE_ARGS  = 0x01,  // bad arguments
+        EXIT_FAILURE_INIT  = 0x02,  // failed to initialize simulator
+        EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
+        EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
+    };
 
-int simulation_main(int argc, char* argv[])
+    struct statistics comps;
+    struct statistics loads;
+
+}
+
+static int simulation_main(int argc, char* argv[])
 {
     int result;
     process* proc;
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();
+        comps.push(proc->get_comp());
+        loads.push(proc->get_real_load());
         delete proc;
     }
     catch (std::invalid_argument& e) {
@@ -46,25 +56,40 @@ int simulation_main(int argc, char* argv[])
     return result;
 }
 
-void check_for_lost_load()
+static void check_for_lost_load()
 {
-    const double threshold = 1e-4;
     double total_init = process::get_total_load_init();
+
     double total_exit = process::get_total_load_exit();
     double lost = total_init - total_exit;
-    double lost_ratio = 100 * lost / total_init;
-    if (lost_ratio < -threshold) {
+    double lost_ratio = 100.0 * lost / total_init;
+    if (lost_ratio < -opt::load_ratio_threshold)
         CRITICAL2("Gained load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
-    } else if (lost_ratio > threshold) {
+    else if (lost_ratio > opt::load_ratio_threshold)
         CRITICAL2("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
-    } else {
-        DEBUG2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
-    }
-
+    else
+        VERB2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
+
+    double total_running = process::get_total_load_running();
+    double running_ratio = 100.0 * total_running / total_init;
+    if (running_ratio < -opt::load_ratio_threshold)
+        CRITICAL2("Negative running load at exit! %g (%g%%) <============",
+                  total_running, running_ratio);
+    else if (running_ratio > opt::load_ratio_threshold)
+        CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
+                  total_running, running_ratio);
+    else
+        VERB2("Running load at exit looks good: %g (%g%%)",
+               total_running, running_ratio);
 }
 
+#define PR_STATS(descr, st)                                             \
+    INFO5("| %.*s: %g / %g / %g", 39,                                   \
+          descr " total/avg./stddev. at exit.........................", \
+          st.get_sum(), st.get_avg(), st.get_stddev())
+
 int main(int argc, char* argv[])
 {
     // Note: variables used after THROW must be declared as volatile.
@@ -93,7 +118,7 @@ int main(int argc, char* argv[])
     MSG_global_init(&argc, argv);
 
     // Parse global parameters
-    int parse_res = opt::parse_args(&argc, argv);
+    bool parse_res = opt::parse_args(&argc, argv);
     if (!parse_res
         || opt::version_requested || opt::help_requested) {
         if (opt::version_requested)
@@ -135,6 +160,11 @@ int main(int argc, char* argv[])
             MSG_launch_application(opt::deployment_file.c_str());
         }
 
+        // Register tracing categories
+        TRACE_category(TRACE_CAT_COMP);
+        TRACE_category(TRACE_CAT_CTRL);
+        TRACE_category(TRACE_CAT_DATA);
+
         exit_status = EXIT_FAILURE_SIMU; // =====
 
         // Launch the MSG simulation.
@@ -142,7 +172,6 @@ int main(int argc, char* argv[])
         res = MSG_main();
         simulated_time = MSG_get_clock();
         INFO1("Simulation ended at %f.", simulated_time);
-        check_for_lost_load();
         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);
 
@@ -168,9 +197,13 @@ int main(int argc, char* argv[])
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();
+        check_for_lost_load();
         INFO0(",----[ Results ]");
-        INFO1("| Total simulated time...: %g", simulated_time);
-        INFO1("| Total simulation time..: %g", simulation_time.duration());
+        PR_STATS("Load", loads);
+        PR_STATS("Computation", comps);
+        INFO1("| Total simulated time...................: %g", simulated_time);
+        INFO1("| Total simulation time..................: %g",
+              simulation_time.duration());
         INFO0("`----");
     }
     if (exit_status)