-/* 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::string new_name = parent->get_name() + "_" + comm->get_name() + "_" + child->get_name();
- comm->set_name(new_name)->vetoable_start();
+ comm->set_name(new_name)->start();
}
static bool check_for_cycle(const std::vector<simgrid::s4u::ActivityPtr>& dag)
{
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;
static YY_BUFFER_STATE input_buffer;
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
static std::vector<ActivityPtr> result;
static std::map<std::string, ExecPtr, std::less<>> jobs;
dax_lineno = 1;
auto root_task = Exec::init()->set_name("root")->set_flops_amount(0);
- root_task->vetoable_start();
+ root_task->start();
result.push_back(root_task);
auto end_task = Exec::init()->set_name("end")->set_flops_amount(0);
- end_task->vetoable_start();
+ end_task->start();
xbt_assert(dax_lex() == 0, "Parse error in %s: %s", filename.c_str(), dax__parse_err_msg());
dax__delete_buffer(input_buffer);
* 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).
*/
- CommPtr file;
-
- for (auto const& elm : files) {
- file = elm.second;
+ for (auto const& [_, elm] : files) {
+ CommPtr file = elm;
CommPtr newfile;
if (file->dependencies_solved()) {
for (auto const& it : file->get_successors()) {
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;
if (activities.find(name) == activities.end()) {
XBT_DEBUG("See <Exec id = %s amount = %.0f>", name.c_str(), amount);
- act = Exec::init()->set_name(name)->set_flops_amount(amount)->vetoable_start();
+ act = Exec::init()->set_name(name)->set_flops_amount(amount)->start();
activities.try_emplace(name, act);
if (name != "root" && name != "end")
dag.push_back(act);
}
/*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();
+ root = Exec::init()->set_name("root")->set_flops_amount(0)->start();
else
root = activities.at("root");
if (activities.find("end") == activities.end())
- end = Exec::init()->set_name("end")->set_flops_amount(0)->vetoable_start();
+ end = Exec::init()->set_name("end")->set_flops_amount(0)->start();
else
end = activities.at("end");
std::string name = std::string(src_name) + "->" + dst_name;
XBT_DEBUG("See <Comm id=%s amount = %.0f>", name.c_str(), size);
if (activities.find(name) == activities.end()) {
- act = Comm::sendto_init()->set_name(name)->set_payload_size(size)->vetoable_start();
+ act = Comm::sendto_init()->set_name(name)->set_payload_size(size)->start();
src->add_successor(act);
act->add_successor(dst);
activities.try_emplace(name, act);
"Please install graphviz, graphviz-dev, and libgraphviz-dev (and erase CMakeCache.txt) before recompiling.");
}
#endif
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
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? */
XBT_DEBUG("See <job id=%s runtime=%s %.0f>", 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::current_job = simgrid::s4u::Exec::init()->set_name(name)->set_flops_amount(runtime)->start();
simgrid::s4u::jobs.try_emplace(A_dax__job_id, simgrid::s4u::current_job);
simgrid::s4u::result.push_back(simgrid::s4u::current_job);
} catch (const std::invalid_argument&) {
{
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");
}
}
