X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/7725e3d7f34e70c0ba01ddc4e1055e096e72c2c3..29d6013f6a85f43d958add37f8317cf038cf335b:/main.cpp?ds=sidebyside

diff --git a/main.cpp b/main.cpp
index 907869e..3a47b92 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,11 +1,6 @@
-#include <algorithm>
-#include <cmath>
 #include <cstring>
-#include <tr1/functional>
 #include <iostream>
-#include <numeric>
 #include <stdexcept>
-#include <vector>
 #include <msg/msg.h>
 #include <xbt/log.h>
 
@@ -24,7 +19,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "misc.h"
 #include "options.h"
 #include "process.h"
+#include "statistics.h"
 #include "timer.h"
+#include "tracing.h"
 #include "version.h"
 
 namespace {
@@ -37,9 +34,9 @@ namespace {
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 
-    std::vector<double> loads;
-    double load_stddev;
-    double load_avg;
+    struct statistics comps;
+    struct statistics loads;
+
 }
 
 static int simulation_main(int argc, char* argv[])
@@ -49,7 +46,8 @@ static int simulation_main(int argc, char* argv[])
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();
-        loads.push_back(proc->get_load());
+        comps.push(proc->get_comp());
+        loads.push(proc->get_load());
         delete proc;
     }
     catch (std::invalid_argument& e) {
@@ -72,7 +70,7 @@ static void check_for_lost_load()
         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;
@@ -83,27 +81,14 @@ static void check_for_lost_load()
         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);
 }
 
-static void compute_load_imbalance()
-{
-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
-
-    unsigned n = loads.size();
-    load_avg = std::accumulate(loads.begin(), loads.end(), 0.0) / n;
-
-    std::vector<double> diff(loads);
-    std::transform(diff.begin(), diff.end(), diff.begin(),
-                   bind(std::minus<double>(), _1, load_avg));
-    double epsilon = std::accumulate(diff.begin(), diff.end(), 0.0);
-    double square_sum = std::inner_product(diff.begin(), diff.end(),
-                                           diff.begin(), 0.0);
-    double variance = (square_sum - (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_avg(), st.get_stddev())
 
 int main(int argc, char* argv[])
 {
@@ -175,6 +160,11 @@ int main(int argc, char* argv[])
             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; // =====
 
         // Launch the MSG simulation.
@@ -182,8 +172,6 @@ int main(int argc, char* argv[])
         res = MSG_main();
         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);
 
@@ -209,10 +197,13 @@ int main(int argc, char* argv[])
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();
+        check_for_lost_load();
         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)