Add leave in chord

[simgrid.git] / src / gras / Msg / timer.c

diff --git a/src/gras/Msg/timer.c b/src/gras/Msg/timer.c
index 989fa840306a46943af1468ea7210f808d95ae02..1fff6ea1fd95ef947c822723fd1be14f8adda31e 100644 (file)
--- a/src/gras/Msg/timer.c
+++ b/src/gras/Msg/timer.c
@@ -65,7 +65,7 @@ void gras_timer_cancel_delay(double interval, void_f_void_t action)
   }
 
   if (!found)
-    THROW2(mismatch_error, 0,
+    THROWF(mismatch_error, 0,
            "Cannot remove the action %p delayed of %f second: not found",
            action, interval);
 
@@ -91,7 +91,7 @@ void gras_timer_cancel_repeat(double interval, void_f_void_t action)
   }
 
   if (!found)
-    THROW2(mismatch_error, 0,
+    THROWF(mismatch_error, 0,
            "Cannot remove the action %p delayed of %f second: not found",
            action, interval);
 }
@@ -115,7 +115,7 @@ void gras_timer_cancel_delay_all(void)
   }
 
   if (!found)
-    THROW0(mismatch_error, 0, "No delayed action to remove");
+    THROWF(mismatch_error, 0, "No delayed action to remove");
 
 }
 
@@ -138,7 +138,7 @@ void gras_timer_cancel_repeat_all(void)
   }
 
   if (!found)
-    THROW0(mismatch_error, 0, "No repetitive action to remove");
+    THROWF(mismatch_error, 0, "No repetitive action to remove");
 }
 
 /** @brief Cancel all delayed and repetitive tasks */
@@ -185,7 +185,7 @@ double gras_msg_timer_handle(void)
                timer->action);
         xbt_dynar_cursor_rm(pd->timers, &cursor);
       }
-      (*action) ();
+      action();
       return 0.0;
     } else if (untilthis < untilnext || untilnext == -1) {
       untilnext = untilthis;