-/* Copyright (c) 2009-2022. The SimGrid Team.
+/* Copyright (c) 2009-2023. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
{
std::vector<simgrid::s4u::ActivityPtr> current;
- for (const auto& a : dag)
- if (dynamic_cast<simgrid::s4u::Exec*>(a.get()) != nullptr && a->has_no_successor())
- current.push_back(a);
+ std::copy_if(begin(dag), end(dag), back_inserter(current), [](const auto& a) {
+ return dynamic_cast<simgrid::s4u::Exec*>(a.get()) != nullptr && a->has_no_successor();
+ });
while (not current.empty()) {
std::vector<simgrid::s4u::ActivityPtr> next;
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*));
+ Agraph_t* dag_dot = agread(in_file, nullptr);
std::unordered_map<std::string, ActivityPtr> activities;
std::vector<ActivityPtr> dag;
void STag_dax__adag()
{
try {
- double version = std::stod(std::string(A_dax__adag_version));
+ double version = std::stod(A_dax__adag_version);
xbt_assert(version == 2.1, "Expected version 2.1 in <adag> 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()
{
try {
- double runtime = std::stod(std::string(A_dax__job_runtime));
+ double runtime = std::stod(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? */
{
double size;
try {
- size = std::stod(std::string(A_dax__uses_size));
+ size = std::stod(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");
}
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) +
+ throw std::out_of_range("Parse error on line " + std::to_string(dax_lineno) +
": Asked to add dependencies to the non-existent " + A_dax__child_ref + "task");
}
}
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");
+ throw std::out_of_range("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");
}
}