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

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index c77cef2e29..aca269a3ff 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -23,6 +23,9 @@ Type::Type(std::string name, std::string alias, std::string color, Type* father)
     father->children_.insert({alias, this});
     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());
+  }
 }
 
 Type::~Type()
@@ -80,6 +83,11 @@ void StateType::popEvent()
   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)", get_cname(), get_id(), father->get_cname(), father->get_id());
@@ -109,17 +117,17 @@ 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(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(issuer_, this, PAJE_EndLink, endContainer, value, key, -1);
 }
@@ -128,28 +136,23 @@ void Type::logDefinition(e_event_type event_type)
 {
   if (trace_format != simgrid::instr::TraceFormat::Paje)
     return;
-  std::stringstream stream;
   XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event_type, TRACE_precision(), 0.);
-  stream << std::fixed << std::setprecision(TRACE_precision()) << event_type << " " << get_id();
-  stream << " " << father_->get_id() << " " << get_name();
+  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 (trace_format != simgrid::instr::TraceFormat::Paje)
     return;
-  std::stringstream stream;
   XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, PAJE_DefineLinkType, TRACE_precision(), 0.);
-  stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DefineLinkType << " " << get_id();
-  stream << " " << father_->get_id() << " " << source->get_id() << " " << dest->get_id() << " " << get_name();
-  XBT_DEBUG("Dump %s", stream.str().c_str());
-  stream << std::endl;
-  fprintf(tracing_file, "%s", stream.str().c_str());
+  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)