->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
}
-static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action,
- simgrid::kernel::resource::Action::State /* previous */)
+static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action)
{
simgrid::surf::Cpu* cpu = static_cast<simgrid::surf::Cpu*>(action->get_variable()->get_constraint(0)->get_id());
TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(),
TRACE_paje_dump_buffer(true);
}
-static void TRACE_actor_kill(smx_process_exit_status_t status, simgrid::s4u::Actor* actor)
-{
- if (status == SMX_EXIT_FAILURE)
- // kill means that this actor no longer exists, let's destroy it
- simgrid::instr::Container::by_name(instr_pid(actor))->remove_from_parent();
-}
-
static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)
{
container_t root = simgrid::instr::Container::get_root();
root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type);
- actor->on_exit((int_f_pvoid_pvoid_t)TRACE_actor_kill, actor->get_impl());
+ actor->on_exit(
+ [](int status, void* actor) {
+ if (status == SMX_EXIT_FAILURE)
+ // kill means that this actor no longer exists, let's destroy it
+ simgrid::instr::Container::by_name(instr_pid(static_cast<simgrid::s4u::Actor*>(actor)))->remove_from_parent();
+ },
+ actor->get_impl());
}
static long long int counter = 0;
simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
- simgrid::s4u::NetZone::onSeal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); });
+ simgrid::s4u::NetZone::on_seal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); });
simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation);
}
- simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
+ simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation);
- simgrid::surf::CpuAction::onStateChange.connect(instr_cpu_action_on_state_change);
+ simgrid::surf::CpuAction::on_state_change.connect(instr_cpu_action_on_state_change);
simgrid::s4u::Link::on_communication_state_change.connect(instr_link_on_communication_state_change);
if (TRACE_actor_is_enabled()) {