From d4b84bf7c2cc1ffe1c73852ce1b6664930bc5f3a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 11 Oct 2019 14:13:04 +0200 Subject: [PATCH 1/1] Deprecate C API for SIMIX timers. --- include/simgrid/simix.h | 11 +++++++---- src/simix/smx_global.cpp | 10 ++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index c6669c3040..d40ac53d3d 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -86,10 +86,13 @@ XBT_PUBLIC void SIMIX_set_maestro(void (*code)(void*), void* data); XBT_PUBLIC void SIMIX_run(); XBT_PUBLIC double SIMIX_get_clock(); -XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, void (*function)(void*), void* arg); -XBT_PUBLIC void SIMIX_timer_remove(smx_timer_t timer); -XBT_PUBLIC double SIMIX_timer_next(); -XBT_PUBLIC double SIMIX_timer_get_date(smx_timer_t timer); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::set()") XBT_PUBLIC smx_timer_t + SIMIX_timer_set(double date, void (*function)(void*), void* arg); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::remove()") XBT_PUBLIC + void SIMIX_timer_remove(smx_timer_t timer); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::next()") XBT_PUBLIC double SIMIX_timer_next(); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::get_date()") XBT_PUBLIC + double SIMIX_timer_get_date(smx_timer_t timer); XBT_PUBLIC void SIMIX_display_process_status(); SG_END_DECL() diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index fbde8a5ef9..c84c5b77b7 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -532,23 +532,25 @@ void SIMIX_run() simgrid::s4u::Engine::on_simulation_end(); } -double SIMIX_timer_next() +double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329 { return simgrid::simix::Timer::next(); } -smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) +smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void* arg) // XBT_ATTRIB_DEPRECATED_v329 { 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) { +void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 +{ 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) { +double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 +{ return timer ? timer->get_date() : 0; } -- 2.20.1