Wip++...

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index dbc5b4306b7c7f98d222354391f9aeba883dc919..a40bb9fa1e11fe26a7ec4898898bcbd8ab655633 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -2,14 +2,21 @@
 #include <iostream>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <iostream>
 #include <msg/msg.h>
 #include <xbt/log.h>

+#include "hostdata.h"

 #include "misc.h"
 #include "options.h"
 #include "process.h"
 #include "timer.h"
 #include "version.h"
 
 #include "misc.h"
 #include "options.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, "Simulation messages");
+XBT_LOG_NEW_SUBCATEGORY(main, simu, "Messages from global infrastructure");
+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 +27,15 @@ enum {
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 
     EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
 };
 

-int simulation_main(int argc, char *argv[])
+#include "loba_least_loaded.h"
+int simulation_main(int argc, char* argv[])

 {
 {

-    process proc(argc, argv);
+    //    process proc(argc, argv);
+    loba_least_loaded proc(argc, argv);

     return proc.run();
 }
 
     return proc.run();
 }
 

-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 +46,9 @@ 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'");

 
     // 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


@@ -60,7 +70,7 @@ int main(int argc, char *argv[])
     }
     opt::print();
 
     }
     opt::print();
 

-    TRY {    
+    TRY {

         exit_status = EXIT_FAILURE_INIT; // =====
 
         // Register the main function of an agent in a global table.
         exit_status = EXIT_FAILURE_INIT; // =====
 
         // Register the main function of an agent in a global table.


@@ -70,14 +80,7 @@ int main(int argc, char *argv[])
 
         // Create the platform and the application.
         MSG_create_environment(opt::platform_file);
 
         // Create the platform and the application.
         MSG_create_environment(opt::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);
-        }
+        hostdata::create();

         MSG_launch_application(opt::application_file);
 
         exit_status = EXIT_FAILURE_SIMU; // =====
         MSG_launch_application(opt::application_file);
 
         exit_status = EXIT_FAILURE_SIMU; // =====


@@ -102,6 +105,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);