-/* Copyright (c) 2009-2016. 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 "src/simdag/simdag_private.h"
+#include "simdag_private.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/simdag.h"
-#include "xbt/log.h"
-#include <stdbool.h>
-#include <string.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
-
-#undef CLEANUP
-
-#ifdef HAVE_CGRAPH_H
+#include "src/internal_config.h"
+#include "xbt/file.hpp"
+#include <algorithm>
+#include <cstring>
+#include <unordered_map>
+#include <vector>
+
+#if HAVE_GRAPHVIZ
#include <graphviz/cgraph.h>
-#elif HAVE_AGRAPH_H
-#include <graphviz/agraph.h>
-#define agnxtnode(dot, node) agnxtnode(node)
-#define agfstout(dot, node) agfstout(node)
-#define agnxtout(dot, edge) agnxtout(edge)
-#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_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) {
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
* 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);
}
-#ifdef HAVE_CGRAPH_H
-static int edge_compare(const void *a, const void *b)
+xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule)
{
- unsigned va = AGSEQ(*(Agedge_t **)a);
- unsigned vb = AGSEQ(*(Agedge_t **)b);
- return va == vb ? 0 : (va < vb ? -1 : 1);
-}
-#endif
-
-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");
- unsigned int i;
- SD_task_t root, end, task;
- xbt_dict_t computers;
- xbt_dynar_t computer = NULL;
- char *computer_name;
- xbt_dict_cursor_t dict_cursor;
+ FILE *in_file = fopen(filename, "r");
+ xbt_assert(in_file != nullptr, "Failed to open file: %s", filename);
+
+ SD_task_t root;
+ SD_task_t end;
+ SD_task_t task;
+ std::vector<SD_task_t>* computer;
+ std::unordered_map<std::string, std::vector<SD_task_t>*> computers;
bool schedule_success = true;
+ std::unordered_map<std::string, SD_task_t> jobs;
xbt_dynar_t result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free);
- xbt_dict_t jobs = xbt_dict_new_homogeneous(NULL);
-
- FILE *in_file = fopen(filename, "r");
- if (in_file == NULL)
- xbt_die("Failed to open file: %s", filename);
Agraph_t * dag_dot = agread(in_file, NIL(Agdisc_t *));
- if (schedule)
- computers = xbt_dict_new_homogeneous(NULL);
-
/* Create all the nodes */
- Agnode_t *node = NULL;
+ 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"));
- double alpha = 0.0;
-
- if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) {
- if (seq_or_par == sequential){
+ double amount = atof(agget(node, (char*)"size"));
+ if (jobs.find(name) == jobs.end()) {
+ if (sequential) {
XBT_DEBUG("See <job id=%s amount =%.0f>", name, amount);
- task = SD_task_create_comp_seq(name, NULL , amount);
+ task = SD_task_create_comp_seq(name, nullptr , amount);
} else {
- alpha = atof(agget(node, (char *) "alpha"));
+ double alpha = atof(agget(node, (char *) "alpha"));
XBT_DEBUG("See <job id=%s amount =%.0f alpha = %.3f>", name, amount, alpha);
- task = SD_task_create_comp_par_amdahl(name, NULL , amount, alpha);
+ task = SD_task_create_comp_par_amdahl(name, nullptr , amount, alpha);
}
- xbt_dict_set(jobs, name, task, NULL);
+ jobs.insert({std::string(name), task});
- if (!strcmp(name, "root")){
- /* by design the root task is always SCHEDULABLE */
- SD_task_set_state(task, SD_SCHEDULABLE);
- /* Put it at the beginning of the dynar */
- xbt_dynar_insert_at(result, 0, &task);
- } else {
- if (!strcmp(name, "end")){
- XBT_DEBUG("Declaration of the 'end' node, don't store it yet.");
- end = task;
- /* Should be inserted later in the dynar */
- } else {
- xbt_dynar_push(result, &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*/
- int performer, order;
char *char_performer = agget(node, (char *) "performer");
char *char_order = agget(node, (char *) "order");
- /* performer is the computer which execute the task */
- performer = ((!char_performer || !strcmp(char_performer,"")) ? -1:atoi(char_performer));
- /* order is giving the task order on one computer */
- order = ((!char_order || !strcmp(char_order, ""))? -1:atoi(char_order));
-
- XBT_DEBUG ("Task '%s' is scheduled on workstation '%d' in position '%d'", task->name, performer, order);
- xbt_dynar_t computer = NULL;
- if(performer != -1 && order != -1){
- /* required parameters are given */
- computer = (xbt_dynar_t)xbt_dict_get_or_null(computers, char_performer);
- if(computer == NULL){
- computer = xbt_dynar_new(sizeof(SD_task_t), NULL);
- xbt_dict_set(computers, char_performer, computer, NULL);
+ /* Tasks will execute on in a given "order" on a given set of "performer" hosts */
+ 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 < static_cast<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);
+ auto comp = computers.find(char_performer);
+ if (comp != computers.end()) {
+ computer = comp->second;
+ } else {
+ computer = new std::vector<SD_task_t>;
+ computers.insert({char_performer, computer});
}
- if(performer < xbt_dict_length(host_list)){
- /* the wanted computer is available */
- SD_task_t *task_test = NULL;
- if((unsigned int)order < computer->used)
- task_test = (SD_task_t *)xbt_dynar_get_ptr(computer,order);
- if(task_test != NULL && *task_test != NULL && *task_test != task){
- /* the user gives the same order to several tasks */
+ if (static_cast<unsigned int>(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("The task %s starts on the computer %s at the position : %s like the task %s",
- (*task_test)->name, char_performer, char_order, task->name);
- }else{
- /* the parameter seems to be ok */
- xbt_dynar_set_as(computer, order, SD_task_t, task);
+ 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;
}
- }else{
- /* the platform has not enough processors to schedule the DAG like
- * the user wants*/
- schedule_success = false;
- XBT_VERB("The schedule is ignored, there are not enough computers");
- }
- }
- else {
+ } else
+ computer->resize(order);
+
+ computer->insert(computer->begin() + order, task);
+ } else {
/* one of required parameters is not given */
schedule_success = false;
- XBT_VERB("The schedule is ignored, the task %s is not correctly scheduled", task->name);
+ XBT_VERB("The schedule is ignored, task '%s' can not be scheduled on %d hosts", task->name, performer);
}
}
} else {
}
/*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"))){
- if (seq_or_par == sequential)
- root = SD_task_create_comp_seq("root", NULL, 0);
- else
- root = SD_task_create_comp_par_amdahl("root", NULL, 0, 0);
- /* by design the root task is always SCHEDULABLE */
- SD_task_set_state(root, SD_SCHEDULABLE);
- /* Put it at the beginning of the dynar */
- xbt_dynar_insert_at(result, 0, &root);
- }
+ 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");
- if (!(end = (SD_task_t)xbt_dict_get_or_null(jobs, "end"))){
- if (seq_or_par == sequential)
- end = SD_task_create_comp_seq("end", NULL, 0);
- else
- end = SD_task_create_comp_par_amdahl("end", NULL, 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 (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*), NULL);
+ std::vector<Agedge_t*> edges;
for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) {
- unsigned cursor;
- 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);
-#ifdef HAVE_CGRAPH_H
- /* Hack: circumvent a bug in libcgraph, where the edges are not always given back in creation order. We sort them
- * again, according to their sequence id. The problem appears to be solved (i.e.: I did not test it) in graphviz'
- * mercurial repository by the following changeset:
- * changeset: 8431:d5f1fb7e8103
- * user: Emden Gansner <erg@research.att.com>
- * date: Tue Oct 11 12:38:58 2011 -0400
- * summary: Make sure edges are stored in node creation order
- * It should be fixed in graphviz 2.30 and above.
- */
- xbt_dynar_sort(edges, edge_compare);
-#endif
- xbt_dynar_foreach(edges, cursor, edge) {
- SD_task_t src, dst;
+ 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 */
+ std::sort(edges.begin(), edges.end(), [](const Agedge_t* a, const Agedge_t* b) { return AGSEQ(a) < AGSEQ(b); });
+
+ for (Agedge_t* edge : edges) {
char *src_name=agnameof(agtail(edge));
char *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);
+ SD_task_t src = jobs.at(src_name);
+ SD_task_t dst = jobs.at(dst_name);
if (size > 0) {
- char *name = (char*)xbt_malloc((strlen(src_name)+strlen(dst_name)+6)*sizeof(char));
- sprintf(name, "%s->%s", src_name, dst_name);
- XBT_DEBUG("See <transfer id=%s amount = %.0f>", 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, NULL , size);
+ std::string name = std::string(src_name) + "->" + dst_name;
+ XBT_DEBUG("See <transfer id=%s amount = %.0f>", 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, NULL , size);
- SD_task_dependency_add(NULL, NULL, src, task);
- SD_task_dependency_add(NULL, NULL, task, dst);
- xbt_dict_set(jobs, name, task, NULL);
+ task = SD_task_create_comm_par_mxn_1d_block(name.c_str(), nullptr, size);
+ 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);
+ XBT_WARN("Task '%s' is defined more than once", name.c_str());
}
- xbt_free(name);
} else {
- SD_task_dependency_add(NULL, NULL, src, dst);
+ SD_task_dependency_add(src, dst);
}
}
}
- xbt_dynar_free(&edges);
- /* all compute and transfer tasks have been created, put the "end" node at the end of dynar */
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 == root || task == end)
- continue;
- if (xbt_dynar_is_empty(task->tasks_before)) {
- XBT_DEBUG("file '%s' has no source. Add dependency from 'root'", task->name);
- SD_task_dependency_add(NULL, NULL, root, 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(root, task);
}
- if (xbt_dynar_is_empty(task->tasks_after)) {
- XBT_DEBUG("file '%s' has no destination. Add dependency to 'end'", task->name);
- SD_task_dependency_add(NULL, NULL, task, end);
+ 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(task, end);
}
}
agclose(dag_dot);
- xbt_dict_free(&jobs);
fclose(in_file);
if(schedule){
if (schedule_success) {
- const sg_host_t *workstations = sg_host_list ();
- xbt_dict_foreach(computers,dict_cursor,computer_name,computer){
- int count_computer = atoi(computer_name);
- unsigned int count=0;
- SD_task_t task;
- SD_task_t task_previous = NULL;
- xbt_dynar_foreach(computer,count,task){
+ std::vector<simgrid::s4u::Host*> hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts();
+
+ for (auto const& elm : computers) {
+ SD_task_t previous_task = nullptr;
+ for (auto const& cur_task : *elm.second) {
/* add dependency between the previous and the task to avoid parallel execution */
- if(task != NULL ){
- if(task_previous != NULL && !SD_task_dependency_exists(task_previous, task))
- SD_task_dependency_add(NULL, NULL, task_previous, 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[count_computer]);
- task_previous = task;
+ SD_task_schedulel(cur_task, 1, hosts[std::stod(elm.first)]);
+ previous_task = cur_task;
}
}
- xbt_dynar_free(&computer);
+ delete elm.second;
}
- 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);
+ for (auto const& elm : computers)
+ delete elm.second;
xbt_dynar_free(&result);
- result = NULL;
+ result = nullptr;
}
}
- if (!acyclic_graph_detail(result)) {
- XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", basename((char*)filename));
+ if (result && not acyclic_graph_detail(result)) {
+ 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 = NULL;
+ 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
