X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93d4164c9d94cbadae79947ac3f378b08c947390..06be38ef613115769d3724faf9df315dd9a34957:/src/instr/instr_resource_utilization.cpp

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index 7de5c32641..19468d23d8 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -26,68 +26,48 @@ static void instr_event(double now, double delta, simgrid::instr::VariableType*
 
   // check if key exists: if it doesn't, set the variable to zero and mark this in the global map.
   if (platform_variables.find(key) == platform_variables.end()) {
-    variable->setEvent(now, resource, 0);
+    variable->setEvent(now, 0);
     platform_variables.insert(key);
   }
 
-  variable->addEvent(now, resource, value);
-  variable->subEvent(now + delta, resource, value);
+  variable->addEvent(now, value);
+  variable->subEvent(now + delta, value);
 }
 
-/* TRACE_surf_link_set_utilization: entry point from SimGrid */
-void TRACE_surf_link_set_utilization(const char *resource, const char *category, double value, double now, double delta)
+static void TRACE_surf_resource_set_utilization(const char* type, const char* name, const char* resource,
+                                                const char* category, double value, double now, double delta)
 {
-  //only trace link utilization if link is known by tracing mechanism
+  // only trace resource utilization if resource is known by tracing mechanism
   container_t container = simgrid::instr::Container::byNameOrNull(resource);
   if (not container || not value)
     return;
 
-  //trace uncategorized link utilization
+  // trace uncategorized resource utilization
   if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now + delta, resource, value);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName("bandwidth_used"));
+    XBT_DEBUG("UNCAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, name, value);
+    simgrid::instr::VariableType* variable = container->getVariable(name);
     instr_event(now, delta, variable, container, value);
   }
 
-  //trace categorized utilization
+  // trace categorized resource utilization
   if (TRACE_categorized()){
     if (not category)
       return;
-    //variable of this category starts by 'b', because we have a link here
-    std::string category_type = std::string("b") + category;
-    XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now + delta, resource, category_type.c_str(), value);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName(category_type));
+    std::string category_type = name[0] + std::string(category);
+    XBT_DEBUG("CAT %s [%f - %f] %s %s %f", type, now, now + delta, resource, category_type.c_str(), value);
+    simgrid::instr::VariableType* variable = container->getVariable(category_type);
     instr_event(now, delta, variable, container, value);
   }
 }
 
-/* TRACE_surf_host_set_utilization: entry point from SimGrid */
-void TRACE_surf_host_set_utilization(const char *resource, const char *category, double value, double now, double delta)
+/* TRACE_surf_link_set_utilization: entry point from SimGrid */
+void TRACE_surf_link_set_utilization(const char* resource, const char* category, double value, double now, double delta)
 {
-  //only trace host utilization if host is known by tracing mechanism
-  container_t container = simgrid::instr::Container::byNameOrNull(resource);
-  if (not container || not value)
-    return;
-
-  //trace uncategorized host utilization
-  if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName("power_used"));
-    instr_event(now, delta, variable, container, value);
-  }
+  TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", resource, category, value, now, delta);
+}
 
-  //trace categorized utilization
-  if (TRACE_categorized()){
-    if (not category)
-      return;
-    //variable of this category starts by 'p', because we have a host here
-    std::string category_type = std::string("p") + category;
-    XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now + delta, resource, category_type.c_str(), value);
-    simgrid::instr::VariableType* variable =
-        static_cast<simgrid::instr::VariableType*>(container->type_->byName(category_type));
-    instr_event(now, delta, variable, container, value);
-  }
+/* TRACE_surf_host_set_utilization: entry point from SimGrid */
+void TRACE_surf_host_set_utilization(const char* resource, const char* category, double value, double now, double delta)
+{
+  TRACE_surf_resource_set_utilization("HOST", "power_used", resource, category, value, now, delta);
 }