X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4636dcbf566244aa2c2bff539d0410dae1071c81..e7d939c32e832e22e45b44ec1bc21999d64c5554:/src/simdag/sd_task.cpp

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 9b677f8866..a9cae7e157 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -52,9 +52,6 @@ void SD_task_recycle_f(void *t)
   task->watch_points = 0;
 
   /* dependencies */
-  task->unsatisfied_dependencies = 0;
-  task->is_not_ready = 0;
-
   task->inputs->clear();
   task->outputs->clear();
   task->predecessors->clear();
@@ -93,8 +90,7 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
 {
   SD_task_t task = static_cast<SD_task_t>(xbt_mallocator_get(sd_global->task_mallocator));
 
-  /* general information */
-  task->data = data;            /* user data */
+  task->data = data;
   task->name = xbt_strdup(name);
   task->amount = amount;
   task->remains = amount;
@@ -288,7 +284,7 @@ void SD_task_set_data(SD_task_t task, void *data)
 void SD_task_set_rate(SD_task_t task, double rate)
 {
   xbt_assert(task->kind == SD_TASK_COMM_E2E, "The rate can be modified for end-to-end communications only.");
-  if(task->start_time<0) {
+  if(task->state < SD_RUNNING) {
     task->rate = rate;
   } else {
     XBT_WARN("Task %p has started. Changing rate is ineffective.", task);
@@ -313,50 +309,48 @@ e_SD_task_state_t SD_task_get_state(SD_task_t task)
 void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
 {
   std::set<SD_task_t>::iterator idx;
-  switch (new_state) {
-  case SD_NOT_SCHEDULED:
-  case SD_SCHEDULABLE:
-    if (SD_task_get_state(task) == SD_FAILED){
-      sd_global->completed_tasks->erase(task);
-      sd_global->initial_tasks->insert(task);
-    }
-    break;
-  case SD_SCHEDULED:
-    if (SD_task_get_state(task) == SD_RUNNABLE){
-      sd_global->initial_tasks->insert(task);
-      sd_global->executable_tasks->erase(task);
-    }
-    break;
-  case SD_RUNNABLE:
+  XBT_DEBUG("Set state of '%s' to %d", task->name, new_state);
+  if ((new_state == SD_NOT_SCHEDULED || new_state == SD_SCHEDULABLE) && task->state == SD_FAILED){
+    sd_global->completed_tasks->erase(task);
+    sd_global->initial_tasks->insert(task);
+  }
+
+  if (new_state == SD_SCHEDULED && task->state == SD_RUNNABLE){
+    sd_global->initial_tasks->insert(task);
+    sd_global->runnable_tasks->erase(task);
+  }
+
+  if (new_state == SD_RUNNABLE){
     idx = sd_global->initial_tasks->find(task);
     if (idx != sd_global->initial_tasks->end()) {
-      sd_global->executable_tasks->insert(*idx);
+      sd_global->runnable_tasks->insert(*idx);
       sd_global->initial_tasks->erase(idx);
     }
-    break;
-  case SD_RUNNING:
-    sd_global->executable_tasks->erase(task);
-    break;
-  case SD_DONE:
+  }
+
+  if (new_state == SD_RUNNING)
+    sd_global->runnable_tasks->erase(task);
+
+  if (new_state == SD_DONE || new_state == SD_FAILED){
     sd_global->completed_tasks->insert(task);
-    task->finish_time = task->surf_action->getFinishTime();
-    task->remains = 0;
+    task->start_time = task->surf_action->getStartTime();
+    if (new_state == SD_DONE){
+      task->finish_time = task->surf_action->getFinishTime();
+      task->remains = 0;
 #if HAVE_JEDULE
-    jedule_log_sd_event(task);
+      jedule_log_sd_event(task);
 #endif
-    break;
-  case SD_FAILED:
-    sd_global->completed_tasks->insert(task);
-    break;
-  default:
-    xbt_die( "Invalid state");
+    } else
+      task->finish_time = surf_get_clock();
+    task->surf_action->unref();
+    task->surf_action = nullptr;
   }
 
   task->state = new_state;
 
   if (task->watch_points & new_state) {
     XBT_VERB("Watch point reached with task '%s'!", SD_task_get_name(task));
-    sd_global->watch_point_reached = 1;
+    sd_global->watch_point_reached = true;
     SD_task_unwatch(task, new_state);   /* remove the watch point */
   }
 }
@@ -389,10 +383,10 @@ xbt_dynar_t SD_task_get_parents(SD_task_t task)
 {
   xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), nullptr);
 
-  for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
-    xbt_dynar_push(parents, &(*it));
-  for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
-    xbt_dynar_push(parents, &(*it));
+  for (auto it : *task->predecessors)
+    xbt_dynar_push(parents, &it);
+  for (auto it : *task->inputs)
+    xbt_dynar_push(parents, &it);
 
   return parents;
 }
@@ -406,10 +400,10 @@ xbt_dynar_t SD_task_get_children(SD_task_t task)
 {
   xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), nullptr);
 
-  for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
-    xbt_dynar_push(children, &(*it));
-  for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
-    xbt_dynar_push(children, &(*it));
+  for (auto it : *task->successors)
+    xbt_dynar_push(children, &it);
+  for (auto it : *task->outputs)
+    xbt_dynar_push(children, &it);
 
   return children;
 }
@@ -531,28 +525,25 @@ void SD_task_dump(SD_task_t task)
     }
   }
 
-  if (task->category)
-    XBT_INFO("  - tracing category: %s", task->category);
-
   XBT_INFO("  - amount: %.0f", SD_task_get_amount(task));
   if (task->kind == SD_TASK_COMP_PAR_AMDAHL)
     XBT_INFO("  - alpha: %.2f", task->alpha);
-  XBT_INFO("  - Dependencies to satisfy: %d", task->unsatisfied_dependencies);
+  XBT_INFO("  - Dependencies to satisfy: %zu", task->inputs->size()+ task->predecessors->size());
   if ((task->inputs->size()+ task->predecessors->size()) > 0) {
     XBT_INFO("  - pre-dependencies:");
-    for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
-      XBT_INFO("    %s", SD_task_get_name(*it));
+    for (auto it : *task->predecessors)
+      XBT_INFO("    %s", SD_task_get_name(it));
 
-    for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
-      XBT_INFO("    %s", SD_task_get_name(*it));
+    for (auto it: *task->inputs)
+      XBT_INFO("    %s", SD_task_get_name(it));
   }
   if ((task->outputs->size() + task->successors->size()) > 0) {
     XBT_INFO("  - post-dependencies:");
 
-    for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
-      XBT_INFO("    %s", SD_task_get_name(*it));
-    for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
-      XBT_INFO("    %s", SD_task_get_name(*it));
+    for (auto it : *task->successors)
+      XBT_INFO("    %s", SD_task_get_name(it));
+    for (auto it : *task->outputs)
+      XBT_INFO("    %s", SD_task_get_name(it));
   }
 }
 
@@ -574,10 +565,10 @@ void SD_task_dotty(SD_task_t task, void *out)
     xbt_die("Unknown task type!");
   }
   fprintf(fout, "];\n");
-  for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
-    fprintf(fout, " T%p -> T%p;\n", (*it), task);
-  for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
-    fprintf(fout, " T%p -> T%p;\n", (*it), task);
+  for (auto it : *task->predecessors)
+    fprintf(fout, " T%p -> T%p;\n", it, task);
+  for (auto it : *task->inputs)
+    fprintf(fout, " T%p -> T%p;\n", it, task);
 }
 
 /**
@@ -594,54 +585,40 @@ void SD_task_dotty(SD_task_t task, void *out)
  */
 void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst)
 {
-
   if (src == dst)
     THROWF(arg_error, 0, "Cannot add a dependency between task '%s' and itself", SD_task_get_name(src));
 
-  e_SD_task_state_t state = SD_task_get_state(src);
-  if (state == SD_DONE || state == SD_FAILED)
+  if (src->state == SD_DONE || src->state == SD_FAILED)
     THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, SD_RUNNABLE, or SD_RUNNING",
-           SD_task_get_name(src));
+           src->name);
 
-  state = SD_task_get_state(dst);
-  if (state == SD_DONE || state == SD_FAILED || state == SD_RUNNING)
+  if (dst->state == SD_DONE || dst->state == SD_FAILED || dst->state == SD_RUNNING)
     THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, or SD_RUNNABLE",
-           SD_task_get_name(dst));
-
-  if (src->successors->find(dst) != src->successors->end() ||
-      dst->predecessors->find(src) != dst->predecessors->end() ||
-      dst->inputs->find(src) != dst->inputs->end() ||
-      src->outputs->find(dst) != src->outputs->end())
-    THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'",
-           SD_task_get_name(src), SD_task_get_name(dst));
+           dst->name);
 
-  XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst));
+  if (dst->inputs->find(src) != dst->inputs->end() || src->outputs->find(dst) != src->outputs->end() ||
+      src->successors->find(dst) != src->successors->end() || dst->predecessors->find(src) != dst->predecessors->end())
+    THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'", src->name, dst->name);
 
-  e_SD_task_kind_t src_kind = SD_task_get_kind(src);
-  e_SD_task_kind_t dst_kind = SD_task_get_kind(dst);
+  XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name, dst->name);
 
-  if (src_kind == SD_TASK_COMM_E2E || src_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
-    if (dst_kind == SD_TASK_COMP_SEQ || dst_kind == SD_TASK_COMP_PAR_AMDAHL){
+  if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
+    if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL)
         dst->inputs->insert(src);
-    } else {
+    else
       dst->predecessors->insert(src);
-    }
     src->successors->insert(dst);
   } else {
-    if (dst_kind == SD_TASK_COMM_E2E|| dst_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
+    if (dst->kind == SD_TASK_COMM_E2E|| dst->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK)
       src->outputs->insert(dst);
-    } else {
+    else
       src->successors->insert(dst);
-    }
     dst->predecessors->insert(src);
   }
 
-  dst->unsatisfied_dependencies++;
-  dst->is_not_ready++;
-
   /* if the task was runnable, the task goes back to SD_SCHEDULED because of the new dependency*/
-  if (SD_task_get_state(dst) == SD_RUNNABLE) {
-    XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", SD_task_get_name(dst));
+  if (dst->state == SD_RUNNABLE) {
+    XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", dst->name);
     SD_task_set_state(dst, SD_SCHEDULED);
   }
 }
@@ -680,48 +657,29 @@ int SD_task_dependency_exists(SD_task_t src, SD_task_t dst)
  */
 void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
 {
-
   XBT_DEBUG("SD_task_dependency_remove: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst));
 
-  if (src->successors->find(dst) == src->successors->end() &&
-      src->outputs->find(dst) == src->outputs->end())
+  if (src->successors->find(dst) == src->successors->end() && src->outputs->find(dst) == src->outputs->end())
     THROWF(arg_error, 0, "No dependency found between task '%s' and '%s': task '%s' is not a successor of task '%s'",
-           SD_task_get_name(src), SD_task_get_name(dst), SD_task_get_name(dst), SD_task_get_name(src));
-
-  if (dst->predecessors->find(src) != dst->predecessors->end() ||
-      dst->inputs->find(src) != dst->inputs->end()){
-    dst->unsatisfied_dependencies--;
-    dst->is_not_ready--;
-  }
+           src->name, dst->name, dst->name, src->name);
 
-  e_SD_task_kind_t src_kind = SD_task_get_kind(src);
-  e_SD_task_kind_t dst_kind = SD_task_get_kind(dst);
-  if (src_kind == SD_TASK_COMM_E2E || src_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
-    if (dst_kind == SD_TASK_COMP_SEQ || dst_kind == SD_TASK_COMP_PAR_AMDAHL){
+  if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
+    if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL)
       dst->inputs->erase(src);
-    } else {
+    else
       dst->predecessors->erase(src);
-    }
     src->successors->erase(dst);
   } else {
-    if (dst_kind == SD_TASK_COMM_E2E|| dst_kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
+    if (dst->kind == SD_TASK_COMM_E2E|| dst->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK)
       src->outputs->erase(dst);
-    } else {
+    else
       src->successors->erase(dst);
-    }
     dst->predecessors->erase(src);
   }
 
   /* if the task was scheduled and dependencies are satisfied, we can make it runnable */
-  if (dst->unsatisfied_dependencies == 0) {
-    if (SD_task_get_state(dst) == SD_SCHEDULED)
-      SD_task_set_state(dst, SD_RUNNABLE);
-    else
-      SD_task_set_state(dst, SD_SCHEDULABLE);
-  }
-
-  if (dst->is_not_ready == 0)
-    SD_task_set_state(dst, SD_SCHEDULABLE);
+  if (dst->predecessors->empty() && dst->inputs->empty() && dst->state == SD_SCHEDULED)
+    SD_task_set_state(dst, SD_RUNNABLE);
 }
 
 /**
@@ -762,37 +720,32 @@ void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state)
  * now and if it was the only task.
  *
  * \param task the task to evaluate
- * \param workstation_nb number of workstations on which the task would be executed
- * \param workstation_list the workstations on which the task would be executed
- * \param flops_amount computation amount for each workstation (i.e., an array of workstation_nb doubles)
- * \param bytes_amount communication amount between each pair of workstations (i.e., a matrix of
- *        workstation_nb*workstation_nb doubles)
+ * \param host_count number of hosts on which the task would be executed
+ * \param host_list the hosts on which the task would be executed
+ * \param flops_amount computation amount for each host(i.e., an array of host_count doubles)
+ * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles)
  * \see SD_schedule()
  */
-double SD_task_get_execution_time(SD_task_t task, int workstation_nb, const sg_host_t *workstation_list,
+double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_t *host_list,
                                   const double *flops_amount, const double *bytes_amount)
 {
-  xbt_assert(workstation_nb > 0, "Invalid parameter");
+  xbt_assert(host_count > 0, "Invalid parameter");
   double max_time = 0.0;
 
   /* the task execution time is the maximum execution time of the parallel tasks */
-  for (int i = 0; i < workstation_nb; i++) {
+  for (int i = 0; i < host_count; i++) {
     double time = 0.0;
     if (flops_amount != nullptr)
-      time = flops_amount[i] / workstation_list[i]->speed();
+      time = flops_amount[i] / host_list[i]->speed();
 
     if (bytes_amount != nullptr)
-      for (int j = 0; j < workstation_nb; j++) {
-        if (bytes_amount[i * workstation_nb + j] !=0 ) {
-          time += (SD_route_get_latency(workstation_list[i], workstation_list[j]) +
-                   bytes_amount[i * workstation_nb + j] /
-                   SD_route_get_bandwidth(workstation_list[i], workstation_list[j]));
-        }
-      }
+      for (int j = 0; j < host_count; j++)
+        if (bytes_amount[i * host_count + j] != 0)
+          time += (SD_route_get_latency(host_list[i], host_list[j]) +
+                   bytes_amount[i * host_count + j] / SD_route_get_bandwidth(host_list[i], host_list[j]));
 
-    if (time > max_time) {
+    if (time > max_time)
       max_time = time;
-    }
   }
   return max_time;
 }
@@ -802,7 +755,7 @@ static inline void SD_task_do_schedule(SD_task_t task)
   if (SD_task_get_state(task) > SD_SCHEDULABLE)
     THROWF(arg_error, 0, "Task '%s' has already been scheduled", SD_task_get_name(task));
 
-  if (task->unsatisfied_dependencies == 0)
+  if (task->predecessors->empty() && task->inputs->empty())
     SD_task_set_state(task, SD_RUNNABLE);
   else
     SD_task_set_state(task, SD_SCHEDULED);
@@ -822,7 +775,7 @@ static inline void SD_task_do_schedule(SD_task_t task)
  * \param rate task execution speed rate
  * \see SD_task_unschedule()
  */
-void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstation_list,
+void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * host_list,
                       const double *flops_amount, const double *bytes_amount, double rate)
 {
   xbt_assert(host_count > 0, "workstation_nb must be positive");
@@ -848,7 +801,7 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstat
   }
 
   task->host_list =  static_cast<sg_host_t*>(xbt_realloc(task->host_list, sizeof(sg_host_t) * host_count));
-  memcpy(task->host_list, workstation_list, sizeof(sg_host_t) * host_count);
+  memcpy(task->host_list, host_list, sizeof(sg_host_t) * host_count);
 
   SD_task_do_schedule(task);
 }
@@ -865,13 +818,10 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstat
  */
 void SD_task_unschedule(SD_task_t task)
 {
-  if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE && task->state != SD_RUNNING &&
-      task->state != SD_FAILED)
-    THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED",
-           SD_task_get_name(task));
+  if (task->state == SD_NOT_SCHEDULED || task->state == SD_SCHEDULABLE)
+    THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", task->name);
 
-  if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE)
-      /* if the task is scheduled or runnable */
+  if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) /* if the task is scheduled or runnable */
       && ((task->kind == SD_TASK_COMP_PAR_AMDAHL) || (task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK))) {
           /* Don't free scheduling data for typed tasks */
     __SD_task_destroy_scheduling_data(task);
@@ -884,7 +834,7 @@ void SD_task_unschedule(SD_task_t task)
     /* the task should become SD_FAILED */
     task->surf_action->cancel();
   else {
-    if (task->unsatisfied_dependencies == 0)
+    if (task->predecessors->empty() && task->inputs->empty())
       SD_task_set_state(task, SD_SCHEDULABLE);
     else
       SD_task_set_state(task, SD_NOT_SCHEDULED);
@@ -896,11 +846,10 @@ void SD_task_unschedule(SD_task_t task)
 /* Runs a task. */
 void SD_task_run(SD_task_t task)
 {
-  xbt_assert(SD_task_get_state(task) == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d",
-             SD_task_get_name(task), (int)SD_task_get_state(task));
-  xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", SD_task_get_name(task));
+  xbt_assert(task->state == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", task->name, (int) task->state);
+  xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", task->name);
 
-  XBT_DEBUG("Running task '%s'", SD_task_get_name(task));
+  XBT_VERB("Executing task '%s'", task->name);
 
   /* Copy the elements of the task into the action */
   int host_nb = task->host_count;
@@ -923,11 +872,9 @@ void SD_task_run(SD_task_t task)
 
   XBT_DEBUG("surf_action = %p", task->surf_action);
 
-  if (task->category)
-    TRACE_surf_action(task->surf_action, task->category);
-
   __SD_task_destroy_scheduling_data(task);      /* now the scheduling data are not useful anymore */
   SD_task_set_state(task, SD_RUNNING);
+  xbt_dynar_push(sd_global->return_set, &task);
 }
 
 /**
@@ -967,18 +914,17 @@ double SD_task_get_finish_time(SD_task_t task)
 void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count)
 {
   xbt_assert(task->kind == SD_TASK_COMP_PAR_AMDAHL, "Task %s is not a SD_TASK_COMP_PAR_AMDAHL typed task."
-              "Cannot use this function.", SD_task_get_name(task));
+              "Cannot use this function.", task->name);
   task->flops_amount = xbt_new0(double, ws_count);
   task->bytes_amount = xbt_new0(double, ws_count * ws_count);
   xbt_free(task->host_list);
   task->host_count = ws_count;
   task->host_list = xbt_new0(sg_host_t, ws_count);
-  
-  for(int i=0;i<ws_count;i++){
+
+  for (int i=0; i<ws_count; i++){
     task->flops_amount[i] = (task->alpha + (1 - task->alpha)/ws_count) * task->amount;
   }
-} 
-
+}
 
 /** @brief Auto-schedules a task.
  *
@@ -993,13 +939,11 @@ void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count)
  *  - Point to point communication (done)
  *  - Sequential computation       (done)
  *  - group communication (redistribution, several kinds)
- *  - parallel tasks with no internal communication (one kind per speedup    model such as Amdahl)
+ *  - parallel tasks with no internal communication (one kind per speedup  model such as Amdahl)
  *  - idem+ internal communication. Task type not enough since we cannot store comm cost alongside to comp one)
  */
 void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
 {
-  int i;
-  int j;
   xbt_assert(task->kind != 0, "Task %s is not typed. Cannot automatically schedule it.", SD_task_get_name(task));
   switch (task->kind) {
   case SD_TASK_COMP_PAR_AMDAHL:
@@ -1008,7 +952,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
   case SD_TASK_COMM_E2E:
   case SD_TASK_COMP_SEQ:
     xbt_assert(task->host_count == count, "Got %d locations, but were expecting %d locations", count,task->host_count);
-    for (i = 0; i < count; i++)
+    for (int i=0; i<count; i++)
       task->host_list[i] = list[i];
     if (SD_task_get_kind(task)== SD_TASK_COMP_SEQ && !task->flops_amount){
       /*This task has failed and is rescheduled. Reset the flops_amount*/
@@ -1031,8 +975,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
     XBT_VERB("Schedule computation task %s on %s. It costs %.f flops", SD_task_get_name(task),
           sg_host_get_name(task->host_list[0]), task->flops_amount[0]);
 
-    for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
-      SD_task_t input = *it;
+    for (auto input : *task->inputs){
       input->host_list[1] = task->host_list[0];
       if (input->host_list[0] && (SD_task_get_state(input) < SD_SCHEDULED)) {
         SD_task_do_schedule(input);
@@ -1041,8 +984,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
       }
     }
 
-    for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
-      SD_task_t output = *it;
+    for (auto output : *task->outputs){
       output->host_list[0] = task->host_list[0];
       if (output->host_list[1] && (SD_task_get_state(output) < SD_SCHEDULED)) {
         SD_task_do_schedule(output);
@@ -1057,14 +999,13 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
   if (task->kind == SD_TASK_COMP_PAR_AMDAHL) {
     XBT_VERB("Schedule computation task %s on %d workstations. %.f flops will be distributed following Amdahl's Law",
           SD_task_get_name(task), task->host_count, task->flops_amount[0]);
-    for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
-      SD_task_t input = *it;
+    for (auto input : *task->inputs){
       if (!input->host_list){
         XBT_VERB("Sender side of Task %s is not scheduled yet", SD_task_get_name(input));
         input->host_list = xbt_new0(sg_host_t, count);
         input->host_count = count;
         XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
-        for (i=0;i<count;i++)
+        for (int i=0; i<count; i++)
           input->host_list[i] = task->host_list[i];
       } else {
         XBT_VERB("Build communication matrix for task '%s'", SD_task_get_name(input));
@@ -1073,7 +1014,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
         src_nb = input->host_count;
         dst_nb = count;
         input->host_list = static_cast<sg_host_t*>(xbt_realloc(input->host_list, (input->host_count+count)*sizeof(sg_host_t)));
-        for(i=0; i<count; i++)
+        for (int i=0; i<count; i++)
           input->host_list[input->host_count+i] = task->host_list[i];
 
         input->host_count += count;
@@ -1082,10 +1023,10 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
         input->flops_amount = xbt_new0(double, input->host_count);
         input->bytes_amount = xbt_new0(double, input->host_count* input->host_count);
 
-        for(i=0;i<src_nb;i++){
+        for (int i=0; i<src_nb; i++) {
           src_start = i*input->amount/src_nb;
           src_end = src_start + input->amount/src_nb;
-          for(j=0; j<dst_nb; j++){
+          for (int j=0; j<dst_nb; j++) {
             dst_start = j*input->amount/dst_nb;
             dst_end = dst_start + input->amount/dst_nb;
             XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)", sg_host_get_name(input->host_list[i]),
@@ -1107,24 +1048,22 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
       }
     }
 
-    for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
-      SD_task_t output = *it;
+    for (auto output : *task->outputs) {
       if (!output->host_list){
         XBT_VERB("Receiver side of Task '%s' is not scheduled yet", SD_task_get_name(output));
         output->host_list = xbt_new0(sg_host_t, count);
         output->host_count = count;
         XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
-        for (i=0;i<count;i++)
+        for (int i=0; i<count; i++)
           output->host_list[i] = task->host_list[i];
       } else {
-        int src_nb, dst_nb;
         double src_start, src_end, dst_start, dst_end;
-        src_nb = count;
-        dst_nb = output->host_count;
+        int src_nb = count;
+        int dst_nb = output->host_count;
         output->host_list = static_cast<sg_host_t*>(xbt_realloc(output->host_list, (output->host_count+count)*sizeof(sg_host_t)));
-        for(i=output->host_count - 1; i>=0; i--)
+        for (int i=output->host_count - 1; i>=0; i--)
           output->host_list[count+i] = output->host_list[i];
-        for(i=0; i<count; i++)
+        for (int i=0; i<count; i++)
           output->host_list[i] = task->host_list[i];
 
         output->host_count += count;
@@ -1135,10 +1074,10 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
         output->flops_amount = xbt_new0(double, output->host_count);
         output->bytes_amount = xbt_new0(double, output->host_count* output->host_count);
 
-        for(i=0;i<src_nb;i++){
+        for (int i=0; i<src_nb; i++) {
           src_start = i*output->amount/src_nb;
           src_end = src_start + output->amount/src_nb;
-          for(j=0; j<dst_nb; j++){
+          for (int j=0; j<dst_nb; j++) {
             dst_start = j*output->amount/dst_nb;
             dst_end = dst_start + output->amount/dst_nb;
             XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end);
@@ -1154,7 +1093,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
         if (SD_task_get_state(output)< SD_SCHEDULED) {
           SD_task_do_schedule(output);
           XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
-              SD_task_get_name(output),output->amount, src_nb, dst_nb);
+              output->name, output->amount, src_nb, dst_nb);
         }
       }
     }
@@ -1172,7 +1111,7 @@ void SD_task_schedulel(SD_task_t task, int count, ...)
   va_list ap;
   sg_host_t *list = xbt_new(sg_host_t, count);
   va_start(ap, count);
-  for (int i = 0; i < count; i++) {
+  for (int i=0; i<count; i++) {
     list[i] = va_arg(ap, sg_host_t);
   }
   va_end(ap);