X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7444a715278a4bad33c0200162286c50f03bcaef..10be64001fd1456d256c9a64b03fa2f57b4a0bed:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 809323c760..683ed17858 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -3,37 +3,20 @@ /* 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. */ -#include -#include -#include - -#include "src/internal_config.h" -#include /* Signal handling */ -#include - -#include -#include - +#include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" - +#include "simgrid/sg_config.hpp" #include "smx_private.hpp" -#include "src/surf/surf_interface.hpp" -#include "src/surf/xml/platf.hpp" -#include "xbt/ex.h" /* ex_backtrace_display */ - -#include "mc/mc.h" -#include "simgrid/sg_config.h" -#include "src/mc/mc_replay.hpp" -#include "src/surf/StorageImpl.hpp" - -#include "src/smpi/include/smpi_process.hpp" - -#include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/mc_replay.hpp" +#include "src/simix/smx_host_private.hpp" +#include "src/smpi/include/smpi_process.hpp" +#include "src/surf/StorageImpl.hpp" +#include "src/surf/xml/platf.hpp" #if SIMGRID_HAVE_MC #include "src/mc/mc_private.hpp" @@ -41,12 +24,12 @@ #include "src/mc/remote/mc_protocol.h" #endif -#include "src/mc/mc_record.hpp" - #if HAVE_SMPI #include "src/smpi/include/private.hpp" #endif +#include + XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -70,7 +53,7 @@ public: void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; -int _sg_do_verbose_exit = 1; +bool _sg_do_verbose_exit = true; static void inthandler(int) { if ( _sg_do_verbose_exit ) { @@ -103,7 +86,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 == SMPI_PRIVATIZE_NONE) { + if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::None) { #if HAVE_PRIVATIZATION fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n"); #else @@ -169,21 +152,18 @@ static void kill_process(smx_actor_t process) SIMIX_process_kill(process, nullptr); } -static std::function maestro_code; namespace simgrid { namespace simix { simgrid::xbt::signal onDeadlock; -XBT_PUBLIC void set_maestro(std::function code) -{ - maestro_code = std::move(code); -} - +simgrid::config::Flag breakpoint{"simix/breakpoint", + "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } } +static std::function maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { #ifdef _WIN32 @@ -195,9 +175,6 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) /** * \ingroup SIMIX_API * \brief Initialize SIMIX internal data. - * - * \param argc Argc - * \param argv Argv */ void SIMIX_global_init(int *argc, char **argv) { @@ -237,12 +214,12 @@ void SIMIX_global_init(int *argc, char **argv) }); simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::StorageImpl* storage) { - sg_storage_t s = simgrid::s4u::Storage::byName(storage->getCname()); - xbt_assert(s != nullptr, "Storage not found for name %s", storage->getCname()); + sg_storage_t s = simgrid::s4u::Storage::byName(storage->get_cname()); + xbt_assert(s != nullptr, "Storage not found for name %s", storage->get_cname()); }); } - if (xbt_cfg_get_boolean("clean-atexit")) + if (simgrid::config::get_value("clean-atexit")) atexit(SIMIX_clean); if (_sg_cfg_exit_asap) @@ -345,15 +322,15 @@ static void SIMIX_wake_processes() XBT_DEBUG("Handling the processes whose action failed (if any)"); while ((action = surf_model_extract_failed_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - SIMIX_simcall_exit(static_cast(action->getData())); + SIMIX_simcall_exit(static_cast(action->get_data())); } XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); while ((action = surf_model_extract_done_action_set(model))) { XBT_DEBUG(" Handling Action %p",action); - if (action->getData() == nullptr) + if (action->get_data() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit(static_cast(action->getData())); + SIMIX_simcall_exit(static_cast(action->get_data())); } } } @@ -420,6 +397,12 @@ void SIMIX_run() do { XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size()); + if (simgrid::simix::breakpoint >= 0.0 && time >= simgrid::simix::breakpoint) { + XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get()); + simgrid::simix::breakpoint = -1.0; + raise(SIGTRAP); + } + SIMIX_execute_tasks(); while (not simix_global->process_to_run.empty()) { @@ -504,7 +487,7 @@ void SIMIX_run() /* 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->getCname()); + XBT_DEBUG("Kill %s", dmon->get_cname()); SIMIX_process_kill(dmon, simix_global->maestro_process); } } @@ -531,7 +514,7 @@ void SIMIX_run() /* Autorestart all process */ for (auto const& host : host_that_restart) { - XBT_INFO("Restart processes on host %s", host->getCname()); + XBT_INFO("Restart processes on host %s", host->get_cname()); SIMIX_host_autorestart(host); } host_that_restart.clear(); @@ -551,7 +534,12 @@ void SIMIX_run() TRACE_end(); - XBT_CRITICAL("Oops ! Deadlock or code not perfectly clean."); + 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::onDeadlock(); xbt_abort(); @@ -662,11 +650,11 @@ void SIMIX_display_process_status() synchro_description = "I/O"; XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid, - process->getCname(), process->host->getCname(), synchro_description, process->waiting_synchro.get(), + process->get_cname(), process->host->get_cname(), synchro_description, process->waiting_synchro.get(), process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state); } else { - XBT_INFO("Process %ld (%s@%s)", process->pid, process->getCname(), process->host->getCname()); + XBT_INFO("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname()); } } }