This change allow to avoid the Visual C++ compiler Warning that occur when you try...

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

diff --git a/src/gras/Msg/timer.c b/src/gras/Msg/timer.c
index 513b289..1249840 100644 (file)
--- a/src/gras/Msg/timer.c
+++ b/src/gras/Msg/timer.c
@@ -141,7 +141,7 @@ double gras_msg_timer_handle(void) {
   double now=gras_os_time();
   double untilnext = -1.0;
   
-  for (cursor=0; cursor < xbt_dynar_length(pd->timers); cursor++) {
+  for (cursor=0; cursor < (int)xbt_dynar_length(pd->timers); cursor++) {
      double untilthis;
      
      timer = xbt_dynar_get_ptr (pd->timers, cursor);
@@ -150,22 +150,23 @@ double gras_msg_timer_handle(void) {
      DEBUG2("Action %p expires in %f", timer->action, untilthis);
      
      if (untilthis <= 0.0) {
+       void_f_void_t action = timer->action;
        
-       DEBUG5("[%.0f] Serve %s action %p (%f<%f)",gras_os_time(),
+       DEBUG5("[%.0f] Serve %s action %p (%f<%f)",gras_os_time(),
              timer->repeat ? "repetitive" : "delayed", timer->action,
              timer->expiry, now);
-       timer->action();
        
-       if (timer->repeat) {    
-          timer->expiry = now + timer->period;
-          DEBUG4("[%.0f] Re-arm repetitive action %p for %f (period=%f)",
-                gras_os_time(),
-                timer->action, timer->expiry, timer->period);
-       } else {
-          DEBUG2("[%.0f] Remove %p now that it's done", gras_os_time(), timer->action);
-          xbt_dynar_cursor_rm(pd->timers, &cursor);
-       }
-       return 0.0;
+       if (timer->repeat) {    
+        timer->expiry = now + timer->period;
+        DEBUG4("[%.0f] Re-arm repetitive action %p for %f (period=%f)",
+               gras_os_time(),
+               timer->action, timer->expiry, timer->period);
+       } else {
+        DEBUG2("[%.0f] Remove %p now that it's done", gras_os_time(), timer->action);
+        xbt_dynar_cursor_rm(pd->timers, &cursor);
+       }
+       (*action)();
+       return 0.0;
      } else if (untilthis < untilnext || untilnext == -1) {
        untilnext = untilthis;
      }