free libs at the right moment.

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

diff --git a/src/msg/global.c b/src/msg/global.c
index f764ade..e853fed 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -179,12 +179,6 @@ int MSG_process_killall(int reset_PIDs)
 MSG_error_t MSG_clean(void)
 {
 
-// Exit the LIB host_lib
-xbt_lib_free(&host_lib);
-xbt_lib_free(&link_lib);
-xbt_lib_free(&as_router_lib);
-
-
 #ifdef HAVE_TRACING
   TRACE_surf_release();
 #endif
@@ -203,6 +197,11 @@ xbt_lib_free(&as_router_lib);
 
   SIMIX_clean();
 
+  // Exit the LIB host_lib
+  xbt_lib_free(&host_lib);
+  xbt_lib_free(&link_lib);
+  xbt_lib_free(&as_router_lib);
+
   return MSG_OK;
 }
 

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 8b941e6..1688cac 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -421,6 +421,9 @@ void SD_exit(void)
     xbt_swag_free(sd_global->done_task_set);
     xbt_swag_free(sd_global->failed_task_set);
 
+    XBT_DEBUG("Exiting Surf...");
+    surf_exit();
+
     // Exit the LIB host_lib
     xbt_lib_free(&host_lib);
     xbt_lib_free(&link_lib);
@@ -437,9 +440,6 @@ void SD_exit(void)
   jedule_sd_cleanup();
 #endif
 
-    XBT_DEBUG("Exiting Surf...");
-    surf_exit();
-
   } else {
     XBT_WARN("SD_exit() called, but SimDag is not running");
     /* we cannot use exceptions here because xbt is not running! */