Fix message::to_string().

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index bce9749dd203324b21ac2985f39a97427d7d4068..aa964bb7d87e183496b70b9ba790d259471fb088 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,8 @@ namespace {
         EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
         EXIT_FAILURE_INTR  = 0x10,  // interrupted by user
         EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
         EXIT_FAILURE_INTR  = 0x10,  // interrupted by user

-        EXIT_FAILURE_OTHER = 0x20,  // other error
+        EXIT_FAILURE_LOAD  = 0x20,  // lost load on exit
+        EXIT_FAILURE_OTHER = 0x40,  // other error

     };
 
     // Cannot be globally initialized...
     };
 
     // Cannot be globally initialized...


@@ -107,32 +108,38 @@ static int simulation_main(int argc, char* argv[])
     return result;
 }
 
     return result;
 }
 

-static void check_for_lost_load()
+static bool check_for_lost_load()

 {
 {

+    bool res = true;

     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.0 * lost / total_init;
     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.0 * lost / total_init;

-    if (lost_ratio < -opt::load_ratio_threshold)
+    if (lost_ratio < -opt::load_ratio_threshold) {

         XBT_ERROR("Gained load at exit! %g (%g%%) <============",
                   -lost, -lost_ratio);
         XBT_ERROR("Gained load at exit! %g (%g%%) <============",
                   -lost, -lost_ratio);

-    else if (lost_ratio > opt::load_ratio_threshold)
+        res = false;
+    } else if (lost_ratio > opt::load_ratio_threshold) {

         XBT_ERROR("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
         XBT_ERROR("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);

-    else
+        res = false;
+    } else

         XBT_VERB("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
 
     double total_running = process::get_total_load_running();
     double running_ratio = 100.0 * total_running / total_init;
         XBT_VERB("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
 
     double total_running = process::get_total_load_running();
     double running_ratio = 100.0 * total_running / total_init;

-    if (running_ratio < -opt::load_ratio_threshold)
+    if (running_ratio < -opt::load_ratio_threshold) {

         XBT_ERROR("Negative running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
         XBT_ERROR("Negative running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);

-    else if (running_ratio > opt::load_ratio_threshold)
+        res = false;
+    } else if (running_ratio > opt::load_ratio_threshold) {

         XBT_ERROR("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
         XBT_ERROR("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);

-    else
+        res = false;
+    } else

         XBT_VERB("Running load at exit looks good: %g (%g%%)",
                  total_running, running_ratio);
         XBT_VERB("Running load at exit looks good: %g (%g%%)",
                  total_running, running_ratio);

+    return res;

 }
 
 static void signal_handler(int /*sig*/)
 }
 
 static void signal_handler(int /*sig*/)


@@ -227,6 +234,7 @@ int main(int argc, char* argv[])
         MSG_create_environment(opt::platform_file.c_str());
         XBT_DEBUG("Creating hostdata...");
         hostdata::create();
         MSG_create_environment(opt::platform_file.c_str());
         XBT_DEBUG("Creating hostdata...");
         hostdata::create();

+        XBT_INFO("Loaded description of %zd hosts.", hostdata::size());

         XBT_DEBUG("Deploying processes...");
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)
         XBT_DEBUG("Deploying processes...");
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)


@@ -236,8 +244,12 @@ int main(int argc, char* argv[])
                          opt::auto_depl::nhosts, hostdata::size());
                 opt::auto_depl::nhosts = hostdata::size();
             }
                          opt::auto_depl::nhosts, hostdata::size());
                 opt::auto_depl::nhosts = hostdata::size();
             }

-            if (!opt::auto_depl::load)
+            if (opt::auto_depl::load == 0.0) {
+                XBT_WARN("Initial load is zero!  Falling back on old behaviour.");

                 opt::auto_depl::load = opt::auto_depl::nhosts;
                 opt::auto_depl::load = opt::auto_depl::nhosts;

+            } else if (opt::auto_depl::load < 0.0)
+                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());
             MY_launch_application(); // it is already opt::* aware...
         } else {
             MSG_launch_application(opt::deployment_file.c_str());


@@ -288,7 +300,8 @@ int main(int argc, char* argv[])
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         elapsed_time.stop();
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         elapsed_time.stop();

-        check_for_lost_load();
+        if (!check_for_lost_load())
+            exit_status |= EXIT_FAILURE_LOAD;

         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);