X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3d08dd00246eb26ced68c5b0e046096706bbe23..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index ac5d691fcc..54baf3766c 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-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,21 +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"); +#include "dax_dtd.h" +#include "dax_dtd.c" -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 -} +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); /* Ensure that transfer tasks have unique names even though a file is used several times */ void uniq_transfer_task_name(SD_task_t task) @@ -35,23 +30,16 @@ void uniq_transfer_task_name(SD_task_t task) } static bool children_are_marked(SD_task_t task){ - for (SD_task_t const& it : *task->successors) - if (it->marked == 0) - return false; - for (SD_task_t const& it : *task->outputs) - if (it->marked == 0) - return false; - return true; + return std::none_of(task->successors->begin(), task->successors->end(), + [](const SD_task_t& elm) { return not elm->marked; }) && + std::none_of(task->outputs->begin(), task->outputs->end(), + [](const SD_task_t& elm) { return not elm->marked; }); } static bool parents_are_marked(SD_task_t task){ - for (SD_task_t const& it : *task->predecessors) - if (it->marked == 0) - return false; - for (SD_task_t const& it : *task->inputs) - if (it->marked == 0) - return false; - return true; + return std::none_of(task->predecessors->begin(), task->predecessors->end(), + [](const SD_task_t& elm) { return not elm->marked; }) && + std::none_of(task->inputs->begin(), task->inputs->end(), [](const SD_task_t& elm) { return not elm->marked; }); } bool acyclic_graph_detail(xbt_dynar_t dag){ @@ -59,20 +47,17 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ bool all_marked = true; SD_task_t task = nullptr; std::vector current; - xbt_dynar_foreach(dag,count,task){ - if(task->kind != SD_TASK_COMM_E2E){ - task->marked = 0; - if(task->successors->empty() && task->outputs->empty()) - current.push_back(task); - } - } + xbt_dynar_foreach (dag, count, task) + if (task->kind != SD_TASK_COMM_E2E && task->successors->empty() && task->outputs->empty()) + current.push_back(task); + while (not current.empty()) { std::vector next; for (auto const& t : current) { //Mark task - t->marked = 1; + t->marked = true; for (SD_task_t const& input : *t->inputs) { - input->marked=1; + input->marked = true; // Inputs are communication, hence they can have only one predecessor SD_task_t input_pred = *(input->predecessors->begin()); if (children_are_marked(input_pred)) @@ -90,7 +75,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ all_marked = true; //test if all tasks are marked xbt_dynar_foreach(dag,count,task){ - if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){ + if (task->kind != SD_TASK_COMM_E2E && not task->marked) { XBT_WARN("the task %s is not marked",task->name); all_marked = false; break; @@ -101,7 +86,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ XBT_VERB("there is at least one cycle in your task graph"); xbt_dynar_foreach(dag,count,task){ if(task->kind != SD_TASK_COMM_E2E && task->predecessors->empty() && task->inputs->empty()){ - task->marked = 1; + task->marked = true; current.push_back(task); } } @@ -110,9 +95,9 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ std::vector next; //test if the current iteration is done for (auto const& t : current) { - t->marked = 1; + t->marked = true; for (SD_task_t const& output : *t->outputs) { - output->marked = 1; + output->marked = true; // outputs are communication, hence they can have only one successor SD_task_t output_succ = *(output->successors->begin()); if (parents_are_marked(output_succ)) @@ -129,7 +114,7 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ all_marked = true; xbt_dynar_foreach(dag,count,task){ - if(task->kind != SD_TASK_COMM_E2E && task->marked == 0){ + if (task->kind != SD_TASK_COMM_E2E && not task->marked) { XBT_WARN("the task %s is in a cycle",task->name); all_marked = false; } @@ -144,13 +129,6 @@ static xbt_dynar_t result; 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; - -static void dax_task_free(void *task) -{ - SD_task_destroy(static_cast(task)); -} /** @brief loads a DAX file describing a DAG * @@ -165,13 +143,13 @@ xbt_dynar_t SD_daxload(const char *filename) dax__switch_to_buffer(input_buffer); dax_lineno = 1; - result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free); - root_task = SD_task_create_comp_seq("root", nullptr, 0); + result = xbt_dynar_new(sizeof(SD_task_t), nullptr); + 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) @@ -192,69 +170,66 @@ xbt_dynar_t SD_daxload(const char *filename) if (file->predecessors->empty()) { 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()) { + } + if (file->successors->empty()) { 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 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); - xbt_dynar_push(result, &newfile); + } + 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(it, newfile); + SD_task_dependency_add(newfile, it2); + xbt_dynar_push(result, &newfile); } } + /* Free previous copy of the files */ + SD_task_destroy(file); } /* Push end task last */ xbt_dynar_push(result, &end_task); - /* Free previous copy of the 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) { uniq_transfer_task_name(file); - } else if (SD_task_get_kind(file) == SD_TASK_COMP_SEQ){ + } else { /* 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 != 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; } } 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); + XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", + simgrid::xbt::Path(filename).get_base_name().c_str()); xbt_dynar_foreach(result, cpt, file) SD_task_destroy(file); xbt_dynar_free_container(&result); - return nullptr; - } else { - return result; + result = nullptr; } + + return result; } void STag_dax__adag() @@ -307,9 +282,9 @@ void STag_dax__uses() } } 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); } @@ -338,7 +313,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) +