Improved printing of simulation parameters, and fixed some defaults.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index a4e9fdb054c8e476d6f277b77689e6348c68eacb..401a51a88079e3ea001e0ded4129f2429e8b9ed4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,9 @@
 #include <cstring>
 #include <iostream>
 #include <cstring>
 #include <iostream>

+#include <stdexcept>

 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <msg/msg.h>
 #include <xbt/log.h>

+#include "deployment.h"

 #include "hostdata.h"
 #include "misc.h"
 #include "options.h"
 #include "hostdata.h"
 #include "misc.h"
 #include "options.h"


@@ -10,8 +12,9 @@
 #include "version.h"
 
 // Creates log categories
 #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(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_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");


@@ -27,13 +30,18 @@ enum {
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 

-#include "loba_least_loaded.h"

 int simulation_main(int argc, char* argv[])
 {
     int result;
 int simulation_main(int argc, char* argv[])
 {
     int result;

-    process* proc = new loba_least_loaded(argc, argv);
-    result = proc->run();
-    delete proc;
+    process* proc;
+    try {
+        proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
+        result = proc->run();
+        delete proc;
+    }
+    catch (std::invalid_argument& e) {
+        THROW1(arg_error, 0, "%s", e.what());
+    }

     return result;
 }
 
     return result;
 }
 


@@ -51,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'");
     // 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
 
     // Initialize some MSG internal data.
     // Note: MSG_global_init() may throw an exception, but it seems


@@ -62,7 +71,8 @@ int main(int argc, char* argv[])
     if (!parse_res
         || opt::version_requested || opt::help_requested) {
         if (opt::version_requested)
     if (!parse_res
         || opt::version_requested || opt::help_requested) {
         if (opt::version_requested)

-            std::clog << version::name << " version " << version::num << "\n"
+            std::clog << version::name << " (" << opt::program_name << ")"
+                      << " version " << version::num << "\n"

                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)
                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)


@@ -70,27 +80,40 @@ int main(int argc, char* argv[])
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
         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; // =====
 
     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);
-        // Preserve some compatibility with old code...
-        MSG_function_register("Calculs", 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.
 
         // Create the platform and the application.

-        MSG_create_environment(opt::platform_file);
+        MSG_create_environment(opt::platform_file.c_str());

         hostdata::create();
         hostdata::create();

-        MSG_launch_application(opt::application_file);
+        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...
+        } else {
+            MSG_launch_application(opt::deployment_file.c_str());
+        }

 
         exit_status = EXIT_FAILURE_SIMU; // =====
 
         // Launch the MSG simulation.
 
         exit_status = EXIT_FAILURE_SIMU; // =====
 
         // Launch the MSG simulation.

-        INFO0("Starting simulation...");
+        INFO1("Starting simulation at %f...", MSG_get_clock());

         res = MSG_main();
         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);
         simulated_time = MSG_get_clock();
         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);