X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0837fbf862b4bbf7f074314f95df143c6285cef..84bbefd8858a51f029fcc71e4c5782cce69d7854:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index d2e15eda43..58969cec4e 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -4,182 +4,122 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/simdag/simdag_private.h" #include "simgrid/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" #include "xbt/str.h" #include "xbt/file.h" /* xbt_basename() */ +#include "simdag_private.hpp" 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" - #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; - SD_task_t parent; - - 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); - - 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); +#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 bool children_are_marked(SD_task_t task){ - SD_dependency_t depafter = nullptr; - unsigned int count; - - xbt_dynar_foreach(task->tasks_after,count,depafter){ - if(depafter->dst->marked == 0) + for (SD_task_t it : *task->successors) + if (it->marked == 0) + return false; + for (SD_task_t it : *task->outputs) + if (it->marked == 0) return false; - } return true; } static bool parents_are_marked(SD_task_t task){ - SD_dependency_t depbefore = nullptr; - unsigned int count; - xbt_dynar_foreach(task->tasks_before,count,depbefore){ - if(depbefore->src->marked == 0) + for (SD_task_t it : *task->predecessors) + if (it->marked == 0) + return false; + for (SD_task_t it : *task->inputs) + if (it->marked == 0) return false; - } return true; } bool acyclic_graph_detail(xbt_dynar_t dag){ - unsigned int count, count_current=0; + unsigned int count; bool all_marked = true; - SD_task_t task = nullptr, parent_task = nullptr, child_task = nullptr; - SD_dependency_t depbefore = nullptr, depafter = nullptr; - xbt_dynar_t next = nullptr, current = xbt_dynar_new(sizeof(SD_task_t),nullptr); - + SD_task_t task = nullptr; + std::vector current; 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)){ - xbt_dynar_push(current, &task); + if(task->kind != SD_TASK_COMM_E2E){ + task->marked = 0; + if(task->successors->empty() && task->outputs->empty()) + current.push_back(task); } } - //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),nullptr); - //test if the current iteration is done - xbt_dynar_foreach(current,count_current,task){ - if (task == nullptr) - continue; - //push task in next - task->marked = 1; - 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 = nullptr; - 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 = nullptr; + while(!current.empty()){ + std::vector next; + for (auto t: current){ + //Mark task + t->marked = 1; + for (SD_task_t input : *t->inputs){ + input->marked=1; + // Inputs are communication, hence they can have only one predecessor + SD_task_t input_pred = *(input->predecessors->begin()); + if (children_are_marked(input_pred)) + next.push_back(input_pred); + } + for (SD_task_t pred : *t->predecessors) { + if (children_are_marked(pred)) + next.push_back(pred); } } - xbt_dynar_free(¤t); + current.clear(); current = next; - next = nullptr; } - xbt_dynar_free(¤t); + all_marked = true; + //test if all tasks are marked 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 not marked",task->name); + if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){ + XBT_WARN("the task %s is not marked",task->name.c_str()); all_marked = false; break; } } + if(!all_marked){ XBT_VERB("there is at least one cycle in your task graph"); - - 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)){ - xbt_dynar_push(current, &task); - } - } - xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) - continue; - if(xbt_dynar_is_empty(task->tasks_before)){ - task->marked = 1; - xbt_dynar_push(current, &task); + if(task->kind != SD_TASK_COMM_E2E) { + if(task->predecessors->empty() && task->inputs->empty()){ + task->marked = 1; + current.push_back(task); + } } } //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),nullptr); + while(!current.empty()){ + std::vector next; //test if the current iteration is done - xbt_dynar_foreach(current,count_current,task){ - if (task == nullptr) - continue; - //push task in next - task->marked = 1; - 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 = nullptr; - 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 = nullptr; + for (auto t: current){ + t->marked = 1; + for (SD_task_t output : *t->outputs) { + output->marked = 1; + // outputs are communication, hence they can have only one successor + SD_task_t output_succ = *(output->successors->begin()); + if (parents_are_marked(output_succ)) + next.push_back(output_succ); + } + for (SD_task_t succ : *t->successors) { + if (parents_are_marked(succ)) + next.push_back(succ); } + current.clear(); + current = next; } - xbt_dynar_free(¤t); - current = next; - next = nullptr; } - xbt_dynar_free(¤t); + 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); + if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){ + XBT_WARN("the task %s is in a cycle",task->name.c_str()); all_marked = false; } } @@ -190,10 +130,9 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ static YY_BUFFER_STATE input_buffer; static xbt_dynar_t result; -static xbt_dict_t jobs; static xbt_dict_t files; +static xbt_dict_t jobs; static SD_task_t current_job; -static SD_task_t root_task, end_task; static void dax_task_free(void *task) { @@ -218,12 +157,12 @@ 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(nullptr); - root_task = SD_task_create_comp_seq("root", nullptr, 0); + SD_task_t 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", nullptr, 0); + SD_task_t end_task = SD_task_create_comp_seq("end", nullptr, 0); int res = dax_lex(); if (res != 0) @@ -240,36 +179,32 @@ xbt_dynar_t SD_daxload(const char *filename) */ xbt_dict_foreach(files, cursor, name, file) { - unsigned int cpt1; - unsigned int cpt2; SD_task_t newfile; - SD_dependency_t depbefore; - SD_dependency_t 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, nullptr, file->amount); + if (file->predecessors->empty()) { + for (SD_task_t it : *file->successors) { + newfile = SD_task_create_comm_e2e(file->name.c_str(), nullptr, file->amount); SD_task_dependency_add(nullptr, nullptr, root_task, newfile); - SD_task_dependency_add(nullptr, nullptr, newfile, depafter->dst); + 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, nullptr, file->amount); - SD_task_dependency_add(nullptr, nullptr, depbefore->src, newfile); + } else if (file->successors->empty()) { + for (SD_task_t it : *file->predecessors){ + newfile = SD_task_create_comm_e2e(file->name.c_str(), 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 (SD_task_t it : *file->predecessors) { + for (SD_task_t it2 : *file->successors) { + 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.c_str(), it->name.c_str()); } - newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount); - SD_task_dependency_add(nullptr, nullptr, depbefore->src, newfile); - SD_task_dependency_add(nullptr, nullptr, newfile, depafter->dst); + newfile = SD_task_create_comm_e2e(file->name.c_str(), nullptr, file->amount); + SD_task_dependency_add(nullptr, nullptr, it, newfile); + SD_task_dependency_add(nullptr, nullptr, newfile, it2); xbt_dynar_push(result, &newfile); } } @@ -284,25 +219,23 @@ xbt_dynar_t SD_daxload(const char *filename) unsigned int cpt; xbt_dynar_foreach(result, cpt, file) { if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) { - uniq_transfer_task_name(file); + /* Ensure that transfer tasks have unique names even though a file is used several times */ + file->name = std::string((*file->predecessors->begin())->name+ "_" + file->name + "_" + + (*file->successors->begin())->name); + } 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 ((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 { - 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 ((file != root_task) && xbt_dynar_is_empty(file->tasks_before)) { - SD_task_dependency_add(nullptr, nullptr, root_task, file); - } - if ((file != end_task) && xbt_dynar_is_empty(file->tasks_after)) { - SD_task_dependency_add(nullptr, nullptr, file, end_task); - } - } else { - THROW_IMPOSSIBLE; - } + THROW_IMPOSSIBLE; } } - if (!acyclic_graph_detail(result)){ + 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); @@ -317,8 +250,7 @@ xbt_dynar_t SD_daxload(const char *filename) void STag_dax__adag() { - XBT_ATTRIB_UNUSED double version; - version = xbt_str_parse_double(A_dax__adag_version, "Parse error: %s is not a double"); + double 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); } @@ -326,16 +258,15 @@ void STag_dax__adag() void STag_dax__job() { 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); + std::string name = std::string(A_dax__job_id) +"@"+ std::string(A_dax__job_name); runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */ XBT_DEBUG("See ",A_dax__job_id,A_dax__job_runtime,runtime); - current_job = SD_task_create_comp_seq(name, nullptr, runtime); + current_job = SD_task_create_comp_seq(name.c_str(), 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) +void STag_dax__uses() { 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); @@ -344,10 +275,10 @@ void STag_dax__uses(void) 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); - xbt_dynar_pop(sd_global->initial_task_set,nullptr); + sd_global->initial_tasks->erase(file); xbt_dict_set(files, A_dax__uses_file, file, nullptr); } else { - if (SD_task_get_amount(file) != size) { + if (file->amount < size || file->amount > size) { XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size); } } @@ -355,8 +286,8 @@ void STag_dax__uses(void) SD_task_dependency_add(nullptr, nullptr, file, current_job); } else { SD_task_dependency_add(nullptr, nullptr, current_job, file); - if (xbt_dynar_length(file->tasks_before) > 1) { - XBT_WARN("File %s created at more than one location...", file->name); + if ((file->predecessors->size() + file->inputs->size()) > 1) { + XBT_WARN("File %s created at more than one location...", file->name.c_str()); } } } @@ -378,9 +309,9 @@ void STag_dax__parent() { 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); + dax_lineno, current_child->name.c_str(), A_dax__parent_ref, A_dax__parent_ref); SD_task_dependency_add(nullptr, nullptr, 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.c_str(), parent->name.c_str()); } void ETag_dax__adag() @@ -388,18 +319,18 @@ void ETag_dax__adag() XBT_DEBUG("See "); } -void ETag_dax__job(void) +void ETag_dax__job() { current_job = nullptr; XBT_DEBUG("See "); } -void ETag_dax__parent(void) +void ETag_dax__parent() { XBT_DEBUG("See "); } -void ETag_dax__uses(void) +void ETag_dax__uses() { XBT_DEBUG("See "); }