fix #285

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

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 8591e80..d46659e 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -238,23 +238,21 @@ static void instr_action_on_state_change(simgrid::kernel::resource::Action* acti
   int n = action->get_variable()->get_number_of_constraint();
 
   for (int i = 0; i < n; i++) {
+    double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i);
     /* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */
     simgrid::kernel::resource::Resource* resource =
         static_cast<simgrid::kernel::resource::Resource*>(action->get_variable()->get_constraint(i)->get_id());
     simgrid::surf::Cpu* cpu = dynamic_cast<simgrid::surf::Cpu*>(resource);
 
-    if (cpu != nullptr) {
-      double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i);
+    if (cpu != nullptr)
       TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(), value,
                                           action->get_last_update(), SIMIX_get_clock() - action->get_last_update());
-    }
+
     simgrid::kernel::resource::LinkImpl* link = dynamic_cast<simgrid::kernel::resource::LinkImpl*>(resource);
 
-    if (link != nullptr) {
-      double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i);
+    if (link != nullptr)
       TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), value,
                                           action->get_last_update(), SIMIX_get_clock() - action->get_last_update());
-    }
   }
 }
 
@@ -300,11 +298,12 @@ 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);
 
+  std::string container_name = instr_pid(actor.get());
   actor->on_exit(
-      [](int status, void* actor) {
+      [container_name](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();
+          simgrid::instr::Container::by_name(container_name)->remove_from_parent();
       },
       actor->get_impl());
 }