X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5089a0a98b27f5eeee62321dff4f025f1648f025..c97656604936a7d3000ee3c98e0926b80f6f2150:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 83c6f920b3..20b1f4afb8 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -43,7 +43,7 @@ XBT_ATTRIB_NORETURN static void inthandler(int) 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(); + simix_global->display_all_actor_status(); } else { XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false."); @@ -72,7 +72,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) } else if (siginfo->si_signo == SIGSEGV) { fprintf(stderr, "Segmentation fault.\n"); #if HAVE_SMPI - if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::NONE) { + if (smpi_enabled() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) { #if HAVE_PRIVATIZATION fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n"); #else @@ -197,12 +197,74 @@ void Global::run_all_actors() actors_to_run.clear(); } +/** Wake up all actors waiting for a Surf action to finish */ +void Global::wake_all_waiting_actors() +{ + for (auto const& model : all_existing_models) { + kernel::resource::Action* action; + + 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) + kernel::activity::ActivityImplPtr(action->get_activity())->post(); + } + 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) + XBT_DEBUG("probably vcpu's action %p, skip", action); + else + kernel::activity::ActivityImplPtr(action->get_activity())->post(); + } + } +} + +void Global::display_all_actor_status() +{ + XBT_INFO("%zu actors are still running, waiting for something.", process_list.size()); + /* List the actors and their state */ + XBT_INFO("Legend of the following listing: \"Actor (@): \""); + for (auto const& kv : process_list) { + kernel::actor::ActorImpl* actor = kv.second; + + if (actor->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>( + actor->waiting_synchro) + ->get_cname(); + + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + synchro_description = "execution"; + + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + synchro_description = "communication"; + + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + synchro_description = "sleeping"; + + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + synchro_description = "synchronization"; + + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + synchro_description = "I/O"; + + XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(), + actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(), + name, (int)actor->waiting_synchro->state_); + } else { + XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname()); + } + } +} + config::Flag cfg_breakpoint{ "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } // namespace simix } // namespace simgrid -static simgrid::simix::ActorCode maestro_code; +static simgrid::kernel::actor::ActorCode maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { #ifdef _WIN32 @@ -227,7 +289,7 @@ void SIMIX_global_init(int *argc, char **argv) surf_init(argc, argv); /* Initialize SURF structures */ simix_global.reset(new simgrid::simix::Global()); - simix_global->maestro_process = nullptr; + simix_global->maestro_ = nullptr; SIMIX_context_mod_init(); // Either create a new context with maestro or create @@ -243,11 +305,6 @@ void SIMIX_global_init(int *argc, char **argv) /* register a function to be called by SURF after the environment creation */ sg_platf_init(); simgrid::s4u::Engine::on_platform_created.connect(surf_presolve); - - 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("debug/clean-atexit")) @@ -287,7 +344,7 @@ void SIMIX_clean() #endif /* Kill all processes (but maestro) */ - simix_global->maestro_process->kill_all(); + simix_global->maestro_->kill_all(); simix_global->run_all_actors(); simix_global->empty_trash(); @@ -310,8 +367,8 @@ void SIMIX_clean() #endif /* Let's free maestro now */ - delete simix_global->maestro_process; - simix_global->maestro_process = nullptr; + delete simix_global->maestro_; + simix_global->maestro_ = nullptr; /* Finish context module and SURF */ SIMIX_context_mod_exit(); @@ -336,29 +393,6 @@ double SIMIX_get_clock() } } -/** Wake up all processes waiting for a Surf action to finish */ -static void SIMIX_wake_processes() -{ - for (auto const& model : all_existing_models) { - simgrid::kernel::resource::Action* action; - - 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 terminated actions (if any)"); - while ((action = model->extract_done_action())) { - XBT_DEBUG(" Handling Action %p",action); - if (action->get_activity() == nullptr) - XBT_DEBUG("probably vcpu's action %p, skip", action); - else - simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); - } - } -} - /** Handle any pending timer. Returns if something was actually run. */ static bool SIMIX_execute_timers() { @@ -417,22 +451,22 @@ void SIMIX_run() * Short proof: only maestro adds stuff to the actors_to_run array, so the execution order of user contexts do * not impact its order. * - * Long proof: processes remain sorted through an arbitrary (implicit, complex but fixed) order in all cases. + * Long proof: actors remain sorted through an arbitrary (implicit, complex but fixed) order in all cases. * - * - if there is no kill during the simulation, processes remain sorted according by their PID. + * - if there is no kill during the simulation, actors remain sorted according by their PID. * Rationale: This can be proved inductively. * Assume that actors_to_run is sorted at a beginning of one round (it is at round 0: the deployment file * is parsed linearly). * Let's show that it is still so at the end of this round. - * - if a process is added when being created, that's from maestro. It can be either at startup + * - if an actor is added when being created, that's from maestro. It can be either at startup * time (and then in PID order), or in response to a process_create simcall. Since simcalls are handled * in arbitrary order (inductive hypothesis), we are fine. - * - 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 + * - If an actor is added because it's getting killed, its subsequent actions shouldn't matter + * - If an actor 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 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. + * - 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(). * This function itself don't mess with the order since simcalls are handled in FIFO order. * The function is called: @@ -446,21 +480,21 @@ void SIMIX_run() * This order is also fixed because it depends of the order in which the surf actions were * added to the system, and only maestro can add stuff this way, through simcalls. * We thus use the inductive hypothesis once again to conclude that the order in which synchros are - * poped out of the set does not depend on the user code's execution order. + * popped out of the set does not depend on the user code's execution order. * - because the communication terminated. In this case, synchros are served in the order given by * set = model->states.done_action_set; * while ((synchro = extract(set))) * SIMIX_simcall_post((smx_synchro_t) synchro->data); * and the argument is very similar to the previous one. - * So, in any case, the orders of calls to SIMIX_comm_finish() do not depend on the order in which user - * processes are executed. - * So, in any cases, the orders of processes within actors_to_run do not depend on the order in which - * user processes were executed previously. + * So, in any case, the orders of calls to CommImpl::finish() do not depend on the order in which user + * actors are executed. + * So, in any cases, the orders of actors within actors_to_run do not depend on the order in which + * user actors were executed previously. * So, if there is no killing in the simulation, the simulation reproducibility is not jeopardized. - * - If there is some process killings, the order is changed by this decision that comes from user-land + * - If there is some actor killings, the order is changed by this decision that comes from user-land * But this decision may not have been motivated by a situation that were different because the simulation is * not reproducible. - * So, even the order change induced by the process killing is perfectly reproducible. + * So, even the order change induced by the actor killing is perfectly reproducible. * * So science works, bitches [http://xkcd.com/54/]. * @@ -478,14 +512,14 @@ void SIMIX_run() simix_global->execute_tasks(); do { - SIMIX_wake_processes(); + simix_global->wake_all_waiting_actors(); } 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()) for (auto const& dmon : simix_global->daemons) { XBT_DEBUG("Kill %s", dmon->get_cname()); - simix_global->maestro_process->kill(dmon); + simix_global->maestro_->kill(dmon); } } @@ -506,7 +540,7 @@ void SIMIX_run() again = SIMIX_execute_timers(); if (simix_global->execute_tasks()) again = true; - SIMIX_wake_processes(); + simix_global->wake_all_waiting_actors(); } while (again); /* Clean actors to destroy */ @@ -514,18 +548,16 @@ void SIMIX_run() XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(), simix_global->actors_to_run.size()); - } while (time > -1.0 || not simix_global->actors_to_run.empty()); if (not simix_global->process_list.empty()) { - if (simix_global->process_list.size() <= simix_global->daemons.size()) { XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) " "once the simulation is over. Please fix your on_exit() functions."); } else { XBT_CRITICAL("Oops! Deadlock or code not perfectly clean."); } - SIMIX_display_process_status(); + simix_global->display_all_actor_status(); simgrid::s4u::Engine::on_deadlock(); xbt_abort(); } @@ -554,54 +586,15 @@ double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 return timer ? timer->get_date() : 0; } -void SIMIX_display_process_status() +void SIMIX_display_process_status() // XBT_ATTRIB_DEPRECATED_v329 { - int nbprocess = simix_global->process_list.size(); - - XBT_INFO("%d processes are still running, waiting for something.", nbprocess); - /* List the process and their state */ - XBT_INFO("Legend of the following listing: \"Process (@): \""); - for (auto const& kv : simix_global->process_list) { - simgrid::kernel::actor::ActorImpl* actor = kv.second; - - if (actor->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>( - actor->waiting_synchro) - ->get_cname(); - - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) - synchro_description = "execution"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) - synchro_description = "communication"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) - synchro_description = "sleeping"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) - synchro_description = "synchronization"; - - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) - synchro_description = "I/O"; - - XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(), - actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(), - name, (int)actor->waiting_synchro->state_); - } - else { - XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname()); - } - } + simix_global->display_all_actor_status(); } int SIMIX_is_maestro() { if (simix_global == nullptr) // SimDag return true; - simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self(); - return self == nullptr || self == simix_global->maestro_process; + const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self(); + return self == nullptr || self == simix_global->maestro_; }