X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9a3ff64a8ae1a5566286e3b68a5d669a1bf2949..7410b72db09489e8b9d3ee3cb087f35882397d93:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index c1b80d2d5e..1b7109c698 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -13,50 +13,34 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); extern "C" { - #undef CLEANUP - #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) -{ - fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg); - xbt_abort(); + #undef CLEANUP + #include "dax_dtd.h" + #define register /* g++ don't like register, so don't say it */ + #include "dax_dtd.c" + #undef register } static double dax_parse_double(const char *string) { - int ret = 0; double value; - - ret = sscanf(string, "%lg", &value); - if (ret != 1) - dax_parse_error(bprintf("%s is not a double", string)); + int ret = sscanf(string, "%lg", &value); + xbt_assert (ret == 1, "Parse error on line %d: %s is not a double", dax_lineno, string); return value; } -/* Ensure that transfer tasks have unique names even though a file is used - * several times */ +/* Ensure that transfer tasks have unique names even though a file is used several times */ void uniq_transfer_task_name(SD_task_t task) { SD_task_t child, parent; - xbt_dynar_t children, parents; - char *new_name; - children = SD_task_get_children(task); - parents = SD_task_get_parents(task); + xbt_dynar_t children = SD_task_get_children(task); + xbt_dynar_t parents = SD_task_get_parents(task); xbt_dynar_get_cpy(children, 0, &child); xbt_dynar_get_cpy(parents, 0, &parent); - new_name = bprintf("%s_%s_%s", - SD_task_get_name(parent), - SD_task_get_name(task), SD_task_get_name(child)); + char *new_name = bprintf("%s_%s_%s", SD_task_get_name(parent), SD_task_get_name(task), SD_task_get_name(child)); SD_task_set_name(task, new_name); @@ -65,42 +49,29 @@ 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; +static bool children_are_marked(SD_task_t task){ 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; + if(depafter->dst->marked == 0) + return false; } - return all_marked; + return true; } -bool parents_are_marked(SD_task_t task){ - SD_task_t parent_task = NULL; - bool all_marked = true; +static bool parents_are_marked(SD_task_t task){ 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; + if(depbefore->src->marked == 0) + return false; } - return all_marked; + return true; } bool acyclic_graph_detail(xbt_dynar_t dag){ - unsigned int count=0, count_current=0; + unsigned int count, 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; @@ -113,19 +84,14 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ xbt_dynar_push(current, &task); } } - task = NULL; - count = 0; //test if something has to be done for the next iteration 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; 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){ @@ -143,15 +109,12 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } 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; @@ -162,7 +125,6 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ break; } } - task = NULL; if(!all_marked){ XBT_VERB("there is at least one cycle in your task graph"); @@ -174,8 +136,6 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } } - count = 0; - task = NULL; xbt_dynar_foreach(dag,count,task){ if(task->kind == SD_TASK_COMM_E2E) continue; if(xbt_dynar_is_empty(task->tasks_before)){ @@ -183,19 +143,14 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ xbt_dynar_push(current, &task); } } - task = NULL; - count = 0; //test if something has to be done for the next iteration 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; 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){ @@ -213,15 +168,12 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } child_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; @@ -235,8 +187,6 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ return all_marked; } - - static YY_BUFFER_STATE input_buffer; static xbt_dynar_t result; @@ -252,8 +202,7 @@ static void dax_task_free(void *task) /** @brief loads a DAX file describing a DAG * - * See https://confluence.pegasus.isi.edu/display/pegasus/WorkflowGenerator - * for more details. + * See https://confluence.pegasus.isi.edu/display/pegasus/WorkflowGenerator for more details. */ xbt_dynar_t SD_daxload(const char *filename) { @@ -271,7 +220,7 @@ xbt_dynar_t SD_daxload(const char *filename) 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); + SD_task_set_state(root_task, SD_SCHEDULABLE); xbt_dynar_push(result, &root_task); end_task = SD_task_create_comp_seq("end", NULL, 0); @@ -299,13 +248,6 @@ xbt_dynar_t SD_daxload(const char *filename) 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); - if (depafter->src){ - const char *category = depafter->src->category; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category(newfile, category); - } - } xbt_dynar_push(result, &newfile); } } else if (xbt_dynar_is_empty(file->tasks_after)) { @@ -313,13 +255,6 @@ xbt_dynar_t SD_daxload(const char *filename) 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); - if (depbefore->src){ - const char *category = depbefore->src->category; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category(newfile, category); - } - } xbt_dynar_push(result, &newfile); } } else { @@ -327,19 +262,12 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { if (depbefore->src == depafter->dst) { 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); + ("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); SD_task_dependency_add(NULL, NULL, depbefore->src, newfile); SD_task_dependency_add(NULL, NULL, newfile, depafter->dst); - if (depbefore->src){ - const char *category = depbefore->src->category; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category(newfile, category); - } - } xbt_dynar_push(result, &newfile); } } @@ -369,11 +297,12 @@ xbt_dynar_t SD_daxload(const char *filename) } if (!acyclic_graph_detail(result)){ - XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", - xbt_basename(filename)); + char* base = xbt_basename(filename); + XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base); + free(base); xbt_dynar_foreach(result, cpt, file) SD_task_destroy(file); - xbt_dynar_free_container(&result); + xbt_dynar_free_container(&result); return NULL; } else { return result; @@ -385,9 +314,7 @@ void STag_dax__adag(void) XBT_ATTRIB_UNUSED double version; version = dax_parse_double(A_dax__adag_version); - xbt_assert(version == 2.1, - "Expected version 2.1 in tag, got %f. Fix the parser or your file", - version); + xbt_assert(version == 2.1, "Expected version 2.1 in tag, got %f. Fix the parser or your file", version); } void STag_dax__job(void) @@ -397,11 +324,6 @@ void STag_dax__job(void) runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */ // XBT_INFO("See ",A_dax__job_id,A_dax__job_runtime,runtime); current_job = SD_task_create_comp_seq(name, NULL, runtime); - char *category = A_dax__job_name; - if (category){ - TRACE_category (category); - TRACE_sd_set_task_category(current_job, category); - } xbt_dict_set(jobs, A_dax__job_id, current_job, NULL); free(name); xbt_dynar_push(result, ¤t_job); @@ -409,19 +331,18 @@ void STag_dax__job(void) void STag_dax__uses(void) { - SD_task_t file; double size = dax_parse_double(A_dax__uses_size); int is_input = (A_dax__uses_link == A_dax__uses_link_input); // XBT_INFO("See ",A_dax__uses_file,(is_input?"in":"out")); - file = (SD_task_t)xbt_dict_get_or_null(files, A_dax__uses_file); + SD_task_t file = (SD_task_t)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_dynar_pop(sd_global->initial_task_set,NULL); 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", - A_dax__uses_file, SD_task_get_amount(file), size); + XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size); } } if (is_input) { @@ -438,10 +359,8 @@ static SD_task_t current_child; void STag_dax__child(void) { current_child = (SD_task_t)xbt_dict_get_or_null(jobs, A_dax__child_ref); - if (current_child == NULL) - dax_parse_error(bprintf - ("Asked to add dependencies to the non-existent %s task", - A_dax__child_ref)); + xbt_assert(current_child != NULL,"Parse error on line %d: Asked to add dependencies to the non-existent %s task", + dax_lineno, A_dax__child_ref); } void ETag_dax__child(void) @@ -452,14 +371,10 @@ void ETag_dax__child(void) void STag_dax__parent(void) { SD_task_t parent = (SD_task_t)xbt_dict_get_or_null(jobs, A_dax__parent_ref); - if (parent == NULL) - dax_parse_error(bprintf - ("Asked to add a dependency from %s to %s, but %s does not exist", - current_child->name, A_dax__parent_ref, - A_dax__parent_ref)); + xbt_assert(parent != NULL, "Parse error on line %d: Asked to add a dependency from %s to %s, but %s does not exist", + dax_lineno, current_child->name, A_dax__parent_ref, A_dax__parent_ref); SD_task_dependency_add(NULL, NULL, parent, current_child); - XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, - parent->name); + XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name); } void ETag_dax__adag(void)