func_f and func_fp need to be provided. This is weird. I thought I

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 3f31f74304c0678a1bc641832bf495b5ad129007..76411fb9a98c8d5bfcbbcd206bbeaee148bc94b6 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -198,7 +198,7 @@ static void parse_file(const char *file)
     if(!ROUTE_SIZE(i,i)) {
       if(!loopback)
        loopback = network_link_new(xbt_strdup("__MSG_loopback__"), 
-                                  498.00, NULL, 0.000015, NULL, 
+                                  498000000, NULL, 0.000015, NULL, 
                                   SURF_NETWORK_LINK_ON, NULL,
                                   SURF_NETWORK_LINK_FATPIPE);
       ROUTE_SIZE(i,i)=1;
@@ -487,10 +487,12 @@ static void action_suspend(surf_action_t action)
 
 static void action_resume(surf_action_t action)
 {
-  lmm_update_variable_weight(maxmin_system,
-                            ((surf_action_network_CM02_t) action)->variable, 
-                            ((surf_action_network_CM02_t) action)->lat_current);
-  ((surf_action_network_CM02_t) action)->suspended = 0;
+  if(((surf_action_network_CM02_t) action)->suspended) {
+    lmm_update_variable_weight(maxmin_system,
+                              ((surf_action_network_CM02_t) action)->variable, 
+                              ((surf_action_network_CM02_t) action)->lat_current);
+    ((surf_action_network_CM02_t) action)->suspended = 0;
+  }
 }
 
 static int action_is_suspended(surf_action_t action)