X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a001b13d7aa269a90f035f58c71778c6812b07f6..9b5c287fbf93c2ae7c3d18c8584647ef9920fe87:/src/simdag/sd_dotloader.cpp diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index 8e3f73676e..9f999f7e5e 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -1,21 +1,24 @@ -/* 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 * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simdag_private.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/simdag.h" #include "src/internal_config.h" -#include "xbt/file.h" +#include "xbt/file.hpp" +#include #include #include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); +#include #if HAVE_GRAPHVIZ #include +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); + xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule); static void dot_task_p_free(void *task) { @@ -42,23 +45,12 @@ xbt_dynar_t SD_dotload_with_sched(const char *filename) { return SD_dotload_generic(filename, true, true); } -static int edge_compare(const void *a, const void *b) -{ - unsigned va = AGSEQ(*(Agedge_t **)a); - unsigned vb = AGSEQ(*(Agedge_t **)b); - if (va == vb) - return 0; - else - return (va < vb ? -1 : 1); -} - xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule) { xbt_assert(filename, "Unable to use a null file descriptor\n"); FILE *in_file = fopen(filename, "r"); xbt_assert(in_file != nullptr, "Failed to open file: %s", filename); - unsigned int i; SD_task_t root; SD_task_t end; SD_task_t task; @@ -151,17 +143,16 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched end = jobs.at("end"); /* Create edges */ - xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), nullptr); + std::vector edges; for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) { - Agedge_t * edge; - xbt_dynar_reset(edges); - for (edge = agfstout(dag_dot, node); edge; edge = agnxtout(dag_dot, edge)) - xbt_dynar_push_as(edges, Agedge_t *, edge); + edges.clear(); + for (Agedge_t* edge = agfstout(dag_dot, node); edge; edge = agnxtout(dag_dot, edge)) + edges.push_back(edge); /* Be sure edges are sorted */ - xbt_dynar_sort(edges, edge_compare); + std::sort(edges.begin(), edges.end(), [](const Agedge_t* a, const Agedge_t* b) { return AGSEQ(a) < AGSEQ(b); }); - xbt_dynar_foreach(edges, i, edge) { + for (Agedge_t* edge : edges) { char *src_name=agnameof(agtail(edge)); char *dst_name=agnameof(aghead(edge)); double size = atof(agget(edge, (char *) "size")); @@ -177,33 +168,33 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched task = SD_task_create_comm_e2e(name.c_str(), nullptr, size); else task = SD_task_create_comm_par_mxn_1d_block(name.c_str(), nullptr, size); - SD_task_dependency_add(nullptr, nullptr, src, task); - SD_task_dependency_add(nullptr, nullptr, task, dst); + SD_task_dependency_add(src, task); + SD_task_dependency_add(task, dst); jobs.insert({name, task}); xbt_dynar_push(result, &task); } else { XBT_WARN("Task '%s' is defined more than once", name.c_str()); } } else { - SD_task_dependency_add(nullptr, nullptr, src, dst); + SD_task_dependency_add(src, dst); } } } - xbt_dynar_free(&edges); XBT_DEBUG("All tasks have been created, put %s at the end of the dynar", end->name); xbt_dynar_push(result, &end); /* Connect entry tasks to 'root', and exit tasks to 'end'*/ + unsigned i; xbt_dynar_foreach (result, i, task){ if (task->predecessors->empty() && task->inputs->empty() && task != root) { XBT_DEBUG("Task '%s' has no source. Add dependency from 'root'", task->name); - SD_task_dependency_add(nullptr, nullptr, root, task); + SD_task_dependency_add(root, task); } if (task->successors->empty() && task->outputs->empty() && task != end) { XBT_DEBUG("Task '%s' has no destination. Add dependency to 'end'", task->name); - SD_task_dependency_add(nullptr, nullptr, task, end); + SD_task_dependency_add(task, end); } } @@ -212,22 +203,22 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched if(schedule){ if (schedule_success) { - sg_host_t* workstations = sg_host_list(); + std::vector hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + for (auto const& elm : computers) { SD_task_t previous_task = nullptr; - for (auto const& task : *elm.second) { + for (auto const& cur_task : *elm.second) { /* add dependency between the previous and the task to avoid parallel execution */ - if(task){ - if (previous_task && not SD_task_dependency_exists(previous_task, task)) - SD_task_dependency_add(nullptr, nullptr, previous_task, task); + if (cur_task) { + if (previous_task && not SD_task_dependency_exists(previous_task, cur_task)) + SD_task_dependency_add(previous_task, cur_task); - SD_task_schedulel(task, 1, workstations[atoi(elm.first.c_str())]); - previous_task = task; + SD_task_schedulel(cur_task, 1, hosts[std::stod(elm.first)]); + previous_task = cur_task; } } delete elm.second; } - xbt_free(workstations); } else { XBT_WARN("The scheduling is ignored"); for (auto const& elm : computers) @@ -238,9 +229,8 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched } if (result && not acyclic_graph_detail(result)) { - char* base = xbt_basename(filename); - XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base); - free(base); + std::string base = simgrid::xbt::Path(filename).get_base_name(); + XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base.c_str()); xbt_dynar_free(&result); result = nullptr; }