Optimize SD_simulate and fix bugs

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

diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c
index 3c65b56..72105d5 100644 (file)
--- a/examples/simdag/sd_test.c
+++ b/examples/simdag/sd_test.c
@@ -55,30 +55,41 @@ int main(int argc, char **argv) {
   SD_task_schedule(taskD, workstation_number, workstation_list,
                   computation_amount, communication_amount, rate);
 
-  printf("Launching simulation...\n");
-  SD_task_t *changed_tasks = SD_simulate(100);
-  int i = 0;
+  SD_task_watch(taskC, SD_DONE);
+
+  SD_task_t *changed_tasks;
+  int i;
+
+  changed_tasks = SD_simulate(100);
   
-  printf("Simulation results:\n");
-  while(changed_tasks[i] != NULL) {
-    switch (SD_task_get_state(changed_tasks[i])) {
-    case SD_SCHEDULED:
-      printf("%s is scheduled.\n", SD_task_get_name(changed_tasks[i]));
-      break;
-    case SD_READY:
-      printf("%s is ready.\n", SD_task_get_name(changed_tasks[i]));
-      break;
-    case SD_DONE:
-      printf("%s is done.\n", SD_task_get_name(changed_tasks[i]));
-      break;
-    case SD_FAILED:
-      printf("%s is failed.\n", SD_task_get_name(changed_tasks[i]));
-      break;
-    default:
-      printf("Unknown status for %s\n", SD_task_get_name(changed_tasks[i]));
-      break;
+  while (changed_tasks[0] != NULL) {
+    printf("Tasks whose state has changed:\n");
+    i = 0;
+    while(changed_tasks[i] != NULL) {
+      switch (SD_task_get_state(changed_tasks[i])) {
+      case SD_SCHEDULED:
+       printf("%s is scheduled.\n", SD_task_get_name(changed_tasks[i]));
+       break;
+      case SD_READY:
+       printf("%s is ready.\n", SD_task_get_name(changed_tasks[i]));
+       break;
+      case SD_RUNNING:
+       printf("%s is running.\n", SD_task_get_name(changed_tasks[i]));
+       break;
+      case SD_DONE:
+       printf("%s is done.\n", SD_task_get_name(changed_tasks[i]));
+       break;
+      case SD_FAILED:
+       printf("%s is failed.\n", SD_task_get_name(changed_tasks[i]));
+       break;
+      default:
+       printf("Unknown status for %s\n", SD_task_get_name(changed_tasks[i]));
+       break;
+      }
+      i++;
     }
-    i++;
+    free(changed_tasks);
+    changed_tasks = SD_simulate(100);
   }
 
   free(changed_tasks);

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 06fe339..0ef4402 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -84,7 +84,6 @@ void __SD_workstation_destroy(void *workstation);
 
 void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state);
 surf_action_t __SD_task_run(SD_task_t task);
-void __SD_task_remove_dependencies(SD_task_t task);
 
 /* Functions to test if the task is in a given state.
    These functions are faster than using SD_task_get_state() */

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 2e5f3f3..4d8b604 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -104,39 +104,47 @@ 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;
 
+  /* 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->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 && 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;
-    }
-
     elapsed_time = surf_solve();
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
@@ -146,10 +154,38 @@ 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);
+
+      /* 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));
+         action = __SD_task_run(dst);
+         surf_workstation_resource->common_public->action_set_data(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;
+       }
       }
     }
 
@@ -161,12 +197,24 @@ SD_task_t* SD_simulate(double how_long)
       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);
+  printf("elapsed_time = %f, total_time = %f, watch_point_reached = %d\n", elapsed_time, total_time, sd_global->watch_point_reached);
 
   return changed_tasks;
 }

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 4a046fa..1578ff1 100644 (file)
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -3,6 +3,8 @@
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
 
+static void __SD_task_remove_dependencies(SD_task_t task);
+
 /**
  * \brief Creates a new task.
  *
@@ -130,7 +132,7 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) {
   xbt_swag_insert(task, task->state_set);
 
   if (task->watch_points & new_state) {
-    printf("Watch point reached with task '%s' in state %d!\n", SD_task_get_name(task), new_state);
+    printf("Watch point reached with task '%s'!\n", SD_task_get_name(task));
     sd_global->watch_point_reached = 1;
     SD_task_unwatch(task, new_state); /* remove the watch point */
   }
@@ -500,10 +502,9 @@ surf_action_t __SD_task_run(SD_task_t task) {
 
   return surf_action;
 }
-
-/* Remove all dependencies associated with a task. This function is called when the task is done.
+/* Remove all dependencies associated with a task. This function is called when the task is destroyed.
  */
-void __SD_task_remove_dependencies(SD_task_t task) {
+static void __SD_task_remove_dependencies(SD_task_t task) {
   /* we must destroy the dependencies carefuly (with SD_dependency_remove)
      because each one is stored twice */
   SD_dependency_t dependency;