X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/82a490fdda330eb916eb059929de4be817fe8a87..76d4afa3496d7710e7548b6bca27473db7c9308c:/main.cpp?ds=sidebyside

diff --git a/main.cpp b/main.cpp
index ebf28f1..ff1fa1b 100644
--- 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(thrd, simu, "Messages from thread wrapper class");
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
@@ -25,6 +26,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "tracing.h"
 #include "version.h"
 
+#define DATA_DESCR_WIDTH 37
+
 namespace {
     // Failure exit status
     enum {
@@ -35,12 +38,21 @@ namespace {
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 
-    mutex_t proc_mutex;
-    condition_t proc_cond;
+    // Cannot be globally initialized...
+    mutex_t* proc_mutex;
+    condition_t* proc_cond;
     unsigned proc_counter = 0;
 
-    statistics comps;
     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;
 
 }
 
@@ -51,15 +63,23 @@ static int simulation_main(int argc, char* argv[])
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
 
-        proc_mutex.acquire();
+        proc_mutex->acquire();
         ++proc_counter;
-        proc_mutex.release();
+        proc_mutex->release();
 
         result = proc->run();
 
-        proc_mutex.acquire();
-        comps.push(proc->get_comp());
+        proc_mutex->acquire();
         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
@@ -67,23 +87,25 @@ static int simulation_main(int argc, char* argv[])
         // destroys a communication they had together.
 
         --proc_counter;
-        proc_cond.broadcast();
+        proc_cond->broadcast();
         while (proc_counter > 0)
-            proc_cond.wait(proc_mutex);
-        proc_mutex.release();
+            proc_cond->wait(*proc_mutex);
+        proc_mutex->release();
 
         delete proc;
     }
-    catch (std::invalid_argument& e) {
+    catch (const std::invalid_argument& e) {
         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();
-
     double total_exit = process::get_total_load_exit();
     double lost = total_init - total_exit;
     double lost_ratio = 100.0 * lost / total_init;
@@ -110,8 +132,8 @@ static void check_for_lost_load()
 }
 
 #define PR_STATS(descr, st)                                             \
-    XBT_INFO("| %.*s: %g / %g / %g", 39,                                \
-             descr " total/avg./stddev. at exit.........................", \
+    XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
+             descr " (total/avg./stddev)................................", \
              st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])
@@ -167,8 +189,11 @@ int main(int argc, char* argv[])
         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());
+        XBT_DEBUG("Creating hostdata...");
         hostdata::create();
+        XBT_DEBUG("Deploying processes...");
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)
                 opt::auto_depl::nhosts = hostdata::size();
@@ -191,12 +216,18 @@ int main(int argc, char* argv[])
 
         exit_status = EXIT_FAILURE_SIMU; // =====
 
+        proc_mutex = new mutex_t();
+        proc_cond = new condition_t();
+
         // Launch the MSG simulation.
         XBT_INFO("Starting simulation at %f...", MSG_get_clock());
         res = MSG_main();
         simulated_time = MSG_get_clock();
         XBT_INFO("Simulation ended at %f.", simulated_time);
 
+        delete proc_cond;
+        delete proc_mutex;
+
         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);
 
@@ -226,9 +257,19 @@ int main(int argc, char* argv[])
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
-        XBT_INFO("| Total simulated time...................: %g",
+        PR_STATS("Data send amount", data_send_amount);
+        PR_STATS("Data recv amount", data_recv_amount);
+        PR_STATS("Data send count", data_send_count);
+        PR_STATS("Data recv count", data_recv_count);
+        PR_STATS("Ctrl send amount", ctrl_send_amount);
+        PR_STATS("Ctrl recv amount", ctrl_recv_amount);
+        PR_STATS("Ctrl send count", ctrl_send_count);
+        PR_STATS("Ctrl recv count", ctrl_recv_count);
+        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
+                 "Total simulated time..................................",
                  simulated_time);
-        XBT_INFO("| Total simulation time..................: %g",
+        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
+                 "Total simulation time.................................",
                  simulation_time.duration());
         XBT_INFO("`----");
     }