Add torus topology.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index df1126a9f04eccd3e465441b607690d9fe6489a9..0ec5b6da05da76d9d8d80571af3497cc4118df94 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,15 +1,25 @@
-#include <cstring>              // for strlen()
+#include <cstring>

 #include <iostream>
 #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 "misc.h"

-#include "parameters.h"
+#include "options.h"

 #include "process.h"
 #include "timer.h"
 #include "version.h"
 
 #include "process.h"
 #include "timer.h"
 #include "version.h"
 

-// Creates a new log category and makes it the default
-XBT_LOG_NEW_DEFAULT_CATEGORY(simu, "Simulation messages");
+// Creates log categories
+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);

 
 // Failure exit status
 enum {
 
 // Failure exit status
 enum {


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

-int simulation_main(int argc, char *argv[])
+int simulation_main(int argc, char* argv[])

 {
 {

-    process proc(argc, argv);
-    return proc.run();
+    int result;
+    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;

 }
 
 }
 

-int main(int argc, char *argv[])
+int main(int argc, char* argv[])

 {
     // Note: variables used after THROW must be declared as volatile.
     volatile int exit_status = 0;   // global exit status
 {
     // Note: variables used after THROW must be declared as volatile.
     volatile int exit_status = 0;   // global exit status


@@ -37,8 +56,10 @@ int main(int argc, char *argv[])
 
     simulation_time.start();
 
 
     simulation_time.start();
 

-    // Set default logging threshold.
+    // Set default logging parameters

     // xbt_log_control_set("simu.thres:verbose");
     // 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


@@ -46,46 +67,47 @@ int main(int argc, char *argv[])
     MSG_global_init(&argc, argv);
 
     // Parse global parameters
     MSG_global_init(&argc, argv);
 
     // Parse global parameters

-    int parse_res = param::parse_args(&argc, argv);
+    int parse_res = opt::parse_args(&argc, argv);

     if (!parse_res
     if (!parse_res

-        || param::version_requested || param::help_requested) {
-        if (param::version_requested)
-            std::clog << version::name << " version " << version::num << "\n"
+        || opt::version_requested || opt::help_requested) {
+        if (opt::version_requested)
+            std::clog << version::name << " (" << opt::program_name << ")"
+                      << " version " << version::num << "\n"

                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";
                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";

-        if (!parse_res || param::help_requested)
-            param::usage();
+        if (!parse_res || opt::help_requested)
+            opt::usage();

         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }

-    param::print();
+    opt::print();

 
 

-    TRY {    
+    TRY {

         exit_status = EXIT_FAILURE_INIT; // =====
 
         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(param::platform_file);
-        if (LOG_ISENABLED(xbt_log_priority_verbose)) {
-            int n = MSG_get_host_number();
-            m_host_t *h = MSG_get_host_table();
-            VERB1("Got %d hosts.", n);
-            for (int i = 0; i < n; i++)
-                VERB2("Host #%d named \"%s\".", i, MSG_host_get_name(h[i]));
-            xbt_free(h);
+        MSG_create_environment(opt::platform_file.c_str());
+        hostdata::create();
+        if (opt::auto_depl::enabled) {
+            if (!opt::auto_depl::nhosts)
+                opt::auto_depl::nhosts = hostdata::size();
+            if (!opt::auto_depl::load)
+                opt::auto_depl::load = hostdata::size();
+            MY_launch_application(); // it is already opt::* aware...
+        } else {
+            MSG_launch_application(opt::deployment_file.c_str());

         }
         }

-        MSG_launch_application(param::application_file);

 
         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);


@@ -102,6 +124,7 @@ int main(int argc, char *argv[])
     }
 
     // Clean the MSG simulation.
     }
 
     // Clean the MSG simulation.

+    hostdata::destroy();

     res = MSG_clean();
     if (res != MSG_OK) {
         ERROR1("MSG_clean() failed with status %#x", res);
     res = MSG_clean();
     if (res != MSG_OK) {
         ERROR1("MSG_clean() failed with status %#x", res);