Don't hide variables with multiple declarations.

[simgrid.git] / src / simdag / sd_daxloader.c

diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c
index b8b8d04..ef0b9ee 100644 (file)
--- a/src/simdag/sd_daxloader.c
+++ b/src/simdag/sd_daxloader.c
@@ -117,14 +117,14 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
   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){
+    if(xbt_dynar_is_empty(task->tasks_after)){
       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){
+  while(!xbt_dynar_is_empty(current)){
     next = xbt_dynar_new(sizeof(SD_task_t),NULL);
     //test if the current iteration is done
     count_current=0;
@@ -177,7 +177,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
     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){
+      if(xbt_dynar_is_empty(task->tasks_before)){
         xbt_dynar_push(current, &task);
       }
     }
@@ -186,7 +186,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
     task = NULL;
     xbt_dynar_foreach(dag,count,task){
       if(task->kind == SD_TASK_COMM_E2E) continue;
-      if(xbt_dynar_length(task->tasks_before) == 0){
+      if(xbt_dynar_is_empty(task->tasks_before)){
         task->marked = 1;
         xbt_dynar_push(current, &task);
       }
@@ -194,7 +194,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){
     task = NULL;
     count = 0;
     //test if something has to be done for the next iteration
-    while(xbt_dynar_length(current) != 0){
+    while(!xbt_dynar_is_empty(current)){
       next = xbt_dynar_new(sizeof(SD_task_t),NULL);
       //test if the current iteration is done
       count_current=0;
@@ -286,8 +286,8 @@ xbt_dynar_t SD_daxload(const char *filename)
   dax_lineno = 1;
 
   result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free);
-  files = xbt_dict_new();
-  jobs = xbt_dict_new();
+  files = xbt_dict_new_homogeneous(&dax_task_free);
+  jobs = xbt_dict_new_homogeneous(NULL);
   root_task = SD_task_create_comp_seq("root", NULL, 0);
   /* by design the root task is always SCHEDULABLE */
   __SD_task_set_state(root_task, SD_SCHEDULABLE);
@@ -312,12 +312,11 @@ xbt_dynar_t SD_daxload(const char *filename)
 
   xbt_dict_foreach(files, cursor, name, file) {
     unsigned int cpt1, cpt2;
-    SD_task_t newfile = NULL;
+    SD_task_t newfile;
     SD_dependency_t depbefore, depafter;
-    if (xbt_dynar_length(file->tasks_before) == 0) {
+    if (xbt_dynar_is_empty(file->tasks_before)) {
       xbt_dynar_foreach(file->tasks_after, cpt2, depafter) {
-        SD_task_t newfile =
-            SD_task_create_comm_e2e(file->name, NULL, file->amount);
+        newfile = 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
@@ -331,10 +330,9 @@ xbt_dynar_t SD_daxload(const char *filename)
 #endif
         xbt_dynar_push(result, &newfile);
       }
-    } else if (xbt_dynar_length(file->tasks_after) == 0) {
+    } else if (xbt_dynar_is_empty(file->tasks_after)) {
       xbt_dynar_foreach(file->tasks_before, cpt2, depbefore) {
-        SD_task_t newfile =
-            SD_task_create_comm_e2e(file->name, NULL, file->amount);
+        newfile = 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
@@ -356,8 +354,7 @@ xbt_dynar_t SD_daxload(const char *filename)
                 ("File %s is produced and consumed by task %s. This loop dependency will prevent the execution of the task.",
                  file->name, depbefore->src->name);
           }
-          newfile =
-              SD_task_create_comm_e2e(file->name, NULL, file->amount);
+          newfile = 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
@@ -430,7 +427,7 @@ void STag_dax__uses(void)
   file = xbt_dict_get_or_null(files, A_dax__uses_file);
   if (file == NULL) {
     file = SD_task_create_comm_e2e(A_dax__uses_file, NULL, size);
-    xbt_dict_set(files, A_dax__uses_file, file, &dax_task_free);
+    xbt_dict_set(files, A_dax__uses_file, file, NULL);
   } else {
     if (SD_task_get_amount(file) != size) {
       XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f",