-/* 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
/* Ensure that transfer tasks have unique names even though a file is used several times */
void uniq_transfer_task_name(SD_task_t task)
{
- const_SD_task_t child = *(task->successors->begin());
- const_SD_task_t parent = *(task->predecessors->begin());
+ const_SD_task_t child = *(task->get_successors().begin());
+ const_SD_task_t parent = *(task->get_dependencies().begin());
- std::string new_name =
- std::string(SD_task_get_name(parent)) + "_" + SD_task_get_name(task) + "_" + SD_task_get_name(child);
+ std::string new_name = parent->get_name() + "_" + task->get_name() + "_" + child->get_name();
- SD_task_set_name(task, new_name.c_str());
+ task->set_name(new_name);
}
static bool children_are_marked(const_SD_task_t task)
{
- return std::none_of(task->successors->begin(), task->successors->end(),
- [](const SD_task_t& elm) { return not elm->marked; }) &&
- std::none_of(task->outputs->begin(), task->outputs->end(),
- [](const SD_task_t& elm) { return not elm->marked; });
+ return std::none_of(task->get_successors().begin(), task->get_successors().end(),
+ [](const SD_task_t& elm) { return not elm->is_marked(); });
}
static bool parents_are_marked(const_SD_task_t task)
{
- return std::none_of(task->predecessors->begin(), task->predecessors->end(),
- [](const SD_task_t& elm) { return not elm->marked; }) &&
- std::none_of(task->inputs->begin(), task->inputs->end(), [](const SD_task_t& elm) { return not elm->marked; });
+ return std::none_of(task->get_dependencies().begin(), task->get_dependencies().end(),
+ [](const SD_task_t& elm) { return not elm->is_marked(); });
}
bool acyclic_graph_detail(const_xbt_dynar_t dag)
{
unsigned int count;
- bool all_marked = true;
SD_task_t task = nullptr;
std::vector<SD_task_t> current;
xbt_dynar_foreach (dag, count, task)
- if (task->kind != SD_TASK_COMM_E2E && task->successors->empty() && task->outputs->empty())
+ if (task->get_kind() != SD_TASK_COMM_E2E && task->is_waited_by() == 0)
current.push_back(task);
while (not current.empty()) {
std::vector<SD_task_t> next;
for (auto const& t : current) {
//Mark task
- t->marked = true;
- for (SD_task_t const& input : *t->inputs) {
- input->marked = true;
+ t->mark();
+ for (auto const& input : t->get_inputs()) {
+ input->mark();
// Inputs are communication, hence they can have only one predecessor
- SD_task_t input_pred = *(input->predecessors->begin());
+ auto input_pred = *(input->get_dependencies().begin());
if (children_are_marked(input_pred))
next.push_back(input_pred);
}
- for (SD_task_t const& pred : *t->predecessors) {
+ for (auto const& pred : t->get_dependencies()) {
if (children_are_marked(pred))
next.push_back(pred);
}
current = next;
}
- all_marked = true;
+ bool all_marked = true;
//test if all tasks are marked
xbt_dynar_foreach(dag,count,task){
- if (task->kind != SD_TASK_COMM_E2E && not task->marked) {
- XBT_WARN("the task %s is not marked",task->name);
+ if (task->get_kind() != SD_TASK_COMM_E2E && not task->is_marked()) {
+ XBT_WARN("the task %s is not marked", task->get_cname());
all_marked = false;
break;
}
if (not all_marked) {
XBT_VERB("there is at least one cycle in your task graph");
xbt_dynar_foreach(dag,count,task){
- if(task->kind != SD_TASK_COMM_E2E && task->predecessors->empty() && task->inputs->empty()){
- task->marked = true;
+ if (task->get_kind() != SD_TASK_COMM_E2E && task->has_unsolved_dependencies() == 0) {
+ task->mark();
current.push_back(task);
}
}
std::vector<SD_task_t> next;
//test if the current iteration is done
for (auto const& t : current) {
- t->marked = true;
- for (SD_task_t const& output : *t->outputs) {
- output->marked = true;
+ t->mark();
+ for (SD_task_t const& output : t->get_outputs()) {
+ output->mark();
// outputs are communication, hence they can have only one successor
- SD_task_t output_succ = *(output->successors->begin());
+ SD_task_t output_succ = *(output->get_successors().begin());
if (parents_are_marked(output_succ))
next.push_back(output_succ);
}
- for (SD_task_t const& succ : *t->successors) {
+ for (SD_task_t const& succ : t->get_successors()) {
if (parents_are_marked(succ))
next.push_back(succ);
}
all_marked = true;
xbt_dynar_foreach(dag,count,task){
- if (task->kind != SD_TASK_COMM_E2E && not task->marked) {
- XBT_WARN("the task %s is in a cycle",task->name);
+ if (task->get_kind() != SD_TASK_COMM_E2E && not task->is_marked()) {
+ XBT_WARN("the task %s is in a cycle", task->get_cname());
all_marked = false;
}
}
static YY_BUFFER_STATE input_buffer;
static xbt_dynar_t result;
-static std::map<std::string, SD_task_t> jobs;
-static std::map<std::string, SD_task_t> files;
+static std::map<std::string, SD_task_t, std::less<>> jobs;
+static std::map<std::string, SD_task_t, std::less<>> files;
static SD_task_t current_job;
/** @brief loads a DAX file describing a DAG
result = xbt_dynar_new(sizeof(SD_task_t), nullptr);
SD_task_t root_task = SD_task_create_comp_seq("root", nullptr, 0);
/* by design the root task is always SCHEDULABLE */
- SD_task_set_state(root_task, SD_SCHEDULABLE);
+ root_task->set_state(SD_SCHEDULABLE);
xbt_dynar_push(result, &root_task);
SD_task_t end_task = SD_task_create_comp_seq("end", nullptr, 0);
- int res = dax_lex();
- if (res != 0)
- xbt_die("Parse error in %s: %s", filename, dax__parse_err_msg());
+ xbt_assert(dax_lex() == 0, "Parse error in %s: %s", filename, dax__parse_err_msg());
dax__delete_buffer(input_buffer);
fclose(in_file);
dax_lex_destroy();
for (auto const& elm : files) {
file = elm.second;
SD_task_t newfile;
- if (file->predecessors->empty()) {
- for (SD_task_t const& it : *file->successors) {
- newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
- SD_task_dependency_add(root_task, newfile);
- SD_task_dependency_add(newfile, it);
+ if (file->has_unsolved_dependencies() == 0) {
+ for (SD_task_t const& it : file->get_successors()) {
+ newfile = SD_task_create_comm_e2e(file->get_cname(), nullptr, file->get_amount());
+ root_task->dependency_add(newfile);
+ newfile->dependency_add(it);
xbt_dynar_push(result, &newfile);
}
}
- if (file->successors->empty()) {
- for (SD_task_t const& it : *file->predecessors) {
- newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
- SD_task_dependency_add(it, newfile);
- SD_task_dependency_add(newfile, end_task);
+ if (file->is_waited_by() == 0) {
+ for (SD_task_t const& it : file->get_dependencies()) {
+ newfile = SD_task_create_comm_e2e(file->get_cname(), nullptr, file->get_amount());
+ it->dependency_add(newfile);
+ newfile->dependency_add(end_task);
xbt_dynar_push(result, &newfile);
}
}
- for (SD_task_t const& it : *file->predecessors) {
- for (SD_task_t const& it2 : *file->successors) {
+ for (SD_task_t const& it : file->get_dependencies()) {
+ for (SD_task_t const& it2 : file->get_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);
+ file->get_cname(), it->get_cname());
}
- newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount);
- SD_task_dependency_add(it, newfile);
- SD_task_dependency_add(newfile, it2);
+ newfile = SD_task_create_comm_e2e(file->get_cname(), nullptr, file->get_amount());
+ it->dependency_add(newfile);
+ newfile->dependency_add(it2);
xbt_dynar_push(result, &newfile);
}
}
/* Free previous copy of the files */
- SD_task_destroy(file);
+ file->destroy();
}
/* Push end task last */
unsigned int cpt;
xbt_dynar_foreach(result, cpt, file) {
- if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) {
+ if (file->get_kind() == SD_TASK_COMM_E2E) {
uniq_transfer_task_name(file);
} else {
/* If some tasks do not take files as input, connect them to the root
* if they don't produce files, connect them to the end node.
*/
if ((file != root_task) && (file != end_task)) {
- if (file->inputs->empty())
- SD_task_dependency_add(root_task, file);
- if (file->outputs->empty())
- SD_task_dependency_add(file, end_task);
+ if (file->has_unsolved_dependencies() == 0)
+ root_task->dependency_add(file);
+ if (file->is_waited_by() == 0)
+ file->dependency_add(end_task);
}
}
}
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
simgrid::xbt::Path(filename).get_base_name().c_str());
xbt_dynar_foreach(result, cpt, file)
- SD_task_destroy(file);
+ file->destroy();
xbt_dynar_free_container(&result);
result = nullptr;
}
files[A_dax__uses_file] = file;
} else {
file = it->second;
- if (file->amount < size || file->amount > size) {
- XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size);
+ if (file->get_amount() < size || file->get_amount() > size) {
+ XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, file->get_amount(), size);
}
}
if (is_input) {
- SD_task_dependency_add(file, current_job);
+ file->dependency_add(current_job);
} else {
- 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);
+ current_job->dependency_add(file);
+ if (file->has_unsolved_dependencies() > 1) {
+ XBT_WARN("File %s created at more than one location...", file->get_cname());
}
}
}
{
auto job = jobs.find(A_dax__parent_ref);
if (job != jobs.end()) {
- SD_task_t parent = job->second;
- SD_task_dependency_add(parent, current_child);
- XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name);
+ auto parent = job->second;
+ parent->dependency_add(current_child);
+ XBT_DEBUG("Control-flow dependency from %s to %s", current_child->get_cname(), parent->get_cname());
} else {
throw std::out_of_range(std::string("Parse error on line ") + std::to_string(dax_lineno) +
- ": Asked to add a dependency from " + current_child->name + " to " + A_dax__parent_ref +
- ", but " + A_dax__parent_ref + " does not exist");
+ ": Asked to add a dependency from " + current_child->get_name() + " to " +
+ A_dax__parent_ref + ", but " + A_dax__parent_ref + " does not exist");
}
}
