X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/a36cada5a2972f79e94880ecce4e42b7af44ec56..035e2d971fc603174fa4c6883359f02d34b77226:/main.cpp

diff --git a/main.cpp b/main.cpp
index 490b52e..3ee3ae1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -45,6 +45,25 @@ int simulation_main(int argc, char* argv[])
     return result;
 }
 
+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) {
+        CRITICAL2("Gained load at exit! %g (%g%%) <============",
+                  lost, lost_ratio);
+    } else if (lost_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);
+    }
+
+}
+
 int main(int argc, char* argv[])
 {
     // Note: variables used after THROW must be declared as volatile.
@@ -57,9 +76,15 @@ int main(int argc, char* argv[])
     simulation_time.start();
 
     // Set default logging parameters
-    // xbt_log_control_set("simu.thres:verbose");
-    xbt_log_control_set("simu.fmt:'[%h %r] [%c/%p] %m%n'");
-    xbt_log_control_set("main.fmt:'[%c/%p] %m%n'");
+    bool do_log_control_set = true;
+    for (int i = 1 ; do_log_control_set && i < argc ; i++)
+        do_log_control_set = !(argv[i][0] == '-' && argv[i][1] != '-' &&
+                               strchr(argv[i] + 1, 'v'));
+    if (do_log_control_set) {
+        // xbt_log_control_set("simu.thres:verbose");
+        xbt_log_control_set("simu.fmt:'[%h %r] [%c/%p] %m%n'");
+        xbt_log_control_set("main.fmt:'[%c/%p] %m%n'");
+    }
 
     // Initialize some MSG internal data.
     // Note: MSG_global_init() may throw an exception, but it seems
@@ -80,6 +105,8 @@ int main(int argc, char* argv[])
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
+    INFO3("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),
+          version::date.c_str());
     opt::print();
 
     TRY {
@@ -95,6 +122,11 @@ int main(int argc, char* argv[])
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
+            if (opt::auto_depl::nhosts > hostdata::size()) {
+                WARN2("%u hosts is too much: limiting to %u",
+                      opt::auto_depl::nhosts, (unsigned )hostdata::size());
+                opt::auto_depl::nhosts = hostdata::size();
+            }
             if (!opt::auto_depl::load)
                 opt::auto_depl::load = opt::auto_depl::nhosts;
             MY_launch_application(); // it is already opt::* aware...
@@ -107,8 +139,9 @@ int main(int argc, char* argv[])
         // Launch the MSG simulation.
         INFO1("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
-        INFO1("Simulation ended at %f.", MSG_get_clock());
         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);