Cosmetics: move around some code.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index ebf28f10c379e715c1a9b45878d1a271b6a1953b..ad59642611707298e6e9e335e23843644a122911 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(thrd, simu, "Messages from thread wrapper class");
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
@@ -35,8 +36,9 @@ 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;
@@ -51,13 +53,13 @@ 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();
+        proc_mutex->acquire();
         comps.push(proc->get_comp());
         loads.push(proc->get_real_load());
 
@@ -67,23 +69,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;
@@ -191,12 +195,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);