Use MSG_comm_waitall for communicator::flush(true).

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 5326e732e9f9bf1834a64166fa971aa6e4276b19..fc42d750f9c992b8fe9a27b17f5aac7ec232b48c 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,9 +1,6 @@
-#include <cmath>

 #include <cstring>
 #include <iostream>
 #include <cstring>
 #include <iostream>

-#include <numeric>

 #include <stdexcept>
 #include <stdexcept>

-#include <vector>

 #include <msg/msg.h>
 #include <xbt/log.h>
 
 #include <msg/msg.h>
 #include <xbt/log.h>
 


@@ -22,7 +19,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "misc.h"
 #include "options.h"
 #include "process.h"
 #include "misc.h"
 #include "options.h"
 #include "process.h"

+#include "statistics.h"

 #include "timer.h"
 #include "timer.h"

+#include "tracing.h"

 #include "version.h"
 
 namespace {
 #include "version.h"
 
 namespace {


@@ -35,9 +34,13 @@ namespace {
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 

-    std::vector<double> loads;
-    double load_stddev;
-    double load_avg;
+    xbt_mutex_t proc_mutex;
+    xbt_cond_t proc_cond;
+    unsigned proc_counter;
+
+    struct statistics comps;
+    struct statistics loads;
+

 }
 
 static int simulation_main(int argc, char* argv[])
 }
 
 static int simulation_main(int argc, char* argv[])


@@ -46,8 +49,28 @@ static int simulation_main(int argc, char* argv[])
     process* proc;
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
     process* proc;
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);

+
+        xbt_mutex_acquire(proc_mutex);
+        ++proc_counter;
+        xbt_mutex_release(proc_mutex);
+

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

-        loads.push_back(proc->get_load());
+
+        xbt_mutex_acquire(proc_mutex);
+        comps.push(proc->get_comp());
+        loads.push(proc->get_real_load());
+
+        // Synchronization barrier...
+        // The goal is to circumvent a limitation in SimGrid (at least
+        // in version 3.5): a process must be alive when another one
+        // destroys a communication they had together.
+
+        --proc_counter;
+        xbt_cond_broadcast(proc_cond);
+        while (proc_counter > 0)
+            xbt_cond_wait(proc_cond, proc_mutex);
+        xbt_mutex_release(proc_mutex);
+

         delete proc;
     }
     catch (std::invalid_argument& e) {
         delete proc;
     }
     catch (std::invalid_argument& e) {


@@ -65,12 +88,12 @@ static void check_for_lost_load()
     double lost_ratio = 100.0 * lost / total_init;
     if (lost_ratio < -opt::load_ratio_threshold)
         CRITICAL2("Gained load at exit! %g (%g%%) <============",
     double lost_ratio = 100.0 * lost / total_init;
     if (lost_ratio < -opt::load_ratio_threshold)
         CRITICAL2("Gained load at exit! %g (%g%%) <============",

-                  lost, lost_ratio);
+                  -lost, -lost_ratio);

     else if (lost_ratio > opt::load_ratio_threshold)
         CRITICAL2("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
     else
     else if (lost_ratio > opt::load_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);
+        VERB2("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;
 
     double total_running = process::get_total_load_running();
     double running_ratio = 100.0 * total_running / total_init;


@@ -81,24 +104,14 @@ static void check_for_lost_load()
         CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
     else
         CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
     else

-        DEBUG2("Running load at exit looks good: %g (%g%%)",
+        VERB2("Running load at exit looks good: %g (%g%%)",

                total_running, running_ratio);
 }
 
                total_running, running_ratio);
 }
 

-static void compute_load_imbalance()
-{
-    unsigned n = loads.size();
-    load_avg = std::accumulate(loads.begin(), loads.end(), 0.0) / n;
-    double variance = 0.0;
-    double epsilon = 0.0;
-    for (unsigned i = 0 ; i < n ; ++i) {
-        double diff = loads[i] - load_avg;
-        variance += diff * diff;
-        epsilon += diff;
-    }
-    variance = (variance - (epsilon * epsilon) / n) / n;
-    load_stddev = sqrt(variance);
-}
+#define PR_STATS(descr, st)                                             \
+    INFO5("| %.*s: %g / %g / %g", 39,                                   \
+          descr " total/avg./stddev. at exit.........................", \
+          st.get_sum(), st.get_mean(), st.get_stddev())

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


@@ -128,7 +141,7 @@ int main(int argc, char* argv[])
     MSG_global_init(&argc, argv);
 
     // Parse global parameters
     MSG_global_init(&argc, argv);
 
     // Parse global parameters

-    int parse_res = opt::parse_args(&argc, argv);
+    bool parse_res = opt::parse_args(&argc, 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)


@@ -170,15 +183,26 @@ int main(int argc, char* argv[])
             MSG_launch_application(opt::deployment_file.c_str());
         }
 
             MSG_launch_application(opt::deployment_file.c_str());
         }
 

+        // Register tracing categories
+        TRACE_category(TRACE_CAT_COMP);
+        TRACE_category(TRACE_CAT_CTRL);
+        TRACE_category(TRACE_CAT_DATA);
+

         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.
         INFO1("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
         simulated_time = MSG_get_clock();
         INFO1("Simulation ended at %f.", simulated_time);
         // Launch the MSG simulation.
         INFO1("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
         simulated_time = MSG_get_clock();
         INFO1("Simulation ended at %f.", simulated_time);

-        check_for_lost_load();
-        compute_load_imbalance();
+
+        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);
 


@@ -204,10 +228,13 @@ int main(int argc, char* argv[])
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();

+        check_for_lost_load();

         INFO0(",----[ Results ]");
         INFO0(",----[ Results ]");

-        INFO2("| Load avg./stddev. at exit.: %g / %g", load_avg, load_stddev);
-        INFO1("| Total simulated time......: %g", simulated_time);
-        INFO1("| Total simulation time.....: %g", simulation_time.duration());
+        PR_STATS("Load", loads);
+        PR_STATS("Computation", comps);
+        INFO1("| Total simulated time...................: %g", simulated_time);
+        INFO1("| Total simulation time..................: %g",
+              simulation_time.duration());

         INFO0("`----");
     }
     if (exit_status)
         INFO0("`----");
     }
     if (exit_status)