X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85e1d2c205ca99512b48bceca0f16677a401e233..61ab0b23d55ea10365ba11d22b8c11b39cbf16e9:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 6664cfa13a..11b654e4d7 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 "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.hpp" -#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 "smx_private.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,13 @@ #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 +#include + XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -70,7 +54,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 ) { @@ -112,7 +96,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) } #endif /* HAVE_SMPI */ } - raise(signum); + std::raise(signum); } char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ @@ -175,6 +159,8 @@ namespace simix { simgrid::xbt::signal onDeadlock; +simgrid::config::Flag breakpoint{"simix/breakpoint", + "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } } @@ -215,26 +201,26 @@ void SIMIX_global_init(int *argc, char **argv) simgrid::kernel::actor::create_maestro(maestro_code); /* Prepare to display some more info when dying on Ctrl-C pressing */ - signal(SIGINT, inthandler); + std::signal(SIGINT, inthandler); #ifndef _WIN32 install_segvhandler(); #endif /* register a function to be called by SURF after the environment creation */ sg_platf_init(); - simgrid::s4u::onPlatformCreated.connect(SIMIX_post_create_environment); + simgrid::s4u::on_platform_created.connect(SIMIX_post_create_environment); simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) { if (host.extension() == nullptr) // another callback to the same signal may have created it host.extension_set(new simgrid::simix::Host()); }); 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) @@ -412,6 +398,16 @@ 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; +#ifdef SIGTRAP + std::raise(SIGTRAP); +#else + std::raise(SIGABRT); +#endif + } + SIMIX_execute_tasks(); while (not simix_global->process_to_run.empty()) { @@ -496,7 +492,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); } } @@ -523,7 +519,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(); @@ -541,14 +537,17 @@ void SIMIX_run() if (not simix_global->process_list.empty()) { - 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(); + simgrid::s4u::on_deadlock(); xbt_abort(); } - simgrid::s4u::onSimulationEnd(); + simgrid::s4u::on_simulation_end(); } /** @@ -654,11 +653,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()); } } }