-/* Copyright (c) 2009-2017. The SimGrid Team.
+/* Copyright (c) 2009-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "simdag_private.hpp"
#include "simgrid/simdag.h"
-#include "xbt/file.h" /* xbt_basename() */
+#include "xbt/file.hpp"
#include "xbt/log.h"
#include "xbt/misc.h"
-#include "xbt/str.h"
#include <map>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
-extern "C" {
- #undef CLEANUP
- #include "dax_dtd.h"
- #define register /* g++ don't like register, so don't say it */
- #include "dax_dtd.c"
- #undef register
-}
+#include "dax_dtd.h"
+#include "dax_dtd.c"
/* Ensure that transfer tasks have unique names even though a file is used several times */
void uniq_transfer_task_name(SD_task_t task)
}
static bool children_are_marked(SD_task_t task){
- for (SD_task_t it : *task->successors)
+ for (SD_task_t const& it : *task->successors)
if (it->marked == 0)
return false;
- for (SD_task_t it : *task->outputs)
+ for (SD_task_t const& it : *task->outputs)
if (it->marked == 0)
return false;
return true;
}
static bool parents_are_marked(SD_task_t task){
- for (SD_task_t it : *task->predecessors)
+ for (SD_task_t const& it : *task->predecessors)
if (it->marked == 0)
return false;
- for (SD_task_t it : *task->inputs)
+ for (SD_task_t const& it : *task->inputs)
if (it->marked == 0)
return false;
return true;
}
while (not current.empty()) {
std::vector<SD_task_t> next;
- for (auto t: current){
+ for (auto const& t : current) {
//Mark task
t->marked = 1;
- for (SD_task_t input : *t->inputs){
+ for (SD_task_t const& input : *t->inputs) {
input->marked=1;
// Inputs are communication, hence they can have only one predecessor
SD_task_t input_pred = *(input->predecessors->begin());
if (children_are_marked(input_pred))
next.push_back(input_pred);
}
- for (SD_task_t pred : *t->predecessors) {
+ for (SD_task_t const& pred : *t->predecessors) {
if (children_are_marked(pred))
next.push_back(pred);
}
while (not current.empty()) {
std::vector<SD_task_t> next;
//test if the current iteration is done
- for (auto t: current){
+ for (auto const& t : current) {
t->marked = 1;
- for (SD_task_t output : *t->outputs) {
+ for (SD_task_t const& output : *t->outputs) {
output->marked = 1;
// outputs are communication, hence they can have only one successor
SD_task_t output_succ = *(output->successors->begin());
if (parents_are_marked(output_succ))
next.push_back(output_succ);
}
- for (SD_task_t succ : *t->successors) {
+ for (SD_task_t const& succ : *t->successors) {
if (parents_are_marked(succ))
next.push_back(succ);
}
* Files not consumed in the system are said to be consumed by end task (bottom of DAG).
*/
- for (auto elm : files) {
+ for (auto const& elm : files) {
file = elm.second;
SD_task_t newfile;
if (file->predecessors->empty()) {
- for (SD_task_t it : *file->successors) {
+ for (SD_task_t const& it : *file->successors) {
newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
- SD_task_dependency_add(nullptr, nullptr, root_task, newfile);
- SD_task_dependency_add(nullptr, nullptr, newfile, it);
+ SD_task_dependency_add(root_task, newfile);
+ SD_task_dependency_add(newfile, it);
xbt_dynar_push(result, &newfile);
}
} else if (file->successors->empty()) {
- for (SD_task_t it : *file->predecessors){
+ for (SD_task_t const& it : *file->predecessors) {
newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
- SD_task_dependency_add(nullptr, nullptr, it, newfile);
- SD_task_dependency_add(nullptr, nullptr, newfile, end_task);
+ SD_task_dependency_add(it, newfile);
+ SD_task_dependency_add(newfile, end_task);
xbt_dynar_push(result, &newfile);
}
} else {
- for (SD_task_t it : *file->predecessors) {
- for (SD_task_t it2 : *file->successors) {
+ for (SD_task_t const& it : *file->predecessors) {
+ for (SD_task_t const& it2 : *file->successors) {
if (it == it2) {
XBT_WARN ("File %s is produced and consumed by task %s."
"This loop dependency will prevent the execution of the task.", file->name, it->name);
}
newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
- SD_task_dependency_add(nullptr, nullptr, it, newfile);
- SD_task_dependency_add(nullptr, nullptr, newfile, it2);
+ SD_task_dependency_add(it, newfile);
+ SD_task_dependency_add(newfile, it2);
xbt_dynar_push(result, &newfile);
}
}
xbt_dynar_push(result, &end_task);
/* Free previous copy of the files */
- for (auto elm : files)
+ for (auto const& elm : files)
SD_task_destroy(elm.second);
unsigned int cpt;
xbt_dynar_foreach(result, cpt, file) {
*/
if ((file != root_task) && (file != end_task)) {
if (file->inputs->empty())
- SD_task_dependency_add(nullptr, nullptr, root_task, file);
+ SD_task_dependency_add(root_task, file);
if (file->outputs->empty())
- SD_task_dependency_add(nullptr, nullptr, file, end_task);
+ SD_task_dependency_add(file, end_task);
}
} else {
THROW_IMPOSSIBLE;
}
if (not acyclic_graph_detail(result)) {
- char* base = xbt_basename(filename);
- XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base);
- free(base);
+ std::string base = simgrid::xbt::Path(filename).getBasename();
+ XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base.c_str());
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);
}
}
if (is_input) {
- SD_task_dependency_add(nullptr, nullptr, file, current_job);
+ SD_task_dependency_add(file, current_job);
} else {
- SD_task_dependency_add(nullptr, nullptr, current_job, file);
+ SD_task_dependency_add(current_job, file);
if ((file->predecessors->size() + file->inputs->size()) > 1) {
XBT_WARN("File %s created at more than one location...", file->name);
}
auto job = jobs.find(A_dax__parent_ref);
if (job != jobs.end()) {
SD_task_t parent = job->second;
- SD_task_dependency_add(nullptr, nullptr, parent, current_child);
+ SD_task_dependency_add(parent, current_child);
XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name);
} else {
throw std::out_of_range(std::string("Parse error on line ") + std::to_string(dax_lineno) +