X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..b51da37243dc16575499f4cb7729fe8bdd7fa514:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index 2cc8cd3f49..df816747ff 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -8,6 +8,7 @@ #include "simgrid/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" +#include "xbt/str.h" #include "xbt/file.h" /* xbt_basename() */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); @@ -15,137 +16,87 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); extern "C" { #undef CLEANUP #include "dax_dtd.h" + #define register /* g++ don't like register, so don't say it */ #include "dax_dtd.c" -} - -bool children_are_marked(SD_task_t task); -bool parents_are_marked(SD_task_t task); - -/* Parsing helpers */ - -static double dax_parse_double(const char *string) -{ - int ret = 0; - double value; - - ret = sscanf(string, "%lg", &value); - xbt_assert (ret == 1, "Parse error on line %d: %s is not a double", dax_lineno, string); - return value; + #undef register } /* 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_get_cpy(children, 0, &child); - xbt_dynar_get_cpy(parents, 0, &parent); + SD_task_t child = *(task->successors->begin()); + SD_task_t parent = *(task->predecessors->begin()); - 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); - xbt_dynar_free_container(&children); - xbt_dynar_free_container(&parents); free(new_name); } -bool children_are_marked(SD_task_t task){ - SD_task_t child_task = NULL; - bool all_marked = true; - 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; - } - return all_marked; +static bool children_are_marked(SD_task_t task){ + for (std::set::iterator it=task->successors->begin(); it!=task->successors->end(); ++it) + if ((*it)->marked == 0) + return false; + for (std::set::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it) + if ((*it)->marked == 0) + return false; + return true; } -bool parents_are_marked(SD_task_t task){ - SD_task_t parent_task = NULL; - bool all_marked = true; - 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; - } - return all_marked; +static bool parents_are_marked(SD_task_t task){ + for (std::set::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it) + if ((*it)->marked == 0) + return false; + for (std::set::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it) + if ((*it)->marked == 0) + return false; + 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; - xbt_dynar_t next = NULL, current = xbt_dynar_new(sizeof(SD_task_t),NULL); + SD_task_t task = nullptr; + xbt_dynar_t next = nullptr, current = xbt_dynar_new(sizeof(SD_task_t),nullptr); xbt_dynar_foreach(dag,count,task){ if(task->kind == SD_TASK_COMM_E2E) continue; task->marked = 0; - if(xbt_dynar_is_empty(task->tasks_after)){ + if(task->successors->empty() && task->outputs->empty()) 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); + next = xbt_dynar_new(sizeof(SD_task_t),nullptr); //test if the current iteration is done - count_current=0; xbt_dynar_foreach(current,count_current,task){ - if (task == NULL) continue; - count = 0; + if (task == nullptr) + continue; //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; + for (std::set::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){ + (*it)->marked = 1; + // Inputs are communication, hence they can have only one predecessor + SD_task_t input_pred = *((*it)->predecessors->begin()); + if (children_are_marked(input_pred)) + xbt_dynar_push(next, &input_pred); + } + for (std::set::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it){ + if (children_are_marked(*it)) + xbt_dynar_push(next, &(*it)); } - task = NULL; - count = 0; } xbt_dynar_free(¤t); current = next; - next = NULL; + next = nullptr; } xbt_dynar_free(¤t); - current = NULL; all_marked = true; xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) continue; + if(task->kind == SD_TASK_COMM_E2E) + continue; //test if all tasks are marked if(task->marked == 0){ XBT_WARN("the task %s is not marked",task->name); @@ -153,81 +104,66 @@ 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"); - current = xbt_dynar_new(sizeof(SD_task_t),NULL); + current = xbt_dynar_new(sizeof(SD_task_t),nullptr); xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) continue; - if(xbt_dynar_is_empty(task->tasks_before)){ + if(task->kind == SD_TASK_COMM_E2E) + continue; + if(task->predecessors->empty() && task->inputs->empty()){ xbt_dynar_push(current, &task); } } - 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)){ + if(task->kind == SD_TASK_COMM_E2E) + continue; + if(task->predecessors->empty() && task->inputs->empty()){ 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_is_empty(current)){ - next = xbt_dynar_new(sizeof(SD_task_t),NULL); + next = xbt_dynar_new(sizeof(SD_task_t),nullptr); //test if the current iteration is done - count_current=0; xbt_dynar_foreach(current,count_current,task){ - if (task == NULL) continue; - count = 0; + if (task == nullptr) + continue; //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){ - 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 = depbefore->dst; - if(parents_are_marked(child_task_2)) - xbt_dynar_push(next, &child_task_2); - } - } else{ - if(parents_are_marked(child_task)) - xbt_dynar_push(next, &child_task); - } - child_task = NULL; + for (std::set::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){ + (*it)->marked = 1; + // outputs are communication, hence they can have only one successor + SD_task_t output_succ = *((*it)->successors->begin()); + if (parents_are_marked(output_succ)) + xbt_dynar_push(next, &output_succ); } - task = NULL; - count = 0; + for (std::set::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it){ + if (parents_are_marked(*it)) + xbt_dynar_push(next, &(*it)); + } + xbt_dynar_free(¤t); + current = next; + next = nullptr; } 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){ - XBT_WARN("the task %s is in a cycle",task->name); - all_marked = false; + 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){ + XBT_WARN("the task %s is in a cycle",task->name); + all_marked = false; + } } } } return all_marked; } - - static YY_BUFFER_STATE input_buffer; static xbt_dynar_t result; @@ -238,7 +174,7 @@ static SD_task_t root_task, end_task; static void dax_task_free(void *task) { - SD_task_destroy((SD_task_t)task); + SD_task_destroy(static_cast(task)); } /** @brief loads a DAX file describing a DAG @@ -258,13 +194,13 @@ xbt_dynar_t SD_daxload(const char *filename) result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free); files = xbt_dict_new_homogeneous(&dax_task_free); - jobs = xbt_dict_new_homogeneous(NULL); - root_task = SD_task_create_comp_seq("root", NULL, 0); + jobs = xbt_dict_new_homogeneous(nullptr); + root_task = SD_task_create_comp_seq("root", nullptr, 0); /* by design the root task is always 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); + end_task = SD_task_create_comp_seq("end", nullptr, 0); int res = dax_lex(); if (res != 0) @@ -281,34 +217,31 @@ xbt_dynar_t SD_daxload(const char *filename) */ xbt_dict_foreach(files, cursor, name, file) { - unsigned int cpt1, cpt2; SD_task_t newfile; - SD_dependency_t depbefore, depafter; - if (xbt_dynar_is_empty(file->tasks_before)) { - xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { - 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 (file->predecessors->empty()) { + for (std::set::iterator it=file->successors->begin(); it!=file->successors->end(); ++it){ + newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount); + SD_task_dependency_add(nullptr, nullptr, root_task, newfile); + SD_task_dependency_add(nullptr, nullptr, newfile, (*it)); xbt_dynar_push(result, &newfile); } - } else if (xbt_dynar_is_empty(file->tasks_after)) { - xbt_dynar_foreach(file->tasks_before, cpt2, depbefore) { - 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); + } else if (file->successors->empty()) { + for (std::set::iterator it=file->predecessors->begin(); it!=file->predecessors->end(); ++it){ + newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount); + SD_task_dependency_add(nullptr, nullptr, (*it), newfile); + SD_task_dependency_add(nullptr, nullptr, newfile, end_task); xbt_dynar_push(result, &newfile); } } else { - xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) { - 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); + for (std::set::iterator it=file->predecessors->begin(); it!=file->predecessors->end(); ++it){ + for (std::set::iterator it2=file->successors->begin(); it2!=file->successors->end(); ++it2){ + if (*it == *it2) { + XBT_WARN ("File %s is produced and consumed by task %s." + "This loop dependency will prevent the execution of the task.", file->name, (*it)->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); + newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount); + SD_task_dependency_add(nullptr, nullptr, (*it), newfile); + SD_task_dependency_add(nullptr, nullptr, newfile, (*it2)); xbt_dynar_push(result, &newfile); } } @@ -325,115 +258,116 @@ xbt_dynar_t SD_daxload(const char *filename) if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) { uniq_transfer_task_name(file); } else if (SD_task_get_kind(file) == SD_TASK_COMP_SEQ){ - /* If some tasks do not take files as input, connect them to the root, if - * they don't produce files, connect them to the end node. + /* If some tasks do not take files as input, connect them to the root + * if they don't produce files, connect them to the end node. */ - if ((file != root_task) && xbt_dynar_is_empty(file->tasks_before)) { - SD_task_dependency_add(NULL, NULL, root_task, file); - } - if ((file != end_task) && xbt_dynar_is_empty(file->tasks_after)) { - SD_task_dependency_add(NULL, NULL, file, end_task); - } + if ((file != root_task) && file->inputs->empty()) + SD_task_dependency_add(nullptr, nullptr, root_task, file); + if ((file != end_task) && file->outputs->empty()) + SD_task_dependency_add(nullptr, nullptr, file, end_task); + } else { + THROW_IMPOSSIBLE; } } - if (!acyclic_graph_detail(result)){ - XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", xbt_basename(filename)); + if (!acyclic_graph_detail(result)) { + 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); - return NULL; + return nullptr; } else { return result; } } -void STag_dax__adag(void) +void STag_dax__adag() { XBT_ATTRIB_UNUSED double version; - version = dax_parse_double(A_dax__adag_version); + version = xbt_str_parse_double(A_dax__adag_version, "Parse error: %s is not a double"); 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) +void STag_dax__job() { - double runtime = dax_parse_double(A_dax__job_runtime); + double runtime = xbt_str_parse_double(A_dax__job_runtime, "Parse error: %s is not a double"); 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? */ -// XBT_INFO("See ",A_dax__job_id,A_dax__job_runtime,runtime); - current_job = SD_task_create_comp_seq(name, NULL, runtime); - xbt_dict_set(jobs, A_dax__job_id, current_job, NULL); + XBT_DEBUG("See ",A_dax__job_id,A_dax__job_runtime,runtime); + current_job = SD_task_create_comp_seq(name, nullptr, runtime); + xbt_dict_set(jobs, A_dax__job_id, current_job, nullptr); free(name); xbt_dynar_push(result, ¤t_job); } void STag_dax__uses(void) { - SD_task_t file; - double size = dax_parse_double(A_dax__uses_size); + double size = xbt_str_parse_double(A_dax__uses_size, "Parse error: %s is not a double"); 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); - 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); + XBT_DEBUG("See ",A_dax__uses_file,(is_input?"in":"out")); + SD_task_t file = static_cast(xbt_dict_get_or_null(files, A_dax__uses_file)); + if (file == nullptr) { + file = SD_task_create_comm_e2e(A_dax__uses_file, nullptr, size); + sd_global->initial_tasks->erase(file); + xbt_dict_set(files, A_dax__uses_file, file, nullptr); } else { if (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) { - SD_task_dependency_add(NULL, NULL, file, current_job); + SD_task_dependency_add(nullptr, nullptr, file, current_job); } else { - SD_task_dependency_add(NULL, NULL, current_job, file); - if (xbt_dynar_length(file->tasks_before) > 1) { + SD_task_dependency_add(nullptr, nullptr, current_job, file); + if ((file->predecessors->size() + file->inputs->size()) > 1) { XBT_WARN("File %s created at more than one location...", file->name); } } } static SD_task_t current_child; -void STag_dax__child(void) +void STag_dax__child() { - current_child = (SD_task_t)xbt_dict_get_or_null(jobs, A_dax__child_ref); - xbt_assert(current_child != NULL,"Parse error on line %d: Asked to add dependencies to the non-existent %s task", + current_child = static_cast(xbt_dict_get_or_null(jobs, A_dax__child_ref)); + xbt_assert(current_child != nullptr,"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) +void ETag_dax__child() { - current_child = NULL; + current_child = nullptr; } -void STag_dax__parent(void) +void STag_dax__parent() { - SD_task_t parent = (SD_task_t)xbt_dict_get_or_null(jobs, 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", + SD_task_t parent = static_cast(xbt_dict_get_or_null(jobs, A_dax__parent_ref)); + xbt_assert(parent != nullptr, "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); + SD_task_dependency_add(nullptr, nullptr, parent, current_child); XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name); } -void ETag_dax__adag(void) +void ETag_dax__adag() { -// XBT_INFO("See "); + XBT_DEBUG("See "); } -void ETag_dax__job(void) +void ETag_dax__job() { - current_job = NULL; -// XBT_INFO("See "); + current_job = nullptr; + XBT_DEBUG("See "); } -void ETag_dax__parent(void) +void ETag_dax__parent() { -// XBT_INFO("See "); + XBT_DEBUG("See "); } -void ETag_dax__uses(void) +void ETag_dax__uses() { -// XBT_INFO("See "); + XBT_DEBUG("See "); }