X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93d4164c9d94cbadae79947ac3f378b08c947390..3f613a4dfe96c1da04ff48ade0c3ebd0609a2c0d:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 555746bb85..e4aea24ee7 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -76,7 +76,8 @@ void TRACE_paje_dump_buffer(bool force)
 
 void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
 {
-  return;
+  if (not XBT_LOG_ISENABLED(instr_paje_trace, xbt_log_priority_debug))
+    return;
   XBT_DEBUG(">>>>>> Dump the state of the buffer. %zu events", buf->size());
   for (auto const& event : *buf) {
     event->print();
@@ -87,24 +88,6 @@ void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
   XBT_DEBUG("<<<<<<");
 }
 
-static void print_row() {
-  stream << std::endl;
-  fprintf(tracing_file, "%s", stream.str().c_str());
-  XBT_DEBUG("Dump %s", stream.str().c_str());
-  stream.str("");
-  stream.clear();
-}
-
-static void print_timestamp(simgrid::instr::PajeEvent* event)
-{
-  stream << " ";
-  /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-  if (event->timestamp_ < 1e-12)
-    stream << 0;
-  else
-    stream << event->timestamp_;
-}
-
 /* internal do the instrumentation module */
 void simgrid::instr::PajeEvent::insertIntoBuffer()
 {
@@ -135,19 +118,14 @@ void simgrid::instr::PajeEvent::insertIntoBuffer()
   buffer_debug(&buffer);
 }
 
-simgrid::instr::PajeEvent::~PajeEvent()
-{
-  XBT_DEBUG("%s not implemented for %p: event_type=%u, timestamp=%f", __FUNCTION__, this, eventType_, timestamp_);
-}
-
 void TRACE_paje_start() {
-  char *filename = TRACE_get_filename();
-  tracing_file = fopen(filename, "w");
+  std::string filename = TRACE_get_filename();
+  tracing_file         = fopen(filename.c_str(), "w");
   if (tracing_file == nullptr){
-    THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename);
+    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str());
   }
 
-  XBT_DEBUG("Filename %s is open for writing", filename);
+  XBT_DEBUG("Filename %s is open for writing", filename.c_str());
 
   /* output generator version */
   fprintf (tracing_file, "#This file was generated using SimGrid-%d.%d.%d\n",
@@ -172,110 +150,19 @@ void TRACE_paje_start() {
 
 void TRACE_paje_end() {
   fclose(tracing_file);
-  char *filename = TRACE_get_filename();
-  XBT_DEBUG("Filename %s is closed", filename);
+  XBT_DEBUG("Filename %s is closed", TRACE_get_filename().c_str());
 }
 
-simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type,
-                                               container_t sourceContainer, std::string value, std::string key)
-    : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1)
-{}
-
-simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type,
-                                               container_t sourceContainer, std::string value, std::string key,
-                                               int size)
-    : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_StartLink)
-    , sourceContainer_(sourceContainer)
-    , value_(value)
-    , key_(key)
-    , size_(size)
-{
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f, value:%s", __FUNCTION__, eventType_, this->timestamp_,
-            this->value_.c_str());
-  insertIntoBuffer();
-}
-
-void simgrid::instr::StartLinkEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << eventType_;
-    print_timestamp(this);
-    stream << " " << type->getId() << " " << container->getId() << " " << value_;
-    stream << " " << sourceContainer_->getId() << " " << key_;
-
-    if (TRACE_display_sizes()) {
-      stream << " " << size_;
-    }
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::EndLinkEvent::EndLinkEvent(double timestamp, container_t container, Type* type,
-                                           container_t destContainer, std::string value, std::string key)
-    : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_EndLink)
-    , destContainer(destContainer)
-    , value(value)
-    , key(key)
-{
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_);
-  insertIntoBuffer();
-}
-
-void simgrid::instr::EndLinkEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << eventType_;
-    print_timestamp(this);
-    stream << " " << type->getId() << " " << container->getId() << " " << value;
-    stream << " " << destContainer->getId() << " " << key;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::NewEvent::NewEvent(double timestamp, container_t container, Type* type, EntityValue* val)
-    : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent), val(val)
-{
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_);
-
-  insertIntoBuffer();
-}
-
-void simgrid::instr::NewEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << eventType_;
-    print_timestamp(this);
-    stream << " " << type->getId() << " " << container->getId() << " " << val->getId();
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
 
 void TRACE_TI_start()
 {
-  char *filename = TRACE_get_filename();
-  tracing_file = fopen(filename, "w");
-  if (tracing_file == nullptr)
-    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename);
+  std::string filename = TRACE_get_filename();
+  tracing_file         = fopen(filename.c_str(), "w");
+  if (tracing_file == nullptr) {
+    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str());
+  }
 
-  XBT_DEBUG("Filename %s is open for writing", filename);
+  XBT_DEBUG("Filename %s is open for writing", filename.c_str());
 
   /* output one line comment */
   dump_comment(TRACE_get_comment());
@@ -287,6 +174,5 @@ void TRACE_TI_start()
 void TRACE_TI_end()
 {
   fclose(tracing_file);
-  char *filename = TRACE_get_filename();
-  XBT_DEBUG("Filename %s is closed", filename);
+  XBT_DEBUG("Filename %s is closed", TRACE_get_filename().c_str());
 }