Update function SD_simulate.

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

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 254f7c0..7c153b4 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -4,6 +4,9 @@
 #include "xbt/dynar.h"
 #include "surf/surf.h"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, msg,
+                               "Logging specific to SimDag (kernel)");
+
 SD_global_t sd_global = NULL;
 
 /* Initialises SD internal data. This function should be called before any other SD function.
@@ -15,7 +18,6 @@ void SD_init(int *argc, char **argv) {
   sd_global->workstations = xbt_dict_new();
   sd_global->workstation_count = 0;
   sd_global->links = xbt_dict_new();
-  sd_global->tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
   sd_global->watch_point_reached = 0;
 
   s_SD_task_t task;
@@ -69,42 +71,69 @@ 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;
-  int i;
   SD_task_t task;
-  surf_action_t surf_action;
+  surf_action_t action;
+
+  /* create the array that will be returned */
+  const int task_number = xbt_swag_size(sd_global->scheduled_task_set) + xbt_swag_size(sd_global->running_task_set);
+  SD_task_t *changed_tasks = xbt_new0(SD_task_t, task_number + 1);
+  changed_tasks[task_number] = NULL;
+  int changed_task_number = 0;
 
   surf_solve(); /* Takes traces into account. Returns 0.0 */
 
+  sd_global->watch_point_reached = 0;
+
   /* main loop */
   while (elapsed_time >= 0.0 && total_time < how_long && !sd_global->watch_point_reached) {
-    for (i = 0 ; i < xbt_dynar_length(sd_global->tasks); i++) {
-      xbt_dynar_get_cpy(sd_global->tasks, i, &task);
-      printf("Examining task '%s'...\n", SD_task_get_name(task));
-
-      /* if the task is scheduled and the dependencies are satisfied,
-        we can execute the task */
-      if (SD_task_get_state(task) == SD_SCHEDULED) {
-       printf("Task '%s' is scheduled.\n", SD_task_get_name(task));
-
-       if (xbt_dynar_length(task->tasks_before) == 0) {
-         printf("The dependencies are satisfied. Executing task '%s'\n", SD_task_get_name(task));
-         surf_action = __SD_task_run(task);
-       }
-       else {
-         printf("Cannot execute task '%s' because some depencies are not satisfied.\n", SD_task_get_name(task));
-       }
+
+    /* explore the scheduled tasks */
+    xbt_swag_foreach(task, sd_global->scheduled_task_set) {
+      INFO1("Examining task '%s'...", SD_task_get_name(task));
+      task->state_changed = 0;
+      if (xbt_dynar_length(task->tasks_before) == 0) {
+       INFO1("The dependencies are satisfied. Executing task '%s'", SD_task_get_name(task));
+       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;
       }
       else {
-       printf("Task '%s' is not scheduled. Nothing to do.\n", SD_task_get_name(task));
+       INFO1("Cannot execute task '%s' now because some depencies are not satisfied.", SD_task_get_name(task));
       }
     }
+
     elapsed_time = surf_solve();
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
-    printf("Total time: %f\n", total_time);
+    /*    INFO1("Total time: %f", total_time);*/
+
+    while ((action = xbt_swag_extract(surf_workstation_resource->common_public->states.done_action_set))) {
+      task = action->data;
+      INFO1("Task '%s' done", SD_task_get_name(task));
+      __SD_task_set_state(task, SD_DONE);
+      __SD_task_remove_dependencies(task);
+      if (!task->state_changed) {
+       task->state_changed = 1;
+       changed_tasks[changed_task_number++] = task;
+      }
+    }
+
+    while ((action = xbt_swag_extract(surf_workstation_resource->common_public->states.failed_action_set))) {
+      task = action->data;
+      INFO1("Task '%s' failed", SD_task_get_name(task));
+      __SD_task_set_state(task, SD_FAILED);
+      if (!task->state_changed) {
+       task->state_changed = 1;
+       changed_tasks[changed_task_number++] = task;
+      }
+    }
   }
 
-  return NULL;
+  INFO0("Simulation finished");
+
+  INFO1("Number of tasks whose state has changed: %d", changed_task_number);
+  return changed_tasks;
 }
 
 void SD_test() {
@@ -155,7 +184,6 @@ void SD_exit() {
   if (sd_global != NULL) {
     xbt_dict_free(&sd_global->workstations);
     xbt_dict_free(&sd_global->links);
-    xbt_dynar_free(&sd_global->tasks);
     xbt_free(sd_global);
 
     xbt_swag_free(sd_global->not_scheduled_task_set);