X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93d4164c9d94cbadae79947ac3f378b08c947390..c0bda26f8216132898999052ea1fdbbe01fd2aa0:/src/surf/instr_surf.cpp

diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp
index b53c55f3d7..2746a66bb2 100644
--- a/src/surf/instr_surf.cpp
+++ b/src/surf/instr_surf.cpp
@@ -12,30 +12,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
-    container_t container      = simgrid::instr::Container::byName(resource);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName("power"));
-    variable->setEvent(date, container, speed);
+    simgrid::instr::Container::byName(resource)->getVariable("power")->setEvent(date, speed);
   }
 }
 
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
 {
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
-    container_t container      = simgrid::instr::Container::byName(resource);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName("bandwidth"));
-    variable->setEvent(date, container, bandwidth);
+    simgrid::instr::Container::byName(resource)->getVariable("bandwidth")->setEvent(date, bandwidth);
   }
 }
 
 void TRACE_surf_action(surf_action_t surf_action, const char *category)
 {
-  if (not TRACE_is_enabled())
-    return;
-  if (not TRACE_categorized())
-    return;
-  if (not category)
+  if (not TRACE_is_enabled() || not TRACE_categorized() || not category)
     return;
 
   surf_action->setCategory(category);