X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/7725e3d7f34e70c0ba01ddc4e1055e096e72c2c3..a2555a351393901a2e5398707e473cb062eed578:/main.cpp?ds=sidebyside diff --git a/main.cpp b/main.cpp index 907869e..8b5c3bd 100644 --- a/main.cpp +++ b/main.cpp @@ -1,11 +1,6 @@ -#include -#include #include -#include #include -#include #include -#include #include #include @@ -24,7 +19,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "misc.h" #include "options.h" #include "process.h" +#include "statistics.h" #include "timer.h" +#include "tracing.h" #include "version.h" namespace { @@ -37,9 +34,13 @@ namespace { EXIT_FAILURE_CLEAN = 0x08, // error at cleanup }; - std::vector loads; - double load_stddev; - double load_avg; + xbt_mutex_t proc_mutex; + xbt_cond_t proc_cond; + unsigned proc_counter; + + struct statistics comps; + struct statistics loads; + } static int simulation_main(int argc, char* argv[]) @@ -48,8 +49,28 @@ static int simulation_main(int argc, char* argv[]) process* proc; try { proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv); + + xbt_mutex_acquire(proc_mutex); + ++proc_counter; + xbt_mutex_release(proc_mutex); + result = proc->run(); - loads.push_back(proc->get_load()); + + xbt_mutex_acquire(proc_mutex); + comps.push(proc->get_comp()); + loads.push(proc->get_real_load()); + + // Synchronization barrier... + // The goal is to circumvent a limitation in SimGrid (at least + // in version 3.5): a process must be alive when another one + // destroys a communication they had together. + + --proc_counter; + xbt_cond_broadcast(proc_cond); + while (proc_counter > 0) + xbt_cond_wait(proc_cond, proc_mutex); + xbt_mutex_release(proc_mutex); + delete proc; } catch (std::invalid_argument& e) { @@ -66,44 +87,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%%) <============", - lost, lost_ratio); + XBT_CRITICAL("Gained load at exit! %g (%g%%) <============", + -lost, -lost_ratio); else if (lost_ratio > opt::load_ratio_threshold) - CRITICAL2("Lost load at exit! %g (%g%%) <============", - lost, lost_ratio); + XBT_CRITICAL("Lost load at exit! %g (%g%%) <============", + lost, lost_ratio); else - DEBUG2("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%%) <============", - total_running, running_ratio); + XBT_CRITICAL("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%%) <============", - total_running, running_ratio); + XBT_CRITICAL("Remaining running load at exit! %g (%g%%) <============", + total_running, running_ratio); else - DEBUG2("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); } -static void compute_load_imbalance() -{ - using std::tr1::bind; - using std::tr1::placeholders::_1; - - unsigned n = loads.size(); - load_avg = std::accumulate(loads.begin(), loads.end(), 0.0) / n; - - std::vector diff(loads); - std::transform(diff.begin(), diff.end(), diff.begin(), - bind(std::minus(), _1, load_avg)); - double epsilon = std::accumulate(diff.begin(), diff.end(), 0.0); - double square_sum = std::inner_product(diff.begin(), diff.end(), - diff.begin(), 0.0); - double variance = (square_sum - (epsilon * epsilon) / n) / n; - load_stddev = sqrt(variance); -} +#define PR_STATS(descr, st) \ + 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[]) { @@ -146,7 +154,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(); @@ -164,8 +172,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) @@ -175,15 +183,26 @@ int main(int argc, char* argv[]) MSG_launch_application(opt::deployment_file.c_str()); } + // Register tracing categories + TRACE_category(TRACE_CAT_COMP); + TRACE_category(TRACE_CAT_CTRL); + TRACE_category(TRACE_CAT_DATA); + 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); - check_for_lost_load(); - compute_load_imbalance(); + 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); @@ -193,8 +212,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); } @@ -202,23 +221,27 @@ 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; } // Report final simulation status. if (simulated_time >= 0.0) { simulation_time.stop(); - INFO0(",----[ Results ]"); - INFO2("| Load avg./stddev. at exit.: %g / %g", load_avg, load_stddev); - INFO1("| Total simulated time......: %g", simulated_time); - INFO1("| Total simulation time.....: %g", simulation_time.duration()); - INFO0("`----"); + check_for_lost_load(); + XBT_INFO(",----[ Results ]"); + PR_STATS("Load", loads); + PR_STATS("Computation", comps); + 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; }