X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/61c63b5df9b55aec7c072edb5b392569b215cb83..e2e4118364b679f5bd7f6eae56c40ee6d039f5eb:/main.cpp?ds=sidebyside diff --git a/main.cpp b/main.cpp index fc42d75..9a33928 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); @@ -20,6 +21,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 +36,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 +52,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,16 +68,19 @@ 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; } - 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; } @@ -87,31 +92,31 @@ 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) - 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) - CRITICAL2("Lost load at exit! %g (%g%%) <============", + XBT_ERROR("Lost load at exit! %g (%g%%) <============", 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) - 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) - CRITICAL2("Remaining running load at exit! %g (%g%%) <============", + XBT_ERROR("Remaining running load at exit! %g (%g%%) <============", 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) \ - 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[]) { @@ -154,7 +159,7 @@ int main(int argc, char* argv[]) 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(); @@ -172,8 +177,8 @@ int main(int argc, char* argv[]) 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) @@ -190,18 +195,11 @@ 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. - 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(); - INFO1("Simulation ended at %f.", simulated_time); - - xbt_cond_destroy(proc_cond); - xbt_mutex_destroy(proc_mutex); + XBT_INFO("Simulation ended at %f.", simulated_time); if (res != MSG_OK) THROW1(0, 0, "MSG_main() failed with status %#x", res); @@ -212,8 +210,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' - 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); } @@ -221,7 +219,7 @@ int main(int argc, char* argv[]) 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; } @@ -229,18 +227,19 @@ int main(int argc, char* argv[]) 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); - INFO1("| Total simulated time...................: %g", simulated_time); - INFO1("| Total simulation time..................: %g", - simulation_time.duration()); - INFO0("`----"); + XBT_INFO("| Total simulated time...................: %g", + simulated_time); + XBT_INFO("| Total simulation time..................: %g", + simulation_time.duration()); + XBT_INFO("`----"); } if (exit_status) - ERROR1("Simulation failed (%#x).", exit_status); + XBT_ERROR("Simulation failed (%#x).", exit_status); else - INFO0("Simulation succeeded."); + XBT_INFO("Simulation succeeded."); return exit_status; }