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

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index c5ccbfa4c1..efac49e541 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -4,180 +4,234 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
 
-static Type* rootType = nullptr;        /* the root type */
+static simgrid::instr::ContainerType* rootType = nullptr; /* the root type */
+extern FILE* tracing_file;
 
-void PJ_type_release ()
+namespace simgrid {
+namespace instr {
+
+Type::Type(std::string name, std::string alias, std::string color, Type* father)
+    : id_(instr_new_paje_id()), name_(name), color_(color), father_(father)
 {
-  rootType = nullptr;
+  if (name.empty() || alias.empty())
+    THROWF(tracing_error, 0, "can't create a new type with no name or alias");
+
+  if (father != nullptr){
+    father->children_.insert({alias, this});
+    XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->getCname());
+  }
 }
 
-Type* PJ_type_get_root()
+Type::~Type()
 {
-  return rootType;
+  for (auto elm : children_)
+    delete elm.second;
 }
 
-Type::Type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, Type* father)
+ValueType::~ValueType()
 {
-  if (typeNameBuff == nullptr || key == nullptr){
-    THROWF(tracing_error, 0, "can't create a new type with name or key equal nullptr");
-  }
+  for (auto elm : values_)
+    delete elm.second;
+}
 
-  this->name = xbt_strdup (typeNameBuff);
-  this->father = father;
-  this->kind = kind;
-  this->children = xbt_dict_new_homogeneous(nullptr);
-  this->values = xbt_dict_new_homogeneous(nullptr);
-  this->color = xbt_strdup (color);
+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);
+}
 
-  char str_id[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
-  this->id = xbt_strdup (str_id);
+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);
+}
 
-  if (father != nullptr){
-    xbt_dict_set (father->children, key, this, nullptr);
-    XBT_DEBUG("new type %s, child of %s", typeNameBuff, father->name);
-  }
+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);
 }
 
-void PJ_type_free(Type* type)
+StateType::~StateType()
 {
-  Value* val;
-  char *value_name;
-  xbt_dict_cursor_t cursor = nullptr;
-  xbt_dict_foreach (type->values, cursor, value_name, val) {
-    XBT_DEBUG("free value %s, child of %s", val->name, val->father->name);
-    xbt_free(val);
-  }
-  xbt_dict_free (&type->values);
-  xbt_free (type->name);
-  xbt_free (type->id);
-  xbt_free (type->color);
-  xbt_dict_free (&type->children);
-  xbt_free (type);
-  type = nullptr;
-}
-
-void recursiveDestroyType(Type* type)
-{
-  XBT_DEBUG("recursiveDestroyType %s", type->name);
-  xbt_dict_cursor_t cursor = nullptr;
-  Type* child;
-  char *child_name;
-  xbt_dict_foreach(type->children, cursor, child_name, child) {
-    recursiveDestroyType (child);
-  }
-  PJ_type_free(type);
+  events_.clear();
 }
 
-Type* PJ_type_get(const char* name, Type* father)
+void StateType::setEvent(double timestamp, Container* container, std::string value_name)
 {
-  Type* ret = Type::getOrNull (name, father);
-  if (ret == nullptr){
-    THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name);
-  }
-  return ret;
+  events_.push_back(new StateEvent(timestamp, container, this, PAJE_SetState, getEntityValue(value_name)));
 }
 
-Type* Type::getOrNull(const char* name, Type* father)
+void StateType::pushEvent(double timestamp, Container* container, std::string value_name, void* extra)
 {
-  if (name == nullptr || father == nullptr){
-    THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father");
-  }
+  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;
-  Type* child;
-  char *child_name;
-  xbt_dict_cursor_t cursor = nullptr;
-  xbt_dict_foreach(father->children, cursor, child_name, child) {
-    if (strcmp (child->name, name) == 0){
-      if (ret != nullptr){
+  for (auto elm : children_) {
+    if (elm.second->name_ == name) {
+      if (ret != nullptr) {
         THROWF (tracing_error, 0, "there are two children types with the same name?");
-      }else{
-        ret = child;
+      } else {
+        ret = elm.second;
       }
     }
   }
+  if (ret == nullptr)
+    THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), getCname());
   return ret;
 }
 
-Type* Type::containerNew(const char* name, Type* father)
+void ValueType::addEntityValue(std::string name)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
-  }
-
-  Type* ret = new Type (name, name, nullptr, TYPE_CONTAINER, father);
-  if (father == nullptr) {
-    rootType = ret;
-  } else {
-    XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-    DefineContainerEvent(ret);
-  }
-  return ret;
+  addEntityValue(name, "");
 }
 
-Type* Type::eventNew(const char* name, Type* father)
+void ValueType::addEntityValue(std::string name, std::string color)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
+  if (name.empty())
+    THROWF(tracing_error, 0, "can't get a value with no name");
+
+  auto it = values_.find(name);
+  if (it == values_.end()) {
+    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();
   }
-
-  Type* ret = new Type (name, name, nullptr, TYPE_EVENT, father);
-  XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-  LogDefineEventType(ret);
-  return ret;
 }
 
-Type* Type::variableNew(const char* name, const char* color, Type* father)
+EntityValue* ValueType::getEntityValue(std::string name)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a variable type with a nullptr name");
+  auto ret = values_.find(name);
+  if (ret == values_.end()) {
+    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), getCname());
   }
+  return ret->second;
+}
 
-  Type* ret = nullptr;
-
-  if (not color) {
-    char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
-    ret = new Type (name, name, white, TYPE_VARIABLE, father);
-  }else{
-    ret = new Type (name, name, color, TYPE_VARIABLE, father);
-  }
-  XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-  LogVariableTypeDefinition (ret);
-  return ret;
+ContainerType* Type::createRootType()
+{
+  rootType = static_cast<ContainerType*>(new simgrid::instr::Type("0", "0", "", nullptr));
+  return rootType;
 }
 
-Type* Type::linkNew(const char* name, Type* father, Type* source, Type* dest)
+ContainerType* Type::getRootType()
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
-  }
+  return rootType;
+}
 
-  Type* ret = nullptr;
+ContainerType* Type::getOrCreateContainerType(std::string name)
+{
+  auto cont = children_.find(name);
+  return cont == children_.end() ? new ContainerType(name, this) : static_cast<ContainerType*>(cont->second);
+}
 
-  char key[INSTR_DEFAULT_STR_SIZE];
-  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", name, source->id, dest->id);
-  ret = new Type (name, key, nullptr, TYPE_LINK, father);
-  XBT_DEBUG("LinkType %s(%s), child of %s(%s)  %s(%s)->%s(%s)", ret->name, ret->id, father->name, father->id,
-            source->name, source->id, dest->name, dest->id);
-  LogLinkTypeDefinition(ret, source, dest);
-  return ret;
+EventType* Type::getOrCreateEventType(std::string name)
+{
+  auto cont = children_.find(name);
+  return cont == children_.end() ? new EventType(name, this) : static_cast<EventType*>(cont->second);
 }
 
-Type* Type::stateNew(const char* name, Type* father)
+StateType* Type::getOrCreateStateType(std::string name)
 {
-  if (name == nullptr){
-    THROWF (tracing_error, 0, "can't create a state type with a nullptr name");
-  }
+  auto cont = children_.find(name);
+  return cont == children_.end() ? new StateType(name, this) : static_cast<StateType*>(cont->second);
+}
 
-  Type* ret = nullptr;
+VariableType* Type::getOrCreateVariableType(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);
+}
 
-  ret = new Type (name, name, nullptr, TYPE_STATE, father);
-  XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-  LogStateTypeDefinition(ret);
-  return ret;
+LinkType* Type::getOrCreateLinkType(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);
+  if (it == children_.end()) {
+    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 static_cast<LinkType*>(it->second);
+}
+}
 }