X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9eec454eff0e5d23fee1eee776df298c9366aef4..eee2dab87926d8b780754b4c06b806a7537f92d8:/src/simdag/sd_task.c

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 8de0fdc6a2..e501281cc1 100644
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -34,6 +34,9 @@ SD_task_t SD_task_create(const char *name, void *data, double amount) {
   xbt_swag_insert(task,task->state_set);
 
   task->amount = amount;
+  task->remains = amount;
+  task->start_time = -1.0;
+  task->finish_time = -1.0;
   task->surf_action = NULL;
   task->watch_points = 0;
   task->state_changed = 0;
@@ -122,9 +125,14 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) {
     break;
   case SD_RUNNING:
     task->state_set = sd_global->running_task_set;
+    task->start_time = surf_workstation_resource->common_public->
+      action_get_start_time(task->surf_action);
     break;
   case SD_DONE:
     task->state_set = sd_global->done_task_set;
+    task->finish_time = surf_workstation_resource->common_public->
+      action_get_finish_time(task->surf_action);
+    task->remains = 0;
     break;
   case SD_FAILED:
     task->state_set = sd_global->failed_task_set;
@@ -180,7 +188,7 @@ double SD_task_get_remaining_amount(SD_task_t task) {
   if (task->surf_action)
     return task->surf_action->remains;
   else
-    return task->amount;
+    return task->remains;
 }
 
 /* temporary function for debbuging */
@@ -251,6 +259,9 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task
 
   if (name != NULL)
     dependency->name = xbt_strdup(name);
+  else
+    dependency->name = NULL;
+
   dependency->data = data;
   dependency->src = src;
   dependency->dst = dst;
@@ -507,6 +518,8 @@ void SD_task_unschedule(SD_task_t task) {
     surf_workstation_resource->common_public->action_cancel(task->surf_action);
   else
     __SD_task_set_state(task, SD_NOT_SCHEDULED);
+  task->remains = task->amount;
+  task->start_time = -1.0;
 }
 
 /* Destroys the data memorised by SD_task_schedule. Task state must be SD_SCHEDULED or SD_READY.
@@ -529,7 +542,7 @@ surf_action_t __SD_task_run(SD_task_t task) {
   xbt_assert2(__SD_task_is_ready(task), "Task '%s' is not ready! Task state: %d",
 	      SD_task_get_name(task), SD_task_get_state(task));
 
-  surf_action_t surf_action = surf_workstation_resource->extension_public->
+  task->surf_action = surf_workstation_resource->extension_public->
     execute_parallel_task(task->workstation_nb,
 			  task->workstation_list,
 			  task->computation_amount,
@@ -537,12 +550,12 @@ surf_action_t __SD_task_run(SD_task_t task) {
 			  task->amount,
 			  task->rate);
 
-  DEBUG1("surf_action = %p", surf_action);
+  DEBUG1("surf_action = %p",  task->surf_action);
 
   __SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */
   __SD_task_set_state(task, SD_RUNNING);
 
-  return surf_action;
+  return task->surf_action;
 }
 /* Remove all dependencies associated with a task. This function is called when the task is destroyed.
  */
@@ -561,6 +574,44 @@ static void __SD_task_remove_dependencies(SD_task_t task) {
   }
 }
 
+/**
+ * \brief Returns the start time of a task
+ *
+ * The task state must be SD_RUNNING, SD_DONE or SD_FAILED.
+ *
+ * \param task: a task
+ * \return the start time of this task
+ */
+double SD_task_get_start_time(SD_task_t task) {
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(task != NULL, "Invalid parameter");
+  if(task->surf_action)
+    return surf_workstation_resource->common_public->action_get_start_time(task->surf_action);
+  else 
+    return task->start_time;
+}
+
+/**
+ * \brief Returns the finish time of a task
+ *
+ * The task state must be SD_RUNNING, SD_DONE or SD_FAILED.
+ * If the state is not completed yet, the returned value is an
+ * estimation of the task finish time. This value can fluctuate 
+ * until the task is completed.
+ *
+ * \param task: a task
+ * \return the start time of this task
+ */
+double SD_task_get_finish_time(SD_task_t task) {
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(task != NULL, "Invalid parameter");
+
+  if(task->surf_action)
+    return surf_workstation_resource->common_public->action_get_finish_time(task->surf_action); /* should never happen as actions are destroyed right after their completion */
+  else 
+    return task->finish_time;
+}
+
 /**
  * \brief Destroys a task.
  *