[route parsing] rename network_element_t into sg_routing_edge_t

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

diff --git a/src/surf/network.c b/src/surf/network.c
index a6c1583..2680406 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -200,6 +200,7 @@ static void *net_create_resource(const char *name,
     lmm_constraint_shared(nw_link->lmm_resource.constraint);
 
   xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link);
+  XBT_DEBUG("Create link '%s'",name);
 
   return nw_link;
 }
@@ -317,6 +318,9 @@ static int net_action_unref(surf_action_t action)
       surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t) action);
       xbt_swag_remove(action, net_modified_set);
     }
+#ifdef HAVE_TRACING
+    if (action->category) xbt_free (action->category);
+#endif
     surf_action_free(&action);
     return 1;
   }
@@ -534,7 +538,10 @@ static void net_update_actions_state_full(double now, double delta)
         link_CM02_t link = lmm_constraint_id(constraint);
         TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
                                         ((surf_action_t)action)->category,
-                                        lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+                                        (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+                                        lmm_get_cnst_weight_from_var(network_maxmin_system,
+                                            GENERIC_LMM_ACTION(action).variable,
+                                            i)),
                                         now - delta,
                                         delta);
       }
@@ -595,7 +602,10 @@ static void net_update_actions_state_lazy(double now, double delta)
         link_CM02_t link = lmm_constraint_id(constraint);
         TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
                                         ((surf_action_t)action)->category,
-                                        lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+                                        (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+                                            lmm_get_cnst_weight_from_var(network_maxmin_system,
+                                                GENERIC_LMM_ACTION(action).variable,
+                                                i)),
                                         GENERIC_LMM_ACTION(action).last_update,
                                         now - GENERIC_LMM_ACTION(action).last_update);
       }
@@ -742,9 +752,9 @@ static void net_update_resource_state(void *id,
 }
 
 
-static surf_action_t net_communicate(void *src,
-                                     void *dst, double size,
-                                     double rate)
+static surf_action_t net_communicate(sg_routing_edge_t src,
+                                     sg_routing_edge_t dst,
+                                     double size, double rate)
 {
   unsigned int i;
   link_CM02_t link;
@@ -755,14 +765,14 @@ static surf_action_t net_communicate(void *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)", ((network_element_t)src)->name, ((network_element_t)dst)->name, size, rate);
+  XBT_IN("(%s,%s,%g,%g)", src->name, dst->name, size, rate);
 
   routing_get_route_and_latency(src, dst, &route, &latency);
   xbt_assert(!xbt_dynar_is_empty(route) || latency,
              "You're trying to send data from %s to %s but there is no connection at all between these two hosts.",
-             ((network_element_t)src)->name, ((network_element_t)dst)->name);
+             src->name, dst->name);
 
   xbt_dynar_foreach(route, i, link) {
     if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) {
@@ -771,7 +781,7 @@ static surf_action_t net_communicate(void *src,
     }
   }
   if (sg_network_crosstraffic == 1) {
-    routing_get_route_and_latency(src, dst, &back_route, NULL);
+    routing_get_route_and_latency(dst, src, &back_route, NULL);
     xbt_dynar_foreach(back_route, i, link) {
       if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) {
         failed = 1;
@@ -821,7 +831,7 @@ static surf_action_t net_communicate(void *src,
     link = *(link_CM02_t *) xbt_dynar_get_ptr(route, 0);
     gap_append(size, link, action);
     XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)",
-              action, ((network_element_t)src)->name, ((network_element_t)dst)->name, action->sender.gap,
+              action, src->name, dst->name, action->sender.gap,
               action->latency);
   }
 
@@ -1081,8 +1091,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));