X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b830103bb89748d30c84ff7a0e88ca821d2d78b7..f063625862eb4dfe006653ce98a4291fb4c1810e:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 4b132db5d6..2662ebaa24 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -32,15 +32,21 @@ std::unique_ptr simix_global; void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; -bool _sg_do_verbose_exit = true; -static void inthandler(int) +namespace simgrid { +namespace simix { +simgrid::config::Flag cfg_verbose_exit{ + "debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true}; +} +} // namespace simgrid +XBT_ATTRIB_NORETURN static void inthandler(int) { - if ( _sg_do_verbose_exit ) { - XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit')."); - SIMIX_display_process_status(); + if (simgrid::simix::cfg_verbose_exit) { + XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option " + "'debug/verbose-exit')."); + SIMIX_display_process_status(); } else { - XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'verbose-exit' is set to false."); + XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false."); } exit(1); } @@ -165,30 +171,30 @@ void Global::empty_trash() while (not actors_to_destroy.empty()) { smx_actor_t actor = &actors_to_destroy.front(); actors_to_destroy.pop_front(); - XBT_DEBUG("Getting rid of %p", actor); + XBT_DEBUG("Getting rid of %s (refcount: %d)", actor->get_cname(), actor->get_refcount()); intrusive_ptr_release(actor); } #if SIMGRID_HAVE_MC - xbt_dynar_reset(simix_global->dead_actors_vector); + xbt_dynar_reset(dead_actors_vector); #endif } /** - * @brief Executes the actors in simix_global->actors_to_run. + * @brief Executes the actors in actors_to_run. * - * The actors in simix_global->actors_to_run are run (in parallel if possible). On exit, simix_global->actors_to_run - * is empty, and simix_global->actors_that_ran contains the list of actors that just ran. - * The two lists are swapped so, be careful when using them before and after a call to this function. + * The actors in actors_to_run are run (in parallel if possible). On exit, actors_to_run is empty, and actors_that_ran + * contains the list of actors that just ran. The two lists are swapped so, be careful when using them before and after + * a call to this function. */ void Global::run_all_actors() { - SIMIX_context_runall(); + simix_global->context_factory->run_all(); - simix_global->actors_to_run.swap(simix_global->actors_that_ran); - simix_global->actors_to_run.clear(); + actors_to_run.swap(actors_that_ran); + actors_to_run.clear(); } -simgrid::config::Flag breakpoint{"simix/breakpoint", - "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; +simgrid::config::Flag cfg_breakpoint{ + "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } } @@ -240,7 +246,7 @@ void SIMIX_global_init(int *argc, char **argv) }); } - if (simgrid::config::get_value("clean-atexit")) + if (simgrid::config::get_value("debug/clean-atexit")) atexit(SIMIX_clean); } @@ -278,7 +284,7 @@ void SIMIX_clean() /* Kill all processes (but maestro) */ simix_global->maestro_process->kill_all(); - SIMIX_context_runall(); + simix_global->context_factory->run_all(); simix_global->empty_trash(); /* Exit the SIMIX network module */ @@ -332,13 +338,13 @@ static void SIMIX_wake_processes() for (auto const& model : all_existing_models) { simgrid::kernel::resource::Action* action; - XBT_DEBUG("Handling the processes whose action failed (if any)"); + XBT_DEBUG("Handling the failed actions (if any)"); while ((action = model->extract_failed_action())) { XBT_DEBUG(" Handling Action %p",action); if (action->get_activity() != nullptr) simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); } - XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); + XBT_DEBUG("Handling the terminated actions (if any)"); while ((action = model->extract_done_action())) { XBT_DEBUG(" Handling Action %p",action); if (action->get_activity() == nullptr) @@ -358,11 +364,7 @@ static bool SIMIX_execute_timers() // FIXME: make the timers being real callbacks (i.e. provide dispatchers that read and expand the args) smx_timer_t timer = simgrid::simix::simix_timers.top().second; simgrid::simix::simix_timers.pop(); - try { - timer->callback(); - } catch (...) { - xbt_die("Exception thrown ouf of timer callback"); - } + timer->callback(); delete timer; } return result; @@ -374,7 +376,7 @@ static bool SIMIX_execute_timers() */ void SIMIX_run() { - if (not MC_record_path.empty()) { + if (MC_record_replay_is_active()) { simgrid::mc::replay(MC_record_path); return; } @@ -384,9 +386,9 @@ void SIMIX_run() do { XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->actors_to_run.size()); - if (simgrid::simix::breakpoint >= 0.0 && surf_get_clock() >= simgrid::simix::breakpoint) { - XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get()); - simgrid::simix::breakpoint = -1.0; + if (simgrid::simix::cfg_breakpoint >= 0.0 && surf_get_clock() >= simgrid::simix::cfg_breakpoint) { + XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::cfg_breakpoint.get()); + simgrid::simix::cfg_breakpoint = -1.0; #ifdef SIGTRAP std::raise(SIGTRAP); #else @@ -424,7 +426,7 @@ void SIMIX_run() * - If a process is added because it's getting killed, its subsequent actions shouldn't matter * - If a process gets added to actors_to_run because one of their blocking action constituting the meat * of a simcall terminates, we're still good. Proof: - * - You are added from SIMIX_simcall_answer() only. When this function is called depends on the resource + * - You are added from ActorImpl::simcall_answer() only. When this function is called depends on the resource * kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications as an * example. * - For communications, this function is called from SIMIX_comm_finish(). @@ -466,7 +468,7 @@ void SIMIX_run() for (smx_actor_t const& process : simix_global->actors_that_ran) { if (process->simcall.call != SIMCALL_NONE) { - SIMIX_simcall_handle(&process->simcall, 0); + process->simcall_handle(0); } }