X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6a76e36485a11afb076ddd5dc5d691429b2d876..d53e7db348cf100819ca9b3bc8f30406dd5077ea:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 0644ac793b..fb5a7c54b5 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -3,6 +3,7 @@ /* 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 @@ -12,6 +13,7 @@ #include #include +#include #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" @@ -23,7 +25,7 @@ #include "mc/mc.h" #include "simgrid/sg_config.h" -#include "src/mc/mc_replay.h" +#include "src/mc/mc_replay.hpp" #include "src/surf/StorageImpl.hpp" #include "src/smpi/include/smpi_process.hpp" @@ -50,14 +52,18 @@ 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; -static xbt_heap_t simix_timers = nullptr; + +namespace { +typedef std::pair TimerQelt; +boost::heap::fibonacci_heap>> simix_timers; +} /** @brief Timer datatype */ class s_smx_timer_t { double date = 0.0; - s_smx_timer_t() = default; 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)) {} @@ -156,7 +162,7 @@ static void install_segvhandler() /********************************* SIMIX **************************************/ double SIMIX_timer_next() { - return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0; + return simix_timers.empty() ? -1.0 : simix_timers.top().first; } static void kill_process(smx_actor_t process) @@ -204,9 +210,6 @@ void SIMIX_global_init(int *argc, char **argv) if (not simix_global) { simix_global = std::unique_ptr(new simgrid::simix::Global()); - - simgrid::simix::ActorImpl proc; - simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup)); simix_global->maestro_process = nullptr; simix_global->create_process_function = &SIMIX_process_create; simix_global->kill_process_function = &kill_process; @@ -240,11 +243,6 @@ void SIMIX_global_init(int *argc, char **argv) }); } - if (not simix_timers) - simix_timers = xbt_heap_new(8, [](void* p) { - delete static_cast(p); - }); - if (xbt_cfg_get_boolean("clean-atexit")) atexit(SIMIX_clean); @@ -292,19 +290,21 @@ void SIMIX_clean() /* Exit the SIMIX network module */ SIMIX_mailbox_exit(); - xbt_heap_free(simix_timers); - simix_timers = nullptr; + while (not simix_timers.empty()) { + delete simix_timers.top().second; + simix_timers.pop(); + } /* Free the remaining data structures */ simix_global->process_to_run.clear(); simix_global->process_that_ran.clear(); - xbt_swag_free(simix_global->process_to_destroy); + simix_global->process_to_destroy.clear(); simix_global->process_list.clear(); - simix_global->process_to_destroy = nullptr; 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 */ @@ -363,18 +363,18 @@ static void SIMIX_wake_processes() static bool SIMIX_execute_timers() { bool result = false; - while (xbt_heap_size(simix_timers) > 0 && SIMIX_get_clock() >= SIMIX_timer_next()) { + while (not simix_timers.empty() && SIMIX_get_clock() >= 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 = (smx_timer_t) xbt_heap_pop(simix_timers); - try { - timer->callback(); - } - catch(...) { - xbt_die("Exception throwed ouf of timer callback"); - } - delete timer; + // 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"); + } + delete timer; } return result; } @@ -411,7 +411,7 @@ static bool SIMIX_execute_tasks() */ void SIMIX_run() { - if (MC_record_path) { + if (not MC_record_path.empty()) { simgrid::mc::replay(MC_record_path); return; } @@ -435,13 +435,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). + * 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 @@ -450,37 +452,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. */ @@ -564,20 +571,21 @@ 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, [callback, arg]() { callback(arg); }); - xbt_heap_push(simix_timers, timer, date); + timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); return timer; } smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task callback) { smx_timer_t timer = new s_smx_timer_t(date, std::move(callback)); - xbt_heap_push(simix_timers, timer, date); + timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); return timer; } /** @brief cancels a timer that was added earlier */ void SIMIX_timer_remove(smx_timer_t timer) { - delete static_cast(xbt_heap_rm_elm(simix_timers, timer, timer->getDate())); + simix_timers.erase(timer->handle_); + delete timer; } /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */