X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c864f7396a94658545769fb9c28e9ff7cef02530..e22da6010c6499813ff88c76041cf499ffbf2b67:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 48b3dca1b1..50fb970def 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-2021. 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. */ @@ -9,6 +9,7 @@ #include "src/smpi/include/smpi_actor.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/MailboxImpl.hpp" @@ -17,13 +18,15 @@ #include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_private.hpp" -#include "src/surf/StorageImpl.hpp" #include "src/surf/xml/platf.hpp" +#include "simgrid/kernel/resource/Model.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 +37,7 @@ 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", "Display the actor status at exit", true}; } // namespace simix } // namespace simgrid @@ -43,9 +46,8 @@ 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(); - } - else { + 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."); } exit(1); @@ -69,7 +71,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) "Minimal Working Example (MWE) reproducing your problem and a full backtrace\n" "of the fault captured with gdb or valgrind.\n", smx_context_stack_size / 1024); - } else if (siginfo->si_signo == SIGSEGV) { + } else if (siginfo->si_signo == SIGSEGV) { fprintf(stderr, "Segmentation fault.\n"); #if HAVE_SMPI if (smpi_enabled() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) { @@ -84,21 +86,15 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) std::raise(signum); } -unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ - /** * Install signal handler for SIGSEGV. Check that nobody has already installed * its own handler. For example, the Java VM does this. */ 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; } @@ -111,7 +107,7 @@ static void install_segvhandler() struct sigaction action; struct sigaction old_action; action.sa_sigaction = &segvhandler; - action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; + action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; sigemptyset(&action.sa_mask); /* Linux tend to raise only SIGSEGV where other systems also raise SIGBUS on severe error */ @@ -136,15 +132,15 @@ namespace simix { Timer* Timer::set(double date, xbt::Task&& callback) { - Timer* timer = new Timer(date, std::move(callback)); - timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); + auto* timer = new Timer(date, std::move(callback)); + timer->handle_ = simix_timers().emplace(std::make_pair(date, timer)); return timer; } /** @brief cancels a timer that was added earlier */ void Timer::remove() { - simix_timers.erase(handle_); + simix_timers().erase(handle_); delete this; } @@ -198,9 +194,9 @@ 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) { + for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) { kernel::resource::Action* action; XBT_DEBUG("Handling the failed actions (if any)"); @@ -220,16 +216,53 @@ void Global::wake_all_waiting_actors() } } -config::Flag cfg_breakpoint{ - "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; +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 */ + 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"; + + 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 %#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", + "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 - XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if you need that feature"); + XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if " + "you need that feature"); #endif maestro_code = std::bind(code, data); } @@ -238,18 +271,18 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) * @ingroup SIMIX_API * @brief Initialize SIMIX internal data. */ -void SIMIX_global_init(int *argc, char **argv) +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(); @@ -266,18 +299,12 @@ 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")) atexit(SIMIX_clean); } -int smx_cleaned = 0; /** * @ingroup SIMIX_API * @brief Clean the SIMIX simulation @@ -286,10 +313,11 @@ int smx_cleaned = 0; */ void SIMIX_clean() { + static bool smx_cleaned = false; if (smx_cleaned) return; // to avoid double cleaning by java and C - smx_cleaned = 1; + smx_cleaned = true; XBT_DEBUG("SIMIX_clean called. Simulation's over."); if (not simix_global->actors_to_run.empty() && SIMIX_get_clock() <= 0.0) { XBT_CRITICAL(" "); @@ -299,10 +327,10 @@ void SIMIX_clean() } #if HAVE_SMPI - if (simix_global->process_list.size() > 0) { - if(smpi_process()->initialized()){ + if (not simix_global->process_list.empty()) { + if (smpi_process()->initialized()) { xbt_die("Process exited without calling MPI_Finalize - Killing simulation"); - }else{ + } else { XBT_WARN("Process called exit when leaving - Skipping cleanups"); return; } @@ -317,9 +345,9 @@ void SIMIX_clean() /* Exit the SIMIX network module */ SIMIX_mailbox_exit(); - while (not simgrid::simix::simix_timers.empty()) { - delete simgrid::simix::simix_timers.top().second; - simgrid::simix::simix_timers.pop(); + while (not simgrid::simix::simix_timers().empty()) { + delete simgrid::simix::simix_timers().top().second; + simgrid::simix::simix_timers().pop(); } /* Free the remaining data structures */ simix_global->actors_to_run.clear(); @@ -352,9 +380,9 @@ void SIMIX_clean() */ double SIMIX_get_clock() { - if(MC_is_active() || MC_record_replay_is_active()){ + if (MC_is_active() || MC_record_replay_is_active()) { return MC_process_clock_get(SIMIX_process_self()); - }else{ + } else { return surf_get_clock(); } } @@ -363,11 +391,12 @@ double SIMIX_get_clock() static bool SIMIX_execute_timers() { bool result = false; - while (not simgrid::simix::simix_timers.empty() && SIMIX_get_clock() >= simgrid::simix::simix_timers.top().first) { + while (not simgrid::simix::simix_timers().empty() && + SIMIX_get_clock() >= simgrid::simix::simix_timers().top().first) { result = true; // 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(); + smx_timer_t timer = simgrid::simix::simix_timers().top().second; + simgrid::simix::simix_timers().pop(); timer->callback(); delete timer; } @@ -381,7 +410,7 @@ static bool SIMIX_execute_timers() void SIMIX_run() { if (MC_record_replay_is_active()) { - simgrid::mc::replay(MC_record_path); + simgrid::mc::replay(MC_record_path()); return; } @@ -471,7 +500,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); } } @@ -515,20 +544,25 @@ void SIMIX_run() XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(), simix_global->actors_to_run.size()); + 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); + } + } } while (time > -1.0 || not simix_global->actors_to_run.empty()); - if (not simix_global->process_list.empty()) { + if (not simix_global->process_list.empty()) + THROW_IMPOSSIBLE; - 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(); - simgrid::s4u::Engine::on_deadlock(); - xbt_abort(); - } simgrid::s4u::Engine::on_simulation_end(); } @@ -554,54 +588,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(); + const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self(); return self == nullptr || self == simix_global->maestro_; }