X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8cfd4f9b786027431b78a9b74db0843634ab7397..808fd3fed0409880a319cae9b6c3ca115c1c01d1:/src/instr/instr_platform.cpp

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index eeb38779a5..59b16ddcd0 100644
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -229,11 +229,10 @@ static void instr_host_on_speed_change(simgrid::s4u::Host& host)
 {
   simgrid::instr::Container::by_name(host.get_cname())
       ->get_variable("power")
-      ->set_event(surf_get_clock(), host.getCoreCount() * host.get_available_speed());
+      ->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(),
@@ -278,13 +277,6 @@ static void instr_on_platform_created()
   TRACE_paje_dump_buffer(true);
 }
 
-static void TRACE_actor_kill(smx_process_exit_status_t status, msg_process_t process)
-{
-  if (status == SMX_EXIT_FAILURE)
-    // kill means that this actor no longer exists, let's destroy it
-    simgrid::instr::Container::by_name(instr_pid(process))->remove_from_parent();
-}
-
 static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)
 {
   container_t root      = simgrid::instr::Container::get_root();
@@ -302,7 +294,13 @@ static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)
   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;
@@ -358,7 +356,7 @@ void instr_define_callbacks()
   }
   simgrid::s4u::NetZone::onCreation.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()) {