Add torus topology.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 1b462c2549769741c19876caaae41f4d2bbdeba8..0ec5b6da05da76d9d8d80571af3497cc4118df94 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -12,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");


@@ -29,7 +30,6 @@ enum {
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 

-#include "loba_simple.h"

 int simulation_main(int argc, char* argv[])
 {
     int result;
 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'");
     // 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


@@ -104,9 +105,9 @@ int main(int argc, char* argv[])
         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);