Fix memleaks by calling surf_exit when needed + minor cleanups

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

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index e613e7f..3a104fb 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -131,8 +131,6 @@ void test(char *platform)
   } while (surf_solve()>=0.0);
 
   DEBUG0("Simulation Terminated\n");
-
-  surf_finalize();
 }
 
 int main(int argc, char **argv)
@@ -143,5 +141,7 @@ int main(int argc, char **argv)
      return 1;
   }
   test(argv[1]);
+
+  surf_exit();
   return 0;
 }

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index c9b83a0..2adbbad 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -103,7 +103,6 @@ void test(char *platform)
 
   DEBUG0("Simulation Terminated\n");
 
-  surf_finalize();
 }
 
 int main(int argc, char **argv)
@@ -111,8 +110,11 @@ int main(int argc, char **argv)
   surf_init(&argc, argv);      /* Initialize some common structures */
   if(argc==1) {
      fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
+     surf_exit();
      return 1;
   }
   test(argv[1]);
+
+  surf_exit();
   return 0;
 }

diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c
index 153605a..9232409 100644 (file)
--- a/testsuite/surf/trace_usage.c
+++ b/testsuite/surf/trace_usage.c
@@ -41,8 +41,6 @@ void test(void)
       break;
   }
 
-  tmgr_trace_free(trace_A);
-  tmgr_trace_free(trace_B);
   tmgr_history_free(history);
   free(host_B);
   free(host_A);
@@ -53,5 +51,6 @@ int main(int argc, char **argv)
 {
   surf_init(&argc,argv);
   test();
+  surf_exit();
   return 0;
 }