X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c91b5a0dff704f2fe08d3480a12cc15f1a8b4081..e47e02e59a4fb6c51d6b7d9cc8a3732cc73dc0ae:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 6be047874c..b777616792 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -1,52 +1,31 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ -#include -#include -#include - -#include "src/internal_config.h" -#include /* Signal handling */ -#include - -#include -#include -#include - +#include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/smpi/include/smpi_actor.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 "simgrid/sg_config.hpp" #include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/IoImpl.hpp" +#include "src/kernel/activity/MailboxImpl.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/simix/smx_private.hpp" +#include "src/surf/StorageImpl.hpp" +#include "src/surf/xml/platf.hpp" #if SIMGRID_HAVE_MC -#include "src/mc/mc_private.hpp" #include "src/mc/remote/Client.hpp" -#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)"); @@ -69,9 +48,9 @@ public: s_smx_timer_t(double date, simgrid::xbt::Task callback) : date(date), callback(std::move(callback)) {} }; -void (*SMPI_switch_data_segment)(int) = nullptr; +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 ) { @@ -104,7 +83,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 @@ -113,7 +92,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 */ @@ -170,21 +149,16 @@ 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 simgrid::simix::ActorCode maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { #ifdef _WIN32 @@ -194,11 +168,8 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) } /** - * \ingroup SIMIX_API - * \brief Initialize SIMIX internal data. - * - * \param argc Argc - * \param argv Argv + * @ingroup SIMIX_API + * @brief Initialize SIMIX internal data. */ void SIMIX_global_init(int *argc, char **argv) { @@ -208,44 +179,34 @@ void SIMIX_global_init(int *argc, char **argv) simgrid::mc::Client::initialize(); #endif - if (not simix_global) { + if (simix_global == nullptr) { simix_global = std::unique_ptr(new simgrid::simix::Global()); - - simgrid::simix::ActorImpl proc; simix_global->maestro_process = nullptr; - simix_global->create_process_function = &SIMIX_process_create; - simix_global->kill_process_function = &kill_process; - simix_global->cleanup_process_function = &SIMIX_process_cleanup; - simix_global->mutex = xbt_os_mutex_init(); surf_init(argc, argv); /* Initialize SURF structures */ SIMIX_context_mod_init(); // Either create a new context with maestro or create // a context object with the current context mestro): - simgrid::simix::create_maestro(maestro_code); + 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) { - if (host.extension() == nullptr) // another callback to the same signal may have created it - host.extension_set(new simgrid::simix::Host()); - }); + simgrid::s4u::on_platform_created.connect(SIMIX_post_create_environment); - 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()); + 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) @@ -254,8 +215,8 @@ void SIMIX_global_init(int *argc, char **argv) int smx_cleaned = 0; /** - * \ingroup SIMIX_API - * \brief Clean the SIMIX simulation + * @ingroup SIMIX_API + * @brief Clean the SIMIX simulation * * This functions remove the memory used by SIMIX */ @@ -285,7 +246,7 @@ void SIMIX_clean() #endif /* Kill all processes (but maestro) */ - SIMIX_process_killall(simix_global->maestro_process, 1); + SIMIX_process_killall(simix_global->maestro_process); SIMIX_context_runall(); SIMIX_process_empty_trash(); @@ -302,16 +263,14 @@ void SIMIX_clean() simix_global->process_to_destroy.clear(); simix_global->process_list.clear(); - xbt_os_mutex_destroy(simix_global->mutex); - simix_global->mutex = nullptr; #if SIMGRID_HAVE_MC xbt_dynar_free(&simix_global->actors_vector); xbt_dynar_free(&simix_global->dead_actors_vector); #endif /* Let's free maestro now */ - delete simix_global->maestro_process->context; - simix_global->maestro_process->context = nullptr; + delete simix_global->maestro_process->context_; + simix_global->maestro_process->context_ = nullptr; delete simix_global->maestro_process; simix_global->maestro_process = nullptr; @@ -323,12 +282,11 @@ void SIMIX_clean() simix_global = nullptr; } - /** - * \ingroup SIMIX_API - * \brief A clock (in second). + * @ingroup SIMIX_API + * @brief A clock (in second). * - * \return Return the clock. + * @return Return the clock. */ double SIMIX_get_clock() { @@ -342,21 +300,21 @@ double SIMIX_get_clock() /** Wake up all processes waiting for a Surf action to finish */ static void SIMIX_wake_processes() { - surf_action_t action; + for (auto const& model : all_existing_models) { + simgrid::kernel::resource::Action* action; - for (auto const& model : *all_existing_models) { XBT_DEBUG("Handling the processes whose action failed (if any)"); - while ((action = surf_model_extract_failed_action_set(model))) { + while ((action = model->extract_failed_action())) { 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))) { + while ((action = model->extract_done_action())) { 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())); } } } @@ -408,8 +366,8 @@ static bool SIMIX_execute_tasks() } /** - * \ingroup SIMIX_API - * \brief Run the main simulation loop. + * @ingroup SIMIX_API + * @brief Run the main simulation loop. */ void SIMIX_run() { @@ -423,6 +381,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()) { @@ -437,13 +405,15 @@ void SIMIX_run() /* Here, the order is ok because: * - * Short proof: only maestro adds stuff to the process_to_run array, so the execution order of user contexts do not impact its order. + * Short proof: only maestro adds stuff to the process_to_run array, so the execution order of user contexts do + * not impact its order. * * Long proof: processes remain sorted through an arbitrary (implicit, complex but fixed) order in all cases. * * - if there is no kill during the simulation, processes remain sorted according by their PID. - * rational: This can be proved inductively. - * Assume that process_to_run is sorted at a beginning of one round (it is at round 0: the deployment file is parsed linearly). + * Rationale: This can be proved inductively. + * Assume that process_to_run is sorted at a beginning of one round (it is at round 0: the deployment file + * is parsed linearly). * Let's show that it is still so at the end of this round. * - if a process is added when being created, that's from maestro. It can be either at startup * time (and then in PID order), or in response to a process_create simcall. Since simcalls are handled @@ -452,37 +422,42 @@ void SIMIX_run() * - If a process gets added to process_to_run because one of their blocking action constituting the meat * of a simcall terminates, we're still good. Proof: * - You are added from SIMIX_simcall_answer() only. When this function is called depends on the resource - * kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications as an example. + * kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications as an + * example. * - For communications, this function is called from SIMIX_comm_finish(). * This function itself don't mess with the order since simcalls are handled in FIFO order. * The function is called: * - before the comm starts (invalid parameters, or resource already dead or whatever). * The order then trivial holds since maestro didn't interrupt its handling of the simcall yet - * - because the communication failed or were canceled after startup. In this case, it's called from the function - * we are in, by the chunk: + * - because the communication failed or were canceled after startup. In this case, it's called from + * the function we are in, by the chunk: * set = model->states.failed_action_set; - * while ((synchro = xbt_swag_extract(set))) + * while ((synchro = extract(set))) * SIMIX_simcall_post((smx_synchro_t) synchro->data); * This order is also fixed because it depends of the order in which the surf actions were * added to the system, and only maestro can add stuff this way, through simcalls. * We thus use the inductive hypothesis once again to conclude that the order in which synchros are - * poped out of the swag does not depend on the user code's execution order. + * poped out of the set does not depend on the user code's execution order. * - because the communication terminated. In this case, synchros are served in the order given by * set = model->states.done_action_set; - * while ((synchro = xbt_swag_extract(set))) + * while ((synchro = extract(set))) * SIMIX_simcall_post((smx_synchro_t) synchro->data); * and the argument is very similar to the previous one. - * So, in any case, the orders of calls to SIMIX_comm_finish() do not depend on the order in which user processes are executed. - * So, in any cases, the orders of processes within process_to_run do not depend on the order in which user processes were executed previously. + * So, in any case, the orders of calls to SIMIX_comm_finish() do not depend on the order in which user + * processes are executed. + * So, in any cases, the orders of processes within process_to_run do not depend on the order in which + * user processes were executed previously. * So, if there is no killing in the simulation, the simulation reproducibility is not jeopardized. * - If there is some process killings, the order is changed by this decision that comes from user-land - * But this decision may not have been motivated by a situation that were different because the simulation is not reproducible. + * But this decision may not have been motivated by a situation that were different because the simulation is + * not reproducible. * So, even the order change induced by the process killing is perfectly reproducible. * * So science works, bitches [http://xkcd.com/54/]. * - * We could sort the process_that_ran array completely so that we can describe the order in which simcalls are handled - * (like "according to the PID of issuer"), but it's not mandatory (order is fixed already even if unfriendly). + * We could sort the process_that_ran array completely so that we can describe the order in which simcalls are + * handled (like "according to the PID of issuer"), but it's not mandatory (order is fixed already even if + * unfriendly). * That would thus be a pure waste of time. */ @@ -500,7 +475,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); } } @@ -525,47 +500,41 @@ void SIMIX_run() SIMIX_wake_processes(); } while (again); - /* Autorestart all process */ - for (auto const& host : host_that_restart) { - XBT_INFO("Restart processes on host %s", host->getCname()); - SIMIX_host_autorestart(host); - } - host_that_restart.clear(); - /* Clean processes to destroy */ SIMIX_process_empty_trash(); 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(); - - 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::on_deadlock(); xbt_abort(); } - simgrid::s4u::onSimulationEnd(); + simgrid::s4u::on_simulation_end(); } /** - * \brief Set the date to execute a function + * @brief Set the date to execute a function * * Set the date to execute the function on the surf. - * \param date Date to execute function - * \param callback Function to be executed - * \param arg Parameters of the function + * @param date Date to execute function + * @param callback Function to be executed + * @param arg Parameters of the function * */ smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) { - smx_timer_t timer = new s_smx_timer_t(date, [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; } @@ -588,45 +557,6 @@ double SIMIX_timer_get_date(smx_timer_t timer) { return timer ? timer->getDate() : 0; } -/** - * \brief Registers a function to create a process. - * - * This function registers a function to be called - * when a new process is created. The function has - * to call SIMIX_process_create(). - * \param function create process function - */ -void SIMIX_function_register_process_create(smx_creation_func_t function) -{ - simix_global->create_process_function = function; -} - -/** - * \brief Registers a function to kill a process. - * - * This function registers a function to be called when a process is killed. The function has to call the - * SIMIX_process_kill(). - * - * \param function Kill process function - */ -void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function) -{ - simix_global->kill_process_function = function; -} - -/** - * \brief Registers a function to cleanup a process. - * - * This function registers a user function to be called when a process ends properly. - * - * \param function cleanup process function - */ -void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function) -{ - simix_global->cleanup_process_function = function; -} - - void SIMIX_display_process_status() { int nbprocess = simix_global->process_list.size(); @@ -656,12 +586,12 @@ void SIMIX_display_process_status() if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) synchro_description = "I/O"; - XBT_INFO("Process %lu (%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->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state); + 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_); } else { - XBT_INFO("Process %lu (%s@%s)", process->pid, process->getCname(), process->host->getCname()); + XBT_INFO("Process %ld (%s@%s)", process->pid_, process->get_cname(), process->host_->get_cname()); } } }