Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Don't return when debug is enabled.
[simgrid.git] / src / instr / instr_paje_trace.cpp
index 8d10295..9c094b6 100644 (file)
@@ -1,68 +1,54 @@
-/* Copyright (c) 2010-2016. The SimGrid Team.
+/* Copyright (c) 2010-2017. 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. */
 
-#include "src/instr/instr_private.h"
-#include "src/instr/instr_smpi.h"
+#include "simgrid/sg_config.h"
+#include "src/instr/instr_private.hpp"
+#include "src/instr/instr_smpi.hpp"
 #include "src/smpi/include/private.hpp"
 #include "typeinfo"
 #include "xbt/virtu.h" /* sg_cmdline */
-#include "simgrid/sg_config.h"
-
-#include <sstream>
-#include <vector>
-#include <iomanip> /** std::setprecision **/
-#include <sys/stat.h>
-#ifdef WIN32
-#include <direct.h> // _mkdir
-#endif
+#include <fstream>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system");
 
 static std::stringstream stream;
 FILE *tracing_file = nullptr;
 
-static xbt_dict_t tracing_files = nullptr; // TI specific
-static double prefix=0.0; // TI specific
-
 std::vector<simgrid::instr::PajeEvent*> buffer;
 void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf);
 
-void dump_comment (const char *comment)
+void dump_comment(std::string comment)
 {
-  if (not strlen(comment))
+  if (comment.empty())
     return;
-  fprintf (tracing_file, "# %s\n", comment);
+  fprintf(tracing_file, "# %s\n", comment.c_str());
 }
 
-void dump_comment_file (const char *filename)
+void dump_comment_file(std::string filename)
 {
-  if (not strlen(filename))
+  if (filename.empty())
     return;
-  FILE *file = fopen (filename, "r");
-  if (not file) {
-    THROWF (system_error, 1, "Comment file %s could not be opened for reading.", filename);
+  std::ifstream* fs = new std::ifstream();
+  fs->open(filename.c_str(), std::ifstream::in);
+
+  if (fs->fail()) {
+    THROWF(system_error, 1, "Comment file %s could not be opened for reading.", filename.c_str());
   }
-  while (not feof(file)) {
-    char c;
-    c = fgetc(file);
-    if (feof(file)) break;
+  while (not fs->eof()) {
+    std::string line;
     fprintf (tracing_file, "# ");
-    while (c != '\n'){
-      fprintf (tracing_file, "%c", c);
-      c = fgetc(file);
-      if (feof(file)) break;
-    }
-    fprintf (tracing_file, "\n");
+    std::getline(*fs, line);
+    fprintf(tracing_file, "%s", line.c_str());
   }
-  fclose(file);
+  fs->close();
 }
 
 double TRACE_last_timestamp_to_dump = 0;
 //dumps the trace file until the timestamp TRACE_last_timestamp_to_dump
-void TRACE_paje_dump_buffer (int force)
+void TRACE_paje_dump_buffer(bool force)
 {
   if (not TRACE_is_enabled())
     return;
@@ -88,10 +74,10 @@ void TRACE_paje_dump_buffer (int force)
   XBT_DEBUG("%s: ends", __FUNCTION__);
 }
 
-void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf);
 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();
@@ -102,41 +88,23 @@ 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 */
-static void insert_into_buffer(simgrid::instr::PajeEvent* tbi)
+void simgrid::instr::PajeEvent::insertIntoBuffer()
 {
-  if (TRACE_buffer() == 0){
-    tbi->print ();
-    delete tbi;
+  if (not TRACE_buffer()) {
+    print();
+    delete this;
     return;
   }
   buffer_debug(&buffer);
 
-  XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%zu)", __FUNCTION__, (int)tbi->eventType_,
-            tbi->timestamp_, buffer.size());
+  XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __FUNCTION__, eventType_, timestamp_,
+            buffer.size());
   std::vector<simgrid::instr::PajeEvent*>::reverse_iterator i;
   for (i = buffer.rbegin(); i != buffer.rend(); ++i) {
     simgrid::instr::PajeEvent* e1 = *i;
-    XBT_DEBUG("compare to %p is of type %d; timestamp:%f", e1, (int)e1->eventType_, e1->timestamp_);
-    if (e1->timestamp_ <= tbi->timestamp_)
+    XBT_DEBUG("compare to %p is of type %u; timestamp:%f", e1, e1->eventType_, e1->timestamp_);
+    if (e1->timestamp_ <= timestamp_)
       break;
   }
   if (i == buffer.rend())
@@ -144,18 +112,12 @@ static void insert_into_buffer(simgrid::instr::PajeEvent* tbi)
   else if (i == buffer.rbegin())
     XBT_DEBUG("%s: inserted at end", __FUNCTION__);
   else
-    XBT_DEBUG("%s: inserted at pos= %zd from its end", __FUNCTION__,
-        std::distance(buffer.rbegin(),i));
-  buffer.insert(i.base(), tbi);
+    XBT_DEBUG("%s: inserted at pos= %zd from its end", __FUNCTION__, std::distance(buffer.rbegin(), i));
+  buffer.insert(i.base(), this);
 
   buffer_debug(&buffer);
 }
 
-simgrid::instr::PajeEvent::~PajeEvent()
-{
-  XBT_DEBUG("%s not implemented for %p: event_type=%d, timestamp=%f", __FUNCTION__, this, (int)eventType_, timestamp_);
-}
-
 void TRACE_paje_start() {
   char *filename = TRACE_get_filename();
   tracing_file = fopen(filename, "w");
@@ -192,693 +154,6 @@ void TRACE_paje_end() {
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
-void LogContainerTypeDefinition(simgrid::instr::Type* type)
-{
-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineContainerType);
-  //print it
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineContainerType,
-              TRACE_precision(), 0.);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << simgrid::instr::PAJE_DefineContainerType;
-    stream << " " << type->id_ << " " << type->father_->id_ << " " << type->name_;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-  //--
-}
-
-void LogVariableTypeDefinition(simgrid::instr::Type* type)
-{
-
-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineVariableType);
-
-  //print it
-if (instr_fmt_type == instr_fmt_paje) {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineVariableType,
-            TRACE_precision(), 0.);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << simgrid::instr::PAJE_DefineVariableType;
-  stream << " " << type->id_ << " " << type->father_->id_ << " " << type->name_;
-  if (type->color_)
-    stream << " \"" << type->color_ << "\"";
-  print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-void LogStateTypeDefinition(simgrid::instr::Type* type)
-{
-  //print it
-if (instr_fmt_type == instr_fmt_paje) {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineStateType, TRACE_precision(),
-            0.);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << simgrid::instr::PAJE_DefineStateType;
-  stream << " " << type->id_ << " " << type->father_->id_ << " " << type->name_;
-  print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-void LogDefineEventType(simgrid::instr::Type* type)
-{
-  //print it
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineEventType,
-              TRACE_precision(), 0.);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << simgrid::instr::PAJE_DefineEventType;
-    stream << " " << type->id_ << " " << type->father_->id_ << " " << type->name_;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-void LogLinkTypeDefinition(simgrid::instr::Type* type, simgrid::instr::Type* source, simgrid::instr::Type* dest)
-{
-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineLinkType);
-  //print it
-if (instr_fmt_type == instr_fmt_paje) {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineLinkType, TRACE_precision(),
-            0.);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << simgrid::instr::PAJE_DefineLinkType;
-  stream << " " << type->id_ << " " << type->father_->id_ << " " << source->id_ << " " << dest->id_ << " "
-         << type->name_;
-  print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-void LogEntityValue(simgrid::instr::Value* val)
-{
-  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineEntityValue);
-  //print it
-if (instr_fmt_type == instr_fmt_paje) {
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << simgrid::instr::PAJE_DefineEntityValue;
-    stream << " " << val->id_ << " " << val->father_->id_ << " " << val->name_;
-    if (val->color_)
-      stream << " \"" << val->color_ << "\"";
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-
-void LogContainerCreation (container_t container)
-{
-  double timestamp = SIMIX_get_clock();
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_CreateContainer, timestamp);
-
-  if (instr_fmt_type == instr_fmt_paje) {
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << simgrid::instr::PAJE_CreateContainer;
-    stream << " ";
-  /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-    if (timestamp < 1e-12)
-      stream << 0;
-    else
-      stream << timestamp;
-    stream << " " << container->id_ << " " << container->type_->id_ << " " << container->father_->id_ << " \""
-           << container->name_ << "\"";
-
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    // if we are in the mode with only one file
-    static FILE* ti_unique_file = nullptr;
-
-    if (tracing_files == nullptr) {
-      tracing_files = xbt_dict_new_homogeneous(nullptr);
-      // generate unique run id with time
-      prefix = xbt_os_time();
-    }
-
-    if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
-      char* folder_name = bprintf("%s_files", TRACE_get_filename());
-      char* filename    = bprintf("%s/%f_%s.txt", folder_name, prefix, container->name_);
-#ifdef WIN32
-      _mkdir(folder_name);
-#else
-      mkdir(folder_name, S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
-      ti_unique_file = fopen(filename, "w");
-      xbt_assert(ti_unique_file, "Tracefile %s could not be opened for writing: %s", filename, strerror(errno));
-      fprintf(tracing_file, "%s\n", filename);
-
-      xbt_free(folder_name);
-      xbt_free(filename);
-    }
-
-    xbt_dict_set(tracing_files, container->name_, (void*)ti_unique_file, nullptr);
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-void LogContainerDestruction(container_t container)
-{
-  double timestamp                               = SIMIX_get_clock();
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_DestroyContainer, timestamp);
-
-  if (instr_fmt_type == instr_fmt_paje) {
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << simgrid::instr::PAJE_DestroyContainer;
-    stream << " ";
-  /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-    if (timestamp < 1e-12)
-        stream << 0;
-    else
-      stream << timestamp;
-    stream << " " << container->type_->id_ << " " << container->id_;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || xbt_dict_length(tracing_files) == 1) {
-      FILE* f = (FILE*)xbt_dict_get_or_null(tracing_files, container->name_);
-      fclose(f);
-    }
-    xbt_dict_remove(tracing_files, container->name_);
-        } else {
-          THROW_IMPOSSIBLE;
-        }
-}
-
-simgrid::instr::SetVariableEvent::SetVariableEvent(double timestamp, container_t container, Type* type, double value)
-{
-  this->eventType_ = PAJE_SetVariable;
-  this->timestamp_ = timestamp;
-  this->type      = type;
-  this->container = container;
-  this->value     = value;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::SetVariableEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_ << " " << value;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::AddVariableEvent::AddVariableEvent(double timestamp, container_t container, simgrid::instr::Type* type,
-                                                   double value)
-{
-  this->eventType_ = PAJE_AddVariable;
-  this->timestamp_ = timestamp;
-  this->type      = type;
-  this->container = container;
-  this->value     = value;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::AddVariableEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_ << " " << value;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::SubVariableEvent::SubVariableEvent(double timestamp, container_t container, Type* type, double value)
-{
-  this->eventType_ = PAJE_SubVariable;
-  this->timestamp_ = timestamp;
-  this->type      = type;
-  this->container = container;
-  this->value     = value;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::SubVariableEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_ << " " << value;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::SetStateEvent::SetStateEvent(double timestamp, container_t container, Type* type, Value* val)
-{
-  this->eventType_                      = PAJE_SetState;
-  this->timestamp_                      = timestamp;
-  this->type      = type;
-  this->container = container;
-  this->val                             = val;
-
-#if HAVE_SMPI
-  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
-    smpi_trace_call_location_t* loc = smpi_trace_get_call_location();
-    filename   = loc->filename;
-    linenumber = loc->linenumber;
-  }
-#endif
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::SetStateEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_;
-    stream << " " << val->id_;
-#if HAVE_SMPI
-    if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
-      stream << " \"" << filename << "\" " << linenumber;
-    }
-#endif
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* val,
-                                               void* extra)
-{
-  this->eventType_                  = PAJE_PushState;
-  this->timestamp_                  = timestamp;
-  this->type = type;
-  this->container = container;
-  this->val                         = val;
-  this->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();
-    filename   = loc->filename;
-    linenumber = loc->linenumber;
-  }
-#endif
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-simgrid::instr::PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* val)
-    : PushStateEvent(timestamp, container, type, val, nullptr)
-{}
-void simgrid::instr::PushStateEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_;
-    stream << " " << val->id_;
-
-    if (TRACE_display_sizes()) {
-      stream << " ";
-      if (extra_ != nullptr) {
-        stream << static_cast<instr_extra_data>(extra_)->send_size;
-      } else {
-        stream << 0;
-      }
-    }
-#if HAVE_SMPI
-    if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
-      stream << " \"" << filename << "\" " << linenumber;
-    }
-#endif
-    print_row();
-
-    if (extra_ != nullptr) {
-      if (static_cast<instr_extra_data>(extra_)->sendcounts != nullptr)
-        xbt_free(static_cast<instr_extra_data>(extra_)->sendcounts);
-      if (static_cast<instr_extra_data>(extra_)->recvcounts != nullptr)
-        xbt_free(static_cast<instr_extra_data>(extra_)->recvcounts);
-      xbt_free(extra_);
-    }
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    if (extra_ == nullptr)
-      return;
-    instr_extra_data extra = (instr_extra_data)extra_;
-
-    char* process_id = nullptr;
-    // FIXME: dirty extract "rank-" from the name, as we want the bare process id here
-    if (strstr(container->name_, "rank-") == nullptr)
-      process_id = xbt_strdup(container->name_);
-    else
-      process_id = xbt_strdup(container->name_ + 5);
-
-    FILE* trace_file = (FILE*)xbt_dict_get(tracing_files, container->name_);
-
-    switch (extra->type) {
-      case TRACING_INIT:
-        fprintf(trace_file, "%s init\n", process_id);
-        break;
-      case TRACING_FINALIZE:
-        fprintf(trace_file, "%s finalize\n", process_id);
-        break;
-      case TRACING_SEND:
-        fprintf(trace_file, "%s send %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
-        break;
-      case TRACING_ISEND:
-        fprintf(trace_file, "%s Isend %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
-        break;
-      case TRACING_RECV:
-        fprintf(trace_file, "%s recv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
-        break;
-      case TRACING_IRECV:
-        fprintf(trace_file, "%s Irecv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
-        break;
-      case TRACING_TEST:
-        fprintf(trace_file, "%s test\n", process_id);
-        break;
-      case TRACING_WAIT:
-        fprintf(trace_file, "%s wait\n", process_id);
-        break;
-      case TRACING_WAITALL:
-        fprintf(trace_file, "%s waitAll\n", process_id);
-        break;
-      case TRACING_BARRIER:
-        fprintf(trace_file, "%s barrier\n", process_id);
-        break;
-      case TRACING_BCAST: // rank bcast size (root) (datatype)
-        fprintf(trace_file, "%s bcast %d ", process_id, extra->send_size);
-        if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, "")))
-          fprintf(trace_file, "%d %s", extra->root, extra->datatype1);
-        fprintf(trace_file, "\n");
-        break;
-      case TRACING_REDUCE: // rank reduce comm_size comp_size (root) (datatype)
-        fprintf(trace_file, "%s reduce %d %f ", process_id, extra->send_size, extra->comp_size);
-        if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, "")))
-          fprintf(trace_file, "%d %s", extra->root, extra->datatype1);
-        fprintf(trace_file, "\n");
-        break;
-      case TRACING_ALLREDUCE: // rank allreduce comm_size comp_size (datatype)
-        fprintf(trace_file, "%s allReduce %d %f %s\n", process_id, extra->send_size, extra->comp_size,
-                extra->datatype1);
-        break;
-      case TRACING_ALLTOALL: // rank alltoall send_size recv_size (sendtype) (recvtype)
-        fprintf(trace_file, "%s allToAll %d %d %s %s\n", process_id, extra->send_size, extra->recv_size,
-                extra->datatype1, extra->datatype2);
-        break;
-      case TRACING_ALLTOALLV: // rank alltoallv send_size [sendcounts] recv_size [recvcounts] (sendtype) (recvtype)
-        fprintf(trace_file, "%s allToAllV %d ", process_id, extra->send_size);
-        for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->sendcounts[i]);
-        fprintf(trace_file, "%d ", extra->recv_size);
-        for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2);
-        break;
-      case TRACING_GATHER: // rank gather send_size recv_size root (sendtype) (recvtype)
-        fprintf(trace_file, "%s gather %d %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->root,
-                extra->datatype1, extra->datatype2);
-        break;
-      case TRACING_ALLGATHERV: // rank allgatherv send_size [recvcounts] (sendtype) (recvtype)
-        fprintf(trace_file, "%s allGatherV %d ", process_id, extra->send_size);
-        for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2);
-        break;
-      case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype)
-        fprintf(trace_file, "%s reduceScatter ", process_id);
-        for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%f %s\n", extra->comp_size, extra->datatype1);
-        break;
-      case TRACING_COMPUTING:
-        fprintf(trace_file, "%s compute %f\n", process_id, extra->comp_size);
-        break;
-      case TRACING_SLEEPING:
-        fprintf(trace_file, "%s sleep %f\n", process_id, extra->sleep_duration);
-        break;
-      case TRACING_GATHERV: // rank gatherv send_size [recvcounts] root (sendtype) (recvtype)
-        fprintf(trace_file, "%s gatherV %d ", process_id, extra->send_size);
-        for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%d %s %s\n", extra->root, extra->datatype1, extra->datatype2);
-        break;
-      case TRACING_ALLGATHER: // rank allgather sendcount recvcounts (sendtype) (recvtype)
-        fprintf(trace_file, "%s allGather %d %d %s %s", process_id, extra->send_size, extra->recv_size, extra->datatype1, extra->datatype2);
-        break;
-      case TRACING_WAITANY:
-      case TRACING_SENDRECV:
-      case TRACING_SCATTER:
-      case TRACING_SCATTERV:
-      case TRACING_SCAN:
-      case TRACING_EXSCAN:
-      case TRACING_COMM_SIZE:
-      case TRACING_COMM_SPLIT:
-      case TRACING_COMM_DUP:
-      case TRACING_SSEND:
-      case TRACING_ISSEND:
-      default:
-        XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", val->name_);
-        break;
-    }
-
-    if (extra->recvcounts != nullptr)
-      xbt_free(extra->recvcounts);
-    if (extra->sendcounts != nullptr)
-      xbt_free(extra->sendcounts);
-    xbt_free(process_id);
-    xbt_free(extra);
-
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::PopStateEvent::PopStateEvent(double timestamp, container_t container, Type* type)
-{
-  this->eventType_ = PAJE_PopState;
-  this->timestamp_ = timestamp;
-  this->type      = type;
-  this->container = container;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::PopStateEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::ResetStateEvent::ResetStateEvent(double timestamp, container_t container, Type* type)
-{
-  this->eventType_ = PAJE_ResetState;
-  this->timestamp_ = timestamp;
-  this->type      = type;
-  this->container = container;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-  delete[] this;
-}
-
-void simgrid::instr::ResetStateEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-simgrid::instr::StartLinkEvent::~StartLinkEvent()
-{
-  free(value);
-  free(key);
-}
-simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type,
-                                               container_t sourceContainer, const char* value, const char* key)
-    : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1)
-{}
-
-simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type,
-                                               container_t sourceContainer, const char* value, const char* key,
-                                               int size)
-{
-  eventType_            = PAJE_StartLink;
-  this->timestamp_      = timestamp;
-  this->type            = type;
-  this->container       = container;
-  this->sourceContainer = sourceContainer;
-  this->value           = xbt_strdup(value);
-  this->key             = xbt_strdup(key);
-  this->size            = size;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, (int)eventType_, this->timestamp_, this->value);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::StartLinkEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_ << " " << value;
-    stream << " " << sourceContainer->id_ << " " << 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, const char* value, const char* key)
-{
-  this->eventType_    = PAJE_EndLink;
-  this->timestamp_    = timestamp;
-  this->type          = type;
-  this->container     = container;
-  this->destContainer = destContainer;
-  this->value         = xbt_strdup(value);
-  this->key           = xbt_strdup(key);
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-simgrid::instr::EndLinkEvent::~EndLinkEvent()
-{
-  free(value);
-  free(key);
-}
-void simgrid::instr::EndLinkEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_ << " " << value;
-    stream << " " << destContainer->id_ << " " << 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, Value* val)
-{
-  this->eventType_                      = PAJE_NewEvent;
-  this->timestamp_                      = timestamp;
-  this->type      = type;
-  this->container = container;
-  this->val                             = val;
-
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_);
-
-  insert_into_buffer (this);
-}
-
-void simgrid::instr::NewEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << (int)this->eventType_;
-    print_timestamp(this);
-    stream << " " << type->id_ << " " << container->id_ << " " << val->id_;
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
 
 void TRACE_TI_start()
 {
@@ -898,9 +173,6 @@ void TRACE_TI_start()
 
 void TRACE_TI_end()
 {
-  xbt_dict_free(&tracing_files);
   fclose(tracing_file);
-  char *filename = TRACE_get_filename();
-  XBT_DEBUG("Filename %s is closed", filename);
+  XBT_DEBUG("Filename %s is closed", TRACE_get_filename());
 }
-