X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4636dcbf566244aa2c2bff539d0410dae1071c81..bc0010abcda73a601f75f7c96fc1cc09918ee2cd:/src/simdag/sd_dotloader.cpp diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index 5a35d52f27..a59bf74149 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -1,249 +1,147 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. +/* Copyright (c) 2009-2021. 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/Activity.hpp" +#include "simgrid/s4u/Comm.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Exec.hpp" #include "src/internal_config.h" -#include "src/simdag/simdag_private.h" -#include "simgrid/simdag.h" -#include "xbt/file.h" -#include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); +#include "xbt/file.hpp" +#include +#include +#include +#include #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); - -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 - * - for a communication task : the amount of bytes to transfer - * 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); -} - -xbt_dynar_t SD_PTG_dotload(const char * filename) { - return SD_dotload_generic(filename, parallel, false); -} +XBT_LOG_NEW_DEFAULT_CATEGORY(dotparse, "Parsing DOT files"); -xbt_dynar_t SD_dotload_with_sched(const char *filename) { - return SD_dotload_generic(filename, sequential, true); -} +namespace simgrid { +namespace s4u { -static int edge_compare(const void *a, const void *b) +std::vector create_DAG_from_dot(const std::string& filename) { - unsigned va = AGSEQ(*(Agedge_t **)a); - unsigned vb = AGSEQ(*(Agedge_t **)b); - return va == vb ? 0 : (va < vb ? -1 : 1); -} - -xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, 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, end, task; - xbt_dict_t computers; - xbt_dynar_t computer = nullptr; - xbt_dict_cursor_t dict_cursor; - bool schedule_success = true; - - xbt_dict_t jobs = xbt_dict_new_homogeneous(nullptr); - xbt_dynar_t result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free); + FILE* in_file = fopen(filename.c_str(), "r"); + xbt_assert(in_file != nullptr, "Failed to open file: %s", filename.c_str()); - Agraph_t * dag_dot = agread(in_file, NIL(Agdisc_t *)); + Agraph_t* dag_dot = agread(in_file, NIL(Agdisc_t*)); - if (schedule) - computers = xbt_dict_new_homogeneous(nullptr); + std::unordered_map activities; + std::vector dag; + ActivityPtr root; + ActivityPtr end; + ActivityPtr act; /* Create all the nodes */ - Agnode_t *node = nullptr; + 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")); - - if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) { - if (seq_or_par == sequential){ - XBT_DEBUG("See ", name, amount); - task = SD_task_create_comp_seq(name, nullptr , amount); - } else { - double alpha = atof(agget(node, (char *) "alpha")); - XBT_DEBUG("See ", name, amount, alpha); - task = SD_task_create_comp_par_amdahl(name, nullptr , amount, alpha); - } - - xbt_dict_set(jobs, name, task, nullptr); - - 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))){ - /* 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)); - - if((performer != -1 && order != -1) && performer < (int) 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); - if(!(computer = (xbt_dynar_t) xbt_dict_get_or_null(computers, char_performer))){ - computer = xbt_dynar_new(sizeof(SD_task_t), nullptr); - xbt_dict_set(computers, char_performer, computer, nullptr); - } - - if((unsigned int)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){ - /* 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); - continue; - } - } - /* the parameter seems to be ok */ - xbt_dynar_set_as(computer, order, SD_task_t, task); - } else { - /* one of required parameters is not given */ - schedule_success = false; - XBT_VERB("The schedule is ignored, task '%s' can not be scheduled on %d hosts", task->name, performer); - } - } + char* name = agnameof(node); + double amount = atof(agget(node, (char*)"size")); + + if (activities.find(name) == activities.end()) { + XBT_DEBUG("See ", name, amount); + act = Exec::init()->set_name(name)->set_flops_amount(amount)->vetoable_start(); + activities.insert({std::string(name), act}); + if (strcmp(name, "root") && strcmp(name, "end")) + dag.push_back(act); } else { - XBT_WARN("Task '%s' is defined more than once", name); + XBT_WARN("Exec '%s' is defined more than once", name); } } - /*Check if 'root' and 'end' nodes have been explicitly declared. If not, create them. */ - if (!(root = (SD_task_t)xbt_dict_get_or_null(jobs, "root"))) - root = (seq_or_par == sequential?SD_task_create_comp_seq("root", nullptr, 0): - SD_task_create_comp_par_amdahl("root", nullptr, 0, 0)); - - 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 */ + if (activities.find("root") == activities.end()) + root = Exec::init()->set_name("root")->set_flops_amount(0)->vetoable_start(); + else + root = activities.at("root"); - if (!(end = (SD_task_t)xbt_dict_get_or_null(jobs, "end"))) - end = (seq_or_par == sequential?SD_task_create_comp_seq("end", nullptr, 0): - SD_task_create_comp_par_amdahl("end", nullptr, 0, 0)); + if (activities.find("end") == activities.end()) + end = Exec::init()->set_name("end")->set_flops_amount(0)->vetoable_start(); + else + end = activities.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) { - SD_task_t src, dst; - char *src_name=agnameof(agtail(edge)), *dst_name=agnameof(aghead(edge)); - double size = atof(agget(edge, (char *) "size")); - - src = (SD_task_t)xbt_dict_get_or_null(jobs, src_name); - dst = (SD_task_t)xbt_dict_get_or_null(jobs, dst_name); + for (Agedge_t* edge : edges) { + const char* src_name = agnameof(agtail(edge)); + const char* dst_name = agnameof(aghead(edge)); + double size = atof(agget(edge, (char*)"size")); + ActivityPtr src = activities.at(src_name); + ActivityPtr dst = activities.at(dst_name); if (size > 0) { - char *name = bprintf("%s->%s", src_name, dst_name); - XBT_DEBUG("See ", name, size); - if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) { - if (seq_or_par == sequential) - task = SD_task_create_comm_e2e(name, nullptr , size); - else - task = SD_task_create_comm_par_mxn_1d_block(name, 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); - xbt_dynar_push(result, &task); + std::string name = std::string(src_name) + "->" + dst_name; + XBT_DEBUG("See ", name.c_str(), size); + if (activities.find(name) == activities.end()) { + act = Comm::sendto_init()->set_name(name)->set_payload_size(size)->vetoable_start(); + src->add_successor(act); + act->add_successor(dst); + activities.insert({name, act}); + dag.push_back(act); } else { - XBT_WARN("Task '%s' is defined more than once", name); + XBT_WARN("Comm '%s' is defined more than once", name.c_str()); } - xbt_free(name); } else { - SD_task_dependency_add(nullptr, nullptr, src, dst); + src->add_successor(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); + XBT_DEBUG("All activities have been created, put %s at the beginning and %s at the end", root->get_cname(), + end->get_cname()); + dag.insert(dag.begin(), root); + dag.push_back(end); /* Connect entry tasks to 'root', and exit tasks to 'end'*/ - 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); + for (const auto& a : dag) { + if (a->dependencies_solved() && a != root) { + XBT_DEBUG("Activity '%s' has no dependencies. Add dependency from 'root'", a->get_cname()); + root->add_successor(a); } - 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); + if (a->is_waited_by() == 0 && a != end) { + XBT_DEBUG("Activity '%s' has no successors. Add dependency to 'end'", a->get_cname()); + a->add_successor(end); } } - 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){ - SD_task_t previous_task = nullptr; - xbt_dynar_foreach(computer, i, task){ - /* add dependency between the previous and the task to avoid parallel execution */ - if(task){ - if(previous_task && !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)]); - previous_task = task; - } - } - xbt_dynar_free(&computer); - } - xbt_dict_free(&computers); - } else { - XBT_WARN("The scheduling is ignored"); - xbt_dict_foreach(computers,dict_cursor,computer_name,computer) - xbt_dynar_free(&computer); - xbt_dict_free(&computers); - xbt_dynar_free(&result); - result = nullptr; - } + if (not check_for_cycle(dag)) { + 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()); + for (const auto& a : dag) + a->destroy(); + dag.clear(); } - 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); - xbt_dynar_free(&result); - result = nullptr; - } - return result; + return dag; } + +} // namespace s4u +} // namespace simgrid + +#else +namespace simgrid { +namespace s4u { +std::vector create_DAG_from_dot(const std::string& filename) +{ + xbt_die("create_DAG_from_dot() is not usable because graphviz was not found.\n" + "Please install graphviz, graphviz-dev, and libgraphviz-dev (and erase CMakeCache.txt) before recompiling."); +} +} // namespace s4u +} // namespace simgrid + +#endif