Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Use action_free to free the actions
[simgrid.git] / src / simdag / sd_global.c
index 2e5f3f3..56eb8b3 100644 (file)
@@ -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;
@@ -67,17 +70,9 @@ void SD_create_environment(const char *platform_file) {
 
   surf_timer_resource_init(platform_file);  /* tell Surf to create the environnement */
 
-  
-  /*printf("surf_workstation_resource = %p, workstation_set = %p\n", surf_workstation_resource, workstation_set);
-    printf("surf_network_resource = %p, network_link_set = %p\n", surf_network_resource, network_link_set);*/
-
   /*surf_workstation_resource_init_KCCFLN05(platform_file);*/
   surf_workstation_resource_init_CLM03(platform_file);
 
-  /*printf("surf_workstation_resource = %p, workstation_set = %p\n", surf_workstation_resource, workstation_set);
-    printf("surf_network_resource = %p, network_link_set = %p\n", surf_network_resource, network_link_set);*/
-
-
   /* now let's create the SD wrappers for workstations and links */
   xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) {
     __SD_workstation_create(surf_workstation, NULL);
@@ -96,7 +91,7 @@ void SD_create_environment(const char *platform_file) {
  * when a watch point is reached, or when no more task can be executed.
  * Then you can call SD_simulate() again.
  * 
- * \param how_long maximum duration of the simulation
+ * \param how_long maximum duration of the simulation (a negative value means no time limit)
  * \return a NULL-terminated array of \ref SD_task_t whose state has changed.
  * \see SD_task_schedule(), SD_task_watch()
  */
@@ -104,40 +99,53 @@ SD_task_t* SD_simulate(double how_long)
 {
   double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
   double elapsed_time = 0.0;
-  SD_task_t task;
+  SD_task_t task, dst;
+  SD_dependency_t dependency;
   surf_action_t action;
   SD_task_t *changed_tasks = NULL;
   int changed_task_number = 0;
   int changed_task_capacity = 16; /* will be increased if necessary */
+  int i;
+  static int first_time = 1;
+
+  INFO0("Starting simulation...");
 
   /* create the array that will be returned */
   changed_tasks = xbt_new0(SD_task_t, changed_task_capacity);
   changed_tasks[0] = NULL;
 
-  surf_solve(); /* Takes traces into account. Returns 0.0 */
+  if (first_time) {
+    surf_solve(); /* Takes traces into account. Returns 0.0 */
+    first_time = 0;
+  }
 
   sd_global->watch_point_reached = 0;
 
-  /* main loop */
-  while (elapsed_time >= 0.0 && total_time < how_long && !sd_global->watch_point_reached) {
-
-    /* explore the ready tasks */
-    xbt_swag_foreach(task, sd_global->ready_task_set) {
-      INFO1("Executing task '%s'", SD_task_get_name(task));
-      task->state_changed = 0;
-      action = __SD_task_run(task);
-      surf_workstation_resource->common_public->action_set_data(action, task);
-      task->state_changed = 1;
-      
-      changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
-      if (changed_task_number == changed_task_capacity) {
-       changed_task_capacity *= 2;
-       changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
-      }
-      changed_tasks[changed_task_number] = NULL;
+  /* explore the ready tasks */
+  xbt_swag_foreach(task, sd_global->ready_task_set) {
+    INFO1("Executing task '%s'", SD_task_get_name(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 */
+    if (changed_task_number == changed_task_capacity) {
+      changed_task_capacity *= 2;
+      changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
     }
+    changed_tasks[changed_task_number] = NULL;
+  }
+
+  /* main loop */
+  elapsed_time = 0.0;
+  while (elapsed_time >= 0.0 &&
+        (how_long < 0.0 || total_time < how_long) &&
+        !sd_global->watch_point_reached) {
+
+    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;
 
@@ -146,10 +154,40 @@ 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);
-      __SD_task_remove_dependencies(task);
+      surf_workstation_resource->common_public->action_free(action);
+      task->surf_action = NULL;
+
+      /* the state has changed */
       if (!task->state_changed) {
        task->state_changed = 1;
        changed_tasks[changed_task_number++] = task;
+       if (changed_task_number == changed_task_capacity) {
+         changed_task_capacity *= 2;
+         changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+       }
+       changed_tasks[changed_task_number] = NULL;
+      }
+
+      /* remove the dependencies after this task */
+      while (xbt_dynar_length(task->tasks_after) > 0) {
+       xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
+       dst = dependency->dst;
+       SD_task_dependency_remove(task, dst);
+       
+       /* is dst ready now? */
+       if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
+         INFO1("Executing task '%s'", SD_task_get_name(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;
+         if (changed_task_number == changed_task_capacity) {
+           changed_task_capacity *= 2;
+           changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+         }
+         changed_tasks[changed_task_number] = NULL;
+       }
       }
     }
 
@@ -158,15 +196,31 @@ 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);
+      surf_workstation_resource->common_public->action_free(action);
+      task->surf_action = NULL;
+
       if (!task->state_changed) {
        task->state_changed = 1;
        changed_tasks[changed_task_number++] = task;
+       if (changed_task_number == changed_task_capacity) {
+         changed_task_capacity *= 2;
+         changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
+       }
+       changed_tasks[changed_task_number] = NULL;
       }
     }
   }
 
+  /* we must reset every task->state_changed */
+  i = 0;
+  while (changed_tasks[i] != NULL) {
+    changed_tasks[i]->state_changed = 0;
+    i++;
+  }
+
   INFO0("Simulation finished");
-  INFO1("Number of tasks whose state has changed: %d", changed_task_number);
+  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;
 }
@@ -181,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);
@@ -192,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();
   }
 }