Define classes for mutex and condition objects.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 0aa4327ba85a01a3bd77497cbbb729de3b164385..ebf28f10c379e715c1a9b45878d1a271b6a1953b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -20,6 +20,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,9 +35,9 @@ 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;
+    mutex_t proc_mutex;
+    condition_t proc_cond;
+    unsigned proc_counter = 0;

 
     statistics comps;
     statistics loads;
 
     statistics comps;
     statistics loads;


@@ -50,13 +51,13 @@ 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);
+        proc_mutex.acquire();

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


@@ -66,10 +67,10 @@ 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;
     }


@@ -190,19 +191,12 @@ 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;
-

         // 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);
 
         // 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);
 

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