X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4accf0246f11d3ed5c8988669f8d85279fcf21cf..9383e83f66e7cb0180d6acfc435d2622615c2c7f:/src/instr/instr_resource_utilization.cpp

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index 127e278139..77dc1e9a99 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -5,19 +5,20 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/instr/instr_private.hpp"
+#include <set>
 #include <string>
-#include <unordered_map>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorized resource utilization");
 
 //to check if variables were previously set to 0, otherwise paje won't simulate them
-static std::unordered_map<std::string, std::string> platform_variables;
+static std::set<std::string> platform_variables;
 
-static void instr_event(double now, double delta, simgrid::instr::Type* variable, container_t resource, double value)
+static void instr_event(double now, double delta, simgrid::instr::VariableType* variable, container_t resource,
+                        double value)
 {
-  /* To trace resource utilization, we use AddVariableEvent and SubVariableEvent only. This implies to add a
-   * SetVariableEvent first to set the initial value of all variables for subsequent adds/subs. If we don't do so,
-   * the first AddVariableEvent would be added to a non-determined value, hence causing analysis problems.
+  /* To trace resource utilization, we use AddEvent and SubEvent only. This implies to add a SetEvent first to set the
+   * initial value of all variables for subsequent adds/subs. If we don't do so, the first AddEvent would be added to a
+   * non-determined value, hence causing analysis problems.
    */
 
   // create a key considering the resource and variable
@@ -25,12 +26,12 @@ static void instr_event(double now, double delta, simgrid::instr::Type* variable
 
   // 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()) {
-    new simgrid::instr::SetVariableEvent(now, resource, variable, 0);
-    platform_variables[key] = std::string("");
+    variable->setEvent(now, 0);
+    platform_variables.insert(key);
   }
 
-  new simgrid::instr::AddVariableEvent(now, resource, variable, value);
-  new simgrid::instr::SubVariableEvent(now + delta, resource, variable, value);
+  variable->addEvent(now, value);
+  variable->subEvent(now + delta, value);
 }
 
 /* TRACE_surf_link_set_utilization: entry point from SimGrid */
@@ -44,8 +45,8 @@ void TRACE_surf_link_set_utilization(const char *resource, const char *category,
   //trace uncategorized link utilization
   if (TRACE_uncategorized()){
     XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now + delta, resource, value);
-    simgrid::instr::Type* type = container->type_->byName("bandwidth_used");
-    instr_event (now, delta, type, container, value);
+    simgrid::instr::VariableType* variable = container->getVariable("bandwidth_used");
+    instr_event(now, delta, variable, container, value);
   }
 
   //trace categorized utilization
@@ -55,8 +56,8 @@ void TRACE_surf_link_set_utilization(const char *resource, const char *category,
     //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::Type* type = container->type_->byName(category_type);
-    instr_event (now, delta, type, container, value);
+    simgrid::instr::VariableType* variable = container->getVariable(category_type);
+    instr_event(now, delta, variable, container, value);
   }
 }
 
@@ -71,8 +72,8 @@ void TRACE_surf_host_set_utilization(const char *resource, const char *category,
   //trace uncategorized host utilization
   if (TRACE_uncategorized()){
     XBT_DEBUG("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
-    simgrid::instr::Type* type = container->type_->byName("power_used");
-    instr_event (now, delta, type, container, value);
+    simgrid::instr::VariableType* variable = container->getVariable("power_used");
+    instr_event(now, delta, variable, container, value);
   }
 
   //trace categorized utilization
@@ -82,7 +83,7 @@ void TRACE_surf_host_set_utilization(const char *resource, const char *category,
     //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::Type* type = container->type_->byName(category_type);
-    instr_event (now, delta, type, container, value);
+    simgrid::instr::VariableType* variable = container->getVariable(category_type);
+    instr_event(now, delta, variable, container, value);
   }
 }