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

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 65465b01a7..a9cae7e157 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -383,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;
 }
@@ -400,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,19 +531,19 @@ void SD_task_dump(SD_task_t task)
   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));
   }
 }
 
@@ -565,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);
 }
 
 /**
@@ -720,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;
 }
@@ -780,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");
@@ -806,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);
 }
@@ -926,7 +921,7 @@ void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count)
   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;
   }
 }
@@ -949,8 +944,6 @@ void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count)
  */
 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:
@@ -959,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*/
@@ -982,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);
@@ -992,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);
@@ -1008,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));
@@ -1024,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;
@@ -1033,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]),
@@ -1058,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;
@@ -1086,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);
@@ -1123,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);