Delete timer on removal.

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 124aae8..a55a783 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -73,8 +73,10 @@ void SIMIX_process_cleanup(smx_actor_t process)
   SIMIX_process_on_exit_runall(process);
 
   /* Unregister from the kill timer if any */
   SIMIX_process_on_exit_runall(process);
 
   /* Unregister from the kill timer if any */

-  if (process->kill_timer != nullptr)
+  if (process->kill_timer != nullptr) {

     SIMIX_timer_remove(process->kill_timer);
     SIMIX_timer_remove(process->kill_timer);

+    process->kill_timer = nullptr;
+  }

 
   xbt_os_mutex_acquire(simix_global->mutex);
 
 
   xbt_os_mutex_acquire(simix_global->mutex);
 

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index dd8daa8..90deaa8 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -575,7 +575,7 @@ smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback)
 
 /** @brief cancels a timer that was added earlier */
 void SIMIX_timer_remove(smx_timer_t timer) {
 
 /** @brief cancels a timer that was added earlier */
 void SIMIX_timer_remove(smx_timer_t timer) {

-  xbt_heap_rm_elm(simix_timers, timer, timer->getDate());
+  delete static_cast<smx_timer_t>(xbt_heap_rm_elm(simix_timers, timer, timer->getDate()));

 }
 
 /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */
 }
 
 /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */