Improved printing of simulation parameters, and fixed some defaults.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index f171425222fa928cb2d9fcc7312183025b35a2f6..401a51a88079e3ea001e0ded4129f2429e8b9ed4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
+#include "deployment.h"
 #include "hostdata.h"
 #include "misc.h"
 #include "options.h"
@@ -11,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");
@@ -28,13 +30,12 @@ enum {
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 
-#include "loba_least_loaded.h"
 int simulation_main(int argc, char* argv[])
 {
     int result;
     process* proc;
     try {
-        proc = new loba_least_loaded(argc, argv);
+        proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();
         delete proc;
     }
@@ -58,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
@@ -78,26 +80,30 @@ 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 {
         exit_status = EXIT_FAILURE_INIT; // =====
 
-        // Register the main function of an agent in a global table.
-        MSG_function_register("simulation_main", simulation_main);
+        // Register the default function of an agent
+        // MSG_function_register("simulation_main", simulation_main);
+        MSG_function_register_default(simulation_main);
 
         // Create the platform and the application.
         MSG_create_environment(opt::platform_file.c_str());
         hostdata::create();
         if (opt::auto_depl::enabled) {
-            opt::auto_depl::nhosts = hostdata::size();
-            opt::auto_depl::load = hostdata::size();
-            try {
-                // fixme: do auto deployment
-            }
-            catch (std::exception& e) {
-                THROW1(0, 0, "%s", e.what());
+            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...
         } else {
             MSG_launch_application(opt::deployment_file.c_str());
         }
@@ -105,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);