Add statistics about message exchanges.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index fc42d750f9c992b8fe9a27b17f5aac7ec232b48c..7af6b74759ba189fb93e9630291b0b5074eb177f 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,21 @@ 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;
-
-    struct statistics comps;
-    struct statistics loads;
+    // Cannot be globally initialized...
+    mutex_t* proc_mutex;
+    condition_t* proc_cond;
+    unsigned proc_counter = 0;
+
+    statistics loads;
+    statistics comps;
+    statistics data_send_amount;
+    statistics data_recv_amount;
+    statistics data_send_count;
+    statistics data_recv_count;
+    statistics ctrl_send_amount;
+    statistics ctrl_recv_amount;
+    statistics ctrl_send_count;
+    statistics ctrl_recv_count;

 
 }
 
 
 }
 


@@ -50,15 +61,23 @@ 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);
-        comps.push(proc->get_comp());
+        proc_mutex->acquire();

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

+        comps.push(proc->get_comp_amount());
+        data_send_amount.push(proc->get_data_send_amount());
+        data_recv_amount.push(proc->get_data_recv_amount());
+        data_send_count.push(proc->get_data_send_count());
+        data_recv_count.push(proc->get_data_recv_count());
+        ctrl_send_amount.push(proc->get_ctrl_send_amount());
+        ctrl_recv_amount.push(proc->get_ctrl_recv_amount());
+        ctrl_send_count.push(proc->get_ctrl_send_count());
+        ctrl_recv_count.push(proc->get_ctrl_recv_count());

 
         // Synchronization barrier...
         // The goal is to circumvent a limitation in SimGrid (at least
 
         // Synchronization barrier...
         // The goal is to circumvent a limitation in SimGrid (at least


@@ -66,52 +85,54 @@ 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)

-        CRITICAL2("Gained load at exit! %g (%g%%) <============",
+        XBT_ERROR("Gained load at exit! %g (%g%%) <============",

                   -lost, -lost_ratio);
     else if (lost_ratio > opt::load_ratio_threshold)
                   -lost, -lost_ratio);
     else if (lost_ratio > opt::load_ratio_threshold)

-        CRITICAL2("Lost load at exit! %g (%g%%) <============",
+        XBT_ERROR("Lost load at exit! %g (%g%%) <============",

                   lost, lost_ratio);
     else
                   lost, lost_ratio);
     else

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

-        CRITICAL2("Negative running load at exit! %g (%g%%) <============",
+        XBT_ERROR("Negative running load at exit! %g (%g%%) <============",

                   total_running, running_ratio);
     else if (running_ratio > opt::load_ratio_threshold)
                   total_running, running_ratio);
     else if (running_ratio > opt::load_ratio_threshold)

-        CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
+        XBT_ERROR("Remaining running load at exit! %g (%g%%) <============",

                   total_running, running_ratio);
     else
                   total_running, running_ratio);
     else

-        VERB2("Running load at exit looks good: %g (%g%%)",
-               total_running, running_ratio);
+        XBT_VERB("Running load at exit looks good: %g (%g%%)",
+                 total_running, running_ratio);

 }
 
 #define PR_STATS(descr, st)                                             \
 }
 
 #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())
+    XBT_INFO("| %.*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[])
 {


@@ -154,7 +175,7 @@ int main(int argc, char* argv[])
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }

-    INFO3("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),
+    XBT_INFO("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),

           version::date.c_str());
     opt::print();
 
           version::date.c_str());
     opt::print();
 


@@ -166,14 +187,17 @@ int main(int argc, char* argv[])
         MSG_function_register_default(simulation_main);
 
         // Create the platform and the application.
         MSG_function_register_default(simulation_main);
 
         // Create the platform and the application.

+        XBT_DEBUG("Loading platform file...");

         MSG_create_environment(opt::platform_file.c_str());
         MSG_create_environment(opt::platform_file.c_str());

+        XBT_DEBUG("Creating hostdata...");

         hostdata::create();
         hostdata::create();

+        XBT_DEBUG("Deploying processes...");

         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
             if (opt::auto_depl::nhosts > hostdata::size()) {
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
             if (opt::auto_depl::nhosts > hostdata::size()) {

-                WARN2("%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,18 +214,17 @@ 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;
+        proc_mutex = new mutex_t();
+        proc_cond = new condition_t();

 
         // Launch the MSG simulation.
 
         // Launch the MSG simulation.

-        INFO1("Starting simulation at %f...", MSG_get_clock());
+        XBT_INFO("Starting simulation at %f...", MSG_get_clock());

         res = MSG_main();
         simulated_time = MSG_get_clock();
         res = MSG_main();
         simulated_time = MSG_get_clock();

-        INFO1("Simulation ended at %f.", simulated_time);
+        XBT_INFO("Simulation ended at %f.", simulated_time);

 
 

-        xbt_cond_destroy(proc_cond);
-        xbt_mutex_destroy(proc_mutex);
+        delete proc_cond;
+        delete 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);


@@ -212,8 +235,8 @@ int main(int argc, char* argv[])
         int len = strlen(ex.msg);
         if (len > 0 && ex.msg[len - 1] == '\n')
             ex.msg[len - 1] = '\0'; // strip the ending '\n'
         int len = strlen(ex.msg);
         if (len > 0 && ex.msg[len - 1] == '\n')
             ex.msg[len - 1] = '\0'; // strip the ending '\n'

-        ERROR1("%s", ex.msg);
-        DEBUG3("Error from %s() in %s:%d", ex.func, ex.file, ex.line);
+        XBT_ERROR("%s", ex.msg);
+        XBT_DEBUG("Error from %s() in %s:%d", ex.func, ex.file, ex.line);

         xbt_ex_free(ex);
     }
 
         xbt_ex_free(ex);
     }
 


@@ -221,7 +244,7 @@ int main(int argc, char* argv[])
     hostdata::destroy();
     res = MSG_clean();
     if (res != MSG_OK) {
     hostdata::destroy();
     res = MSG_clean();
     if (res != MSG_OK) {

-        ERROR1("MSG_clean() failed with status %#x", res);
+        XBT_ERROR("MSG_clean() failed with status %#x", res);

         exit_status |= EXIT_FAILURE_CLEAN;
     }
 
         exit_status |= EXIT_FAILURE_CLEAN;
     }
 


@@ -229,18 +252,27 @@ int main(int argc, char* argv[])
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         check_for_lost_load();
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         check_for_lost_load();

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

         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);

-        INFO1("| Total simulated time...................: %g", simulated_time);
-        INFO1("| Total simulation time..................: %g",
-              simulation_time.duration());
-        INFO0("`----");
+        PR_STATS("Data send", data_send_amount);
+        PR_STATS("Data recv", data_recv_amount);
+        PR_STATS("Data send #", data_send_count);
+        PR_STATS("Data recv #", data_recv_count);
+        PR_STATS("Ctrl send", ctrl_send_amount);
+        PR_STATS("Ctrl recv", ctrl_recv_amount);
+        PR_STATS("Ctrl send #", ctrl_send_count);
+        PR_STATS("Ctrl recv #", ctrl_recv_count);
+        XBT_INFO("| Total simulated time...................: %g",
+                 simulated_time);
+        XBT_INFO("| Total simulation time..................: %g",
+                 simulation_time.duration());
+        XBT_INFO("`----");

     }
     if (exit_status)
     }
     if (exit_status)

-        ERROR1("Simulation failed (%#x).", exit_status);
+        XBT_ERROR("Simulation failed (%#x).", exit_status);

     else
     else

-        INFO0("Simulation succeeded.");
+        XBT_INFO("Simulation succeeded.");

 
     return exit_status;
 }
 
     return exit_status;
 }