-/* Copyright (c) 2009-2019. 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
#include "simgrid/simdag.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>
* 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.
+ * If this attribute is omitted, the default value is zero.
*/
xbt_dynar_t SD_dotload(const char *filename) {
return SD_dotload_generic(filename, true, false);
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;
if (comp != computers.end()) {
computer = comp->second;
} else {
- computer = new std::vector<SD_task_t>;
+ computer = new std::vector<SD_task_t>();
computers.insert({char_performer, computer});
}
if (static_cast<unsigned int>(order) < computer->size()) {
- SD_task_t task_test = computer->at(order);
+ const s_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;
end = jobs.at("end");
/* Create edges */
- xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), nullptr);
+ std::vector<Agedge_t*> 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) {
- char *src_name=agnameof(agtail(edge));
- char *dst_name=agnameof(aghead(edge));
+ 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"));
SD_task_t src = jobs.at(src_name);
}
}
}
- 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);
if (previous_task && not SD_task_dependency_exists(previous_task, cur_task))
SD_task_dependency_add(previous_task, cur_task);
- SD_task_schedulel(cur_task, 1, hosts[std::stod(elm.first)]);
+ SD_task_schedulel(cur_task, 1, hosts[std::stoi(elm.first)]);
previous_task = cur_task;
}
}