Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
refactor a bit
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 11 Jul 2018 17:41:35 +0000 (19:41 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 11 Jul 2018 17:41:35 +0000 (19:41 +0200)
src/instr/instr_platform.cpp

index 8591e80..ff63c71 100644 (file)
@@ -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++) {
   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);
 
     /* 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());
       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);
 
     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());
       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());
-    }
   }
 }
 
   }
 }