X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2cf13759ba1696d88f5ff86afee5324f30ccdbfc..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 99f9d1cec9..108ba80fea 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -16,7 +16,6 @@ #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" @@ -25,29 +24,12 @@ #include "src/mc/remote/Client.hpp" #endif -#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; @@ -95,7 +77,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 @@ -139,13 +121,22 @@ static void install_segvhandler() #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; } -namespace simgrid { -namespace simix { +/** @brief cancels a timer that was added earlier */ +void Timer::remove() +{ + simgrid::simix::simix_timers.erase(handle_); + delete this; +} void Global::empty_trash() { @@ -201,7 +192,7 @@ void SIMIX_global_init(int *argc, char **argv) #endif if (simix_global == nullptr) { - simix_global = std::unique_ptr(new simgrid::simix::Global()); + simix_global.reset(new simgrid::simix::Global()); simix_global->maestro_process = nullptr; surf_init(argc, argv); /* Initialize SURF structures */ @@ -274,9 +265,9 @@ void SIMIX_clean() /* 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->actors_to_run.clear(); @@ -290,8 +281,6 @@ void SIMIX_clean() #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; @@ -344,11 +333,11 @@ static void SIMIX_wake_processes() 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(); + smx_timer_t timer = simgrid::simix::simix_timers.top().second; + simgrid::simix::simix_timers.pop(); try { timer->callback(); } catch (...) { @@ -370,10 +359,9 @@ static bool SIMIX_execute_tasks() 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); + simix_global->tasks.swap(simix_global->tasksTemp); // Execute all the queued tasks: for (auto& task : simix_global->tasksTemp) @@ -500,7 +488,7 @@ void SIMIX_run() } } - 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); @@ -543,38 +531,29 @@ void SIMIX_run() simgrid::s4u::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 - * - */ +double SIMIX_timer_next() +{ + return simgrid::simix::Timer::next(); +} + 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::make_task([callback, arg]() { callback(arg); })); - timer->handle_ = simix_timers.emplace(std::make_pair(date, timer)); - return timer; + return simgrid::simix::Timer::set(date, std::bind(callback, arg)); } -smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task callback) +smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task&& callback) // deprecated { - 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::move(callback)); } /** @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; } void SIMIX_display_process_status()