X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/751ae9fcfc70b0b48670338c2273e2eaebc388d2..892e36c1af3105e5f548a4ef8b9f777b95d47fc2:/main.cpp?ds=inline diff --git a/main.cpp b/main.cpp index 8b5c3bd..ebf28f1 100644 --- 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 "synchro.h" #include "timer.h" #include "tracing.h" #include "version.h" @@ -34,12 +35,12 @@ namespace { 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; - struct statistics comps; - struct 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); - xbt_mutex_acquire(proc_mutex); + proc_mutex.acquire(); ++proc_counter; - xbt_mutex_release(proc_mutex); + proc_mutex.release(); result = proc->run(); - xbt_mutex_acquire(proc_mutex); + proc_mutex.acquire(); 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; - xbt_cond_broadcast(proc_cond); + proc_cond.broadcast(); 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; } @@ -87,22 +88,22 @@ static void check_for_lost_load() double lost = total_init - total_exit; double lost_ratio = 100.0 * lost / total_init; if (lost_ratio < -opt::load_ratio_threshold) - XBT_CRITICAL("Gained load at exit! %g (%g%%) <============", - -lost, -lost_ratio); + XBT_ERROR("Gained load at exit! %g (%g%%) <============", + -lost, -lost_ratio); else if (lost_ratio > opt::load_ratio_threshold) - XBT_CRITICAL("Lost load at exit! %g (%g%%) <============", - lost, lost_ratio); + XBT_ERROR("Lost load at exit! %g (%g%%) <============", + lost, lost_ratio); else 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) - XBT_CRITICAL("Negative running load at exit! %g (%g%%) <============", - total_running, running_ratio); + XBT_ERROR("Negative running load at exit! %g (%g%%) <============", + total_running, running_ratio); else if (running_ratio > opt::load_ratio_threshold) - XBT_CRITICAL("Remaining running load at exit! %g (%g%%) <============", - total_running, running_ratio); + XBT_ERROR("Remaining running load at exit! %g (%g%%) <============", + total_running, running_ratio); else XBT_VERB("Running load at exit looks good: %g (%g%%)", total_running, running_ratio); @@ -190,19 +191,12 @@ int main(int argc, char* argv[]) 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); - xbt_cond_destroy(proc_cond); - xbt_mutex_destroy(proc_mutex); - if (res != MSG_OK) THROW1(0, 0, "MSG_main() failed with status %#x", res);