Delete process::sum_of_to_send().

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 5326e732e9f9bf1834a64166fa971aa6e4276b19..3a47b920da0db461b81444de817c70e399e9e97d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,9 +1,6 @@
-#include <cmath>
 #include <cstring>
 #include <iostream>
-#include <numeric>
 #include <stdexcept>
-#include <vector>
 #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 "statistics.h"
 #include "timer.h"
+#include "tracing.h"
 #include "version.h"
 
 namespace {
@@ -35,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[])
@@ -47,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) {
@@ -70,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;
@@ -81,24 +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()
-{
-    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_avg(), st.get_stddev())
 
 int main(int argc, char* argv[])
 {
@@ -128,7 +118,7 @@ int main(int argc, char* argv[])
     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)
@@ -170,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.
@@ -177,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);
 
@@ -204,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)