From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 16 Aug 2016 11:45:07 +0000 (+0200)
Subject: plug a memleak by properly finalizing the framework
X-Git-Tag: v3_14~541
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4af77064e63a230d657657a4164f6ff918e5df54

plug a memleak by properly finalizing the framework
---

diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.c b/teshsuite/surf/maxmin_bench/maxmin_bench.c
index 78e9222a02..dc907a9a5e 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench.c
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench.c
@@ -6,6 +6,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "src/include/surf/surf.h"
 #include "surf/maxmin.h"
 #include "xbt/module.h"
 #include "xbt/xbt_os_time.h"
@@ -179,7 +180,7 @@ int main(int argc, char **argv)
   //Otherwise, just set it to a constant value (and set rate_no_limit to 1.0):
   //nb_elem=200
 
-  xbt_init(&argc, argv);
+  surf_init(&argc, argv);
 
   for(int i=0;i<testcount;i++){
     seedx=i+1;
@@ -198,5 +199,7 @@ int main(int argc, char **argv)
          testcount,nb_cnst, nb_var, nb_elem, (1<<pw_base_limit), (1<<pw_base_limit)+(1<<pw_max_limit), max_share);
   if(mode==3)
     fprintf(stderr, "Execution time: %g +- %g  microseconds \n",mean_date, stdev_date);
+   
+  surf_exit();
   return 0;
 }
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
index 41abf8bdbe..8ececd2323 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
@@ -4,6 +4,9 @@
 ! expect return 0
 ! output sort
 $ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench medium 5 test
+> [0.000000]: [surf_kernel/DEBUG] Add SURF levels
+> [0.000000]: [surf_kernel/DEBUG] Add routing levels
+> [0.000000]: [surf_kernel/DEBUG] Create all Libs
 > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1
 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 100
 > [0.000000]: [surf_maxmin/DEBUG] Constraint '98' usage: 13.060939 remaining: 3.166833 concurrency: 7<=8<=10
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
index 04a5a48070..303353542f 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
@@ -4,6 +4,9 @@
 ! expect return 0
 ! output sort
 $ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench small  10 test
+> [0.000000]: [surf_kernel/DEBUG] Add SURF levels
+> [0.000000]: [surf_kernel/DEBUG] Add routing levels
+> [0.000000]: [surf_kernel/DEBUG] Create all Libs
 > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1
 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 10
 > [0.000000]: [surf_maxmin/DEBUG] Constraint '9' usage: 4.703796 remaining: 7.082917 concurrency: 2<=2<=-1