The second version of hierarchical routing. I implemented the parse functions and...

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 4a3d052..7a3c23a 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -263,22 +263,20 @@ static int net_action_unref(surf_action_t action)
 
 static void net_action_cancel(surf_action_t action)
 {
-  surf_network_model->action_state_set((surf_action_t) action,
-                                       SURF_ACTION_FAILED);
-  return;
+  surf_network_model->action_state_set(action, SURF_ACTION_FAILED);
 }
 
-static void net_action_recycle(surf_action_t action)
+void net_action_recycle(surf_action_t action)
 {
   return;
 }
 
-static int net_get_link_latency(surf_action_t action)
+int net_get_link_latency(surf_action_t action)
 {
   return action->latency_limited;
 }
 
-static double net_action_get_remains(surf_action_t action)
+double net_action_get_remains(surf_action_t action)
 {
   return action->remains;
 }
@@ -326,17 +324,6 @@ static void net_update_actions_state(double now, double delta)
    */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-
-#ifdef HAVE_TRACING
-    xbt_dynar_t route = used_routing->get_route(action->src, action->dst);
-    link_CM02_t link;
-    unsigned int i;
-    xbt_dynar_foreach(route, i, link) {
-       TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name,
-          action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
-    }
-#endif
-
     deltap = delta;
     if (action->latency > 0) {
       if (action->latency > deltap) {
@@ -350,6 +337,15 @@ static void net_update_actions_state(double now, double delta)
         lmm_update_variable_weight(network_maxmin_system, action->variable,
                                    action->weight);
     }
+#ifdef HAVE_TRACING
+    xbt_dynar_t route = used_routing->get_route(action->src, action->dst);
+    link_CM02_t link;
+    unsigned int i;
+    xbt_dynar_foreach(route, i, link) {
+      TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name,
+          action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
+    }
+#endif
     double_update(&(action->generic_action.remains),
                   lmm_variable_getvalue(action->variable) * deltap);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
@@ -630,7 +626,7 @@ static int net_action_is_suspended(surf_action_t action)
   return ((surf_action_network_CM02_t) action)->suspended;
 }
 
-static void net_action_set_max_duration(surf_action_t action, double duration)
+void net_action_set_max_duration(surf_action_t action, double duration)
 {
   action->max_duration = duration;
 }