X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c62085625aa523c18f1f729633f24e99624b4c82..3d07c492fcabdf883adce049d7ce605709a4fcb9:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index 9d542db6a0..d471fe25e0 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -1,368 +1,367 @@ -/* 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 "src/simdag/simdag_private.h" -#include "simgrid/simdag.h" -#include "xbt/misc.h" -#include "xbt/log.h" -#include "xbt/str.h" -#include "xbt/file.h" /* xbt_basename() */ - -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 -} - -/* Ensure that transfer tasks have unique names even though a file is used several times */ - -void uniq_transfer_task_name(SD_task_t task) -{ - SD_task_t child; - SD_task_t parent; +#include "src/internal_config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include - xbt_dynar_t children = SD_task_get_children(task); - xbt_dynar_t parents = SD_task_get_parents(task); +#include "dax_dtd.h" +#include "dax_dtd.c" - xbt_dynar_get_cpy(children, 0, &child); - xbt_dynar_get_cpy(parents, 0, &parent); +XBT_LOG_NEW_DEFAULT_CATEGORY(dag_parsing, "Generation DAGs from files"); - char *new_name = bprintf("%s_%s_%s", SD_task_get_name(parent), SD_task_get_name(task), SD_task_get_name(child)); +#if HAVE_GRAPHVIZ +#include +#endif - SD_task_set_name(task, new_name); - - xbt_dynar_free_container(&children); - xbt_dynar_free_container(&parents); - free(new_name); -} - -static bool children_are_marked(SD_task_t task){ - SD_dependency_t depafter = nullptr; - unsigned int count; +/* Ensure that transfer tasks have unique names even though a file is used several times */ +static void uniq_transfer_task_name(simgrid::s4u::Comm* comm) +{ + const auto& child = comm->get_successors().front(); + const auto& parent = *(comm->get_dependencies().begin()); - xbt_dynar_foreach(task->tasks_after,count,depafter){ - if(depafter->dst->marked == 0) - return false; - } - return true; -} + std::string new_name = parent->get_name() + "_" + comm->get_name() + "_" + child->get_name(); -static bool parents_are_marked(SD_task_t task){ - SD_dependency_t depbefore = nullptr; - unsigned int count; - xbt_dynar_foreach(task->tasks_before,count,depbefore){ - if(depbefore->src->marked == 0) - return false; - } - return true; + comm->set_name(new_name)->vetoable_start(); } -bool acyclic_graph_detail(xbt_dynar_t dag){ - unsigned int count, count_current=0; - bool all_marked = true; - SD_task_t task = nullptr, parent_task = nullptr, child_task = nullptr; - SD_dependency_t depbefore = nullptr, depafter = nullptr; - xbt_dynar_t next = nullptr, current = xbt_dynar_new(sizeof(SD_task_t),nullptr); - - xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) continue; - task->marked = 0; - if(xbt_dynar_is_empty(task->tasks_after)){ - xbt_dynar_push(current, &task); - } - } - //test if something has to be done for the next iteration - while(!xbt_dynar_is_empty(current)){ - next = xbt_dynar_new(sizeof(SD_task_t),nullptr); - //test if the current iteration is done - xbt_dynar_foreach(current,count_current,task){ - if (task == nullptr) - continue; - //push task in next - task->marked = 1; - xbt_dynar_foreach(task->tasks_before,count,depbefore){ - parent_task = depbefore->src; - if(parent_task->kind == SD_TASK_COMM_E2E){ - unsigned int j=0; - parent_task->marked = 1; - SD_task_t parent_task_2 = nullptr; - xbt_dynar_foreach(parent_task->tasks_before,j,depbefore){ - parent_task_2 = depbefore->src; - if(children_are_marked(parent_task_2)) - xbt_dynar_push(next, &parent_task_2); - } - } else{ - if(children_are_marked(parent_task)) - xbt_dynar_push(next, &parent_task); +static bool check_for_cycle(const std::vector& dag) +{ + std::vector current; + + for (const auto& a : dag) + if (dynamic_cast(a.get()) != nullptr && a->is_waited_by() == 0) + current.push_back(a); + + while (not current.empty()) { + std::vector next; + for (auto const& a : current) { + a->mark(); + for (auto const& pred : a->get_dependencies()) { + if (dynamic_cast(pred.get()) != nullptr) { + pred->mark(); + // Comms have only one predecessor + auto pred_pred = *(pred->get_dependencies().begin()); + if (std::none_of(pred_pred->get_successors().begin(), pred_pred->get_successors().end(), + [](const simgrid::s4u::ActivityPtr& act) { return not act->is_marked(); })) + next.push_back(pred_pred); + } else { + if (std::none_of(pred->get_successors().begin(), pred->get_successors().end(), + [](const simgrid::s4u::ActivityPtr& act) { return not act->is_marked(); })) + next.push_back(pred); } - parent_task = nullptr; } } - xbt_dynar_free(¤t); + current.clear(); current = next; - next = nullptr; - } - xbt_dynar_free(¤t); - all_marked = true; - xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) - continue; - //test if all tasks are marked - if(task->marked == 0){ - XBT_WARN("the task %s is not marked",task->name); - all_marked = false; - break; - } } - if(!all_marked){ - XBT_VERB("there is at least one cycle in your task graph"); - - current = xbt_dynar_new(sizeof(SD_task_t),nullptr); - xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) - continue; - if(xbt_dynar_is_empty(task->tasks_before)){ - xbt_dynar_push(current, &task); - } - } - xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) - continue; - if(xbt_dynar_is_empty(task->tasks_before)){ - task->marked = 1; - xbt_dynar_push(current, &task); - } - } - //test if something has to be done for the next iteration - while(!xbt_dynar_is_empty(current)){ - next = xbt_dynar_new(sizeof(SD_task_t),nullptr); - //test if the current iteration is done - xbt_dynar_foreach(current,count_current,task){ - if (task == nullptr) - continue; - //push task in next - task->marked = 1; - xbt_dynar_foreach(task->tasks_after,count,depafter){ - child_task = depbefore->dst; - if(child_task->kind == SD_TASK_COMM_E2E){ - unsigned int j=0; - child_task->marked = 1; - SD_task_t child_task_2 = nullptr; - xbt_dynar_foreach(child_task->tasks_after,j,depafter){ - child_task_2 = depbefore->dst; - if(parents_are_marked(child_task_2)) - xbt_dynar_push(next, &child_task_2); - } - } else{ - if(parents_are_marked(child_task)) - xbt_dynar_push(next, &child_task); - } - child_task = nullptr; - } - } - xbt_dynar_free(¤t); - current = next; - next = nullptr; - } - xbt_dynar_free(¤t); - all_marked = true; - xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) - continue; - //test if all tasks are marked - if(task->marked == 0){ - XBT_WARN("the task %s is in a cycle",task->name); - all_marked = false; - } - } - } - return all_marked; + return not std::any_of(dag.begin(), dag.end(), [](const simgrid::s4u::ActivityPtr& a) { return not a->is_marked(); }); } static YY_BUFFER_STATE input_buffer; -static xbt_dynar_t result; -static xbt_dict_t jobs; -static xbt_dict_t files; -static SD_task_t current_job; -static SD_task_t root_task, end_task; +namespace simgrid { +namespace s4u { -static void dax_task_free(void *task) -{ - SD_task_destroy(static_cast(task)); -} +static std::vector result; +static std::map> jobs; +static std::map> files; +static ExecPtr current_job; /** @brief loads a DAX file describing a DAG - * + * * See https://confluence.pegasus.isi.edu/display/pegasus/WorkflowGenerator for more details. */ -xbt_dynar_t SD_daxload(const char *filename) +std::vector create_DAG_from_DAX(const std::string& filename) { - xbt_dict_cursor_t cursor; - SD_task_t file; - char *name; - FILE *in_file = fopen(filename, "r"); - xbt_assert(in_file, "Unable to open \"%s\"\n", filename); + FILE* in_file = fopen(filename.c_str(), "r"); + xbt_assert(in_file, "Unable to open \"%s\"\n", filename.c_str()); input_buffer = dax__create_buffer(in_file, 10); dax__switch_to_buffer(input_buffer); dax_lineno = 1; - result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free); - files = xbt_dict_new_homogeneous(&dax_task_free); - jobs = xbt_dict_new_homogeneous(nullptr); - 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); + auto root_task = Exec::init()->set_name("root")->set_flops_amount(0); + root_task->vetoable_start(); - xbt_dynar_push(result, &root_task); - end_task = SD_task_create_comp_seq("end", nullptr, 0); + result.push_back(root_task); - int res = dax_lex(); - if (res != 0) - xbt_die("Parse error in %s: %s", filename, dax__parse_err_msg()); + auto end_task = Exec::init()->set_name("end")->set_flops_amount(0); + end_task->vetoable_start(); + + xbt_assert(dax_lex() == 0, "Parse error in %s: %s", filename.c_str(), dax__parse_err_msg()); dax__delete_buffer(input_buffer); fclose(in_file); dax_lex_destroy(); - xbt_dict_free(&jobs); /* And now, post-process the files. * We want a file task per pair of computation tasks exchanging the file. Duplicate on need * Files not produced in the system are said to be produced by root task (top of DAG). * Files not consumed in the system are said to be consumed by end task (bottom of DAG). */ - - xbt_dict_foreach(files, cursor, name, file) { - unsigned int cpt1; - unsigned int cpt2; - SD_task_t newfile; - SD_dependency_t depbefore; - SD_dependency_t depafter; - if (xbt_dynar_is_empty(file->tasks_before)) { - xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { - 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, depafter->dst); - xbt_dynar_push(result, &newfile); + CommPtr file; + + for (auto const& elm : files) { + file = elm.second; + CommPtr newfile; + if (file->dependencies_solved()) { + for (auto const& it : file->get_successors()) { + newfile = Comm::sendto_init()->set_name(file->get_name())->set_payload_size(file->get_remaining()); + root_task->add_successor(newfile); + newfile->add_successor(it); + result.push_back(newfile); } - } else if (xbt_dynar_is_empty(file->tasks_after)) { - xbt_dynar_foreach(file->tasks_before, cpt2, depbefore) { - newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount); - SD_task_dependency_add(nullptr, nullptr, depbefore->src, newfile); - SD_task_dependency_add(nullptr, nullptr, newfile, end_task); - xbt_dynar_push(result, &newfile); + } + if (file->is_waited_by() == 0) { + for (auto const& it : file->get_dependencies()) { + newfile = Comm::sendto_init()->set_name(file->get_name())->set_payload_size(file->get_remaining()); + it->add_successor(newfile); + newfile->add_successor(end_task); + result.push_back(newfile); } - } else { - xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) { - xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { - if (depbefore->src == depafter->dst) { - XBT_WARN - ("File %s is produced and consumed by task %s." - "This loop dependency will prevent the execution of the task.", file->name, depbefore->src->name); - } - newfile = SD_task_create_comm_e2e(file->name, nullptr, file->amount); - SD_task_dependency_add(nullptr, nullptr, depbefore->src, newfile); - SD_task_dependency_add(nullptr, nullptr, newfile, depafter->dst); - xbt_dynar_push(result, &newfile); + } + for (auto const& it : file->get_dependencies()) { + for (auto 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->get_cname(), it->get_cname()); } + newfile = Comm::sendto_init()->set_name(file->get_name())->set_payload_size(file->get_remaining()); + it->add_successor(newfile); + newfile->add_successor(it2); + result.push_back(newfile); } } + /* Free previous copy of the files */ + file->destroy(); } /* Push end task last */ - xbt_dynar_push(result, &end_task); - - /* Free previous copy of the files */ - xbt_dict_free(&files); - unsigned int cpt; - xbt_dynar_foreach(result, cpt, file) { - if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) { - uniq_transfer_task_name(file); - } else if (SD_task_get_kind(file) == SD_TASK_COMP_SEQ){ + result.push_back(end_task); + + for (const auto& a : result) { + auto* comm = dynamic_cast(a.get()); + if (comm != nullptr) { + uniq_transfer_task_name(comm); + } 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) && xbt_dynar_is_empty(file->tasks_before)) - SD_task_dependency_add(nullptr, nullptr, root_task, file); - if ((file != end_task) && xbt_dynar_is_empty(file->tasks_after)) - SD_task_dependency_add(nullptr, nullptr, file, end_task); + if ((a != root_task) && (a != end_task)) { + if (a->dependencies_solved()) + root_task->add_successor(a); + if (a->is_waited_by() == 0) + a->add_successor(end_task); + } + } + } + + if (not check_for_cycle(result)) { + XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", + simgrid::xbt::Path(filename).get_base_name().c_str()); + for (const auto& a : result) + a->destroy(); + result.clear(); + } + + return result; +} + +#if HAVE_GRAPHVIZ +std::vector create_DAG_from_dot(const std::string& filename) +{ + 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*)); + + std::unordered_map activities; + std::vector dag; + + ActivityPtr root; + ActivityPtr end; + ActivityPtr act; + /* Create all the nodes */ + 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 (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 { - THROW_IMPOSSIBLE; + 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 (activities.find("root") == activities.end()) + root = Exec::init()->set_name("root")->set_flops_amount(0)->vetoable_start(); + else + root = activities.at("root"); + + 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 */ + std::vector edges; + for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) { + 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) { + 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) { + 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("Comm '%s' is defined more than once", name.c_str()); + } + } else { + src->add_successor(dst); + } } } - if (!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); - xbt_dynar_foreach(result, cpt, file) - SD_task_destroy(file); - xbt_dynar_free_container(&result); - return nullptr; - } else { - return result; + 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'*/ + 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 (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); + fclose(in_file); + + 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(); + } + + return dag; +} +#else +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."); } +#endif +} // namespace s4u +} // namespace simgrid void STag_dax__adag() { - XBT_ATTRIB_UNUSED double version; - version = xbt_str_parse_double(A_dax__adag_version, "Parse error: %s is not a double"); - - xbt_assert(version == 2.1, "Expected version 2.1 in tag, got %f. Fix the parser or your file", version); + try { + double version = std::stod(std::string(A_dax__adag_version)); + xbt_assert(version == 2.1, "Expected version 2.1 in tag, got %f. Fix the parser or your file", version); + } catch (const std::invalid_argument&) { + throw std::invalid_argument(std::string("Parse error: ") + A_dax__adag_version + " is not a double"); + } } void STag_dax__job() { - double runtime = xbt_str_parse_double(A_dax__job_runtime, "Parse error: %s is not a double"); - char *name = bprintf("%s@%s", A_dax__job_id, A_dax__job_name); - runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */ - XBT_DEBUG("See ",A_dax__job_id,A_dax__job_runtime,runtime); - current_job = SD_task_create_comp_seq(name, nullptr, runtime); - xbt_dict_set(jobs, A_dax__job_id, current_job, nullptr); - free(name); - xbt_dynar_push(result, ¤t_job); + try { + double runtime = std::stod(std::string(A_dax__job_runtime)); + + std::string name = std::string(A_dax__job_id) + "@" + A_dax__job_name; + runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */ + XBT_DEBUG("See ", A_dax__job_id, A_dax__job_runtime, runtime); + simgrid::s4u::current_job = simgrid::s4u::Exec::init()->set_name(name)->set_flops_amount(runtime)->vetoable_start(); + simgrid::s4u::jobs.insert({A_dax__job_id, simgrid::s4u::current_job}); + simgrid::s4u::result.push_back(simgrid::s4u::current_job); + } catch (const std::invalid_argument&) { + throw std::invalid_argument(std::string("Parse error: ") + A_dax__job_runtime + " is not a double"); + } } -void STag_dax__uses(void) +void STag_dax__uses() { - double size = xbt_str_parse_double(A_dax__uses_size, "Parse error: %s is not a double"); - int is_input = (A_dax__uses_link == A_dax__uses_link_input); + double size; + try { + size = std::stod(std::string(A_dax__uses_size)); + } catch (const std::invalid_argument&) { + throw std::invalid_argument(std::string("Parse error: ") + A_dax__uses_size + " is not a double"); + } + bool is_input = (A_dax__uses_link == A_dax__uses_link_input); XBT_DEBUG("See ",A_dax__uses_file,(is_input?"in":"out")); - SD_task_t file = static_cast(xbt_dict_get_or_null(files, A_dax__uses_file)); - if (file == nullptr) { - file = SD_task_create_comm_e2e(A_dax__uses_file, nullptr, size); - sd_global->initial_tasks->erase(file); - xbt_dict_set(files, A_dax__uses_file, file, nullptr); + auto it = simgrid::s4u::files.find(A_dax__uses_file); + simgrid::s4u::CommPtr file; + if (it == simgrid::s4u::files.end()) { + file = simgrid::s4u::Comm::sendto_init()->set_name(A_dax__uses_file)->set_payload_size(size); + simgrid::s4u::files[A_dax__uses_file] = file.get(); } else { - if (SD_task_get_amount(file) != size) { - XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size); + file = it->second; + if (file->get_remaining() < size || file->get_remaining() > size) { + XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, file->get_remaining(), size); } } if (is_input) { - SD_task_dependency_add(nullptr, nullptr, file, current_job); + file->add_successor(simgrid::s4u::current_job); } else { - SD_task_dependency_add(nullptr, nullptr, current_job, file); - if (xbt_dynar_length(file->tasks_before) > 1) { - XBT_WARN("File %s created at more than one location...", file->name); + simgrid::s4u::current_job->add_successor(file); + if (file->get_dependencies().size() > 1) { + XBT_WARN("File %s created at more than one location...", file->get_cname()); } } } -static SD_task_t current_child; +static simgrid::s4u::ExecPtr current_child; void STag_dax__child() { - current_child = static_cast(xbt_dict_get_or_null(jobs, A_dax__child_ref)); - xbt_assert(current_child != nullptr,"Parse error on line %d: Asked to add dependencies to the non-existent %s task", - dax_lineno, A_dax__child_ref); + auto job = simgrid::s4u::jobs.find(A_dax__child_ref); + if (job != simgrid::s4u::jobs.end()) { + current_child = job->second; + } else { + throw std::out_of_range(std::string("Parse error on line ") + std::to_string(dax_lineno) + + ": Asked to add dependencies to the non-existent " + A_dax__child_ref + "task"); + } } void ETag_dax__child() @@ -372,11 +371,16 @@ void ETag_dax__child() void STag_dax__parent() { - SD_task_t parent = static_cast(xbt_dict_get_or_null(jobs, A_dax__parent_ref)); - xbt_assert(parent != nullptr, "Parse error on line %d: Asked to add a dependency from %s to %s, but %s does not exist", - dax_lineno, current_child->name, A_dax__parent_ref, A_dax__parent_ref); - SD_task_dependency_add(nullptr, nullptr, parent, current_child); - XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name, parent->name); + auto job = simgrid::s4u::jobs.find(A_dax__parent_ref); + if (job != simgrid::s4u::jobs.end()) { + auto parent = job->second; + parent->add_successor(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->get_name() + " to " + + A_dax__parent_ref + ", but " + A_dax__parent_ref + " does not exist"); + } } void ETag_dax__adag() @@ -384,18 +388,18 @@ void ETag_dax__adag() XBT_DEBUG("See "); } -void ETag_dax__job(void) +void ETag_dax__job() { - current_job = nullptr; + simgrid::s4u::current_job = nullptr; XBT_DEBUG("See "); } -void ETag_dax__parent(void) +void ETag_dax__parent() { XBT_DEBUG("See "); } -void ETag_dax__uses(void) +void ETag_dax__uses() { XBT_DEBUG("See "); }