X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/399074b4ede421f542db26f61e9f435a0930e8b9..2dc05ae685723a13f5244736364c22a87a0c3ad0:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 576c163d2c..b4e17c7917 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -9,7 +9,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel,sd,
 
 SD_global_t sd_global = NULL;
 
-/* Initialises SD internal data. This function should be called before any other SD function.
+/**
+ * \brief Initialises SD internal data
+ *
+ * This function must be called before any other SD function. Then you
+ * should call SD_create_environment().
+ *
+ * \param argc argument number
+ * \param argv argument list
+ * \see SD_create_environment(), SD_exit()
  */
 void SD_init(int *argc, char **argv) {
   xbt_assert0(sd_global == NULL, "SD_init already called");
@@ -31,7 +39,23 @@ void SD_init(int *argc, char **argv) {
   surf_init(argc, argv);
 }
 
-/* Creates the environnement described in a xml file of a platform description.
+/**
+ * \brief Creates the environment
+ *
+ * The environment (i.e. the \ref SD_workstation_management "workstations" and the
+ * \ref SD_link_management "links") is created with the data stored in the given XML
+ * platform file.
+ *
+ * \param platform_file name of an XML file describing the environment to create
+ * \see SD_workstation_management, SD_link_management
+ *
+ * The XML file follows this DTD:
+ *
+ *     \include surfxml.dtd
+ *
+ * Here is a small example of such a platform: 
+ *
+ *     \include small_platform.xml
  */
 void SD_create_environment(const char *platform_file) {
   xbt_dict_cursor_t cursor = NULL;
@@ -64,45 +88,63 @@ void SD_create_environment(const char *platform_file) {
   }
 }
 
-/* Launches the simulation. Returns a NULL-terminated array of SD_task_t whose state has changed.
+/**
+ * \brief Launches the simulation.
+ *
+ * The function will execute the \ref SD_READY ready tasks.
+ * The simulation will be stopped when its time reaches \a how_long,
+ * 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
+ * \return a NULL-terminated array of \ref SD_task_t whose state has changed.
+ * \see SD_task_schedule(), SD_task_watch()
  */
 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;
@@ -112,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;
+	}
       }
     }
 
@@ -127,18 +197,35 @@ 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;
 }
 
-/* Destroys all SD internal data. This function should be called when the simulation is over.
- * The tasks should have been destroyed first.
+/**
+ * \brief Destroys all SD internal data.
+ *
+ * This function should be called when the simulation is over. Don't forget also to destroy
+ * the tasks.
+ *
+ * \see SD_init(), SD_task_destroy()
  */
 void SD_exit(void) {
   if (sd_global != NULL) {