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

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index ead0ea4060..77dc1e9a99 100644
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -5,57 +5,48 @@
  * 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;
 
-//used by all methods
-static void __TRACE_surf_check_variable_set_to_zero(double now, const char* variable, std::string resource)
+static void instr_event(double now, double delta, simgrid::instr::VariableType* variable, container_t resource,
+                        double value)
 {
-  /* To trace resource utilization, we use pajeAddVariable and pajeSubVariable only.
-   * The Paje simulator needs a pajeSetVariable in the first place so it knows the initial value of all variables for
-   * subsequent adds/subs. If we don't do so, the first pajeAddVariable is added to a non-determined value within
-   * the Paje simulator, 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
-  std::string key = resource + variable;
+  std::string key = resource->getName() + variable->getName();
 
-  // check if key exists: if it doesn't, set the variable to zero and mark this in the dict
+  // 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()) {
-    container_t container      = PJ_container_get(resource.c_str());
-    simgrid::instr::Type* type = container->type_->getChild(variable);
-    new simgrid::instr::SetVariableEvent(now, container, type, 0);
-    platform_variables[key] = std::string("");
+    variable->setEvent(now, 0);
+    platform_variables.insert(key);
   }
-}
 
-static void instr_event(double now, double delta, simgrid::instr::Type* variable, container_t resource, double value)
-{
-  __TRACE_surf_check_variable_set_to_zero(now, variable->name_, resource->name_);
-  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 */
 void TRACE_surf_link_set_utilization(const char *resource, const char *category, double value, double now, double delta)
 {
   //only trace link utilization if link is known by tracing mechanism
-  if (not PJ_container_get_or_null(resource))
-    return;
-  if (not value)
+  container_t container = simgrid::instr::Container::byNameOrNull(resource);
+  if (not container || not value)
     return;
 
   //trace uncategorized link utilization
   if (TRACE_uncategorized()){
-    XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
-    container_t container = PJ_container_get (resource);
-    simgrid::instr::Type* type = container->type_->getChild("bandwidth_used");
-    instr_event (now, delta, type, container, value);
+    XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now + delta, resource, value);
+    simgrid::instr::VariableType* variable = container->getVariable("bandwidth_used");
+    instr_event(now, delta, variable, container, value);
   }
 
   //trace categorized utilization
@@ -63,12 +54,10 @@ void TRACE_surf_link_set_utilization(const char *resource, const char *category,
     if (not category)
       return;
     //variable of this category starts by 'b', because we have a link here
-    char category_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", category);
-    XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
-    container_t container = PJ_container_get (resource);
-    simgrid::instr::Type* type = container->type_->getChild(category_type);
-    instr_event (now, delta, type, container, value);
+    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 = container->getVariable(category_type);
+    instr_event(now, delta, variable, container, value);
   }
 }
 
@@ -76,15 +65,15 @@ void TRACE_surf_link_set_utilization(const char *resource, const char *category,
 void TRACE_surf_host_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 = PJ_container_get_or_null(resource);
+  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::Type* type = container->type_->getChild("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
@@ -92,10 +81,9 @@ void TRACE_surf_host_set_utilization(const char *resource, const char *category,
     if (not category)
       return;
     //variable of this category starts by 'p', because we have a host here
-    char category_type[INSTR_DEFAULT_STR_SIZE];
-    snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", category);
-    XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
-    simgrid::instr::Type* type = container->type_->getChild(category_type);
-    instr_event (now, delta, type, container, value);
+    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 = container->getVariable(category_type);
+    instr_event(now, delta, variable, container, value);
   }
 }