X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f2c30ea366a1f0ef91e94000f89b16a763c0dccd..de9d56dddba96f345ba109a8cdb0a2986cd59292:/main.cpp diff --git a/main.cpp b/main.cpp index 92e4882..ad59642 100644 --- a/main.cpp +++ b/main.cpp @@ -1,11 +1,6 @@ -#include -#include #include -#include #include -#include #include -#include #include #include @@ -16,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); @@ -24,7 +20,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "misc.h" #include "options.h" #include "process.h" +#include "statistics.h" +#include "synchro.h" #include "timer.h" +#include "tracing.h" #include "version.h" namespace { @@ -37,14 +36,14 @@ namespace { EXIT_FAILURE_CLEAN = 0x08, // error at cleanup }; - std::vector comps; - double comp_total; - double comp_avg; - double comp_stddev; + // Cannot be globally initialized... + mutex_t* proc_mutex; + condition_t* proc_cond; + unsigned proc_counter = 0; + + statistics comps; + statistics loads; - std::vector loads; - double load_avg; - double load_stddev; } static int simulation_main(int argc, char* argv[]) @@ -53,78 +52,71 @@ static int simulation_main(int argc, char* argv[]) process* proc; try { proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv); + + proc_mutex->acquire(); + ++proc_counter; + proc_mutex->release(); + result = proc->run(); - comps.push_back(proc->get_comp()); - loads.push_back(proc->get_load()); + + proc_mutex->acquire(); + 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; + proc_cond->broadcast(); + while (proc_counter > 0) + 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; if (lost_ratio < -opt::load_ratio_threshold) - CRITICAL2("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) - CRITICAL2("Lost load at exit! %g (%g%%) <============", + XBT_ERROR("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%%) <============", + 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 - 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 statistics(const std::vector& vec, - double* sum, double* avg, double* stddev) -{ - using std::tr1::bind; - using std::tr1::placeholders::_1; - - unsigned n = vec.size(); - double vec_sum = std::accumulate(vec.begin(), vec.end(), 0.0); - double vec_avg = vec_sum / n; - - if (sum) - *sum = vec_sum; - if (avg) - *avg = vec_avg; - - if (stddev) { - std::vector diff(vec); - std::transform(diff.begin(), diff.end(), diff.begin(), - bind(std::minus(), _1, vec_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; - *stddev = sqrt(variance); - } -} - -static void compute_metrics() -{ - statistics(comps, &comp_total, &comp_avg, &comp_stddev); - statistics(loads, NULL, &load_avg, &load_stddev); -} +#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[]) { @@ -167,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(); @@ -185,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) @@ -196,13 +188,25 @@ 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 = new mutex_t(); + proc_cond = new condition_t(); + // 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_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); @@ -212,8 +216,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 +225,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,21 +233,19 @@ int main(int argc, char* argv[]) if (simulated_time >= 0.0) { simulation_time.stop(); check_for_lost_load(); - compute_metrics(); - INFO0(",----[ Results ]"); - INFO2("| Load avg./stddev. at exit..............: %g / %g", - load_avg, load_stddev); - INFO3("| Computation total/avg./stddev. at exit.: %g / %g / %g", - comp_total, comp_avg, comp_stddev); - INFO1("| Total simulated time...................: %g", simulated_time); - INFO1("| Total simulation time..................: %g", - simulation_time.duration()); - INFO0("`----"); + 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; }