X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b482c74139e9088b65a3f9a0d41da0276cb641c..9b5c287fbf93c2ae7c3d18c8584647ef9920fe87:/src/instr/instr_paje_events.cpp

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index aef50ebd2d..ba18219ff8 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. */
@@ -65,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());
@@ -91,7 +91,7 @@ void StateEvent::print()
       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")) {
@@ -105,20 +105,23 @@ void StateEvent::print()
       return;
 
     /* Unimplemented calls are: WAITANY, SENDRECV, SCAN, EXSCAN, SSEND, and ISSEND. */
-
+    std::string container_name(get_container()->get_name());
     // FIXME: dirty extract "rank-" from the name, as we want the bare process id here
-    if (get_container()->get_name().find("rank-") != 0)
-      stream_ << get_container()->get_name() << " " << extra_->print();
-    else
+    if (get_container()->get_name().find("rank-") == 0) {
       /* Subtract -1 because this is the process id and we transform it to the rank id */
-      stream_ << stoi(get_container()->get_name().erase(0, 5)) - 1 << " " << extra_->print();
-
+      container_name=std::to_string(stoi(container_name.erase(0, 5)) - 1);
+    }
+    #if HAVE_SMPI
+    if (simgrid::config::get_value<bool>("smpi/trace-call-location")) {
+      stream_ << container_name << " location " << filename << " " << linenumber << std::endl ;
+    }
+    #endif
+    stream_ << container_name << " " << extra_->print();
     *tracing_files.at(get_container()) << stream_.str() << std::endl;
   } else {
     THROW_IMPOSSIBLE;
   }
 
-  delete extra_;
 }
 }
 }