X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d49fc33cc147f3b7ddac64e3076348003d020a9..2bcb5dd3317c733c31c288ae79e72fb28863d936:/src/simdag/sd_daxloader.cpp

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index d8e0a91d34..4a83abd776 100644
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -4,12 +4,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/simdag/simdag_private.h"
 #include "simgrid/simdag.h"
 #include "xbt/misc.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/file.h" /* xbt_basename() */
+#include "simdag_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 
@@ -36,128 +36,103 @@ void uniq_transfer_task_name(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;
-  for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
-    if ((*it)->marked == 0)
+  for (SD_task_t it : *task->outputs)
+    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;
-  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;
 }
 
 bool acyclic_graph_detail(xbt_dynar_t dag){
-  unsigned int count, count_current=0;
+  unsigned int count;
   bool all_marked = true;
   SD_task_t task = nullptr;
-  xbt_dynar_t next = nullptr, current = xbt_dynar_new(sizeof(SD_task_t),nullptr);
-
+  std::vector<SD_task_t> current;
   xbt_dynar_foreach(dag,count,task){
-    if(task->kind == SD_TASK_COMM_E2E) continue;
-    task->marked = 0;
-    if(task->successors->empty() && task->outputs->empty())
-      xbt_dynar_push(current, &task);
+    if(task->kind != SD_TASK_COMM_E2E){
+      task->marked = 0;
+      if(task->successors->empty() && task->outputs->empty())
+        current.push_back(task);
+    }
   }
-  //test if something has to be done for the next iteration
-  while(!xbt_dynar_is_empty(current)){
-    next = xbt_dynar_new(sizeof(SD_task_t),nullptr);
-    //test if the current iteration is done
-    xbt_dynar_foreach(current,count_current,task){
-      if (task == nullptr)
-        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;
+  while(!current.empty()){
+    std::vector<SD_task_t> next;
+    for (auto t: current){
+      //Mark task
+      t->marked = 1;
+      for (SD_task_t input : *t->inputs){
+        input->marked=1;
         // Inputs are communication, hence they can have only one predecessor
-        SD_task_t input_pred = *((*it)->predecessors->begin());
+        SD_task_t input_pred = *(input->predecessors->begin());
         if (children_are_marked(input_pred))
-          xbt_dynar_push(next, &input_pred);
+          next.push_back(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 pred : *t->predecessors) {
+        if (children_are_marked(pred))
+          next.push_back(pred);
       }
     }
-    xbt_dynar_free(&current);
+    current.clear();
     current = next;
-    next = nullptr;
   }
-  xbt_dynar_free(&current);
+
   all_marked = true;
+  //test if all tasks are marked
   xbt_dynar_foreach(dag,count,task){
-    if(task->kind == SD_TASK_COMM_E2E)
-      continue;
-    //test if all tasks are marked
-    if(task->marked == 0){
+    if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){
       XBT_WARN("the task %s is not marked",task->name);
       all_marked = false;
       break;
     }
   }
+
   if(!all_marked){
     XBT_VERB("there is at least one cycle in your task graph");
-
-    current = xbt_dynar_new(sizeof(SD_task_t),nullptr);
     xbt_dynar_foreach(dag,count,task){
-      if(task->kind == SD_TASK_COMM_E2E)
-        continue;
-      if(task->predecessors->empty() && task->inputs->empty()){
-        xbt_dynar_push(current, &task);
-      }
-    }
-
-    xbt_dynar_foreach(dag,count,task){
-      if(task->kind == SD_TASK_COMM_E2E)
-        continue;
-      if(task->predecessors->empty() && task->inputs->empty()){
-        task->marked = 1;
-        xbt_dynar_push(current, &task);
+      if(task->kind != SD_TASK_COMM_E2E && task->predecessors->empty() && task->inputs->empty()){
+	task->marked = 1;
+	current.push_back(task);
       }
     }
     //test if something has to be done for the next iteration
-    while(!xbt_dynar_is_empty(current)){
-      next = xbt_dynar_new(sizeof(SD_task_t),nullptr);
+    while(!current.empty()){
+      std::vector<SD_task_t> next;
       //test if the current iteration is done
-      xbt_dynar_foreach(current,count_current,task){
-        if (task == nullptr)
-          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 (auto t: current){
+        t->marked = 1;
+        for (SD_task_t output : *t->outputs) {
+          output->marked = 1;
           // outputs are communication, hence they can have only one successor
-          SD_task_t output_succ = *((*it)->successors->begin());
+          SD_task_t output_succ = *(output->successors->begin());
           if (parents_are_marked(output_succ))
-            xbt_dynar_push(next, &output_succ);
+            next.push_back(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 succ : *t->successors) {
+          if (parents_are_marked(succ))
+            next.push_back(succ);
         }
-        xbt_dynar_free(&current);
+        current.clear();
         current = next;
-        next = nullptr;
       }
-      xbt_dynar_free(&current);
-      all_marked = true;
-      xbt_dynar_foreach(dag,count,task){
-        if(task->kind == SD_TASK_COMM_E2E)
-          continue;
-        //test if all tasks are marked
-        if(task->marked == 0){
-          XBT_WARN("the task %s is in a cycle",task->name);
-          all_marked = false;
-        }
+    }
+
+    all_marked = true;
+    xbt_dynar_foreach(dag,count,task){
+      if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){
+        XBT_WARN("the task %s is in a cycle",task->name);
+        all_marked = false;
       }
     }
   }
@@ -170,7 +145,8 @@ static xbt_dynar_t result;
 static xbt_dict_t jobs;
 static xbt_dict_t files;
 static SD_task_t current_job;
-static SD_task_t root_task, end_task;
+static SD_task_t root_task;
+static SD_task_t end_task;
 
 static void dax_task_free(void *task)
 {
@@ -219,29 +195,29 @@ xbt_dynar_t SD_daxload(const char *filename)
   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);
-        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()) {
-      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);
-        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 {
-      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."
-                      "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);
-          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);
         }
       }
@@ -303,7 +279,7 @@ void STag_dax__job()
   xbt_dynar_push(result, &current_job);
 }
 
-void STag_dax__uses(void)
+void STag_dax__uses()
 {
   double size = xbt_str_parse_double(A_dax__uses_size, "Parse error: %s is not a double");
   int is_input = (A_dax__uses_link == A_dax__uses_link_input);
@@ -315,7 +291,7 @@ void STag_dax__uses(void)
     sd_global->initial_tasks->erase(file);
     xbt_dict_set(files, A_dax__uses_file, file, nullptr);
   } else {
-    if (SD_task_get_amount(file) != size) {
+    if (file->amount < size || file->amount > size) {
       XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size);
     }
   }
@@ -356,18 +332,18 @@ void ETag_dax__adag()
   XBT_DEBUG("See </adag>");
 }
 
-void ETag_dax__job(void)
+void ETag_dax__job()
 {
   current_job = nullptr;
   XBT_DEBUG("See </job>");
 }
 
-void ETag_dax__parent(void)
+void ETag_dax__parent()
 {
   XBT_DEBUG("See </parent>");
 }
 
-void ETag_dax__uses(void)
+void ETag_dax__uses()
 {
   XBT_DEBUG("See </uses>");
 }