[trace] fix SimDag tracing

[simgrid.git] / src / simdag / sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index a9065e3..8f11105 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -248,7 +248,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
 
   sd_global->watch_point_reached = 0;
 
-  while(xbt_swag_extract(sd_global->return_set)) {}
+  xbt_swag_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
   xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
@@ -395,15 +395,10 @@ void SD_exit(void)
 
   xbt_mallocator_free(sd_global->task_mallocator);
 
-  XBT_DEBUG("Destroying workstation and link arrays if necessary...");
-  if (sd_global->workstation_list != NULL)
-    xbt_free(sd_global->workstation_list);
-
-  if (sd_global->link_list != NULL)
-    xbt_free(sd_global->link_list);
-
-  if (sd_global->recyclable_route != NULL)
-    xbt_free(sd_global->recyclable_route);
+  XBT_DEBUG("Destroying workstation and link arrays...");
+  xbt_free(sd_global->workstation_list);
+  xbt_free(sd_global->link_list);
+  xbt_free(sd_global->recyclable_route);
 
   XBT_DEBUG("Destroying the swags...");
   xbt_swag_free(sd_global->not_scheduled_task_set);
@@ -416,15 +411,16 @@ void SD_exit(void)
   xbt_swag_free(sd_global->failed_task_set);
   xbt_swag_free(sd_global->return_set);
 
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+
   XBT_DEBUG("Exiting Surf...");
   surf_exit();
 
   xbt_free(sd_global);
   sd_global = NULL;
 
-#ifdef HAVE_TRACING
-  TRACE_end();
-#endif
 #ifdef HAVE_JEDULE
   jedule_sd_dump();
   jedule_sd_cleanup();