Merge branch 'master' into fix/execute_benched

[simgrid.git] / src / instr / instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 2cbd8d8..3f87707 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -8,7 +8,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
 
-static simgrid::instr::ContainerType* rootType = nullptr; /* the root type */
 extern FILE* tracing_file;
 
 namespace simgrid {
@@ -56,22 +55,81 @@ StateType::StateType(std::string name, Type* father) : ValueType(name, father)
   logDefinition(PAJE_DefineStateType);
 }
 
+StateType::~StateType()
+{
+  events_.clear();
+}
+
+void StateType::setEvent(std::string value_name)
+{
+  events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, getEntityValue(value_name)));
+}
+
+void StateType::pushEvent(std::string value_name, TIData* extra)
+{
+  events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), extra));
+}
+
+void StateType::pushEvent(std::string value_name)
+{
+  events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name)));
+}
+
+void StateType::popEvent()
+{
+  events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr));
+}
+
 VariableType::VariableType(std::string name, std::string color, Type* father) : Type(name, name, color, father)
 {
   XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId());
   logDefinition(PAJE_DefineVariableType);
 }
 
+VariableType::~VariableType()
+{
+  events_.clear();
+}
+
+void VariableType::setEvent(double timestamp, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SetVariable, value));
+}
+
+void VariableType::addEvent(double timestamp, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_AddVariable, value));
+}
+
+void VariableType::subEvent(double timestamp, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SubVariable, value));
+}
+
 LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
 {
 }
+void LinkType::startEvent(container_t startContainer, std::string value, std::string key)
+{
+  startEvent(startContainer, value, key, -1);
+}
+
+void LinkType::startEvent(container_t startContainer, std::string value, std::string key, int size)
+{
+  new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, key, size);
+}
+
+void LinkType::endEvent(container_t endContainer, std::string value, std::string key)
+{
+  new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key);
+}
 
 void Type::logDefinition(e_event_type event_type)
 {
   if (instr_fmt_type != instr_fmt_paje)
     return;
   std::stringstream stream;
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, event_type, TRACE_precision(), 0.);
+  XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, event_type, TRACE_precision(), 0.);
   stream << std::fixed << std::setprecision(TRACE_precision()) << event_type << " " << getId();
   stream << " " << father_->getId() << " " << getName();
   if (isColored())
@@ -86,7 +144,7 @@ void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* des
   if (instr_fmt_type != instr_fmt_paje)
     return;
   std::stringstream stream;
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineLinkType, TRACE_precision(), 0.);
+  XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, PAJE_DefineLinkType, TRACE_precision(), 0.);
   stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DefineLinkType << " " << getId();
   stream << " " << father_->getId() << " " << source->getId() << " " << dest->getId() << " " << getName();
   XBT_DEBUG("Dump %s", stream.str().c_str());
@@ -123,14 +181,14 @@ void ValueType::addEntityValue(std::string name, std::string color)
 
   auto it = values_.find(name);
   if (it == values_.end()) {
-    Value* new_val = new Value(name, color, this);
+    EntityValue* new_val = new EntityValue(name, color, this);
     values_.insert({name, new_val});
     XBT_DEBUG("new value %s, child of %s", name.c_str(), getCname());
     new_val->print();
   }
 }
 
-Value* ValueType::getEntityValue(std::string name)
+EntityValue* ValueType::getEntityValue(std::string name)
 {
   auto ret = values_.find(name);
   if (ret == values_.end()) {
@@ -139,17 +197,6 @@ Value* ValueType::getEntityValue(std::string name)
   return ret->second;
 }
 
-ContainerType* Type::createRootType()
-{
-  rootType = static_cast<ContainerType*>(new simgrid::instr::Type("0", "0", "", nullptr));
-  return rootType;
-}
-
-ContainerType* Type::getRootType()
-{
-  return rootType;
-}
-
 ContainerType* Type::getOrCreateContainerType(std::string name)
 {
   auto cont = children_.find(name);
@@ -171,8 +218,8 @@ StateType* Type::getOrCreateStateType(std::string name)
 VariableType* Type::getOrCreateVariableType(std::string name, std::string color)
 {
   auto cont = children_.find(name);
-  return cont == children_.end() ? new VariableType(name, color.empty() ? "1 1 1" : color, this)
-                                 : static_cast<VariableType*>(cont->second);
+  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)