move function to class

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 952af67..7343396 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -9,6 +9,8 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
 
 extern std::ofstream tracing_file;
+// to check if variables were previously set to 0, otherwise paje won't simulate them
+static std::set<std::string> platform_variables;
 
 namespace simgrid {
 namespace instr {
@@ -99,6 +101,26 @@ VariableType::~VariableType()
   events_.clear();
 }
 
+void VariableType::instr_event(double now, double delta, const char* resource, double value)
+{
+  /* 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 = std::string(resource) + get_name();
+
+  // 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()) {
+    setEvent(now, 0);
+    platform_variables.insert(key);
+  }
+
+  addEvent(now, value);
+  subEvent(now + delta, value);
+}
+
 void VariableType::setEvent(double timestamp, double value)
 {
   events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SetVariable, value));

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index 75f38b5..6f33a2c 100644 (file)
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -59,6 +59,7 @@ class VariableType : public Type {
 public:
   VariableType(std::string name, std::string color, Type* father);
   ~VariableType();
+  void instr_event(double now, double delta, const char* resource, double value);
   void setEvent(double timestamp, double value);
   void addEvent(double timestamp, double value);
   void subEvent(double timestamp, double value);

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index a706875..120de2d 100644 (file)
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -5,35 +5,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/instr/instr_private.hpp"
-#include <set>
 #include <string>
 
 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::set<std::string> platform_variables;
-
-static void instr_event(double now, double delta, simgrid::instr::VariableType* variable, container_t resource,
-                        double value)
-{
-  /* 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->get_name() + variable->get_name();
-
-  // 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, 0);
-    platform_variables.insert(key);
-  }
-
-  variable->addEvent(now, value);
-  variable->subEvent(now + delta, value);
-}
-
 void TRACE_surf_resource_set_utilization(const char* type, const char* name, const char* resource, const char* category,
                                          double value, double now, double delta)
 {
@@ -45,18 +20,14 @@ void TRACE_surf_resource_set_utilization(const char* type, const char* name, con
   // trace uncategorized resource utilization
   if (TRACE_uncategorized()){
     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);
+    container->getVariable(name)->instr_event(now, delta, resource, value);
   }
 
   // trace categorized resource utilization
-  if (TRACE_categorized()){
-    if (not category)
-      return;
+  if (TRACE_categorized() && category) {
     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);
+    container->getVariable(name)->instr_event(now, delta, resource, value);
   }
 }