Keep track of load scheduled to be sent, and update total_load_running.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index dcefafcf3c2fdc83f8091e1a63ac38a91e34df56..d7d9963ad1792894e334f0ce1668361b6546b057 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -11,6 +11,7 @@ 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");

+XBT_LOG_NEW_SUBCATEGORY(thrd, simu, "Messages from thread wrapper class");

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 


@@ -20,6 +21,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "options.h"
 #include "process.h"
 #include "statistics.h"
 #include "options.h"
 #include "process.h"
 #include "statistics.h"

+#include "synchro.h"

 #include "timer.h"
 #include "tracing.h"
 #include "version.h"
 #include "timer.h"
 #include "tracing.h"
 #include "version.h"


@@ -34,12 +36,12 @@ namespace {
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 

-    xbt_mutex_t proc_mutex;
-    xbt_cond_t proc_cond;
-    unsigned proc_counter;
+    mutex_t proc_mutex;
+    condition_t proc_cond;
+    unsigned proc_counter = 0;

 
 

-    struct statistics comps;
-    struct statistics loads;
+    statistics comps;
+    statistics loads;

 
 }
 
 
 }
 


@@ -50,13 +52,13 @@ static int simulation_main(int argc, char* argv[])
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
 
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
 

-        xbt_mutex_acquire(proc_mutex);
+        proc_mutex.acquire();

         ++proc_counter;
         ++proc_counter;

-        xbt_mutex_release(proc_mutex);
+        proc_mutex.release();

 
         result = proc->run();
 
 
         result = proc->run();
 

-        xbt_mutex_acquire(proc_mutex);
+        proc_mutex.acquire();

         comps.push(proc->get_comp());
         loads.push(proc->get_real_load());
 
         comps.push(proc->get_comp());
         loads.push(proc->get_real_load());
 


@@ -66,43 +68,45 @@ static int simulation_main(int argc, char* argv[])
         // destroys a communication they had together.
 
         --proc_counter;
         // destroys a communication they had together.
 
         --proc_counter;

-        xbt_cond_broadcast(proc_cond);
+        proc_cond.broadcast();

         while (proc_counter > 0)
         while (proc_counter > 0)

-            xbt_cond_wait(proc_cond, proc_mutex);
-        xbt_mutex_release(proc_mutex);
+            proc_cond.wait(proc_mutex);
+        proc_mutex.release();

 
         delete proc;
     }
 
         delete proc;
     }

-    catch (std::invalid_argument& e) {
+    catch (const std::invalid_argument& e) {

         THROW1(arg_error, 0, "%s", e.what());
     }
         THROW1(arg_error, 0, "%s", e.what());
     }

+    catch (const std::exception& e) {
+        THROW1(0, 0, "%s", e.what());
+    }

     return result;
 }
 
 static void check_for_lost_load()
 {
     double total_init = process::get_total_load_init();
     return result;
 }
 
 static void check_for_lost_load()
 {
     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)
     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)

-        XBT_CRITICAL("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)
     else if (lost_ratio > opt::load_ratio_threshold)

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

     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;
     if (running_ratio < -opt::load_ratio_threshold)
     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;
     if (running_ratio < -opt::load_ratio_threshold)

-        XBT_CRITICAL("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)
     else if (running_ratio > opt::load_ratio_threshold)

-        XBT_CRITICAL("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
         XBT_VERB("Running load at exit looks good: %g (%g%%)",
                  total_running, running_ratio);
     else
         XBT_VERB("Running load at exit looks good: %g (%g%%)",
                  total_running, running_ratio);


@@ -172,8 +176,8 @@ int main(int argc, char* argv[])
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
             if (opt::auto_depl::nhosts > hostdata::size()) {
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
             if (opt::auto_depl::nhosts > hostdata::size()) {

-                XBT_WARN("%u hosts is too much: limiting to %u",
-                         opt::auto_depl::nhosts, (unsigned )hostdata::size());
+                XBT_WARN("%u hosts is too much: limiting to %zu",
+                         opt::auto_depl::nhosts, hostdata::size());

                 opt::auto_depl::nhosts = hostdata::size();
             }
             if (!opt::auto_depl::load)
                 opt::auto_depl::nhosts = hostdata::size();
             }
             if (!opt::auto_depl::load)


@@ -190,19 +194,12 @@ int main(int argc, char* argv[])
 
         exit_status = EXIT_FAILURE_SIMU; // =====
 
 
         exit_status = EXIT_FAILURE_SIMU; // =====
 

-        proc_mutex = xbt_mutex_init();
-        proc_cond = xbt_cond_init();
-        proc_counter = 0;
-

         // Launch the MSG simulation.
         XBT_INFO("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
         simulated_time = MSG_get_clock();
         XBT_INFO("Simulation ended at %f.", simulated_time);
 
         // Launch the MSG simulation.
         XBT_INFO("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
         simulated_time = MSG_get_clock();
         XBT_INFO("Simulation ended at %f.", simulated_time);
 

-        xbt_cond_destroy(proc_cond);
-        xbt_mutex_destroy(proc_mutex);
-

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