X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89047acf6125582321f8e86f9765b0f57e350e2c..a73d204e173f35c0abb92b26e061929066b8b283:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index a4a9b7a486..fbde8a5ef9 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. 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. */ @@ -6,63 +6,47 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/smpi/include/smpi_actor.hpp" + #include "simgrid/sg_config.hpp" -#include "smx_private.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/smpi/include/smpi_process.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 - -#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)"); std::unique_ptr simix_global; -namespace { -typedef std::pair TimerQelt; -boost::heap::fibonacci_heap>> simix_timers; -} - -/** @brief Timer datatype */ -class s_smx_timer_t { - double date = 0.0; - -public: - decltype(simix_timers)::handle_type handle_; - simgrid::xbt::Task callback; - double getDate() { return date; } - s_smx_timer_t(double date, simgrid::xbt::Task callback) : date(date), callback(std::move(callback)) {} -}; - void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr; -bool _sg_do_verbose_exit = true; -static void inthandler(int) +namespace simgrid { +namespace simix { +simgrid::config::Flag cfg_verbose_exit{ + "debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true}; +} +} // namespace simgrid +XBT_ATTRIB_NORETURN static void inthandler(int) { - if ( _sg_do_verbose_exit ) { - XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit')."); - SIMIX_display_process_status(); + 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 { - XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'verbose-exit' is set to false."); + XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false."); } exit(1); } @@ -70,24 +54,25 @@ static void inthandler(int) #ifndef _WIN32 static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) { - if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) { - fprintf(stderr, "Access violation detected.\n" - "This probably comes from a programming error in your code, or from a stack\n" - "overflow. If you are certain of your code, try increasing the stack size\n" - " --cfg=contexts/stack-size=XXX (current size is %u KiB).\n" - "\n" - "If it does not help, this may have one of the following causes:\n" - "a bug in SimGrid, a bug in the OS or a bug in a third-party libraries.\n" - "Failing hardware can sometimes generate such errors too.\n" - "\n" - "If you think you've found a bug in SimGrid, please report it along with a\n" - "Minimal Working Example (MWE) reproducing your problem and a full backtrace\n" - "of the fault captured with gdb or valgrind.\n", + if ((siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) || siginfo->si_signo == SIGBUS) { + fprintf(stderr, + "Access violation or Bus error detected.\n" + "This probably comes from a programming error in your code, or from a stack\n" + "overflow. If you are certain of your code, try increasing the stack size\n" + " --cfg=contexts/stack-size=XXX (current size is %u KiB).\n" + "\n" + "If it does not help, this may have one of the following causes:\n" + "a bug in SimGrid, a bug in the OS or a bug in a third-party libraries.\n" + "Failing hardware can sometimes generate such errors too.\n" + "\n" + "If you think you've found a bug in SimGrid, please report it along with a\n" + "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) { 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 @@ -99,7 +84,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) std::raise(signum); } -char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ +unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */ /** * Install signal handler for SIGSEGV. Check that nobody has already installed @@ -129,42 +114,95 @@ static void install_segvhandler() action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; sigemptyset(&action.sa_mask); - if (sigaction(SIGSEGV, &action, &old_action) == -1) { - XBT_WARN("Failed to register signal handler for SIGSEGV: %s", strerror(errno)); - return; - } - if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { - XBT_DEBUG("A signal handler was already installed for SIGSEGV (%p). Restore it.", - (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); - sigaction(SIGSEGV, &old_action, nullptr); + /* Linux tend to raise only SIGSEGV where other systems also raise SIGBUS on severe error */ + for (int sig : {SIGSEGV, SIGBUS}) { + if (sigaction(sig, &action, &old_action) == -1) { + XBT_WARN("Failed to register signal handler for signal %d: %s", sig, strerror(errno)); + continue; + } + if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { + XBT_DEBUG("A signal handler was already installed for signal %d (%p). Restore it.", sig, + (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); + sigaction(sig, &old_action, nullptr); + } } } #endif /* _WIN32 */ /********************************* SIMIX **************************************/ -double SIMIX_timer_next() +namespace simgrid { +namespace simix { + +Timer* Timer::set(double date, simgrid::xbt::Task&& callback) { - return simix_timers.empty() ? -1.0 : simix_timers.top().first; + Timer* timer = new Timer(date, std::move(callback)); + timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); + return timer; } -static void kill_process(smx_actor_t process) +/** @brief cancels a timer that was added earlier */ +void Timer::remove() { - SIMIX_process_kill(process, nullptr); + simgrid::simix::simix_timers.erase(handle_); + delete this; } +/** Execute all the tasks that are queued, e.g. `.then()` callbacks of futures. */ +bool Global::execute_tasks() +{ + xbt_assert(tasksTemp.empty()); -namespace simgrid { -namespace simix { + if (tasks.empty()) + return false; -simgrid::xbt::signal onDeadlock; + do { + // We don't want the callbacks to modify the vector we are iterating over: + tasks.swap(tasksTemp); -simgrid::config::Flag breakpoint{"simix/breakpoint", - "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0}; + // Execute all the queued tasks: + for (auto& task : tasksTemp) + task(); + + tasksTemp.clear(); + } while (not tasks.empty()); + + return true; +} + +void Global::empty_trash() +{ + while (not actors_to_destroy.empty()) { + smx_actor_t actor = &actors_to_destroy.front(); + actors_to_destroy.pop_front(); + XBT_DEBUG("Getting rid of %s (refcount: %d)", actor->get_cname(), actor->get_refcount()); + intrusive_ptr_release(actor); + } +#if SIMGRID_HAVE_MC + xbt_dynar_reset(dead_actors_vector); +#endif +} +/** + * @brief Executes the actors in actors_to_run. + * + * The actors in actors_to_run are run (in parallel if possible). On exit, actors_to_run is empty, and actors_that_ran + * contains the list of actors that just ran. The two lists are swapped so, be careful when using them before and after + * a call to this function. + */ +void Global::run_all_actors() +{ + simix_global->context_factory->run_all(); + + actors_to_run.swap(actors_that_ran); + actors_to_run.clear(); +} + +simgrid::config::Flag cfg_breakpoint{ + "debug/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 @@ -174,8 +212,8 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) } /** - * \ingroup SIMIX_API - * \brief Initialize SIMIX internal data. + * @ingroup SIMIX_API + * @brief Initialize SIMIX internal data. */ void SIMIX_global_init(int *argc, char **argv) { @@ -185,15 +223,11 @@ void SIMIX_global_init(int *argc, char **argv) simgrid::mc::Client::initialize(); #endif - if (not simix_global) { - simix_global = std::unique_ptr(new simgrid::simix::Global()); - 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(); + if (simix_global == nullptr) { + surf_init(argc, argv); /* Initialize SURF structures */ - surf_init(argc, argv); /* Initialize SURF structures */ + simix_global.reset(new simgrid::simix::Global()); + simix_global->maestro_process = nullptr; SIMIX_context_mod_init(); // Either create a new context with maestro or create @@ -208,29 +242,22 @@ void SIMIX_global_init(int *argc, char **argv) #endif /* register a function to be called by SURF after the environment creation */ sg_platf_init(); - 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::s4u::Engine::on_platform_created.connect(surf_presolve); - 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 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("clean-atexit")) + if (simgrid::config::get_value("debug/clean-atexit")) atexit(SIMIX_clean); - - if (_sg_cfg_exit_asap) - exit(0); } 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 */ @@ -241,7 +268,7 @@ void SIMIX_clean() smx_cleaned = 1; XBT_DEBUG("SIMIX_clean called. Simulation's over."); - if (not simix_global->process_to_run.empty() && SIMIX_get_clock() <= 0.0) { + if (not simix_global->actors_to_run.empty() && SIMIX_get_clock() <= 0.0) { XBT_CRITICAL(" "); XBT_CRITICAL("The time is still 0, and you still have processes ready to run."); XBT_CRITICAL("It seems that you forgot to run the simulation that you setup."); @@ -260,33 +287,29 @@ void SIMIX_clean() #endif /* Kill all processes (but maestro) */ - SIMIX_process_killall(simix_global->maestro_process); - SIMIX_context_runall(); - SIMIX_process_empty_trash(); + simix_global->maestro_process->kill_all(); + simix_global->context_factory->run_all(); + simix_global->empty_trash(); /* Exit the SIMIX network module */ SIMIX_mailbox_exit(); - while (not simix_timers.empty()) { - delete simix_timers.top().second; - 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->process_to_run.clear(); - simix_global->process_that_ran.clear(); - simix_global->process_to_destroy.clear(); + simix_global->actors_to_run.clear(); + simix_global->actors_that_ran.clear(); + simix_global->actors_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; simix_global->maestro_process = nullptr; @@ -298,12 +321,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() { @@ -317,78 +339,48 @@ double SIMIX_get_clock() /** Wake up all processes waiting for a Surf action to finish */ static void SIMIX_wake_processes() { - for (auto const& model : *all_existing_models) { + for (auto const& model : all_existing_models) { simgrid::kernel::resource::Action* action; - XBT_DEBUG("Handling the processes whose action failed (if any)"); - while ((action = surf_model_extract_failed_action_set(model))) { + XBT_DEBUG("Handling the failed actions (if any)"); + while ((action = model->extract_failed_action())) { XBT_DEBUG(" Handling Action %p",action); - SIMIX_simcall_exit(static_cast(action->get_data())); + if (action->get_activity() != nullptr) + simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); } - XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); - while ((action = surf_model_extract_done_action_set(model))) { + XBT_DEBUG("Handling the terminated actions (if any)"); + while ((action = model->extract_done_action())) { XBT_DEBUG(" Handling Action %p",action); - if (action->get_data() == nullptr) + if (action->get_activity() == nullptr) XBT_DEBUG("probably vcpu's action %p, skip", action); else - SIMIX_simcall_exit(static_cast(action->get_data())); + simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); } } } -/** Handle any pending timer */ +/** Handle any pending timer. Returns if something was actually run. */ static bool SIMIX_execute_timers() { bool result = false; - while (not simix_timers.empty() && SIMIX_get_clock() >= 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 = simix_timers.top().second; - simix_timers.pop(); - try { - timer->callback(); - } catch (...) { - xbt_die("Exception thrown ouf of timer callback"); - } + // 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(); + timer->callback(); delete timer; } return result; } -/** Execute all the tasks that are queued - * - * e.g. `.then()` callbacks of futures. - **/ -static bool SIMIX_execute_tasks() -{ - xbt_assert(simix_global->tasksTemp.empty()); - - if (simix_global->tasks.empty()) - return false; - - using std::swap; - do { - // We don't want the callbacks to modify the vector we are iterating over: - swap(simix_global->tasks, simix_global->tasksTemp); - - // Execute all the queued tasks: - for (auto& task : simix_global->tasksTemp) - task(); - - simix_global->tasksTemp.clear(); - } while (not simix_global->tasks.empty()); - - return true; -} - /** - * \ingroup SIMIX_API - * \brief Run the main simulation loop. + * @ingroup SIMIX_API + * @brief Run the main simulation loop. */ void SIMIX_run() { - if (not MC_record_path.empty()) { + if (MC_record_replay_is_active()) { simgrid::mc::replay(MC_record_path); return; } @@ -396,11 +388,11 @@ void SIMIX_run() double time = 0; do { - XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size()); + XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->actors_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; + if (simgrid::simix::cfg_breakpoint >= 0.0 && surf_get_clock() >= simgrid::simix::cfg_breakpoint) { + XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::cfg_breakpoint.get()); + simgrid::simix::cfg_breakpoint = -1.0; #ifdef SIGTRAP std::raise(SIGTRAP); #else @@ -408,13 +400,13 @@ void SIMIX_run() #endif } - SIMIX_execute_tasks(); + simix_global->execute_tasks(); - while (not simix_global->process_to_run.empty()) { - XBT_DEBUG("New Sub-Schedule Round; size(queue)=%zu", simix_global->process_to_run.size()); + while (not simix_global->actors_to_run.empty()) { + XBT_DEBUG("New Sub-Schedule Round; size(queue)=%zu", simix_global->actors_to_run.size()); /* Run all processes that are ready to run, possibly in parallel */ - SIMIX_process_runall(); + simix_global->run_all_actors(); /* answer sequentially and in a fixed arbitrary order all the simcalls that were issued during that sub-round */ @@ -422,23 +414,23 @@ 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 + * Short proof: only maestro adds stuff to the actors_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. * 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 + * Assume that actors_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 * in arbitrary order (inductive hypothesis), we are fine. * - If a process is added because it's getting killed, its subsequent actions shouldn't matter - * - If a process gets added to process_to_run because one of their blocking action constituting the meat + * - If a process gets added to actors_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 + * - You are added from ActorImpl::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. * - For communications, this function is called from SIMIX_comm_finish(). @@ -462,7 +454,7 @@ void SIMIX_run() * 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 + * So, in any cases, the orders of processes within actors_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 @@ -472,32 +464,32 @@ void SIMIX_run() * * 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 + * We could sort the actors_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. */ - for (smx_actor_t const& process : simix_global->process_that_ran) { - if (process->simcall.call != SIMCALL_NONE) { - SIMIX_simcall_handle(&process->simcall, 0); + for (smx_actor_t const& process : simix_global->actors_that_ran) { + if (process->simcall.call_ != SIMCALL_NONE) { + process->simcall_handle(0); } } - SIMIX_execute_tasks(); + simix_global->execute_tasks(); do { SIMIX_wake_processes(); - } while (SIMIX_execute_tasks()); + } while (simix_global->execute_tasks()); /* 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->get_cname()); - SIMIX_process_kill(dmon, simix_global->maestro_process); + simix_global->maestro_process->kill(dmon); } } - time = SIMIX_timer_next(); + time = simgrid::simix::Timer::next(); if (time > -1.0 || not simix_global->process_list.empty()) { XBT_DEBUG("Calling surf_solve"); time = surf_solve(time); @@ -512,28 +504,18 @@ void SIMIX_run() bool again = false; do { again = SIMIX_execute_timers(); - if (SIMIX_execute_tasks()) + if (simix_global->execute_tasks()) again = true; SIMIX_wake_processes(); } while (again); - /* Autorestart all process */ - for (auto const& host : host_that_restart) { - XBT_INFO("Restart processes on host %s", host->get_cname()); - SIMIX_host_autorestart(host); - } - host_that_restart.clear(); - - /* Clean processes to destroy */ - SIMIX_process_empty_trash(); + /* Clean actors to destroy */ + simix_global->empty_trash(); XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(), - simix_global->process_to_run.size()); + simix_global->actors_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()); + } while (time > -1.0 || not simix_global->actors_to_run.empty()); if (not simix_global->process_list.empty()) { @@ -544,85 +526,32 @@ void SIMIX_run() XBT_CRITICAL("Oops! Deadlock or code not perfectly clean."); } SIMIX_display_process_status(); - simgrid::s4u::on_deadlock(); + simgrid::s4u::Engine::on_deadlock(); xbt_abort(); } - simgrid::s4u::on_simulation_end(); + simgrid::s4u::Engine::on_simulation_end(); } -/** - * \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 - * - */ -smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) +double SIMIX_timer_next() { - smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::makeTask([callback, arg]() { callback(arg); })); - timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); - return timer; + return simgrid::simix::Timer::next(); } -smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task callback) +smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) { - smx_timer_t timer = new s_smx_timer_t(date, std::move(callback)); - timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); - return timer; + return simgrid::simix::Timer::set(date, std::bind(callback, arg)); } /** @brief cancels a timer that was added earlier */ void SIMIX_timer_remove(smx_timer_t timer) { - simix_timers.erase(timer->handle_); - delete timer; + timer->remove(); } /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ double SIMIX_timer_get_date(smx_timer_t timer) { - return timer ? timer->getDate() : 0; + return timer ? timer->get_date() : 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(); @@ -631,33 +560,38 @@ void SIMIX_display_process_status() /* List the process and their state */ XBT_INFO("Legend of the following listing: \"Process (@): \""); for (auto const& kv : simix_global->process_list) { - smx_actor_t process = kv.second; + smx_actor_t actor = kv.second; - if (process->waiting_synchro) { + 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(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "execution"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "communication"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "sleeping"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "synchronization"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "I/O"; - 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_); + 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("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname()); + XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname()); } } }