X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88d8c7a64ca458f3e1a81fa3653eba880ae71fed..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/instr/instr_paje_events.cpp

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index a22de7daa6..0870bf097f 100644
--- a/src/instr/instr_paje_events.cpp
+++ b/src/instr/instr_paje_events.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -23,9 +23,18 @@ PajeEvent::PajeEvent(Container* container, Type* type, double timestamp, e_event
     stream_ << std::fixed << std::setprecision(TRACE_precision());
     stream_ << eventType_ << " " << timestamp_ << " " << type_->get_id() << " " << container_->get_id();
   }
-  insertIntoBuffer();
+  insert_into_buffer();
 };
 
+void PajeEvent::print()
+{
+  if (trace_format != simgrid::instr::TraceFormat::Paje)
+    return;
+
+  XBT_DEBUG("Dump %s", stream_.str().c_str());
+  tracing_file << stream_.str() << std::endl;
+}
+
 StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value, TIData* extra)
     : PajeEvent::PajeEvent(container, type, SIMIX_get_clock(), event_type), value(value), extra_(extra)
 {
@@ -43,7 +52,7 @@ void NewEvent::print()
   if (trace_format != simgrid::instr::TraceFormat::Paje)
     return;
 
-  stream_ << " " << value->getId();
+  stream_ << " " << value->get_id();
 
   XBT_DEBUG("Dump %s", stream_.str().c_str());
   tracing_file << stream_.str() << std::endl;
@@ -56,7 +65,7 @@ void LinkEvent::print()
 
   stream_ << " " << value_ << " " << endpoint_->get_id() << " " << key_;
 
-  if (TRACE_display_sizes())
+  if (TRACE_display_sizes() && size_ != -1)
     stream_ << " " << size_;
 
   XBT_DEBUG("Dump %s", stream_.str().c_str());
@@ -68,7 +77,7 @@ void VariableEvent::print()
   if (trace_format != simgrid::instr::TraceFormat::Paje)
     return;
 
-  stream_ << " " << value;
+  stream_ << " " << value_;
 
   XBT_DEBUG("Dump %s", stream_.str().c_str());
   tracing_file << stream_.str() << std::endl;
@@ -79,10 +88,10 @@ void StateEvent::print()
   if (trace_format == simgrid::instr::TraceFormat::Paje) {
 
     if (value != nullptr) // PAJE_PopState Event does not need to have a value
-      stream_ << " " << value->getId();
+      stream_ << " " << value->get_id();
 
     if (TRACE_display_sizes())
-      stream_ << " " << ((extra_ != nullptr) ? extra_->display_size() : 0);
+      stream_ << " " << ((extra_ != nullptr) ? extra_->display_size() : "");
 
 #if HAVE_SMPI
     if (simgrid::config::get_value<bool>("smpi/trace-call-location")) {
@@ -98,13 +107,14 @@ void StateEvent::print()
     /* Unimplemented calls are: WAITANY, SENDRECV, SCAN, EXSCAN, SSEND, and ISSEND. */
 
     // FIXME: dirty extract "rank-" from the name, as we want the bare process id here
-    if (getContainer()->get_name().find("rank-") != 0)
-      stream_ << getContainer()->get_name() << " " << extra_->print();
-    else
+    if (get_container()->get_name().find("rank-") != 0) {
+      stream_ << get_container()->get_name() << " " << extra_->print();
+    } else {
       /* Subtract -1 because this is the process id and we transform it to the rank id */
-      stream_ << stoi(getContainer()->get_name().erase(0, 5)) - 1 << " " << extra_->print();
-
-    *tracing_files.at(getContainer()) << stream_.str() << std::endl;
+      std::string container_name(get_container()->get_name());
+      stream_ << stoi(container_name.erase(0, 5)) - 1 << " " << extra_->print();
+    }
+    *tracing_files.at(get_container()) << stream_.str() << std::endl;
   } else {
     THROW_IMPOSSIBLE;
   }