X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/26173071a8897d8cd839d6a354816bad7d671547..af64dd20ef845daabe4d63ea34723d94d3a20c35:/main.cpp?ds=sidebyside diff --git a/main.cpp b/main.cpp index ff1fa1b..aa964bb 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,6 @@ -#include +#include +#include +#include // strchr #include #include #include @@ -36,6 +38,9 @@ namespace { EXIT_FAILURE_INIT = 0x02, // failed to initialize simulator EXIT_FAILURE_SIMU = 0x04, // simulation failed EXIT_FAILURE_CLEAN = 0x08, // error at cleanup + EXIT_FAILURE_INTR = 0x10, // interrupted by user + EXIT_FAILURE_LOAD = 0x20, // lost load on exit + EXIT_FAILURE_OTHER = 0x40, // other error }; // Cannot be globally initialized... @@ -95,40 +100,73 @@ static int simulation_main(int argc, char* argv[]) delete proc; } catch (const std::invalid_argument& e) { - THROW1(arg_error, 0, "%s", e.what()); + THROWF(arg_error, 0, "%s", e.what()); } catch (const std::exception& e) { - THROW1(0, 0, "%s", e.what()); + THROWF(0, 0, "%s", e.what()); } return result; } -static void check_for_lost_load() +static bool check_for_lost_load() { + bool res = true; 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) + if (lost_ratio < -opt::load_ratio_threshold) { XBT_ERROR("Gained load at exit! %g (%g%%) <============", -lost, -lost_ratio); - else if (lost_ratio > opt::load_ratio_threshold) + res = false; + } else if (lost_ratio > opt::load_ratio_threshold) { XBT_ERROR("Lost load at exit! %g (%g%%) <============", lost, lost_ratio); - else + res = false; + } 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) + if (running_ratio < -opt::load_ratio_threshold) { XBT_ERROR("Negative running load at exit! %g (%g%%) <============", total_running, running_ratio); - else if (running_ratio > opt::load_ratio_threshold) + res = false; + } else if (running_ratio > opt::load_ratio_threshold) { XBT_ERROR("Remaining running load at exit! %g (%g%%) <============", total_running, running_ratio); - else + res = false; + } else XBT_VERB("Running load at exit looks good: %g (%g%%)", total_running, running_ratio); + return res; +} + +static void signal_handler(int /*sig*/) +{ + if (!opt::exit_request) { + XBT_CRITICAL(">>>>>>>>>>" + " caught CTRL-C: global exit requested " + "<<<<<<<<<<"); + opt::exit_request = 1; + } else { + XBT_CRITICAL(">>>>>>>>>>" + " caught CTRL-C for the 2nd time: exit immediately " + "<<<<<<<<<<"); + exit(EXIT_FAILURE_INTR); + } +} + +static void install_signal_handler() +{ + struct sigaction action; + action.sa_handler = signal_handler; + sigemptyset(&action.sa_mask); + action.sa_flags = SA_RESTART; + if (sigaction(SIGINT, &action, NULL) == -1) { + std::cerr << "sigaction: " << strerror(errno) << "\n"; + exit(EXIT_FAILURE_OTHER); + } } #define PR_STATS(descr, st) \ @@ -141,10 +179,12 @@ int main(int argc, char* argv[]) // Note: variables used after THROW must be declared as volatile. volatile int exit_status = 0; // global exit status volatile double simulated_time = -1.0; - timestamp simulation_time; + timestamp elapsed_time(timestamp::wallclock_time); + timestamp simulation_time(timestamp::cpu_time); xbt_ex_t ex; MSG_error_t res; + elapsed_time.start(); simulation_time.start(); // Set default logging parameters @@ -162,6 +202,7 @@ int main(int argc, char* argv[]) // Note: MSG_global_init() may throw an exception, but it seems // impossible to catch it correctly :-( MSG_global_init(&argc, argv); + install_signal_handler(); // Parse global parameters bool parse_res = opt::parse_args(&argc, argv); @@ -193,6 +234,7 @@ int main(int argc, char* argv[]) MSG_create_environment(opt::platform_file.c_str()); XBT_DEBUG("Creating hostdata..."); hostdata::create(); + XBT_INFO("Loaded description of %zd hosts.", hostdata::size()); XBT_DEBUG("Deploying processes..."); if (opt::auto_depl::enabled) { if (!opt::auto_depl::nhosts) @@ -202,17 +244,21 @@ int main(int argc, char* argv[]) opt::auto_depl::nhosts, hostdata::size()); opt::auto_depl::nhosts = hostdata::size(); } - if (!opt::auto_depl::load) + if (opt::auto_depl::load == 0.0) { + XBT_WARN("Initial load is zero! Falling back on old behaviour."); opt::auto_depl::load = opt::auto_depl::nhosts; + } else if (opt::auto_depl::load < 0.0) + opt::auto_depl::load = + -opt::auto_depl::load * opt::auto_depl::nhosts; MY_launch_application(); // it is already opt::* aware... } else { 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); + TRACE_category_with_color(TRACE_CAT_COMP, TRACE_COLOR_COMP); + TRACE_category_with_color(TRACE_CAT_CTRL, TRACE_COLOR_CTRL); + TRACE_category_with_color(TRACE_CAT_DATA, TRACE_COLOR_DATA); exit_status = EXIT_FAILURE_SIMU; // ===== @@ -229,7 +275,7 @@ int main(int argc, char* argv[]) delete proc_mutex; if (res != MSG_OK) - THROW1(0, 0, "MSG_main() failed with status %#x", res); + THROWF(0, 0, "MSG_main() failed with status %#x", res); exit_status = EXIT_NO_FAILURE; // ===== } @@ -253,7 +299,9 @@ int main(int argc, char* argv[]) // Report final simulation status. if (simulated_time >= 0.0) { simulation_time.stop(); - check_for_lost_load(); + elapsed_time.stop(); + if (!check_for_lost_load()) + exit_status |= EXIT_FAILURE_LOAD; XBT_INFO(",----[ Results ]"); PR_STATS("Load", loads); PR_STATS("Computation", comps); @@ -271,6 +319,9 @@ int main(int argc, char* argv[]) XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH, "Total simulation time.................................", simulation_time.duration()); + XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH, + "Elapsed (wall clock) time.............................", + elapsed_time.duration()); XBT_INFO("`----"); } if (exit_status)