X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/999a64fe86043f1b9cc777db6a5cdc4e34c4c922..45f517dc85cc6c2ed4ebce27de4f75c00271f945:/src/simdag/sd_daxloader.c diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c index c63256fb1b..45137ff25e 100644 --- a/src/simdag/sd_daxloader.c +++ b/src/simdag/sd_daxloader.c @@ -8,6 +8,7 @@ #include "simdag/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); @@ -93,10 +94,10 @@ bool children_are_marked(SD_task_t task){ bool parents_are_marked(SD_task_t task){ SD_task_t parent_task = NULL; bool all_marked = true; - SD_dependency_t depafter = NULL; + SD_dependency_t depbefore = NULL; unsigned int count; - xbt_dynar_foreach(task->tasks_after,count,depafter){ - parent_task = depafter->dst; + xbt_dynar_foreach(task->tasks_before,count,depbefore){ + parent_task = depbefore->src; //test marked if(parent_task->marked == 0) { all_marked = false; @@ -117,14 +118,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; @@ -165,28 +166,36 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ 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); + XBT_WARN("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"); + XBT_VERB("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_is_empty(task->tasks_before)){ + xbt_dynar_push(current, &task); + } + } count = 0; task = NULL; xbt_dynar_foreach(dag,count,task){ if(task->kind == SD_TASK_COMM_E2E) continue; - task->marked = 0; - if(xbt_dynar_length(task->tasks_before) == 0){ + if(xbt_dynar_is_empty(task->tasks_before)){ + 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){ + 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; @@ -197,13 +206,13 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ task->marked = 1; count = 0; xbt_dynar_foreach(task->tasks_after,count,depafter){ - child_task = depafter->dst; + 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 = depafter->src; + child_task_2 = depbefore->dst; if(parents_are_marked(child_task_2)) xbt_dynar_push(next, &child_task_2); } @@ -211,7 +220,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ if(parents_are_marked(child_task)) xbt_dynar_push(next, &child_task); } - parent_task = NULL; + child_task = NULL; } task = NULL; count = 0; @@ -227,7 +236,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ 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); + XBT_WARN("the task %s is in a cycle",task->name); all_marked = false; } } @@ -235,75 +244,6 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ return all_marked; } -bool acyclic_graph_detection(xbt_dynar_t dag){ - unsigned int count=0, count_current=0; - bool all_marked = true; - SD_task_t task = NULL, parent_task = NULL; - SD_dependency_t depbefore = 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(¤t); - current = next; - next = NULL; - } - xbt_dynar_free(¤t); - 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"); - } - return all_marked; -} static YY_BUFFER_STATE input_buffer; @@ -319,7 +259,7 @@ static void dump_res() unsigned int cursor; SD_task_t task; xbt_dynar_foreach(result, cursor, task) { - INFO1("Task %d", cursor); + XBT_INFO("Task %u", cursor); SD_task_dump(task); } } @@ -341,14 +281,14 @@ xbt_dynar_t SD_daxload(const char *filename) SD_task_t file; char *name; FILE *in_file = fopen(filename, "r"); - xbt_assert1(in_file, "Unable to open \"%s\"\n", filename); + xbt_assert(in_file, "Unable to open \"%s\"\n", filename); input_buffer = dax__create_buffer(in_file, 10); dax__switch_to_buffer(input_buffer); 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); @@ -356,10 +296,13 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_push(result, &root_task); end_task = SD_task_create_comp_seq("end", NULL, 0); - xbt_assert2(!dax_lex(), "Parse error in %s: %s", filename, + _XBT_GNUC_UNUSED int res; + res = dax_lex(); + xbt_assert(!res, "Parse error in %s: %s", filename, dax__parse_err_msg()); dax__delete_buffer(input_buffer); fclose(in_file); + dax_lex_destroy(); xbt_dict_free(&jobs); /* And now, post-process the files. @@ -370,34 +313,36 @@ 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 - const char *category = depbefore->src->category; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category (newfile, category); + if (depafter->src){ + const char *category = depafter->src->category; + if (category){ + TRACE_category (category); + SD_task_set_category (newfile, category); + } } #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 - const char *category = depbefore->src->category; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category (newfile, category); + if (depbefore->src){ + const char *category = depbefore->src->category; + if (category){ + TRACE_category (category); + SD_task_set_category (newfile, category); + } } #endif xbt_dynar_push(result, &newfile); @@ -406,19 +351,20 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) { xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { if (depbefore->src == depafter->dst) { - WARN2 + XBT_WARN ("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 - const char *category = depbefore->src->category; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category (newfile, category); + if (depbefore->src){ + const char *category = depbefore->src->category; + if (category){ + TRACE_category (category); + SD_task_set_category (newfile, category); + } } #endif xbt_dynar_push(result, &newfile); @@ -439,15 +385,24 @@ xbt_dynar_t SD_daxload(const char *filename) } } - acyclic_graph_detection(result); - return result; + if (!acyclic_graph_detail(result)){ + XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", + basename((char*)filename)); + xbt_dynar_foreach(result, cpt, file) + SD_task_destroy(file); + xbt_dynar_free_container(&result); + return NULL; + } else { + return result; + } } void STag_dax__adag(void) { - double version = dax_parse_double(A_dax__adag_version); + _XBT_GNUC_UNUSED double version; + version = dax_parse_double(A_dax__adag_version); - xbt_assert1((version == 2.1), + xbt_assert(version == 2.1, "Expected version 2.1 in tag, got %f. Fix the parser or your file", version); } @@ -457,13 +412,13 @@ void STag_dax__job(void) double runtime = dax_parse_double(A_dax__job_runtime); char *name = bprintf("%s@%s", A_dax__job_id, A_dax__job_name); runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */ -// INFO3("See ",A_dax__job_id,A_dax__job_runtime,runtime); +// XBT_INFO("See ",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); + SD_task_set_category(current_job, category); } #endif xbt_dict_set(jobs, A_dax__job_id, current_job, NULL); @@ -477,14 +432,14 @@ void STag_dax__uses(void) double size = dax_parse_double(A_dax__uses_size); int is_input = (A_dax__uses_link == A_dax__uses_link_input); -// INFO2("See ",A_dax__uses_file,(is_input?"in":"out")); +// XBT_INFO("See ",A_dax__uses_file,(is_input?"in":"out")); 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) { - WARN3("Ignoring file %s size redefinition from %.0f to %.0f", + XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size); } } @@ -493,7 +448,7 @@ void STag_dax__uses(void) } else { SD_task_dependency_add(NULL, NULL, current_job, file); if (xbt_dynar_length(file->tasks_before) > 1) { - WARN1("File %s created at more than one location...", file->name); + XBT_WARN("File %s created at more than one location...", file->name); } } } @@ -522,27 +477,27 @@ void STag_dax__parent(void) current_child->name, A_dax__parent_ref, A_dax__parent_ref)); SD_task_dependency_add(NULL, NULL, parent, current_child); - DEBUG2("Control-flow dependency from %s to %s", current_child->name, + XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name); } void ETag_dax__adag(void) { -// INFO0("See "); +// XBT_INFO("See "); } void ETag_dax__job(void) { current_job = NULL; -// INFO0("See "); +// XBT_INFO("See "); } void ETag_dax__parent(void) { -// INFO0("See "); +// XBT_INFO("See "); } void ETag_dax__uses(void) { -// INFO0("See "); +// XBT_INFO("See "); }