Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Ansi C declaration of the variables (at the beginning of the blocks)
[simgrid.git] / src / simdag / sd_task.c
index a777596..c9db873 100644 (file)
@@ -19,9 +19,11 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task);
  * \see SD_task_destroy()
  */
 SD_task_t SD_task_create(const char *name, void *data, double amount) {
+
+  SD_task_t task;
   SD_CHECK_INIT_DONE();
 
-  SD_task_t task = xbt_new0(s_SD_task_t, 1);
+  task = xbt_new(s_SD_task_t, 1);
 
   /* general information */
   task->data = data; /* user data */
@@ -30,9 +32,11 @@ SD_task_t SD_task_create(const char *name, void *data, double amount) {
   else
     task->name = NULL;
 
+  task->state_hookup.prev = NULL;
+  task->state_hookup.next = NULL;
   task->state_set = sd_global->not_scheduled_task_set;
   task->state = SD_NOT_SCHEDULED;
-  xbt_swag_insert(task,task->state_set);
+  xbt_swag_insert(task, task->state_set);
 
   task->amount = amount;
   task->remains = amount;
@@ -120,12 +124,12 @@ 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->
+    task->start_time = surf_workstation_model->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->
+    task->finish_time = surf_workstation_model->common_public->
       action_get_finish_time(task->surf_action);
     task->remains = 0;
     break;
@@ -189,11 +193,16 @@ double SD_task_get_remaining_amount(SD_task_t task) {
 
 /* temporary function for debbuging */
 static void __SD_print_dependencies(SD_task_t task) {
-  INFO1("The following tasks must be executed before %s:", SD_task_get_name(task));
-  xbt_dynar_t dynar = task->tasks_before;
-  int length = xbt_dynar_length(dynar);
+  xbt_dynar_t dynar;
+  int length;
   int i;
   SD_dependency_t dependency;
+
+  INFO1("The following tasks must be executed before %s:", SD_task_get_name(task));
+  dynar = task->tasks_before;
+  length = xbt_dynar_length(dynar);
+
+
   for (i = 0; i < length; i++) {
     xbt_dynar_get_cpy(dynar, i, &dependency);
     INFO1(" %s", SD_task_get_name(dependency->src));
@@ -231,15 +240,20 @@ static void __SD_task_dependency_destroy(void *dependency) {
  * \see SD_task_dependency_remove()
  */
 void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-
-  xbt_dynar_t dynar = src->tasks_after;
-  int length = xbt_dynar_length(dynar);
+  xbt_dynar_t dynar;
+  int length;
   int found = 0;
   int i;
   SD_dependency_t dependency;
 
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
+
+  dynar = src->tasks_after;
+  length = xbt_dynar_length(dynar);
+
+
+
   if (src == dst) 
     THROW1(arg_error, 0, "Cannot add a dependency between task '%s' and itself",
           SD_task_get_name(src));
@@ -261,7 +275,7 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task
     THROW2(arg_error, 0, "A dependency already exists between task '%s' and task '%s'",
           SD_task_get_name(src), SD_task_get_name(dst));
 
-  dependency = xbt_new0(s_SD_dependency_t, 1);
+  dependency = xbt_new(s_SD_dependency_t, 1);
 
   if (name != NULL)
     dependency->name = xbt_strdup(name);
@@ -287,6 +301,31 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task
       __SD_print_dependencies(dst); */
 }
 
+/**
+ * \brief Indacates whether there is a dependency between two tasks.
+ *
+ * \param src a task
+ * \param dst a task depending on \a src
+ */
+int SD_task_dependency_exists(SD_task_t src, SD_task_t dst) {
+  xbt_dynar_t dynar;
+  int length;
+  int i;
+  SD_dependency_t dependency;
+
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
+
+  dynar = src->tasks_after;
+  length = xbt_dynar_length(dynar);
+
+  for (i = 0; i < length; i++) {
+    xbt_dynar_get_cpy(dynar, i, &dependency);
+    if (dependency->dst == dst) return 1;
+  }
+  return 0;
+}
+
 /**
  * \brief Remove a dependency between two tasks
  *
@@ -295,15 +334,20 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task
  * \see SD_task_dependency_add()
  */
 void SD_task_dependency_remove(SD_task_t src, SD_task_t dst) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
 
-  /* remove the dependency from src->tasks_after */
-  xbt_dynar_t dynar = src->tasks_after;
-  int length = xbt_dynar_length(dynar);
+  xbt_dynar_t dynar;
+  int length;
   int found = 0;
   int i;
   SD_dependency_t dependency;
+
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
+
+  /* remove the dependency from src->tasks_after */
+  dynar = src->tasks_after;
+  length = xbt_dynar_length(dynar);
+
   for (i = 0; i < length && !found; i++) {
     xbt_dynar_get_cpy(dynar, i, &dependency);
     if (dependency->dst == dst) {
@@ -350,14 +394,20 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst) {
  * \see SD_task_dependency_add()
  */
 void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
 
-  xbt_dynar_t dynar = src->tasks_after;
-  int length = xbt_dynar_length(dynar);
+  xbt_dynar_t dynar;
+  int length;
   int found = 0;
   int i;
   SD_dependency_t dependency;
+
+
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
+
+  dynar = src->tasks_after;
+  length = xbt_dynar_length(dynar);
+
   for (i = 0; i < length && !found; i++) {
     xbt_dynar_get_cpy(dynar, i, &dependency);
     found = (dependency->dst == dst);
@@ -371,10 +421,11 @@ void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst) {
 static void __SD_print_watch_points(SD_task_t task) {
   static const int state_masks[] = {SD_SCHEDULED, SD_RUNNING, SD_READY, SD_DONE, SD_FAILED};
   static const char* state_names[] = {"scheduled", "running", "ready", "done", "failed"};
+  int i;
 
   INFO2("Task '%s' watch points (%x): ", SD_task_get_name(task), task->watch_points);
 
-  int i;
+
   for (i = 0; i < 5; i++) {
     if (task->watch_points & state_masks[i])
       INFO1("%s ", state_names[i]);
@@ -441,14 +492,15 @@ double SD_task_get_execution_time(SD_task_t task,
                                  const double *computation_amount,
                                  const double *communication_amount,
                                  double rate) {
+  double time, max_time = 0.0;
+  int i, j;
   SD_CHECK_INIT_DONE();
   xbt_assert0(task != NULL && workstation_nb > 0 && workstation_list != NULL &&
              computation_amount != NULL && communication_amount != NULL,
              "Invalid parameter");
 
   /* the task execution time is the maximum execution time of the parallel tasks */
-  double time, max_time = 0.0;
-  int i, j;
+
   for (i = 0; i < workstation_nb; i++) {
     time = SD_workstation_get_computation_time(workstation_list[i], computation_amount[i]);
     
@@ -482,6 +534,9 @@ double SD_task_get_execution_time(SD_task_t task,
 void SD_task_schedule(SD_task_t task, int workstation_nb,
                     const SD_workstation_t *workstation_list, const double *computation_amount,
                     const double *communication_amount, double rate) {
+
+  int communication_nb;
+  
   SD_CHECK_INIT_DONE();
   xbt_assert0(task != NULL, "Invalid parameter");
   xbt_assert0(workstation_nb > 0, "workstation_nb must be positive");
@@ -492,14 +547,14 @@ void SD_task_schedule(SD_task_t task, int workstation_nb,
   task->workstation_nb = workstation_nb;
   task->rate = rate;
 
-  task->computation_amount = xbt_new0(double, workstation_nb);
+  task->computation_amount = xbt_new(double, workstation_nb);
   memcpy(task->computation_amount, computation_amount, sizeof(double) * workstation_nb);
 
-  int communication_nb = workstation_nb * workstation_nb;
-  task->communication_amount = xbt_new0(double, communication_nb);
+  communication_nb = workstation_nb * workstation_nb;
+  task->communication_amount = xbt_new(double, communication_nb);
   memcpy(task->communication_amount, communication_amount, sizeof(double) * communication_nb);
 
-  task->workstation_list = xbt_new0(SD_workstation_t, workstation_nb);
+  task->workstation_list = xbt_new(SD_workstation_t, workstation_nb);
   memcpy(task->workstation_list, workstation_list, sizeof(SD_workstation_t) * workstation_nb);
 
   /* update the task state */
@@ -534,7 +589,7 @@ void SD_task_unschedule(SD_task_t task) {
     __SD_task_destroy_scheduling_data(task);
 
   if (__SD_task_is_running(task)) /* the task should become SD_FAILED */
-    surf_workstation_resource->common_public->action_cancel(task->surf_action);
+    surf_workstation_model->common_public->action_cancel(task->surf_action);
   else
     __SD_task_set_state(task, SD_NOT_SCHEDULED);
   task->remains = task->amount;
@@ -557,14 +612,17 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task) {
  * the task gets out of its fifos.
  */
 void __SD_task_really_run(SD_task_t task) {
+
+  int i;
+  void **surf_workstations;
+
   SD_CHECK_INIT_DONE();
   xbt_assert0(task != NULL, "Invalid parameter");
   xbt_assert2(__SD_task_is_ready_or_in_fifo(task), "Task '%s' is not ready or in a fifo! Task state: %d",
           SD_task_get_name(task), SD_task_get_state(task));
   xbt_assert1(task->workstation_list != NULL, "Task '%s': workstation_list is NULL!", SD_task_get_name(task));
 
-  int i;
-  void **surf_workstations;
+
 
   DEBUG1("Really running task '%s'", SD_task_get_name(task));
 
@@ -581,25 +639,66 @@ void __SD_task_really_run(SD_task_t task) {
   /* start the task */
 
   /* we have to create a Surf workstation array instead of the SimDag workstation array */
-  surf_workstations = xbt_new0(void*, task->workstation_nb);
+  surf_workstations = xbt_new(void*, task->workstation_nb);
 
   for (i = 0; i < task->workstation_nb; i++) {
     surf_workstations[i] = task->workstation_list[i]->surf_workstation;
   }
   
-  task->surf_action = surf_workstation_resource->extension_public->
-    execute_parallel_task(task->workstation_nb,
-                         surf_workstations,
-                         task->computation_amount,
-                         task->communication_amount,
-                         task->amount,
-                         task->rate);
-  surf_workstation_resource->common_public->action_set_data(task->surf_action, task);
+  task->surf_action = NULL;
+  if((task->workstation_nb==1) &&
+     (task->communication_amount[0]==0.0)) {
+    task->surf_action = surf_workstation_model->extension_public->
+      execute(surf_workstations[0], task->computation_amount[0]);
+  } else if((task->workstation_nb==1) &&
+           (task->computation_amount[0]==0.0)) {
+    task->surf_action = surf_workstation_model->extension_public->
+      communicate(surf_workstations[0], surf_workstations[0],
+                 task->communication_amount[0],task->rate);
+  } else if((task->workstation_nb==2) &&
+           (task->computation_amount[0]==0.0)&&
+           (task->computation_amount[1]==0.0)) {
+    int nb=0;
+    double value=0.0;
+    
+    for (i = 0; i < task->workstation_nb*task->workstation_nb; i++) {
+      if(task->communication_amount[i]>0.0) {
+       nb++;
+       value = task->communication_amount[i];
+      }
+    }
+    if(nb==1) {
+      task->surf_action = surf_workstation_model->extension_public->
+       communicate(surf_workstations[0], surf_workstations[1],
+                   value, task->rate);
+    }
+  }
+  if(!task->surf_action) {
+    double *computation_amount = xbt_new(double, task->workstation_nb);
+    double *communication_amount = xbt_new(double, task->workstation_nb * 
+                                          task->workstation_nb);
+
+    memcpy(computation_amount, task->computation_amount, sizeof(double) * 
+          task->workstation_nb);
+    memcpy(communication_amount, task->communication_amount, 
+          sizeof(double) * task->workstation_nb * task->workstation_nb);
+
+    task->surf_action = surf_workstation_model->extension_public->
+      execute_parallel_task(task->workstation_nb,
+                           surf_workstations,
+                           computation_amount,
+                           communication_amount,
+                           task->amount,
+                           task->rate);
+  } else {
+    xbt_free(surf_workstations);
+  }
+
+  surf_workstation_model->common_public->action_set_data(task->surf_action, task);
   task->state_changed = 1;
 
   DEBUG1("surf_action = %p",  task->surf_action);
 
-  xbt_free(surf_workstations);
   __SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */
   __SD_task_set_state(task, SD_RUNNING);
   xbt_assert2(__SD_task_is_running(task), "Bad state of task '%s': %d",
@@ -614,14 +713,16 @@ void __SD_task_really_run(SD_task_t task) {
  * Returns whether the task has started.
  */
 int __SD_task_try_to_run(SD_task_t task) {
+
+  int can_start = 1;
+  int i;
+  SD_workstation_t workstation;
+
   SD_CHECK_INIT_DONE();
   xbt_assert0(task != NULL, "Invalid parameter");
   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));
 
-  int can_start = 1;
-  int i;
-  SD_workstation_t workstation;
 
   for (i = 0; i < task->workstation_nb; i++) {
     can_start = !__SD_workstation_is_busy(task->workstation_list[i]);
@@ -655,22 +756,25 @@ int __SD_task_try_to_run(SD_task_t task) {
  * which were waiting in fifos for the end of `task'
  */
 void __SD_task_just_done(SD_task_t task) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  xbt_assert1(__SD_task_is_running(task), "The task must be running! Task state: %d", SD_task_get_state(task));
-  xbt_assert1(task->workstation_list != NULL, "Task '%s': workstation_list is NULL!", SD_task_get_name(task));
-
-  int i, j;
+   int i, j;
   SD_workstation_t workstation;
 
   SD_task_t candidate;
   int candidate_nb = 0;
   int candidate_capacity = 8;
-  SD_task_t *candidates = xbt_new0(SD_task_t, 8);
+  SD_task_t *candidates;
   int can_start = 1;
 
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(task != NULL, "Invalid parameter");
+  xbt_assert1(__SD_task_is_running(task), "The task must be running! Task state: %d", SD_task_get_state(task));
+  xbt_assert1(task->workstation_list != NULL, "Task '%s': workstation_list is NULL!", SD_task_get_name(task));
+
+
+  candidates = xbt_new(SD_task_t, 8);
+
   __SD_task_set_state(task, SD_DONE);
-  surf_workstation_resource->common_public->action_free(task->surf_action);
+  surf_workstation_model->common_public->action_free(task->surf_action);
   task->surf_action = NULL;
 
   DEBUG0("Looking for candidates");
@@ -803,7 +907,7 @@ 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);
+    return surf_workstation_model->common_public->action_get_start_time(task->surf_action);
   else 
     return task->start_time;
 }
@@ -824,7 +928,7 @@ double SD_task_get_finish_time(SD_task_t task) {
   xbt_assert0(task != NULL, "Invalid parameter");
 
   if(task->surf_action) /* should never happen as actions are destroyed right after their completion */
-    return surf_workstation_resource->common_public->action_get_finish_time(task->surf_action);
+    return surf_workstation_model->common_public->action_get_finish_time(task->surf_action);
   else 
     return task->finish_time;
 }
@@ -853,7 +957,7 @@ void SD_task_destroy(SD_task_t task) {
     xbt_free(task->name);
 
   if (task->surf_action != NULL)
-    surf_workstation_resource->common_public->action_free(task->surf_action);
+    surf_workstation_model->common_public->action_free(task->surf_action);
 
   if (task->workstation_list != NULL)
     xbt_free(task->workstation_list);