// create an array with all ancestors of a1
std::vector<simgrid::instr::Container*> ancestors_a1;
- simgrid::instr::Container* p = a1->father_;
- while (p) {
+ for (auto* p = a1->father_; p != nullptr; p = p->father_)
ancestors_a1.push_back(p);
- p = p->father_;
- }
// create an array with all ancestors of a2
std::vector<simgrid::instr::Container*> ancestors_a2;
- p = a2->father_;
- while (p) {
+ for (auto* p = a2->father_; p != nullptr; p = p->father_)
ancestors_a2.push_back(p);
- p = p->father_;
- }
// find the lowest ancestor
- p = nullptr;
+ simgrid::instr::Container* p = nullptr;
int i = static_cast<int>(ancestors_a1.size()) - 1;
int j = static_cast<int>(ancestors_a2.size()) - 1;
while (i >= 0 && j >= 0) {
}
static void linkContainers(simgrid::instr::Container* src, simgrid::instr::Container* dst,
- std::set<std::string>* filter)
+ std::set<std::string, std::less<>>* filter)
{
// ignore loopback
if (src->get_name() == "__loopback__" || dst->get_name() == "__loopback__") {
}
static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, simgrid::instr::Container* container,
- std::set<std::string>* filter)
+ std::set<std::string, std::less<>>* filter)
{
if (not TRACE_platform_topology()) {
XBT_DEBUG("Graph extraction disabled by user.");
}
auto* graph = xbt_graph_new_graph(0, nullptr);
- auto* nodes = new std::map<std::string, xbt_node_t>();
- auto* edges = new std::map<std::string, xbt_edge_t>();
+ std::map<std::string, xbt_node_t, std::less<>> nodes;
+ std::map<std::string, xbt_edge_t, std::less<>> edges;
- netzone->get_impl()->get_graph(graph, nodes, edges);
- for (auto elm : *edges) {
+ netzone->get_impl()->get_graph(graph, &nodes, &edges);
+ for (auto const& elm : edges) {
const xbt_edge* edge = elm.second;
linkContainers(simgrid::instr::Container::by_name(static_cast<const char*>(edge->src->data)),
simgrid::instr::Container::by_name(static_cast<const char*>(edge->dst->data)), filter);
}
- delete nodes;
- delete edges;
xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr);
}
void platform_graph_export_graphviz(const std::string& output_filename)
{
auto* g = xbt_graph_new_graph(0, nullptr);
- auto* nodes = new std::map<std::string, xbt_node_t>();
- auto* edges = new std::map<std::string, xbt_edge_t>();
- s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, nodes, edges);
+ std::map<std::string, xbt_node_t, std::less<>> nodes;
+ std::map<std::string, xbt_edge_t, std::less<>> edges;
+ s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, &nodes, &edges);
std::ofstream fs;
fs.open(output_filename, std::ofstream::out);
fs << " node [shape=box, style=filled]" << std::endl;
fs << " node [width=.3, height=.3, style=filled, color=skyblue]" << std::endl << std::endl;
- for (auto const& elm : *nodes)
+ for (auto const& elm : nodes)
fs << " \"" << elm.first << "\";" << std::endl;
- for (auto const& elm : *edges) {
+ for (auto const& elm : edges) {
const char* src_s = static_cast<char*>(elm.second->src->data);
const char* dst_s = static_cast<char*>(elm.second->dst->data);
if (g->directed)
fs.close();
xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr);
- delete nodes;
- delete edges;
}
/* Callbacks */
if (not TRACE_smpi_is_grouped())
mpi->by_name_or_create<StateType>("MPI_STATE");
root->type_->by_name_or_create("MPI_LINK", mpi, mpi);
- // TODO See if we can move this to the LoadBalancer plugin
root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi);
mpi->by_name_or_create<StateType>("MIGRATE_STATE");
}
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) {
auto* mpi = container->type_->by_name_or_create<ContainerType>("MPI");
mpi->by_name_or_create<StateType>("MPI_STATE");
- // TODO See if we can move this to the LoadBalancer plugin
root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi);
mpi->by_name_or_create<StateType>("MIGRATE_STATE");
}
static void on_platform_created()
{
currentContainer.clear();
- auto* filter = new std::set<std::string>();
+ std::set<std::string, std::less<>> filter;
XBT_DEBUG("Starting graph extraction.");
- recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), filter);
+ recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), &filter);
XBT_DEBUG("Graph extraction finished.");
- delete filter;
dump_buffer(true);
}
});
s4u::Actor::on_wake_up.connect(
[](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); });
- s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const&) {
- Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute");
+ s4u::Exec::on_start.connect([](s4u::Exec const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute");
});
- s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) {
- Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
+ s4u::Exec::on_completion.connect([](s4u::Exec const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event();
});
- s4u::Comm::on_sender_start.connect([](s4u::Actor const& actor) {
- Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send");
+ s4u::Comm::on_start.connect([](s4u::Comm const&, bool is_sender) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))
+ ->get_state("ACTOR_STATE")
+ ->push_event(is_sender ? "send" : "receive");
});
- s4u::Comm::on_receiver_start.connect([](s4u::Actor const& actor) {
- Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive");
+ s4u::Comm::on_completion.connect([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event();
});
- s4u::Comm::on_completion.connect(
- [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); });
s4u::Actor::on_host_change.connect(on_actor_host_change);
}
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) {
- s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const& exec) {
- Container::by_name(std::string("rank-") + std::to_string(actor.get_pid()))
+ s4u::Exec::on_start.connect([](s4u::Exec const& exec) {
+ Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid()))
->get_state("MPI_STATE")
->push_event("computing", new CpuTIData("compute", exec.get_cost()));
});
- s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) {
- Container::by_name(std::string("rank-") + std::to_string(actor.get_pid()))->get_state("MPI_STATE")->pop_event();
+ s4u::Exec::on_completion.connect([](s4u::Exec const&) {
+ Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid()))
+ ->get_state("MPI_STATE")
+ ->pop_event();
});
}