X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eabe7ba29733550e5a69d42533644d8367738343..c9fa3b2f54b1793ba420c06fed2f7bf4ec04b30f:/src/simdag/sd_daxloader.c diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c index b8b8d04f35..a47704d031 100644 --- 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; @@ -314,7 +314,7 @@ xbt_dynar_t SD_daxload(const char *filename) unsigned int cpt1, cpt2; SD_task_t newfile = NULL; 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); @@ -331,7 +331,7 @@ 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);