X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e30d391831c58e590aa83dce5f30f218cc3f53ce..76bb3df276161c7ae9e6fa1e81057adc9671704e:/src/instr/instr_paje_events.cpp

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index 4aacda95af..6ba97ee705 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-2020. 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. */
@@ -9,8 +9,6 @@
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_events, instr, "Paje tracing event system (events)");
-extern FILE* tracing_file;
-std::map<container_t, FILE*> tracing_files; // TI specific
 
 namespace simgrid {
 namespace instr {
@@ -18,20 +16,21 @@ namespace instr {
 PajeEvent::PajeEvent(Container* container, Type* type, double timestamp, e_event_type eventType)
     : container_(container), type_(type), timestamp_(timestamp), eventType_(eventType)
 {
-  XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, eventType_, TRACE_precision(), timestamp_);
-  if (trace_format == simgrid::instr::TraceFormat::Paje) {
-    stream_ << std::fixed << std::setprecision(TRACE_precision());
-    stream_ << eventType_ << " " << timestamp_ << " " << type_->get_id() << " " << container_->get_id();
-  }
-  insertIntoBuffer();
-};
+  on_creation(*this);
+  insert_into_buffer();
+}
+
+PajeEvent::~PajeEvent()
+{
+  on_destruction(*this);
+}
 
 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)
 {
 #if HAVE_SMPI
-  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
-    smpi_trace_call_location_t* loc = smpi_trace_get_call_location();
+  if (simgrid::config::get_value<bool>("smpi/trace-call-location")) {
+    const smpi_trace_call_location_t* loc = smpi_trace_get_call_location();
     filename                        = loc->filename;
     linenumber                      = loc->linenumber;
   }
@@ -40,76 +39,49 @@ StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type
 
 void NewEvent::print()
 {
-  if (trace_format != simgrid::instr::TraceFormat::Paje)
-    return;
-
-  stream_ << " " << value->getId();
-
-  XBT_DEBUG("Dump %s", stream_.str().c_str());
-  fprintf(tracing_file, "%s\n", stream_.str().c_str());
+  stream_ << " " << value->get_id();
 }
 
 void LinkEvent::print()
 {
-  if (trace_format != simgrid::instr::TraceFormat::Paje)
-    return;
-
   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());
-  fprintf(tracing_file, "%s\n", stream_.str().c_str());
-}
-
-void VariableEvent::print()
-{
-  if (trace_format != simgrid::instr::TraceFormat::Paje)
-    return;
-
-  stream_ << " " << value;
-
-  XBT_DEBUG("Dump %s", stream_.str().c_str());
-  fprintf(tracing_file, "%s\n", stream_.str().c_str());
 }
 
 void StateEvent::print()
 {
-  if (trace_format == simgrid::instr::TraceFormat::Paje) {
-
+  if (trace_format == 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 (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    if (simgrid::config::get_value<bool>("smpi/trace-call-location"))
       stream_ << " \"" << filename << "\" " << linenumber;
-    }
 #endif
-    XBT_DEBUG("Dump %s", stream_.str().c_str());
-    fprintf(tracing_file, "%s\n", stream_.str().c_str());
-  } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
+  } else if (trace_format == TraceFormat::Ti) {
     if (extra_ == nullptr)
       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 (getContainer()->get_name().find("rank-") != 0)
-      stream_ << getContainer()->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(getContainer()->get_name().erase(0, 5)) - 1 << " " << extra_->print();
-
-    fprintf(tracing_files.at(getContainer()), "%s\n", stream_.str().c_str());
+      container_name=std::to_string(stoi(container_name.erase(0, 5)) - 1);
+    }
+#if HAVE_SMPI
+    if (config::get_value<bool>("smpi/trace-call-location"))
+      stream_ << container_name << " location " << filename << " " << linenumber << std::endl ;
+#endif
+    stream_ << container_name << " " << extra_->print();
   } else {
     THROW_IMPOSSIBLE;
   }
-
-  delete extra_;
-}
-}
 }
+} // namespace instr
+} // namespace simgrid