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

diff --git a/main.cpp b/main.cpp
index 1b462c2..401a51a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,8 +12,9 @@
 #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");
@@ -29,7 +30,6 @@ enum {
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 
-#include "loba_simple.h"
 int simulation_main(int argc, char* argv[])
 {
     int result;
@@ -59,6 +59,7 @@ int main(int argc, char* argv[])
     // 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'");
 
     // Initialize some MSG internal data.
     // Note: MSG_global_init() may throw an exception, but it seems
@@ -79,6 +80,7 @@ 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 +96,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,9 +111,9 @@ 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.");
+        INFO1("Simulation ended at %f.", MSG_get_clock());
         simulated_time = MSG_get_clock();
         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);