X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..2fb822c48e7a43db651782eaf2cbaf1e762b32c7:/src/simdag/sd_dotloader.cpp diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index 2acf99c573..b4f8b3b733 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -1,34 +1,29 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. +/* Copyright (c) 2009-2017. 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 "src/internal_config.h" -#include "src/simdag/simdag_private.h" +#include "simdag_private.hpp" #include "simgrid/simdag.h" -#include "xbt/file.h" -#include +#include "src/internal_config.h" +#include "xbt/file.hpp" +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); #if HAVE_GRAPHVIZ #include -#endif - -typedef enum { - sequential =0, - parallel -} seq_par_t; -xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule); +xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule); static void dot_task_p_free(void *task) { SD_task_destroy(*(SD_task_t *)task); } /** @brief loads a DOT file describing a DAG - * + * * See http://www.graphviz.org/doc/info/lang.html for more details. * The size attribute of a node describes: * - for a compute task: the amount of flops to execute @@ -36,25 +31,29 @@ static void dot_task_p_free(void *task) { * If this attribute is ommited, the default value is zero. */ xbt_dynar_t SD_dotload(const char *filename) { - return SD_dotload_generic(filename, sequential, false); + return SD_dotload_generic(filename, true, false); } xbt_dynar_t SD_PTG_dotload(const char * filename) { - return SD_dotload_generic(filename, parallel, false); + return SD_dotload_generic(filename, false, false); } xbt_dynar_t SD_dotload_with_sched(const char *filename) { - return SD_dotload_generic(filename, sequential, true); + 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); - return va == vb ? 0 : (va < vb ? -1 : 1); + if (va == vb) + return 0; + else + return (va < vb ? -1 : 1); } -xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule){ +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); @@ -63,27 +62,22 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool SD_task_t root; SD_task_t end; SD_task_t task; - xbt_dict_t computers; - xbt_dynar_t computer = nullptr; - xbt_dict_cursor_t dict_cursor; + std::vector* computer; + std::unordered_map*> computers; bool schedule_success = true; - xbt_dict_t jobs = xbt_dict_new_homogeneous(nullptr); + std::unordered_map jobs; xbt_dynar_t result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free); Agraph_t * dag_dot = agread(in_file, NIL(Agdisc_t *)); - if (schedule) - computers = xbt_dict_new_homogeneous(nullptr); - /* Create all the nodes */ Agnode_t *node = nullptr; for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) { char *name = agnameof(node); double amount = atof(agget(node, (char*)"size")); - task = static_cast(xbt_dict_get_or_null(jobs, name)); - if (task == nullptr) { - if (seq_or_par == sequential){ + if (jobs.find(name) == jobs.end()) { + if (sequential) { XBT_DEBUG("See ", name, amount); task = SD_task_create_comp_seq(name, nullptr , amount); } else { @@ -92,41 +86,43 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool task = SD_task_create_comp_par_amdahl(name, nullptr , amount, alpha); } - xbt_dict_set(jobs, name, task, nullptr); + jobs.insert({std::string(name), task}); if (strcmp(name,"root") && strcmp(name,"end")) xbt_dynar_push(result, &task); - if((seq_or_par == sequential) && - ((schedule && schedule_success) || XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose))){ + if ((sequential) && + ((schedule && schedule_success) || XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose))) { /* try to take the information to schedule the task only if all is right*/ char *char_performer = agget(node, (char *) "performer"); char *char_order = agget(node, (char *) "order"); /* Tasks will execute on in a given "order" on a given set of "performer" hosts */ - int performer = ((!char_performer || !strcmp(char_performer,"")) ? -1:atoi(char_performer)); - int order = ((!char_order || !strcmp(char_order, ""))? -1:atoi(char_order)); + int performer = ((not char_performer || not strcmp(char_performer, "")) ? -1 : atoi(char_performer)); + int order = ((not char_order || not strcmp(char_order, "")) ? -1 : atoi(char_order)); - if((performer != -1 && order != -1) && performer < (int) sg_host_count()){ + if ((performer != -1 && order != -1) && performer < static_cast(sg_host_count())) { /* required parameters are given and less performers than hosts are required */ XBT_DEBUG ("Task '%s' is scheduled on workstation '%d' in position '%d'", task->name, performer, order); - computer = static_cast (xbt_dict_get_or_null(computers, char_performer)); - if(computer == nullptr){ - computer = xbt_dynar_new(sizeof(SD_task_t), nullptr); - xbt_dict_set(computers, char_performer, computer, nullptr); + auto comp = computers.find(char_performer); + if (comp != computers.end()) { + computer = comp->second; + } else { + computer = new std::vector; + computers.insert({char_performer, computer}); } - - if(static_cast(order) < xbt_dynar_length(computer)){ - SD_task_t *task_test = (SD_task_t *)xbt_dynar_get_ptr(computer,order); - if(*task_test && *task_test != task){ + if (static_cast(order) < computer->size()) { + SD_task_t task_test = computer->at(order); + if (task_test && task_test != task) { /* the user gave the same order to several tasks */ schedule_success = false; XBT_VERB("Task '%s' wants to start on performer '%s' at the same position '%s' as task '%s'", - (*task_test)->name, char_performer, char_order, task->name); + task_test->name, char_performer, char_order, task->name); continue; } - } - /* the parameter seems to be ok */ - xbt_dynar_set_as(computer, order, SD_task_t, task); + } else + computer->resize(order); + + computer->insert(computer->begin() + order, task); } else { /* one of required parameters is not given */ schedule_success = false; @@ -139,18 +135,20 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool } /*Check if 'root' and 'end' nodes have been explicitly declared. If not, create them. */ - root = static_cast(xbt_dict_get_or_null(jobs, "root")); - if (root == nullptr) - root = (seq_or_par == sequential?SD_task_create_comp_seq("root", nullptr, 0): - SD_task_create_comp_par_amdahl("root", nullptr, 0, 0)); + if (jobs.find("root") == jobs.end()) + root = (sequential ? SD_task_create_comp_seq("root", nullptr, 0) + : SD_task_create_comp_par_amdahl("root", nullptr, 0, 0)); + else + root = jobs.at("root"); SD_task_set_state(root, SD_SCHEDULABLE); /* by design the root task is always SCHEDULABLE */ xbt_dynar_insert_at(result, 0, &root); /* Put it at the beginning of the dynar */ - end = static_cast(xbt_dict_get_or_null(jobs, "end")); - if (end == nullptr) - end = (seq_or_par == sequential?SD_task_create_comp_seq("end", nullptr, 0): - SD_task_create_comp_par_amdahl("end", nullptr, 0, 0)); + if (jobs.find("end") == jobs.end()) + end = (sequential ? SD_task_create_comp_seq("end", nullptr, 0) + : SD_task_create_comp_par_amdahl("end", nullptr, 0, 0)); + else + end = jobs.at("end"); /* Create edges */ xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), nullptr); @@ -168,26 +166,24 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool char *dst_name=agnameof(aghead(edge)); double size = atof(agget(edge, (char *) "size")); - SD_task_t src = static_cast(xbt_dict_get_or_null(jobs, src_name)); - SD_task_t dst = static_cast(xbt_dict_get_or_null(jobs, dst_name)); + SD_task_t src = jobs.at(src_name); + SD_task_t dst = jobs.at(dst_name); if (size > 0) { - char *name = bprintf("%s->%s", src_name, dst_name); - XBT_DEBUG("See ", name, size); - task = static_cast(xbt_dict_get_or_null(jobs, name)); - if (task == nullptr) { - if (seq_or_par == sequential) - task = SD_task_create_comm_e2e(name, nullptr , size); + std::string name = std::string(src_name) + "->" + dst_name; + XBT_DEBUG("See ", name.c_str(), size); + if (jobs.find(name) == jobs.end()) { + if (sequential) + task = SD_task_create_comm_e2e(name.c_str(), nullptr, size); else - task = SD_task_create_comm_par_mxn_1d_block(name, nullptr , size); + 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); - xbt_dict_set(jobs, name, task, nullptr); + jobs.insert({name, task}); xbt_dynar_push(result, &task); } else { - XBT_WARN("Task '%s' is defined more than once", name); + XBT_WARN("Task '%s' is defined more than once", name.c_str()); } - xbt_free(name); } else { SD_task_dependency_add(nullptr, nullptr, src, dst); } @@ -212,44 +208,52 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool } agclose(dag_dot); - xbt_dict_free(&jobs); fclose(in_file); if(schedule){ - char *computer_name; if (schedule_success) { - const sg_host_t *workstations = sg_host_list (); - xbt_dict_foreach(computers,dict_cursor,computer_name,computer){ + sg_host_t* workstations = sg_host_list(); + for (auto const& elm : computers) { SD_task_t previous_task = nullptr; - xbt_dynar_foreach(computer, i, task){ + for (auto const& task : *elm.second) { /* add dependency between the previous and the task to avoid parallel execution */ if(task){ - if(previous_task && !SD_task_dependency_exists(previous_task, task)) + if (previous_task && not SD_task_dependency_exists(previous_task, task)) SD_task_dependency_add(nullptr, nullptr, previous_task, task); - SD_task_schedulel(task, 1, workstations[atoi(computer_name)]); + SD_task_schedulel(task, 1, workstations[atoi(elm.first.c_str())]); previous_task = task; } } - xbt_dynar_free(&computer); + delete elm.second; } - xbt_dict_free(&computers); + xbt_free(workstations); } else { XBT_WARN("The scheduling is ignored"); - xbt_dict_foreach(computers,dict_cursor,computer_name,computer) - xbt_dynar_free(&computer); - xbt_dict_free(&computers); + for (auto const& elm : computers) + delete elm.second; xbt_dynar_free(&result); result = nullptr; } } - if (result && !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); + if (result && not acyclic_graph_detail(result)) { + std::string base = simgrid::xbt::Path(filename).getBasename(); + XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base.c_str()); xbt_dynar_free(&result); result = nullptr; } return result; } +#else +xbt_dynar_t SD_dotload(const char *filename) { + xbt_die("SD_dotload_generic() is not usable because graphviz was not found.\n" + "Please install graphviz, graphviz-dev, and libgraphviz-dev (and erase CMakeCache.txt) before recompiling."); +} +xbt_dynar_t SD_dotload_with_sched(const char *filename) { + return SD_dotload(filename); +} +xbt_dynar_t SD_PTG_dotload(const char * filename) { + return SD_dotload(filename); +} +#endif