Define process::print_loads_p() to print loads by using neighp[]

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index a40bb9fa1e11fe26a7ec4898898bcbd8ab655633..fe584f725f6518347b6e4b096ff10198888bb8a0 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,23 +1,27 @@
 #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 "hostdata.h"
-#include "misc.h"
-#include "options.h"
-#include "process.h"
-#include "timer.h"
-#include "version.h"

 
 // Creates log categories
 
 // 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_EXTERNAL_DEFAULT_CATEGORY(main);
 
 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);
 

+#include "deployment.h"
+#include "hostdata.h"
+#include "misc.h"
+#include "options.h"
+#include "process.h"
+#include "timer.h"
+#include "version.h"
+

 // Failure exit status
 enum {
     EXIT_NO_FAILURE    = 0x00,  // no error
 // Failure exit status
 enum {
     EXIT_NO_FAILURE    = 0x00,  // no error


@@ -27,12 +31,38 @@ 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 simulation_main(int argc, char* argv[])
 {

-    //    process proc(argc, argv);
-    loba_least_loaded 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;
+}
+
+void check_for_lost_load()
+{
+    const double threshold = 1e-4;
+    double total_init = process::get_total_load_init();
+    double total_exit = process::get_total_load_exit();
+    double lost = total_init - total_exit;
+    double lost_ratio = 100 * lost / total_init;
+    if (lost_ratio < -threshold) {
+        CRITICAL2("Gained load at exit! %g (%g%%) <============",
+                  lost, lost_ratio);
+    } else if (lost_ratio > threshold) {
+        CRITICAL2("Lost load at exit! %g (%g%%) <============",
+                  lost, lost_ratio);
+    } else {
+        DEBUG2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
+    }
+

 }
 
 int main(int argc, char* argv[])
 }
 
 int main(int argc, char* argv[])


@@ -47,8 +77,15 @@ int main(int argc, char* argv[])
     simulation_time.start();
 
     // Set default logging parameters
     simulation_time.start();
 
     // Set default logging parameters

-    // xbt_log_control_set("simu.thres:verbose");
-    xbt_log_control_set("simu.fmt:'[%h %r] [%c/%p] %m%n'");
+    bool do_log_control_set = true;
+    for (int i = 1 ; do_log_control_set && i < argc ; i++)
+        do_log_control_set = !(argv[i][0] == '-' && argv[i][1] != '-' &&
+                               strchr(argv[i] + 1, 'v'));
+    if (do_log_control_set) {
+        // 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


@@ -60,7 +97,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)


@@ -68,28 +106,43 @@ 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.");

         simulated_time = MSG_get_clock();
         simulated_time = MSG_get_clock();

+        INFO1("Simulation ended at %f.", simulated_time);
+        check_for_lost_load();

         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);
 
         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);