X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fd762bbcbc15aa4ffafe2d15df5cb650d1fa1ff..a4c8f1898670317d0fa33bf1b1a904ea922b78cc:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 108ba80fea..ca3e4b9edb 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); } @@ -138,35 +144,57 @@ void Timer::remove() delete this; } +/** Execute all the tasks that are queued, e.g. `.then()` callbacks of futures. */ +bool Global::execute_tasks() +{ + xbt_assert(tasksTemp.empty()); + + if (tasks.empty()) + return false; + + do { + // We don't want the callbacks to modify the vector we are iterating over: + tasks.swap(tasksTemp); + + // Execute all the queued tasks: + for (auto& task : tasksTemp) + task(); + + tasksTemp.clear(); + } while (not tasks.empty()); + + return true; +} + 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}; } } @@ -192,10 +220,10 @@ void SIMIX_global_init(int *argc, char **argv) #endif if (simix_global == nullptr) { + surf_init(argc, argv); /* Initialize SURF structures */ + simix_global.reset(new simgrid::simix::Global()); simix_global->maestro_process = nullptr; - - surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); // Either create a new context with maestro or create @@ -212,17 +240,14 @@ void SIMIX_global_init(int *argc, char **argv) sg_platf_init(); simgrid::s4u::on_platform_created.connect(surf_presolve); - simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) { + simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage const& storage) { sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_name()); xbt_assert(s != nullptr, "Storage not found for name %s", storage.get_cname()); }); } - if (simgrid::config::get_value("clean-atexit")) + if (simgrid::config::get_value("debug/clean-atexit")) atexit(SIMIX_clean); - - if (_sg_cfg_exit_asap) - exit(0); } int smx_cleaned = 0; @@ -259,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 */ @@ -316,15 +341,16 @@ static void SIMIX_wake_processes() XBT_DEBUG("Handling the processes whose action failed (if any)"); while ((action = model->extract_failed_action())) { XBT_DEBUG(" Handling Action %p",action); - SIMIX_simcall_exit(static_cast(action->get_data())); + if (action->get_activity() != nullptr) + simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); } XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); while ((action = model->extract_done_action())) { XBT_DEBUG(" Handling Action %p",action); - if (action->get_data() == nullptr) + if (action->get_activity() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit(static_cast(action->get_data())); + simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); } } } @@ -338,48 +364,19 @@ 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; } -/** Execute all the tasks that are queued - * - * e.g. `.then()` callbacks of futures. - **/ -static bool SIMIX_execute_tasks() -{ - xbt_assert(simix_global->tasksTemp.empty()); - - if (simix_global->tasks.empty()) - return false; - - do { - // We don't want the callbacks to modify the vector we are iterating over: - simix_global->tasks.swap(simix_global->tasksTemp); - - // Execute all the queued tasks: - for (auto& task : simix_global->tasksTemp) - task(); - - simix_global->tasksTemp.clear(); - } while (not simix_global->tasks.empty()); - - return true; -} - /** * @ingroup SIMIX_API * @brief Run the main simulation loop. */ void SIMIX_run() { - if (not MC_record_path.empty()) { + if (MC_record_replay_is_active()) { simgrid::mc::replay(MC_record_path); return; } @@ -389,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 @@ -399,7 +396,7 @@ void SIMIX_run() #endif } - SIMIX_execute_tasks(); + simix_global->execute_tasks(); while (not simix_global->actors_to_run.empty()) { XBT_DEBUG("New Sub-Schedule Round; size(queue)=%zu", simix_global->actors_to_run.size()); @@ -475,10 +472,10 @@ void SIMIX_run() } } - SIMIX_execute_tasks(); + simix_global->execute_tasks(); do { SIMIX_wake_processes(); - } while (SIMIX_execute_tasks()); + } while (simix_global->execute_tasks()); /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */ if (simix_global->process_list.size() == simix_global->daemons.size()) @@ -503,7 +500,7 @@ void SIMIX_run() bool again = false; do { again = SIMIX_execute_timers(); - if (SIMIX_execute_tasks()) + if (simix_global->execute_tasks()) again = true; SIMIX_wake_processes(); } while (again); @@ -569,6 +566,11 @@ void SIMIX_display_process_status() if (process->waiting_synchro) { const char* synchro_description = "unknown"; + // we don't care about the Activity type to get its name, use RawImpl + const char* name = + boost::static_pointer_cast>( + process->waiting_synchro) + ->get_cname(); if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "execution"; @@ -587,8 +589,7 @@ void SIMIX_display_process_status() XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->get_pid(), process->get_cname(), process->get_host()->get_cname(), synchro_description, - process->waiting_synchro.get(), process->waiting_synchro->get_cname(), - (int)process->waiting_synchro->state_); + process->waiting_synchro.get(), name, (int)process->waiting_synchro->state_); } else { XBT_INFO("Process %ld (%s@%s)", process->get_pid(), process->get_cname(), process->get_host()->get_cname());