X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da44b26eb7f4da0d4ce7672f479dea4d01767b3..2489210b4ea8d03fbece8db288ef9e3ff6725723:/src/simdag/sd_daxloader.c diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c index f73dfdc4df..29803e9f75 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"); @@ -22,7 +23,7 @@ bool parents_are_marked(SD_task_t task); static void dax_parse_error(char *msg) { fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg); - abort(); + xbt_abort(); } static double dax_parse_double(const char *string) @@ -36,17 +37,6 @@ static double dax_parse_double(const char *string) return value; } -static int dax_parse_int(const char *string) -{ - int ret = 0; - int value; - - ret = sscanf(string, "%d", &value); - if (ret != 1) - dax_parse_error(bprintf("%s is not an integer", string)); - return value; -} - /* Ensure that transfer tasks have unique names even though a file is used * several times */ @@ -117,14 +107,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 +167,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 +176,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 +184,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; @@ -253,16 +243,6 @@ static xbt_dict_t files; static SD_task_t current_job; static SD_task_t root_task, end_task; -static void dump_res() -{ - unsigned int cursor; - SD_task_t task; - xbt_dynar_foreach(result, cursor, task) { - XBT_INFO("Task %d", cursor); - SD_task_dump(task); - } -} - static void dax_task_free(void *task) { SD_task_t t = task; @@ -286,8 +266,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); @@ -301,6 +281,7 @@ xbt_dynar_t SD_daxload(const char *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. @@ -311,12 +292,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 @@ -324,16 +304,15 @@ xbt_dynar_t SD_daxload(const char *filename) const char *category = depafter->src->category; if (category){ TRACE_category (category); - TRACE_sd_set_task_category (newfile, category); + TRACE_sd_set_task_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 @@ -341,7 +320,7 @@ xbt_dynar_t SD_daxload(const char *filename) const char *category = depbefore->src->category; if (category){ TRACE_category (category); - TRACE_sd_set_task_category (newfile, category); + TRACE_sd_set_task_category(newfile, category); } } #endif @@ -355,8 +334,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 @@ -364,7 +342,7 @@ xbt_dynar_t SD_daxload(const char *filename) const char *category = depbefore->src->category; if (category){ TRACE_category (category); - TRACE_sd_set_task_category (newfile, category); + TRACE_sd_set_task_category(newfile, category); } } #endif @@ -386,8 +364,16 @@ xbt_dynar_t SD_daxload(const char *filename) } } - acyclic_graph_detail(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) @@ -429,7 +415,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",