X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da4315a72d87955d1059bf0930ff895bb20f2611..64578ee8e932a2a7e292514c0912f50fe4299220:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 7261a6a59f..aca269a3ff 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2014-2017. The SimGrid Team.
+/* Copyright (c) 2012-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -21,7 +21,10 @@ Type::Type(std::string name, std::string alias, std::string color, Type* father)
 
   if (father != nullptr){
     father->children_.insert({alias, this});
-    XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->getCname());
+    XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->get_cname());
+  }
+  if (trace_format == simgrid::instr::TraceFormat::Paje) {
+    stream_ << std::fixed << std::setprecision(TRACE_precision());
   }
 }
 
@@ -39,19 +42,19 @@ ValueType::~ValueType()
 
 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());
+  XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   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());
+  XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   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());
+  XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   logDefinition(PAJE_DefineStateType);
 }
 
@@ -62,28 +65,32 @@ StateType::~StateType()
 
 void StateType::setEvent(std::string value_name)
 {
-  events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_SetState, getEntityValue(value_name)));
+  events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, getEntityValue(value_name), nullptr));
 }
 
-void StateType::pushEvent(std::string value_name, void* extra)
+void StateType::pushEvent(std::string value_name, TIData* extra)
 {
-  events_.push_back(
-      new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_PushState, getEntityValue(value_name), 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(SIMIX_get_clock(), issuer_, this, PAJE_PushState, getEntityValue(value_name)));
+  events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), nullptr));
 }
 
 void StateType::popEvent()
 {
-  events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_PopState, nullptr));
+  events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, nullptr));
+}
+
+void StateType::popEvent(TIData* extra)
+{
+  events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, extra));
 }
 
 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());
+  XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   logDefinition(PAJE_DefineVariableType);
 }
 
@@ -110,47 +117,42 @@ void VariableType::subEvent(double timestamp, double 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)
+void LinkType::startEvent(Container* 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)
+void LinkType::startEvent(Container* startContainer, std::string value, std::string key, int size)
 {
-  new LinkEvent(SIMIX_get_clock(), issuer_, this, PAJE_StartLink, startContainer, value, key, size);
+  new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, key, size);
 }
 
-void LinkType::endEvent(container_t endContainer, std::string value, std::string key)
+void LinkType::endEvent(Container* endContainer, std::string value, std::string key)
 {
-  new LinkEvent(SIMIX_get_clock(), issuer_, this, PAJE_EndLink, endContainer, value, key);
+  new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key, -1);
 }
 
 void Type::logDefinition(e_event_type event_type)
 {
-  if (instr_fmt_type != instr_fmt_paje)
+  if (trace_format != simgrid::instr::TraceFormat::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();
+  XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event_type, TRACE_precision(), 0.);
+  stream_ << event_type << " " << get_id() << " " << father_->get_id() << " " << get_name();
   if (isColored())
-    stream << " \"" << color_ << "\"";
-  XBT_DEBUG("Dump %s", stream.str().c_str());
-  stream << std::endl;
-  fprintf(tracing_file, "%s", stream.str().c_str());
+    stream_ << " \"" << color_ << "\"";
+  XBT_DEBUG("Dump %s", stream_.str().c_str());
+  fprintf(tracing_file, "%s\n", stream_.str().c_str());
 }
 
 void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest)
 {
-  if (instr_fmt_type != instr_fmt_paje)
+  if (trace_format != simgrid::instr::TraceFormat::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());
+  XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, PAJE_DefineLinkType, TRACE_precision(), 0.);
+  stream_ << PAJE_DefineLinkType << " " << get_id() << " " << father_->get_id() << " " << source->get_id();
+  stream_ << " " << dest->get_id() << " " << get_name();
+  XBT_DEBUG("Dump %s", stream_.str().c_str());
+  fprintf(tracing_file, "%s\n", stream_.str().c_str());
 }
 
 Type* Type::byName(std::string name)
@@ -166,7 +168,7 @@ Type* Type::byName(std::string name)
     }
   }
   if (ret == nullptr)
-    THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), getCname());
+    THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), get_cname());
   return ret;
 }
 
@@ -184,7 +186,7 @@ void ValueType::addEntityValue(std::string name, std::string color)
   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());
+    XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname());
     new_val->print();
   }
 }
@@ -193,7 +195,7 @@ EntityValue* ValueType::getEntityValue(std::string 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());
+    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), get_cname());
   }
   return ret->second;
 }
@@ -229,8 +231,8 @@ LinkType* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest)
   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());
+    XBT_DEBUG("LinkType %s(%lld), child of %s(%lld)  %s(%lld)->%s(%lld)", ret->get_cname(), ret->get_id(), get_cname(),
+              get_id(), source->get_cname(), source->get_id(), dest->get_cname(), dest->get_id());
     ret->logDefinition(source, dest);
     return ret;
   } else