snake_case some easy parts of s4u::Host

[simgrid.git] / src / instr / instr_platform.cpp

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index fe2f6e8..985c506 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -229,7 +229,7 @@ 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,
@@ -278,6 +278,13 @@ static void instr_on_platform_created()
   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();
@@ -294,6 +301,8 @@ static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)
   state->add_entity_value("task_execute", "0 1 1");
   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());
 }
 
 static long long int counter = 0;