[NS3] plug memory issue and cosmetics

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

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 1185fda..7e669dc 100644 (file)
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -18,8 +18,6 @@ extern xbt_lib_t as_router_lib;
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf,
                                 "Logging specific to the SURF network NS3 module");
 
-#define MAX_LENGHT_IPV4 16 //255.255.255.255\0
-
 extern routing_global_t global_routing;
 extern xbt_dict_t dict_socket;
 
@@ -53,20 +51,20 @@ static void replace_str(char *str, const char *orig, const char *rep)
   str = xbt_strdup(buffer);
 }
 
-static void replace_bdw_ns3(char * bdw)
+static void replace_bdw_ns3(char ** bdw)
 {
-       char *temp = xbt_strdup(bdw);
-       xbt_free(bdw);
-       bdw = bprintf("%fBps",atof(temp));
+       char *temp = xbt_strdup(*bdw);
+       xbt_free(*bdw);
+       *bdw = bprintf("%fBps",atof(temp));
        xbt_free(temp);
 
 }
 
-static void replace_lat_ns3(char * lat)
+static void replace_lat_ns3(char ** lat)
 {
-       char *temp = xbt_strdup(lat);
-       xbt_free(lat);
-       lat = bprintf("%fs",atof(temp));
+       char *temp = xbt_strdup(*lat);
+       xbt_free(*lat);
+       *lat = bprintf("%fs",atof(temp));
        xbt_free(temp);
 }
 
@@ -90,7 +88,7 @@ void parse_ns3_add_link(void)
 {
        XBT_DEBUG("NS3_ADD_LINK '%s'",A_surfxml_link_id);
 
-       if(!IPV4addr) IPV4addr = xbt_dynar_new(MAX_LENGHT_IPV4*sizeof(char),ns3_free_dynar);
+       if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),ns3_free_dynar);
 
        tmgr_trace_t bw_trace;
        tmgr_trace_t state_trace;
@@ -203,8 +201,8 @@ void parse_ns3_add_cluster(void)
        int elmts;
        char * lat = xbt_strdup(cluster_lat);
        char * bw =  xbt_strdup(cluster_bw);
-       replace_lat_ns3(lat);
-       replace_bdw_ns3(bw);
+       replace_lat_ns3(&lat);
+       replace_bdw_ns3(&bw);
 
        xbt_dynar_foreach(tab_elements_num,cpt,elmts)
        {
@@ -229,8 +227,8 @@ void parse_ns3_add_cluster(void)
        //Create link backbone
        lat = xbt_strdup(cluster_bb_lat);
        bw =  xbt_strdup(cluster_bb_bw);
-       replace_lat_ns3(lat);
-       replace_bdw_ns3(bw);
+       replace_lat_ns3(&lat);
+       replace_bdw_ns3(&bw);
        ns3_add_cluster(bw,lat,A_surfxml_cluster_id);
        xbt_free(lat);
        xbt_free(bw);   
@@ -285,8 +283,8 @@ void create_ns3_topology()
      XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id);
      char * link_bdw = bprintf("%s",((surf_ns3_link_t)link)->data->bdw);
         char * link_lat = bprintf("%s",(((surf_ns3_link_t)link)->data->lat));
-        replace_lat_ns3(link_lat);
-        replace_bdw_ns3(link_bdw);
+        replace_lat_ns3(&link_lat);
+        replace_bdw_ns3(&link_bdw);
         ((surf_ns3_link_t)link)->created = 0;
 
         //      XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);