Clean and reorganize: move some frees to the right locations...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5597 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index 6c2c6c1..0495333 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -273,14 +273,6 @@ static void add_traces(void) {
       
       link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
    }
       
       link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
    }

-
-   xbt_dict_free(&trace_connect_list_host_avail);
-   xbt_dict_free(&trace_connect_list_power);
-   xbt_dict_free(&trace_connect_list_link_avail);
-   xbt_dict_free(&trace_connect_list_bandwidth);
-   xbt_dict_free(&trace_connect_list_latency);
-   
-   xbt_dict_free(&traces_set_list); 

 }
 
 static void define_callbacks(const char *file)
 }
 
 static void define_callbacks(const char *file)

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 3d1724a..c1dbedb 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -531,6 +531,13 @@ static void free_data(void)
   }
   xbt_dict_free(&route_table);
   route_link_list = NULL;
   }
   xbt_dict_free(&route_table);
   route_link_list = NULL;

+
+  xbt_dict_free(&trace_connect_list_host_avail);
+  xbt_dict_free(&trace_connect_list_power);
+  xbt_dict_free(&trace_connect_list_link_avail);
+  xbt_dict_free(&trace_connect_list_bandwidth);
+  xbt_dict_free(&trace_connect_list_latency);
+  xbt_dict_free(&traces_set_list);

 }
 
 void parse_platform_file(const char* file)
 }
 
 void parse_platform_file(const char* file)

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index b72a43d..147d12a 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -1023,13 +1023,6 @@ static void add_traces(void) {
      }
    }
 */
      }
    }
 */

-   xbt_dict_free(&trace_connect_list_host_avail);
-   xbt_dict_free(&trace_connect_list_power);
-   xbt_dict_free(&trace_connect_list_link_avail);
-   xbt_dict_free(&trace_connect_list_bandwidth);
-   xbt_dict_free(&trace_connect_list_latency);
-   
-   xbt_dict_free(&traces_set_list); 

 }
 
 static void define_callbacks(const char *file)
 }
 
 static void define_callbacks(const char *file)