X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7096a14ba7ced90d836aade4d15ae5854168f865..659ba669d7e5726c70f22d33f62efec4f267f994:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index ffd30c7a8a..592a1e8112 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -25,7 +25,10 @@ void SD_init(int *argc, char **argv) {
   sd_global = xbt_new0(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
   sd_global->workstation_count = 0;
+  sd_global->workstation_list = NULL;
   sd_global->links = xbt_dict_new();
+  sd_global->link_count = 0;
+  sd_global->link_list = NULL;
   sd_global->watch_point_reached = 0;
 
   s_SD_task_t task;
@@ -121,8 +124,8 @@ SD_task_t* SD_simulate(double how_long)
   /* explore the ready tasks */
   xbt_swag_foreach(task, sd_global->ready_task_set) {
     INFO1("Executing task '%s'", SD_task_get_name(task));
-    action = __SD_task_run(task);
-    surf_workstation_resource->common_public->action_set_data(action, task);
+    task->surf_action = __SD_task_run(task);
+    surf_workstation_resource->common_public->action_set_data(task->surf_action, task);
     task->state_changed = 1;
     
     changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
@@ -142,6 +145,7 @@ SD_task_t* SD_simulate(double how_long)
     DEBUG1("Total time: %f", total_time);
 
     elapsed_time = surf_solve();
+    DEBUG1("surf_solve() returns %f", elapsed_time);
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
 
@@ -150,6 +154,8 @@ SD_task_t* SD_simulate(double how_long)
       task = action->data;
       INFO1("Task '%s' done", SD_task_get_name(task));
       __SD_task_set_state(task, SD_DONE);
+      xbt_free(action);
+      task->surf_action = NULL;
 
       /* the state has changed */
       if (!task->state_changed) {
@@ -171,8 +177,8 @@ SD_task_t* SD_simulate(double how_long)
 	/* is dst ready now? */
 	if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
 	  INFO1("Executing task '%s'", SD_task_get_name(dst));
-	  action = __SD_task_run(dst);
-	  surf_workstation_resource->common_public->action_set_data(action, dst);
+	  dst->surf_action = __SD_task_run(dst);
+	  surf_workstation_resource->common_public->action_set_data(dst->surf_action, dst);
 	  dst->state_changed = 1;
 	  
 	  changed_tasks[changed_task_number++] = dst;
@@ -190,6 +196,9 @@ SD_task_t* SD_simulate(double how_long)
       task = action->data;
       INFO1("Task '%s' failed", SD_task_get_name(task));
       __SD_task_set_state(task, SD_FAILED);
+      xbt_free(action);
+      task->surf_action = NULL;
+
       if (!task->state_changed) {
 	task->state_changed = 1;
 	changed_tasks[changed_task_number++] = task;
@@ -211,6 +220,7 @@ SD_task_t* SD_simulate(double how_long)
 
   INFO0("Simulation finished");
   DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d", elapsed_time, total_time, sd_global->watch_point_reached);
+  DEBUG1("current time = %f", surf_get_clock());
 
   return changed_tasks;
 }
@@ -225,10 +235,18 @@ SD_task_t* SD_simulate(double how_long)
  */
 void SD_exit(void) {
   if (sd_global != NULL) {
+    DEBUG0("Destroying workstation and link dictionaries...");
     xbt_dict_free(&sd_global->workstations);
     xbt_dict_free(&sd_global->links);
-    xbt_free(sd_global);
 
+    DEBUG0("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);
+
+    DEBUG0("Destroying the swags...");
     xbt_swag_free(sd_global->not_scheduled_task_set);
     xbt_swag_free(sd_global->scheduled_task_set);
     xbt_swag_free(sd_global->ready_task_set);
@@ -236,6 +254,9 @@ void SD_exit(void) {
     xbt_swag_free(sd_global->done_task_set);
     xbt_swag_free(sd_global->failed_task_set);
 
+    xbt_free(sd_global);
+
+    DEBUG0("Exiting Surf...");
     surf_exit();
   }
 }