X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..302cb260ba620a268dcd7f633d27715a0dd54bae:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 20b1f4afb8..f511017755 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -21,9 +21,10 @@ #include "src/surf/xml/platf.hpp" #if SIMGRID_HAVE_MC -#include "src/mc/remote/Client.hpp" +#include "src/mc/remote/AppSide.hpp" #endif +#include XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -34,7 +35,10 @@ void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; namespace simgrid { namespace simix { -config::Flag cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true}; +config::Flag cfg_verbose_exit{"debug/verbose-exit", + {"verbose-exit"}, // XBT_ATTRIB_DEPRECATED_v327(option alias) + "Display the actor status at exit", + true}; } // namespace simix } // namespace simgrid @@ -84,7 +88,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) std::raise(signum); } -unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ +std::array sigsegv_stack; /* alternate stack for SIGSEGV handler */ /** * Install signal handler for SIGSEGV. Check that nobody has already installed @@ -92,13 +96,9 @@ unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ */ static void install_segvhandler() { - stack_t stack; stack_t old_stack; - stack.ss_sp = sigsegv_stack; - stack.ss_size = sizeof sigsegv_stack; - stack.ss_flags = 0; - if (sigaltstack(&stack, &old_stack) == -1) { + if (simgrid::kernel::context::Context::install_sigsegv_stack(&old_stack, true) == -1) { XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno)); return; } @@ -136,7 +136,7 @@ namespace simix { Timer* Timer::set(double date, xbt::Task&& callback) { - Timer* timer = new Timer(date, std::move(callback)); + auto* timer = new Timer(date, std::move(callback)); timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); return timer; } @@ -198,7 +198,7 @@ void Global::run_all_actors() } /** Wake up all actors waiting for a Surf action to finish */ -void Global::wake_all_waiting_actors() +void Global::wake_all_waiting_actors() const { for (auto const& model : all_existing_models) { kernel::resource::Action* action; @@ -220,7 +220,7 @@ void Global::wake_all_waiting_actors() } } -void Global::display_all_actor_status() +void Global::display_all_actor_status() const { XBT_INFO("%zu actors are still running, waiting for something.", process_list.size()); /* List the actors and their state */ @@ -228,39 +228,38 @@ void Global::display_all_actor_status() for (auto const& kv : process_list) { kernel::actor::ActorImpl* actor = kv.second; - if (actor->waiting_synchro) { + 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) + if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) synchro_description = "execution"; - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) synchro_description = "communication"; - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) synchro_description = "sleeping"; - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro_) != nullptr) synchro_description = "synchronization"; - if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) + 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_); + XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %d to finish", actor->get_pid(), + actor->get_cname(), actor->get_host()->get_cname(), synchro_description, + (xbt_log_no_loc ? (size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get()), + actor->waiting_synchro_->get_cname(), (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}; +config::Flag cfg_breakpoint{"debug/breakpoint", + {"simix/breakpoint"}, // XBT_ATTRIB_DEPRECATED_v327(option alias) + "When non-negative, raise a SIGTRAP after given (simulated) time", + -1.0}; } // namespace simix } // namespace simgrid @@ -282,13 +281,13 @@ void SIMIX_global_init(int *argc, char **argv) #if SIMGRID_HAVE_MC // The communication initialization is done ASAP. // We need to communicate initialization of the different layers to the model-checker. - simgrid::mc::Client::initialize(); + simgrid::mc::AppSide::initialize(); #endif if (simix_global == nullptr) { surf_init(argc, argv); /* Initialize SURF structures */ - simix_global.reset(new simgrid::simix::Global()); + simix_global = std::make_unique(); simix_global->maestro_ = nullptr; SIMIX_context_mod_init(); @@ -333,7 +332,7 @@ void SIMIX_clean() } #if HAVE_SMPI - if (simix_global->process_list.size() > 0) { + if (not simix_global->process_list.empty()) { if(smpi_process()->initialized()){ xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); }else{ @@ -505,7 +504,7 @@ void SIMIX_run() */ for (auto const& actor : simix_global->actors_that_ran) { - if (actor->simcall.call_ != SIMCALL_NONE) { + if (actor->simcall_.call_ != simgrid::simix::Simcall::NONE) { actor->simcall_handle(0); } } @@ -548,19 +547,26 @@ 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."); + if (time < 0. && simix_global->actors_to_run.empty() && 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_global->display_all_actor_status(); + simgrid::s4u::Engine::on_deadlock(); + for (auto const& kv : simix_global->process_list) { + XBT_DEBUG("Kill %s", kv.second->get_cname()); + simix_global->maestro_->kill(kv.second); + } } - simix_global->display_all_actor_status(); - simgrid::s4u::Engine::on_deadlock(); - xbt_abort(); - } + } while (time > -1.0 || not simix_global->actors_to_run.empty()); + + if (not simix_global->process_list.empty()) + THROW_IMPOSSIBLE; + simgrid::s4u::Engine::on_simulation_end(); }