X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c871d5837bd9fefd1942daf48982e3c34c507abb..93d4164c9d94cbadae79947ac3f378b08c947390:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index a6e5a95a25..efac49e541 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -8,19 +8,17 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
 
-static simgrid::instr::Type* rootType = nullptr; /* the root type */
+static simgrid::instr::ContainerType* rootType = nullptr; /* the root type */
+extern FILE* tracing_file;
 
 namespace simgrid {
 namespace instr {
 
-Type::Type(std::string name, std::string alias, std::string color, e_entity_types kind, Type* father)
-    : name_(name), color_(color), kind_(kind), father_(father)
+Type::Type(std::string name, std::string alias, std::string color, Type* father)
+    : id_(instr_new_paje_id()), name_(name), color_(color), father_(father)
 {
-  if (name.empty() || alias.empty()) {
+  if (name.empty() || alias.empty())
     THROWF(tracing_error, 0, "can't create a new type with no name or alias");
-  }
-
-  id_ = std::to_string(instr_new_paje_id());
 
   if (father != nullptr){
     father->children_.insert({alias, this});
@@ -30,12 +28,117 @@ Type::Type(std::string name, std::string alias, std::string color, e_entity_type
 
 Type::~Type()
 {
-  for (auto elm : values_)
-    delete elm.second;
   for (auto elm : children_)
     delete elm.second;
 }
 
+ValueType::~ValueType()
+{
+  for (auto elm : values_)
+    delete elm.second;
+}
+
+ContainerType::ContainerType(std::string name, Type* father) : Type(name, name, "", father)
+{
+  XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId());
+  logDefinition(PAJE_DefineContainerType);
+}
+
+EventType::EventType(std::string name, Type* father) : ValueType(name, father)
+{
+  XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId());
+  logDefinition(PAJE_DefineEventType);
+}
+
+StateType::StateType(std::string name, Type* father) : ValueType(name, father)
+{
+  XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId());
+  logDefinition(PAJE_DefineStateType);
+}
+
+StateType::~StateType()
+{
+  events_.clear();
+}
+
+void StateType::setEvent(double timestamp, Container* container, std::string value_name)
+{
+  events_.push_back(new StateEvent(timestamp, container, this, PAJE_SetState, getEntityValue(value_name)));
+}
+
+void StateType::pushEvent(double timestamp, Container* container, std::string value_name, void* extra)
+{
+  events_.push_back(new StateEvent(timestamp, container, this, PAJE_PushState, getEntityValue(value_name), extra));
+}
+
+void StateType::pushEvent(double timestamp, Container* container, std::string value_name)
+{
+  events_.push_back(new StateEvent(timestamp, container, this, PAJE_PushState, getEntityValue(value_name)));
+}
+
+void StateType::popEvent(double timestamp, Container* container)
+{
+  events_.push_back(new StateEvent(timestamp, container, 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, Container* container, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SetVariable, value));
+}
+
+void VariableType::addEvent(double timestamp, Container* container, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, container, this, PAJE_AddVariable, value));
+}
+
+void VariableType::subEvent(double timestamp, Container* container, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SubVariable, value));
+}
+
+LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
+{
+}
+
+void Type::logDefinition(e_event_type event_type)
+{
+  if (instr_fmt_type != instr_fmt_paje)
+    return;
+  std::stringstream stream;
+  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())
+    stream << " \"" << color_ << "\"";
+  XBT_DEBUG("Dump %s", stream.str().c_str());
+  stream << std::endl;
+  fprintf(tracing_file, "%s", stream.str().c_str());
+}
+
+void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest)
+{
+  if (instr_fmt_type != instr_fmt_paje)
+    return;
+  std::stringstream stream;
+  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());
+  stream << std::endl;
+  fprintf(tracing_file, "%s", stream.str().c_str());
+}
+
 Type* Type::byName(std::string name)
 {
   Type* ret = nullptr;
@@ -53,29 +156,26 @@ Type* Type::byName(std::string name)
   return ret;
 }
 
-void Type::addEntityValue(std::string name)
+void ValueType::addEntityValue(std::string name)
 {
   addEntityValue(name, "");
 }
 
-void Type::addEntityValue(std::string name, std::string color)
+void ValueType::addEntityValue(std::string name, std::string color)
 {
-  if (name.empty()) {
+  if (name.empty())
     THROWF(tracing_error, 0, "can't get a value with no name");
-  }
-  if (kind_ == TYPE_VARIABLE)
-    THROWF(tracing_error, 0, "variables can't have different values (%s)", getCname());
 
   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());
+    XBT_DEBUG("new value %s, child of %s", name.c_str(), getCname());
     new_val->print();
   }
 }
 
-Value* Type::getEntityValue(std::string name)
+EntityValue* ValueType::getEntityValue(std::string name)
 {
   auto ret = values_.find(name);
   if (ret == values_.end()) {
@@ -84,81 +184,54 @@ Value* Type::getEntityValue(std::string name)
   return ret->second;
 }
 
-Type* Type::createRootType()
+ContainerType* Type::createRootType()
 {
-  simgrid::instr::Type* ret = new simgrid::instr::Type("0", "0", "", TYPE_CONTAINER, nullptr);
-  rootType                  = ret;
-  return ret;
+  rootType = static_cast<ContainerType*>(new simgrid::instr::Type("0", "0", "", nullptr));
+  return rootType;
 }
 
-Type* Type::getRootType()
+ContainerType* Type::getRootType()
 {
   return rootType;
 }
 
-Type* Type::getOrCreateContainerType(std::string name)
+ContainerType* Type::getOrCreateContainerType(std::string name)
 {
-  auto it = children_.find(name);
-  if (it == children_.end()) {
-    Type* ret = new simgrid::instr::Type(name, name, "", TYPE_CONTAINER, this);
-    XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
-    ret->logContainerTypeDefinition();
-    return ret;
-  } else
-    return it->second;
+  auto cont = children_.find(name);
+  return cont == children_.end() ? new ContainerType(name, this) : static_cast<ContainerType*>(cont->second);
 }
 
-Type* Type::getOrCreateEventType(std::string name)
+EventType* Type::getOrCreateEventType(std::string name)
 {
-  auto it = children_.find(name);
-  if (it == children_.end()) {
-    Type* ret = new Type(name, name, "", TYPE_EVENT, this);
-    XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
-    ret->logDefineEventType();
-    return ret;
-  } else {
-    return it->second;
-  }
+  auto cont = children_.find(name);
+  return cont == children_.end() ? new EventType(name, this) : static_cast<EventType*>(cont->second);
 }
 
-Type* Type::getOrCreateVariableType(std::string name, std::string color)
+StateType* Type::getOrCreateStateType(std::string name)
 {
-  auto it = children_.find(name);
-  if (it == children_.end()) {
-    Type* ret = new Type(name, name, color.empty() ? "1 1 1" : color, TYPE_VARIABLE, this);
-
-    XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
-    ret->logVariableTypeDefinition();
-
-    return ret;
-  } else
-    return it->second;
+  auto cont = children_.find(name);
+  return cont == children_.end() ? new StateType(name, this) : static_cast<StateType*>(cont->second);
 }
 
-Type* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest)
+VariableType* Type::getOrCreateVariableType(std::string name, std::string color)
 {
-  std::string alias = name + "-" + source->id_ + "-" + dest->id_;
-  auto it           = children_.find(alias);
-  if (it == children_.end()) {
-    Type* ret = new Type(name, alias, "", TYPE_LINK, this);
-    XBT_DEBUG("LinkType %s(%s), child of %s(%s)  %s(%s)->%s(%s)", ret->getCname(), ret->getId(), getCname(), getId(),
-              source->getCname(), source->getId(), dest->getCname(), dest->getId());
-    ret->logLinkTypeDefinition(source, dest);
-    return ret;
-  } else
-    return it->second;
+  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);
 }
 
-Type* Type::getOrCreateStateType(std::string name)
+LinkType* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest)
 {
-  auto it = children_.find(name);
+  std::string alias = name + "-" + std::to_string(source->id_) + "-" + std::to_string(dest->id_);
+  auto it           = children_.find(alias);
   if (it == children_.end()) {
-    Type* ret = new Type(name, name, "", TYPE_STATE, this);
-    XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->getCname(), ret->getId(), getCname(), getId());
-    ret->logStateTypeDefinition();
+    LinkType* ret = new LinkType(name, alias, this);
+    XBT_DEBUG("LinkType %s(%lld), child of %s(%lld)  %s(%lld)->%s(%lld)", ret->getCname(), ret->getId(), getCname(),
+              getId(), source->getCname(), source->getId(), dest->getCname(), dest->getId());
+    ret->logDefinition(source, dest);
     return ret;
   } else
-    return it->second;
+    return static_cast<LinkType*>(it->second);
 }
 }
 }