Fix memleak

diff --git a/src/surf/surf.cpp b/src/surf/surf.cpp
index bffcc42..ac32b8d 100644 (file)
--- a/src/surf/surf.cpp
+++ b/src/surf/surf.cpp
@@ -15,6 +15,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
 }
 
                                 "Logging specific to SURF (kernel)");
 }
 

+
+

 /*********
  * Utils *
  *********/
 /*********
  * Utils *
  *********/


@@ -172,9 +174,10 @@ s_surf_model_description_t surf_storage_model_description[] = {
 static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 
 static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 

-static double *surf_mins = NULL; /* return value of share_resources for each model */
-

 double NOW = 0;
 double NOW = 0;

+double *surf_mins = NULL; /* return value of share_resources for each model */
+int surf_min_index;       /* current index in surf_mins */
+double surf_min;               /* duration determined by surf_solve */

 
 double surf_get_clock(void)
 {
 
 double surf_get_clock(void)
 {

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index c0f76be..24a8f2c 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -10,7 +10,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 /*********
  * TOOLS *
  *********/
 /*********
  * TOOLS *
  *********/

-extern double NOW;

 
 static CpuPtr get_casted_cpu(surf_resource_t resource){
   return dynamic_cast<CpuPtr>(static_cast<ResourcePtr>(surf_cpu_resource_priv(resource)));
 
 static CpuPtr get_casted_cpu(surf_resource_t resource){
   return dynamic_cast<CpuPtr>(static_cast<ResourcePtr>(surf_cpu_resource_priv(resource)));


@@ -32,9 +31,10 @@ char *surf_routing_edge_name(sg_routing_edge_t edge){
 static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 
 static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 

-static double *surf_mins = NULL; /* return value of share_resources for each model */
-static int surf_min_index;       /* current index in surf_mins */
-static double surf_min;               /* duration determined by surf_solve */
+extern double NOW;
+extern double *surf_mins; /* return value of share_resources for each model */
+extern int surf_min_index;       /* current index in surf_mins */
+extern double surf_min;               /* duration determined by surf_solve */

 
 void surf_presolve(void)
 {
 
 void surf_presolve(void)
 {