Display load average and standard deviation at the end.

diff --git a/TODO b/TODO
index 1d5fe423b8e3bd59936f2f6c6a01a605101fb5d6..09559efc618b5345ce32e64d09d50bca2d464cb2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,8 +4,6 @@
 
 * implement loba_* algorithms (start with some trivial one)
 
 
 * implement loba_* algorithms (start with some trivial one)
 

-* add some statistics about load (im)balance at the end of the simulation?
-

 * for automatic process topology,
    -> implement some random initial distribution of load
 
 * for automatic process topology,
    -> implement some random initial distribution of load
 

diff --git a/main.cpp b/main.cpp
index 01bf3ac34926c11459e62f4b925ce313851b7204..5326e732e9f9bf1834a64166fa971aa6e4276b19 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,9 @@
+#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,22 +25,29 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "timer.h"
 #include "version.h"
 
 #include "timer.h"
 #include "version.h"
 

-// Failure exit status
-enum {
-    EXIT_NO_FAILURE    = 0x00,  // no error
-    EXIT_FAILURE_ARGS  = 0x01,  // bad arguments
-    EXIT_FAILURE_INIT  = 0x02,  // failed to initialize simulator
-    EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
-    EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
-};
+namespace {
+    // Failure exit status
+    enum {
+        EXIT_NO_FAILURE    = 0x00,  // no error
+        EXIT_FAILURE_ARGS  = 0x01,  // bad arguments
+        EXIT_FAILURE_INIT  = 0x02,  // failed to initialize simulator
+        EXIT_FAILURE_SIMU  = 0x04,  // simulation failed
+        EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
+    };
+
+    std::vector<double> loads;
+    double load_stddev;
+    double load_avg;
+}

 
 

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

 {
     int result;
     process* proc;
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();
 {
     int result;
     process* proc;
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();

+        loads.push_back(proc->get_load());

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


@@ -46,7 +56,7 @@ int simulation_main(int argc, char* argv[])
     return result;
 }
 
     return result;
 }
 

-void check_for_lost_load()
+static void check_for_lost_load()

 {
     double total_init = process::get_total_load_init();
 
 {
     double total_init = process::get_total_load_init();
 


@@ -75,6 +85,21 @@ void check_for_lost_load()
                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);
+}
+

 int main(int argc, char* argv[])
 {
     // Note: variables used after THROW must be declared as volatile.
 int main(int argc, char* argv[])
 {
     // Note: variables used after THROW must be declared as volatile.


@@ -153,6 +178,7 @@ int main(int argc, char* argv[])
         simulated_time = MSG_get_clock();
         INFO1("Simulation ended at %f.", simulated_time);
         check_for_lost_load();
         simulated_time = MSG_get_clock();
         INFO1("Simulation ended at %f.", simulated_time);
         check_for_lost_load();

+        compute_load_imbalance();

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


@@ -179,8 +205,9 @@ int main(int argc, char* argv[])
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         INFO0(",----[ Results ]");
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         INFO0(",----[ Results ]");

-        INFO1("| Total simulated time...: %g", simulated_time);
-        INFO1("| Total simulation time..: %g", simulation_time.duration());
+        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());

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

diff --git a/process.h b/process.h
index 4e6ab240f8d73b6f3b15c9fe404568bb82bdc7e2..c72fdf20e82094f4365672beb27074e25b34e8ab 100644 (file)
--- a/process.h
+++ b/process.h
@@ -26,6 +26,8 @@ public:
     process(int argc, char* argv[]);
     virtual ~process();
 
     process(int argc, char* argv[]);
     virtual ~process();
 

+    double get_load() const                { return load; }
+

     int run();
 
 protected:
     int run();
 
 protected: