X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ba8a9c5fbc92dc95fc99d8078b3474fd2fd5a043..0c4a3402a57c61218bf1d1c6d8c31f5c3e1482f9:/main.cpp?ds=sidebyside

diff --git a/main.cpp b/main.cpp
index 1b462c2..01bf3ac 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,23 +3,25 @@
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
-#include "deployment.h"
-#include "hostdata.h"
-#include "misc.h"
-#include "options.h"
-#include "process.h"
-#include "timer.h"
-#include "version.h"
 
 // Creates log categories
-XBT_LOG_NEW_CATEGORY(simu, "Simulation messages");
+XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
 XBT_LOG_NEW_SUBCATEGORY(main, simu, "Messages from global infrastructure");
+XBT_LOG_NEW_SUBCATEGORY(depl, main, "Messages from auto deployment");
 XBT_LOG_NEW_SUBCATEGORY(comm, simu, "Messages from asynchronous pipes");
 XBT_LOG_NEW_SUBCATEGORY(proc, simu, "Messages from base process class");
 XBT_LOG_NEW_SUBCATEGORY(loba, simu, "Messages from load-balancer");
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
+#include "deployment.h"
+#include "hostdata.h"
+#include "misc.h"
+#include "options.h"
+#include "process.h"
+#include "timer.h"
+#include "version.h"
+
 // Failure exit status
 enum {
     EXIT_NO_FAILURE    = 0x00,  // no error
@@ -29,7 +31,6 @@ enum {
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 
-#include "loba_simple.h"
 int simulation_main(int argc, char* argv[])
 {
     int result;
@@ -45,6 +46,35 @@ int simulation_main(int argc, char* argv[])
     return result;
 }
 
+void check_for_lost_load()
+{
+    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.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 > 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);
+
+    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
+        DEBUG2("Running load at exit looks good: %g (%g%%)",
+               total_running, running_ratio);
+}
+
 int main(int argc, char* argv[])
 {
     // Note: variables used after THROW must be declared as volatile.
@@ -57,8 +87,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'");
+    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
@@ -79,6 +116,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 {
@@ -94,8 +133,13 @@ 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 = hostdata::size();
+                opt::auto_depl::load = opt::auto_depl::nhosts;
             MY_launch_application(); // it is already opt::* aware...
         } else {
             MSG_launch_application(opt::deployment_file.c_str());
@@ -104,10 +148,11 @@ int main(int argc, char* argv[])
         exit_status = EXIT_FAILURE_SIMU; // =====
 
         // Launch the MSG simulation.
-        INFO0("Starting simulation...");
+        INFO1("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
-        INFO0("Simulation ended.");
         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);