X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6db81e17ddbb49af0f135e8bec12274efab13e3d..09e1d23365995a569c73ae4e1067e0f7c85efc58:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index e7e7070ce3..f0b03adfdb 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -6,10 +6,11 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" + +#include "../kernel/activity/IoImpl.hpp" #include "simgrid/sg_config.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" @@ -29,6 +30,7 @@ #endif #include +#include XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); @@ -53,7 +55,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 ) { @@ -86,7 +88,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_privatize_global_variables == SmpiPrivStrategies::NONE) { #if HAVE_PRIVATIZATION fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n"); #else @@ -95,7 +97,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 */ @@ -156,12 +158,12 @@ static void kill_process(smx_actor_t process) namespace simgrid { namespace simix { -simgrid::xbt::signal onDeadlock; - +simgrid::config::Flag breakpoint{"simix/breakpoint", + "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; } } -static std::function maestro_code; +static simgrid::simix::ActorCode maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { #ifdef _WIN32 @@ -198,26 +200,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::Host::onCreation.connect([](simgrid::s4u::Host& host) { + simgrid::s4u::on_platform_created.connect(SIMIX_post_create_environment); + simgrid::s4u::Host::on_creation.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->get_cname()); - xbt_assert(s != nullptr, "Storage not found for name %s", storage->get_cname()); + simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) { + sg_storage_t s = simgrid::s4u::Storage::by_name(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) @@ -395,6 +397,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 && surf_get_clock() >= 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()) { @@ -517,15 +529,10 @@ void SIMIX_run() XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(), simix_global->process_to_run.size()); - if (simix_global->process_to_run.empty() && not simix_global->process_list.empty()) - simgrid::simix::onDeadlock(); - } while (time > -1.0 || not simix_global->process_to_run.empty()); if (not simix_global->process_list.empty()) { - TRACE_end(); - 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."); @@ -533,10 +540,10 @@ void SIMIX_run() 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(); } /** @@ -550,7 +557,7 @@ void SIMIX_run() */ smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) { - smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::makeTask([callback, arg]() { callback(arg); })); + smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::make_task([callback, arg]() { callback(arg); })); timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); return timer; } @@ -643,7 +650,7 @@ void SIMIX_display_process_status() XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid, process->get_cname(), process->host->get_cname(), synchro_description, process->waiting_synchro.get(), - process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state); + process->waiting_synchro->name_.c_str(), (int)process->waiting_synchro->state_); } else { XBT_INFO("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname());