X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92197c7e3516470da6ccee2253d0e515a70a70a9..8d9283f70767d924231914c13674153d4b90a168:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 952af67936..6a1556d576 100644
--- 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));
@@ -155,7 +177,7 @@ void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* des
   tracing_file << stream_.str() << std::endl;
 }
 
-Type* Type::byName(std::string name)
+Type* Type::by_name(std::string name)
 {
   Type* ret = nullptr;
   for (auto elm : children_) {
@@ -200,32 +222,14 @@ EntityValue* ValueType::getEntityValue(std::string name)
   return ret->second;
 }
 
-ContainerType* Type::getOrCreateContainerType(std::string name)
-{
-  auto cont = children_.find(name);
-  return cont == children_.end() ? new ContainerType(name, this) : static_cast<ContainerType*>(cont->second);
-}
-
-EventType* Type::getOrCreateEventType(std::string name)
-{
-  auto cont = children_.find(name);
-  return cont == children_.end() ? new EventType(name, this) : static_cast<EventType*>(cont->second);
-}
-
-StateType* Type::getOrCreateStateType(std::string name)
-{
-  auto cont = children_.find(name);
-  return cont == children_.end() ? new StateType(name, this) : static_cast<StateType*>(cont->second);
-}
-
-VariableType* Type::getOrCreateVariableType(std::string name, std::string color)
+VariableType* Type::by_name_or_create(std::string name, std::string color)
 {
   auto cont = children_.find(name);
   std::string mycolor = color.empty() ? "1 1 1" : color;
   return cont == children_.end() ? new VariableType(name, mycolor, this) : static_cast<VariableType*>(cont->second);
 }
 
-LinkType* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest)
+LinkType* Type::by_name_or_create(std::string name, Type* source, Type* dest)
 {
   std::string alias = name + "-" + std::to_string(source->id_) + "-" + std::to_string(dest->id_);
   auto it           = children_.find(alias);