further use c++11 loops

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index 44c32f9..6dfe768 100644 (file)
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -36,21 +36,21 @@ void uniq_transfer_task_name(SD_task_t task)
 }
 
 static bool children_are_marked(SD_task_t task){
 }
 
 static bool children_are_marked(SD_task_t task){

-  for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
-    if ((*it)->marked == 0)
+  for (SD_task_t it : *task->successors)
+    if (it->marked == 0)

       return false;
       return false;

-  for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
+  for (SD_task_t it : *task->outputs)

     if ((*it)->marked == 0)
       return false;
   return true;
 }
 
 static bool parents_are_marked(SD_task_t task){
     if ((*it)->marked == 0)
       return false;
   return true;
 }
 
 static bool parents_are_marked(SD_task_t task){

-  for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
-    if ((*it)->marked == 0)
+  for (SD_task_t it : *task->predecessors)
+    if (it->marked == 0)

       return false;
       return false;

-  for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
-    if ((*it)->marked == 0)
+  for (SD_task_t it : *task->inputs)
+    if (it->marked == 0)

       return false;
   return true;
 }
       return false;
   return true;
 }


@@ -77,16 +77,16 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
         continue;
       //push task in next
       task->marked = 1;
         continue;
       //push task in next
       task->marked = 1;

-      for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
-        (*it)->marked = 1;
+      for (SD_task_t it : *task->inputs){
+        it->marked = 1;

         // Inputs are communication, hence they can have only one predecessor
         // Inputs are communication, hence they can have only one predecessor

-        SD_task_t input_pred = *((*it)->predecessors->begin());
+        SD_task_t input_pred = *(it->predecessors->begin());

         if (children_are_marked(input_pred))
           xbt_dynar_push(next, &input_pred);
       }
         if (children_are_marked(input_pred))
           xbt_dynar_push(next, &input_pred);
       }

-      for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it){
-        if (children_are_marked(*it))
-          xbt_dynar_push(next, &(*it));
+      for (SD_task_t it : *task->predecessors) {
+        if (children_are_marked(it))
+          xbt_dynar_push(next, &it);

       }
     }
     xbt_dynar_free(&current);
       }
     }
     xbt_dynar_free(&current);


@@ -134,16 +134,16 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
           continue;
         //push task in next
         task->marked = 1;
           continue;
         //push task in next
         task->marked = 1;

-        for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
-          (*it)->marked = 1;
+        for (SD_task_t it : *task->outputs) {
+          it->marked = 1;

           // outputs are communication, hence they can have only one successor
           // outputs are communication, hence they can have only one successor

-          SD_task_t output_succ = *((*it)->successors->begin());
+          SD_task_t output_succ = *(it->successors->begin());

           if (parents_are_marked(output_succ))
             xbt_dynar_push(next, &output_succ);
         }
           if (parents_are_marked(output_succ))
             xbt_dynar_push(next, &output_succ);
         }

-        for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it){
-          if (parents_are_marked(*it))
-            xbt_dynar_push(next, &(*it));
+        for (SD_task_t it : *task->predecessors) {
+          if (parents_are_marked(it))
+            xbt_dynar_push(next, &it);

         }
         xbt_dynar_free(&current);
         current = next;
         }
         xbt_dynar_free(&current);
         current = next;


@@ -221,29 +221,29 @@ xbt_dynar_t SD_daxload(const char *filename)
   xbt_dict_foreach(files, cursor, name, file) {
     SD_task_t newfile;
     if (file->predecessors->empty()) {
   xbt_dict_foreach(files, cursor, name, file) {
     SD_task_t newfile;
     if (file->predecessors->empty()) {

-      for (std::set<SD_task_t>::iterator it=file->successors->begin(); it!=file->successors->end(); ++it){
+      for (SD_task_t it : *file->successors) {

         newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
         SD_task_dependency_add(nullptr, nullptr, root_task, newfile);
         newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
         SD_task_dependency_add(nullptr, nullptr, root_task, newfile);

-        SD_task_dependency_add(nullptr, nullptr, newfile, (*it));
+        SD_task_dependency_add(nullptr, nullptr, newfile, it);

         xbt_dynar_push(result, &newfile);
       }
     } else if (file->successors->empty()) {
         xbt_dynar_push(result, &newfile);
       }
     } else if (file->successors->empty()) {

-      for (std::set<SD_task_t>::iterator it=file->predecessors->begin(); it!=file->predecessors->end(); ++it){
+      for (SD_task_t it : *file->predecessors){

         newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
         newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);

-        SD_task_dependency_add(nullptr, nullptr, (*it), newfile);
+        SD_task_dependency_add(nullptr, nullptr, it, newfile);

         SD_task_dependency_add(nullptr, nullptr, newfile, end_task);
         xbt_dynar_push(result, &newfile);
       }
     } else {
         SD_task_dependency_add(nullptr, nullptr, newfile, end_task);
         xbt_dynar_push(result, &newfile);
       }
     } else {

-      for (std::set<SD_task_t>::iterator it=file->predecessors->begin(); it!=file->predecessors->end(); ++it){
-        for (std::set<SD_task_t>::iterator it2=file->successors->begin(); it2!=file->successors->end(); ++it2){
-          if (*it == *it2) {
+      for (SD_task_t it : *file->predecessors) {
+        for (SD_task_t it2 : *file->successors) {
+          if (it == it2) {

             XBT_WARN ("File %s is produced and consumed by task %s."
             XBT_WARN ("File %s is produced and consumed by task %s."

-                      "This loop dependency will prevent the execution of the task.", file->name, (*it)->name);
+                      "This loop dependency will prevent the execution of the task.", file->name, it->name);

           }
           newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
           }
           newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);

-          SD_task_dependency_add(nullptr, nullptr, (*it), newfile);
-          SD_task_dependency_add(nullptr, nullptr, newfile, (*it2));
+          SD_task_dependency_add(nullptr, nullptr, it, newfile);
+          SD_task_dependency_add(nullptr, nullptr, newfile, it2);

           xbt_dynar_push(result, &newfile);
         }
       }
           xbt_dynar_push(result, &newfile);
         }
       }

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 4f55b83..66f3c61 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -150,39 +150,39 @@ xbt_dynar_t SD_simulate(double how_long) {
           xbt_dynar_push(sd_global->return_set, &task);
 
         /* remove the dependencies after this task */
           xbt_dynar_push(sd_global->return_set, &task);
 
         /* remove the dependencies after this task */

-        for (std::set<SD_task_t>::iterator succ = task->successors->begin(); succ != task->successors->end(); ++succ){
-          (*succ)->predecessors->erase(task);
-          (*succ)->inputs->erase(task);
-          XBT_DEBUG("Release dependency on %s: %zu remain(s). Becomes schedulable if %zu=0", SD_task_get_name((*succ)),
-              (*succ)->predecessors->size()+(*succ)->inputs->size(), (*succ)->predecessors->size());
+        for (auto succ : *task->successors) {
+          succ->predecessors->erase(task);
+          succ->inputs->erase(task);
+          XBT_DEBUG("Release dependency on %s: %zu remain(s). Becomes schedulable if %zu=0", SD_task_get_name(succ),
+              succ->predecessors->size()+succ->inputs->size(), succ->predecessors->size());

 
 

-          if (SD_task_get_state((*succ)) == SD_NOT_SCHEDULED && (*succ)->predecessors->empty())
-            SD_task_set_state((*succ), SD_SCHEDULABLE);
+          if (SD_task_get_state(succ) == SD_NOT_SCHEDULED && succ->predecessors->empty())
+            SD_task_set_state(succ, SD_SCHEDULABLE);

 
 

-          if (SD_task_get_state((*succ)) == SD_SCHEDULED && (*succ)->predecessors->empty() && (*succ)->inputs->empty())
-            SD_task_set_state((*succ), SD_RUNNABLE);
+          if (SD_task_get_state(succ) == SD_SCHEDULED && succ->predecessors->empty() && succ->inputs->empty())
+            SD_task_set_state(succ, SD_RUNNABLE);

 
 

-          if (SD_task_get_state((*succ)) == SD_RUNNABLE && !sd_global->watch_point_reached)
-            SD_task_run((*succ));
+          if (SD_task_get_state(succ) == SD_RUNNABLE && !sd_global->watch_point_reached)
+            SD_task_run(succ);

         }
         task->successors->clear();
 
         }
         task->successors->clear();
 

-        for (std::set<SD_task_t>::iterator output=task->outputs->begin(); output!=task->outputs->end(); ++output){
-          (*output)->start_time = task->finish_time;
-          (*output)->predecessors->erase(task);
-          if (SD_task_get_state(*output) == SD_SCHEDULED)
-             SD_task_set_state(*output, SD_RUNNABLE);
+        for (auto output : *task->outputs) {
+          output->start_time = task->finish_time;
+          output->predecessors->erase(task);
+          if (SD_task_get_state(output) == SD_SCHEDULED)
+             SD_task_set_state(output, SD_RUNNABLE);

           else
           else

-             SD_task_set_state(*output, SD_SCHEDULABLE);
+             SD_task_set_state(output, SD_SCHEDULABLE);

 
 

-          SD_task_t comm_dst = *((*output)->successors->begin());
+          SD_task_t comm_dst = *(output->successors->begin());

           if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->predecessors->empty()){
             XBT_DEBUG("%s is a transfer, %s may be ready now if %zu=0",
           if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->predecessors->empty()){
             XBT_DEBUG("%s is a transfer, %s may be ready now if %zu=0",

-                SD_task_get_name(*output), SD_task_get_name(comm_dst), comm_dst->predecessors->size());
+                SD_task_get_name(output), SD_task_get_name(comm_dst), comm_dst->predecessors->size());

             SD_task_set_state(comm_dst, SD_SCHEDULABLE);
           }
             SD_task_set_state(comm_dst, SD_SCHEDULABLE);
           }

-          if (SD_task_get_state(*output) == SD_RUNNABLE && !sd_global->watch_point_reached)
-            SD_task_run(*output);
+          if (SD_task_get_state(output) == SD_RUNNABLE && !sd_global->watch_point_reached)
+            SD_task_run(output);

         }
         task->outputs->clear();
       }
         }
         task->outputs->clear();
       }


@@ -201,8 +201,8 @@ xbt_dynar_t SD_simulate(double how_long) {
     XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size());
     static const char* state_names[] =
       { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };
     XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size());
     static const char* state_names[] =
       { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };

-    for (std::set<SD_task_t>::iterator t = sd_global->initial_tasks->begin(); t != sd_global->initial_tasks->end(); ++t)
-      XBT_WARN("%s is in %s state", SD_task_get_name(*t), state_names[SD_task_get_state(*t)]);
+    for (auto t : *sd_global->initial_tasks)
+      XBT_WARN("%s is in %s state", SD_task_get_name(t), state_names[SD_task_get_state(t)]);

   }
 
   XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
   }
 
   XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d",