X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..537c056a021b3f8955560913638ce292d575e862:/src/simdag/sd_daxloader.c

diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c
index d1f79c1fb5..abb9e5d698 100644
--- a/src/simdag/sd_daxloader.c
+++ b/src/simdag/sd_daxloader.c
@@ -15,6 +15,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 #include "dax_dtd.h"
 #include "dax_dtd.c"
 
+bool children_are_marked(SD_task_t task);
+bool parents_are_marked(SD_task_t task);
 
 /* Parsing helpers */
 static void dax_parse_error(char *msg)
@@ -71,6 +73,177 @@ void uniq_transfer_task_name(SD_task_t task)
   free(new_name);
 }
 
+bool children_are_marked(SD_task_t task){
+  SD_task_t child_task = NULL;
+  bool all_marked = true;
+  SD_dependency_t depafter = NULL;
+  unsigned int count;
+  xbt_dynar_foreach(task->tasks_after,count,depafter){
+    child_task = depafter->dst;
+    //test marked
+    if(child_task->marked == 0) {
+      all_marked = false;
+      break;
+    }
+    child_task = NULL;
+  }
+  return all_marked;
+}
+
+bool parents_are_marked(SD_task_t task){
+  SD_task_t parent_task = NULL;
+  bool all_marked = true;
+  SD_dependency_t depbefore = NULL;
+  unsigned int count;
+  xbt_dynar_foreach(task->tasks_before,count,depbefore){
+    parent_task = depbefore->src;
+    //test marked
+    if(parent_task->marked == 0) {
+      all_marked = false;
+      break;
+    }
+    parent_task = NULL;
+  }
+  return all_marked;
+}
+
+bool acyclic_graph_detail(xbt_dynar_t dag){
+  unsigned int count=0, count_current=0;
+  bool all_marked = true;
+  SD_task_t task = NULL, parent_task = NULL, child_task = NULL;
+  SD_dependency_t depbefore = NULL, depafter = NULL;
+  xbt_dynar_t next = NULL, current = xbt_dynar_new(sizeof(SD_task_t),NULL);
+
+  xbt_dynar_foreach(dag,count,task){
+    if(task->kind == SD_TASK_COMM_E2E) continue;
+    task->marked = 0;
+    if(xbt_dynar_length(task->tasks_after) == 0){
+      xbt_dynar_push(current, &task);
+    }
+  }
+  task = NULL;
+  count = 0;
+  //test if something has to be done for the next iteration
+  while(xbt_dynar_length(current) != 0){
+    next = xbt_dynar_new(sizeof(SD_task_t),NULL);
+    //test if the current iteration is done
+    count_current=0;
+    xbt_dynar_foreach(current,count_current,task){
+      if (task == NULL) continue;
+      count = 0;
+      //push task in next
+      task->marked = 1;
+      count = 0;
+      xbt_dynar_foreach(task->tasks_before,count,depbefore){
+        parent_task = depbefore->src;
+        if(parent_task->kind == SD_TASK_COMM_E2E){
+          unsigned int j=0;
+          parent_task->marked = 1;
+          SD_task_t parent_task_2 = NULL;
+          xbt_dynar_foreach(parent_task->tasks_before,j,depbefore){
+            parent_task_2 = depbefore->src;
+            if(children_are_marked(parent_task_2))
+              xbt_dynar_push(next, &parent_task_2);
+          }
+        } else{
+          if(children_are_marked(parent_task))
+            xbt_dynar_push(next, &parent_task);
+        }
+        parent_task = NULL;
+      }
+      task = NULL;
+      count = 0;
+    }
+    xbt_dynar_free(&current);
+    current = next;
+    next = NULL;
+  }
+  xbt_dynar_free(&current);
+  current = NULL;
+  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){
+      WARN1("the task %s is not marked",task->name);
+      all_marked = false;
+      break;
+    }
+  }
+  task = NULL;
+  if(!all_marked){
+    VERB0("there is at least one cycle in your task graph");
+
+    current = xbt_dynar_new(sizeof(SD_task_t),NULL);
+    xbt_dynar_foreach(dag,count,task){
+      if(task->kind == SD_TASK_COMM_E2E) continue;
+      if(xbt_dynar_length(task->tasks_before) == 0){
+        xbt_dynar_push(current, &task);
+      }
+    }
+
+    count = 0;
+    task = NULL;
+    xbt_dynar_foreach(dag,count,task){
+      if(task->kind == SD_TASK_COMM_E2E) continue;
+      if(xbt_dynar_length(task->tasks_before) == 0){
+        task->marked = 1;
+        xbt_dynar_push(current, &task);
+      }
+    }
+    task = NULL;
+    count = 0;
+    //test if something has to be done for the next iteration
+    while(xbt_dynar_length(current) != 0){
+      next = xbt_dynar_new(sizeof(SD_task_t),NULL);
+      //test if the current iteration is done
+      count_current=0;
+      xbt_dynar_foreach(current,count_current,task){
+        if (task == NULL) continue;
+        count = 0;
+        //push task in next
+        task->marked = 1;
+        count = 0;
+        xbt_dynar_foreach(task->tasks_after,count,depafter){
+          child_task = depbefore->dst;
+          if(child_task->kind == SD_TASK_COMM_E2E){
+            unsigned int j=0;
+            child_task->marked = 1;
+            SD_task_t child_task_2 = NULL;
+            xbt_dynar_foreach(child_task->tasks_after,j,depafter){
+              child_task_2 = depbefore->dst;
+              if(parents_are_marked(child_task_2))
+                xbt_dynar_push(next, &child_task_2);
+            }
+          } else{
+            if(parents_are_marked(child_task))
+              xbt_dynar_push(next, &child_task);
+          }
+          child_task = NULL;
+        }
+        task = NULL;
+        count = 0;
+      }
+      xbt_dynar_free(&current);
+      current = next;
+      next = NULL;
+    }
+    xbt_dynar_free(&current);
+    current = NULL;
+    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){
+        WARN1("the task %s is in a cycle",task->name);
+        all_marked = false;
+      }
+    }
+  }
+  return all_marked;
+}
+
+
 
 static YY_BUFFER_STATE input_buffer;
 
@@ -144,6 +317,13 @@ xbt_dynar_t SD_daxload(const char *filename)
             SD_task_create_comm_e2e(file->name, NULL, file->amount);
         SD_task_dependency_add(NULL, NULL, root_task, newfile);
         SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
+#ifdef HAVE_TRACING
+        const char *category = depbefore->src->category;
+        if (category){
+          TRACE_category (category);
+          TRACE_sd_set_task_category (newfile, category);
+        }
+#endif
         xbt_dynar_push(result, &newfile);
       }
     } else if (xbt_dynar_length(file->tasks_after) == 0) {
@@ -152,6 +332,13 @@ xbt_dynar_t SD_daxload(const char *filename)
             SD_task_create_comm_e2e(file->name, NULL, file->amount);
         SD_task_dependency_add(NULL, NULL, depbefore->src, newfile);
         SD_task_dependency_add(NULL, NULL, newfile, end_task);
+#ifdef HAVE_TRACING
+        const char *category = depbefore->src->category;
+        if (category){
+          TRACE_category (category);
+          TRACE_sd_set_task_category (newfile, category);
+        }
+#endif
         xbt_dynar_push(result, &newfile);
       }
     } else {
@@ -166,6 +353,13 @@ xbt_dynar_t SD_daxload(const char *filename)
               SD_task_create_comm_e2e(file->name, NULL, file->amount);
           SD_task_dependency_add(NULL, NULL, depbefore->src, newfile);
           SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
+#ifdef HAVE_TRACING
+          const char *category = depbefore->src->category;
+          if (category){
+            TRACE_category (category);
+            TRACE_sd_set_task_category (newfile, category);
+          }
+#endif
           xbt_dynar_push(result, &newfile);
         }
       }
@@ -184,6 +378,7 @@ xbt_dynar_t SD_daxload(const char *filename)
     }
   }
 
+  acyclic_graph_detail(result);
   return result;
 }
 
@@ -203,6 +398,13 @@ void STag_dax__job(void)
   runtime *= 4200000000.;       /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */
 //  INFO3("See <job id=%s runtime=%s %.0f>",A_dax__job_id,A_dax__job_runtime,runtime);
   current_job = SD_task_create_comp_seq(name, NULL, runtime);
+#ifdef HAVE_TRACING
+  char *category = A_dax__job_name;
+  if (category){
+    TRACE_category (category);
+    TRACE_sd_set_task_category(current_job, category);
+  }
+#endif
   xbt_dict_set(jobs, A_dax__job_id, current_job, NULL);
   free(name);
   xbt_dynar_push(result, &current_job);