char *name transformed in const char *name to avoid compilation complain

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 9d703f7..c933aae 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -258,6 +258,7 @@ static int net_action_unref(surf_action_t action)
 #ifdef HAVE_TRACING
     xbt_free (((surf_action_network_CM02_t)action)->src_name);
     xbt_free (((surf_action_network_CM02_t)action)->dst_name);
+    if (action->category) xbt_free (action->category);
 #endif
     free(action);
     return 1;
@@ -351,7 +352,7 @@ static void net_update_actions_state(double now, double delta)
     unsigned int i;
     xbt_dynar_foreach(route, i, link) {
       TRACE_surf_link_set_utilization (link,
-          action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
+          action->generic_action.data, (surf_action_t)action, lmm_variable_getvalue(action->variable), now-delta, delta);
     }
 #endif
     double_update(&(action->generic_action.remains),
@@ -606,6 +607,11 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name,
   return (surf_action_t) action;
 }
 
+static xbt_dynar_t net_get_route(const char *src, const char *dst)
+{
+       return global_routing->get_route( src, dst);
+}
+
 static double net_get_link_bandwidth(const void *link)
 {
   surf_resource_lmm_t lmm = (surf_resource_lmm_t) link;
@@ -689,6 +695,7 @@ static void surf_network_model_init_internal(void)
   surf_cpu_model->set_max_duration = net_action_set_max_duration;
 
   surf_network_model->extension.network.communicate = net_communicate;
+  surf_network_model->extension.network.get_route = net_get_route;
   surf_network_model->extension.network.get_link_bandwidth =
     net_get_link_bandwidth;
   surf_network_model->extension.network.get_link_latency =