Rewrite function net_update_action_remaining_lazy like in cpu.

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

diff --git a/src/surf/network.c b/src/surf/network.c
index c9e0a70..7bb1803 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -60,7 +60,7 @@ e_UM_t network_update_mechanism = UM_UNDEFINED;
 static int net_selective_update = 0;
 
 static int net_action_is_suspended(surf_action_t action);
-static void net_update_action_remaining_lazy(double now);
+static void net_update_action_remaining_lazy(surf_action_network_CM02_t action, double now);
 
 static xbt_swag_t net_modified_set = NULL;
 static xbt_heap_t net_action_heap = NULL;
@@ -353,46 +353,47 @@ int net_get_link_latency_limited(surf_action_t action)
 
 double net_action_get_remains(surf_action_t action)
 {
+  XBT_IN("(%p)", action);
+  /* update remains before return it */
   if (network_update_mechanism == UM_LAZY)      /* update remains before return it */
-    net_update_action_remaining_lazy(surf_get_clock());
+    net_update_action_remaining_lazy((surf_action_network_CM02_t)action,
+        surf_get_clock());
+  XBT_OUT();
   return action->remains;
 }
 
-static void net_update_action_remaining_lazy(double now)
+static void net_update_action_remaining_lazy(surf_action_network_CM02_t action, double now)
 {
-  surf_action_lmm_t action = NULL;
   double delta = 0.0;
 
-  xbt_swag_foreach(action, net_modified_set) {
+  if (GENERIC_LMM_ACTION(action).suspended != 0)
+    return;
 
-    if (action->suspended != 0) {
-      continue;
-    }
+  delta = now - GENERIC_LMM_ACTION(action).last_update;
 
-    delta = now - action->last_update;
+  double_update(&(((surf_action_t)action)->remains),
+      GENERIC_LMM_ACTION(action).last_value * delta);
 
-    double_update(&(((surf_action_t)action)->remains),
-                  lmm_variable_getvalue(action->variable) * delta);
+  if (((surf_action_t)action)->max_duration != NO_MAX_DURATION)
+    double_update(&(((surf_action_t)action)->max_duration), delta);
 
-    if (((surf_action_t)action)->max_duration != NO_MAX_DURATION)
-      double_update(&(((surf_action_t)action)->max_duration), delta);
-
-    if ((((surf_action_t)action)->remains <= 0) &&
-        (lmm_get_variable_weight(action->variable) > 0)) {
-      ((surf_action_t)action)->finish = surf_get_clock();
-      surf_network_model->action_state_set((surf_action_t) action,
-                                           SURF_ACTION_DONE);
-      surf_action_lmm_heap_remove(net_action_heap,action);
-    } else if (((((surf_action_t)action)->max_duration != NO_MAX_DURATION)
-               && (((surf_action_t)action)->max_duration <= 0))) {
-      ((surf_action_t)action)->finish = surf_get_clock();
-      surf_network_model->action_state_set((surf_action_t) action,
-                                           SURF_ACTION_DONE);
-      surf_action_lmm_heap_remove(net_action_heap,action);
-    }
+  if ((((surf_action_t)action)->remains <= 0) &&
+      (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) {
+    ((surf_action_t)action)->finish = surf_get_clock();
+    surf_network_model->action_state_set((surf_action_t) action,
+        SURF_ACTION_DONE);
 
-    action->last_update = now;
+    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
+  } else if (((((surf_action_t)action)->max_duration != NO_MAX_DURATION)
+      && (((surf_action_t)action)->max_duration <= 0))) {
+    ((surf_action_t)action)->finish = surf_get_clock();
+    surf_network_model->action_state_set((surf_action_t) action,
+        SURF_ACTION_DONE);
+    surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t)action);
   }
+
+  GENERIC_LMM_ACTION(action).last_update = now;
+  GENERIC_LMM_ACTION(action).last_value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
 }
 
 static double net_share_resources_full(double now)
@@ -438,7 +439,6 @@ static double net_share_resources_lazy(double now)
   XBT_DEBUG
       ("Before share resources, the size of modified actions set is %d",
        xbt_swag_size(net_modified_set));
-  net_update_action_remaining_lazy(now);
 
   lmm_solve(network_maxmin_system);
 
@@ -446,7 +446,7 @@ static double net_share_resources_lazy(double now)
       ("After share resources, The size of modified actions set is %d",
        xbt_swag_size(net_modified_set));
 
-  xbt_swag_foreach(action, net_modified_set) {
+  while((action = xbt_swag_extract(net_modified_set))) {
     int max_dur_flag = 0;
 
     if (GENERIC_ACTION(action).state_set !=
@@ -457,6 +457,8 @@ static double net_share_resources_lazy(double now)
     if (GENERIC_ACTION(action).priority <= 0)
       continue;
 
+    net_update_action_remaining_lazy(action,now);
+
     min = -1;
     value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
     if (value > 0) {
@@ -752,8 +754,8 @@ static void net_update_resource_state(void *id,
 }
 
 
-static surf_action_t net_communicate(network_element_t src,
-                                     network_element_t dst,
+static surf_action_t net_communicate(sg_routing_edge_t src,
+                                     sg_routing_edge_t dst,
                                      double size, double rate)
 {
   unsigned int i;
@@ -765,7 +767,7 @@ static surf_action_t net_communicate(network_element_t src,
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
 
-  xbt_dynar_t route = xbt_dynar_new(global_routing->size_of_link, NULL);
+  xbt_dynar_t route = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
 
   XBT_IN("(%s,%s,%g,%g)", src->name, dst->name, size, rate);
 
@@ -1091,8 +1093,7 @@ static void surf_network_model_init_internal(void)
   if (!network_maxmin_system)
     network_maxmin_system = lmm_system_new(net_selective_update);
 
-  routing_model_create(sizeof(link_CM02_t),
-                       net_create_resource("__loopback__",
+  routing_model_create(net_create_resource("__loopback__",
                                            498000000, NULL, 0.000015, NULL,
                                            SURF_RESOURCE_ON, NULL,
                                            SURF_LINK_FATPIPE, NULL));