X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/093b834960aa7457d220feacad9542c4606ed8a0..06be38ef613115769d3724faf9df315dd9a34957:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index f18920c2ad..185966bcf3 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. +/* Copyright (c) 2009-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,20 +6,16 @@ #include "simdag_private.hpp" #include "simgrid/simdag.h" -#include "xbt/file.h" /* xbt_basename() */ +#include "xbt/file.hpp" #include "xbt/log.h" #include "xbt/misc.h" -#include "xbt/str.h" -#include +#include 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 +#include "dax_dtd.h" +#include "dax_dtd.c" } /* Ensure that transfer tasks have unique names even though a file is used several times */ @@ -35,20 +31,20 @@ void uniq_transfer_task_name(SD_task_t task) } static bool children_are_marked(SD_task_t task){ - for (SD_task_t it : *task->successors) + for (SD_task_t const& it : *task->successors) if (it->marked == 0) return false; - for (SD_task_t it : *task->outputs) + for (SD_task_t const& it : *task->outputs) if (it->marked == 0) return false; return true; } static bool parents_are_marked(SD_task_t task){ - for (SD_task_t it : *task->predecessors) + for (SD_task_t const& it : *task->predecessors) if (it->marked == 0) return false; - for (SD_task_t it : *task->inputs) + for (SD_task_t const& it : *task->inputs) if (it->marked == 0) return false; return true; @@ -68,17 +64,17 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } while (not current.empty()) { std::vector next; - for (auto t: current){ + for (auto const& t : current) { //Mark task t->marked = 1; - for (SD_task_t input : *t->inputs){ + for (SD_task_t const& 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) { + for (SD_task_t const& pred : *t->predecessors) { if (children_are_marked(pred)) next.push_back(pred); } @@ -109,22 +105,22 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ while (not current.empty()) { std::vector next; //test if the current iteration is done - for (auto t: current){ + for (auto const& t : current) { t->marked = 1; - for (SD_task_t output : *t->outputs) { + for (SD_task_t const& 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) { + for (SD_task_t const& succ : *t->successors) { if (parents_are_marked(succ)) next.push_back(succ); } - current.clear(); - current = next; } + current.clear(); + current = next; } all_marked = true; @@ -141,8 +137,8 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ static YY_BUFFER_STATE input_buffer; static xbt_dynar_t result; -static std::unordered_map jobs; -static xbt_dict_t files; +static std::map jobs; +static std::map files; static SD_task_t current_job; static SD_task_t root_task; static SD_task_t end_task; @@ -158,9 +154,7 @@ static void dax_task_free(void *task) */ xbt_dynar_t SD_daxload(const char *filename) { - xbt_dict_cursor_t cursor; SD_task_t file; - char* name; FILE* in_file = fopen(filename, "r"); xbt_assert(in_file, "Unable to open \"%s\"\n", filename); input_buffer = dax__create_buffer(in_file, 10); @@ -168,7 +162,6 @@ 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_homogeneous(&dax_task_free); 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); @@ -189,32 +182,33 @@ xbt_dynar_t SD_daxload(const char *filename) * Files not consumed in the system are said to be consumed by end task (bottom of DAG). */ - xbt_dict_foreach(files, cursor, name, file) { + for (auto const& elm : files) { + file = elm.second; SD_task_t newfile; if (file->predecessors->empty()) { - for (SD_task_t it : *file->successors) { + for (SD_task_t const& it : *file->successors) { 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); + SD_task_dependency_add(root_task, newfile); + SD_task_dependency_add(newfile, it); xbt_dynar_push(result, &newfile); } } else if (file->successors->empty()) { - for (SD_task_t it : *file->predecessors){ + for (SD_task_t const& it : *file->predecessors) { 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); + SD_task_dependency_add(it, newfile); + SD_task_dependency_add(newfile, end_task); xbt_dynar_push(result, &newfile); } } else { - for (SD_task_t it : *file->predecessors) { - for (SD_task_t it2 : *file->successors) { + for (SD_task_t const& it : *file->predecessors) { + for (SD_task_t const& 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, it->name); } 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); + SD_task_dependency_add(it, newfile); + SD_task_dependency_add(newfile, it2); xbt_dynar_push(result, &newfile); } } @@ -225,7 +219,8 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_push(result, &end_task); /* Free previous copy of the files */ - xbt_dict_free(&files); + for (auto const& elm : files) + SD_task_destroy(elm.second); unsigned int cpt; xbt_dynar_foreach(result, cpt, file) { if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) { @@ -236,9 +231,9 @@ xbt_dynar_t SD_daxload(const char *filename) */ if ((file != root_task) && (file != end_task)) { if (file->inputs->empty()) - SD_task_dependency_add(nullptr, nullptr, root_task, file); + SD_task_dependency_add(root_task, file); if (file->outputs->empty()) - SD_task_dependency_add(nullptr, nullptr, file, end_task); + SD_task_dependency_add(file, end_task); } } else { THROW_IMPOSSIBLE; @@ -246,9 +241,8 @@ xbt_dynar_t SD_daxload(const char *filename) } if (not 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); + std::string base = simgrid::xbt::Path(filename).getBasename(); + XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base.c_str()); xbt_dynar_foreach(result, cpt, file) SD_task_destroy(file); xbt_dynar_free_container(&result); @@ -295,20 +289,22 @@ void STag_dax__uses() bool is_input = (A_dax__uses_link == A_dax__uses_link_input); 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) { + auto it = files.find(A_dax__uses_file); + SD_task_t file; + if (it == files.end()) { 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); + files[A_dax__uses_file] = file; } else { + file = it->second; 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); } } if (is_input) { - SD_task_dependency_add(nullptr, nullptr, file, current_job); + SD_task_dependency_add(file, current_job); } else { - SD_task_dependency_add(nullptr, nullptr, current_job, file); + SD_task_dependency_add(current_job, file); if ((file->predecessors->size() + file->inputs->size()) > 1) { XBT_WARN("File %s created at more than one location...", file->name); } @@ -337,7 +333,7 @@ void STag_dax__parent() auto job = jobs.find(A_dax__parent_ref); if (job != jobs.end()) { SD_task_t parent = job->second; - SD_task_dependency_add(nullptr, nullptr, parent, current_child); + SD_task_dependency_add(parent, current_child); XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name); } else { throw std::out_of_range(std::string("Parse error on line ") + std::to_string(dax_lineno) +