Do routing parse before tracing parse

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

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 8a114b8..3713856 100644 (file)
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -26,8 +26,8 @@ static double time_to_next_flow_completion = -1;
 static double ns3_share_resources(double min);
 static void ns3_update_actions_state(double now, double delta);
 static void finalize(void);
-static surf_action_t ns3_communicate(const char *src_name,
-                                 const char *dst_name, double size, double rate);
+static surf_action_t ns3_communicate(void *src_elm, void *dst_elm,
+    double size, double rate);
 static void action_suspend(surf_action_t action);
 static void action_resume(surf_action_t action);
 static int action_is_suspended(surf_action_t action);
@@ -62,17 +62,11 @@ static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
     );
 }
 
-static void ns3_free_dynar(void * elmts)
-{
-  free(elmts);
-  return;
-}
-
 static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
 {
   XBT_DEBUG("NS3_ADD_LINK '%s'",link->id);
 
-  if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),ns3_free_dynar);
+  if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free);
 
   tmgr_trace_t bw_trace;
   tmgr_trace_t state_trace;
@@ -90,7 +84,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
     XBT_INFO("The NS3 network model doesn't support link state traces");
 
   ns3_link_t link_ns3 = xbt_new0(s_ns3_link_t,1);;
-  link_ns3->id = (char*)(link->id);
+  link_ns3->id = xbt_strdup((char*)(link->id));
   link_ns3->bdw = bprintf("%f",link->bandwidth);
   link_ns3->lat = bprintf("%f",link->latency);
 
@@ -238,10 +232,10 @@ static double ns3_get_link_bandwidth (const void *link)
   return bdw;
 }
 
-static xbt_dynar_t ns3_get_route(const char *src, const char *dst)
+static xbt_dynar_t ns3_get_route(void *src_card, void *dst_card)
 {
   xbt_dynar_t route = NULL;
-  routing_get_route_and_latency(src, dst, &route, NULL);
+  routing_get_route_and_latency(src_card, dst_card, &route, NULL);
   return route;
 }
 
@@ -266,10 +260,9 @@ static void create_ns3_topology(void)
   onelink_t onelink;
   unsigned int iter;
   xbt_dynar_foreach(onelink_routes, iter, onelink) {
-    char *src = onelink->src;
-    char *dst = onelink->dst;
+    char *src = ((network_element_t)onelink->src)->name;
+    char *dst = ((network_element_t)onelink->dst)->name;
     void *link = onelink->link_ptr;
-
     if( strcmp(src,dst) && ((surf_ns3_link_t)link)->created){
       XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id);
       char * link_bdw = xbt_strdup(((surf_ns3_link_t)link)->data->bdw);
@@ -484,15 +477,15 @@ static void ns3_update_actions_state(double now, double delta)
 }
 
 /* Max durations are not supported */
-static surf_action_t ns3_communicate(const char *src_name,
-                                 const char *dst_name, double size, double rate)
+static surf_action_t ns3_communicate(void *src_elm,
+    void *dst_elm, double size, double rate)
 {
   surf_action_network_ns3_t action = NULL;
 
-  XBT_DEBUG("Communicate from %s to %s",src_name,dst_name);
+  XBT_DEBUG("Communicate from %s to %s",((network_element_t)src_elm)->name,((network_element_t)dst_elm)->name);
   action = surf_action_new(sizeof(s_surf_action_network_ns3_t), size, surf_network_model, 0);
 
-  ns3_create_flow(src_name, dst_name, surf_get_clock(), size, action);
+  ns3_create_flow(((network_element_t)src_elm)->name, ((network_element_t)dst_elm)->name, surf_get_clock(), size, action);
 
 #ifdef HAVE_TRACING
   action->last_sent = 0;