if (not netzone->get_children().empty()) {
// bottom-up recursion
for (auto const& nz_son : netzone->get_children()) {
- container_t child_container = container->children_.at(nz_son->get_cname());
+ container_t child_container = container->children_.at(nz_son->get_name());
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
static void instr_host_on_speed_change(simgrid::s4u::Host& host)
{
- simgrid::instr::Container::by_name(host.get_cname())
+ simgrid::instr::Container::by_name(host.get_name())
->get_variable("speed")
->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
}
static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link)
{
- simgrid::instr::Container::by_name(link.get_cname())
+ simgrid::instr::Container::by_name(link.get_name())
->get_variable("bandwidth")
->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
}
static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
{
if (netpoint->is_router())
- new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back());
+ new simgrid::instr::RouterContainer(netpoint->get_name(), currentContainer.back());
}
static void instr_on_platform_created()
root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type);
std::string container_name = instr_pid(actor.get());
- actor->on_exit(
- [container_name](int status, void*) {
- if (status == SMX_EXIT_FAILURE)
- // kill means that this actor no longer exists, let's destroy it
- simgrid::instr::Container::by_name(container_name)->remove_from_parent();
- },
- actor->get_impl());
+ actor->on_exit([container_name](bool failed) {
+ if (failed)
+ // kill means that this actor no longer exists, let's destroy it
+ simgrid::instr::Container::by_name(container_name)->remove_from_parent();
+ });
}
static long long int counter = 0;
if (not netzone->get_children().empty()) {
// bottom-up recursion
for (auto const& netzone_child : netzone->get_children()) {
- container_t child_container = container->children_.at(netzone_child->get_cname());
+ container_t child_container = container->children_.at(netzone_child->get_name());
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}