X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2795eb46b32db7cd2de790dda6e92a7b1244db1..6d3020209fdad39e81987f91d375f482be14dee6:/src/instr/instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index 1cfd6bfb1f..c0ef9ad310 100644
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -7,17 +7,9 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/instr/instr_private.hpp"
-#include <sys/stat.h>
-#ifdef WIN32
-#include <direct.h> // _mkdir
-#endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
-extern std::ofstream tracing_file;
-std::map<container_t, std::ofstream*> tracing_files; // TI specific
-double prefix = 0.0;                               // TI specific
-
 static container_t rootContainer = nullptr;    /* the root container */
 static std::map<std::string, container_t> allContainers; /* all created containers indexed by name */
 
@@ -44,7 +36,7 @@ NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level,
     std::string type_name = std::string("L") + std::to_string(level);
     type_                 = father_->type_->by_name_or_create<ContainerType>(type_name);
     father_->children_.insert({get_name(), this});
-    log_creation();
+    on_creation(*this);
   } else {
     type_         = new ContainerType("0");
     rootContainer = this;
@@ -82,7 +74,7 @@ Container::Container(const std::string& name, const std::string& type_name, Cont
     if (not type_name.empty()) {
       type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
       father_->children_.insert({name_, this});
-      log_creation();
+      on_creation(*this);
     }
   }
 
@@ -101,16 +93,10 @@ Container::~Container()
   for (auto child : children_)
     delete child.second;
 
-  // obligation to dump previous events because they might reference the container that is about to be destroyed
-  TRACE_last_timestamp_to_dump = SIMIX_get_clock();
-  TRACE_paje_dump_buffer(true);
-
-  // trace my destruction, but not if user requests so or if the container is root
-  if (not TRACE_disable_destroy() && this != Container::get_root())
-    log_destruction();
-
   // remove me from the allContainers data structure
   allContainers.erase(name_);
+
+  on_destruction(*this);
 }
 
 void Container::create_child(const std::string& name, const std::string& type_name)
@@ -141,74 +127,6 @@ void Container::remove_from_parent()
   delete this;
 }
 
-void Container::log_creation()
-{
-  double timestamp = SIMIX_get_clock();
-  std::stringstream stream;
-
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, timestamp);
-
-  if (trace_format == simgrid::instr::TraceFormat::Paje) {
-    stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_CreateContainer << " ";
-    stream << timestamp << " " << id_ << " " << type_->get_id() << " " << father_->id_ << " \"";
-    if (name_.find("rank-") != 0)
-      stream << name_ << "\"";
-    else
-      /* Subtract -1 because this is the process id and we transform it to the rank id */
-      stream << "rank-" << stoi(name_.substr(5)) - 1 << "\"";
-
-    XBT_DEBUG("Dump %s", stream.str().c_str());
-    tracing_file << stream.str() << std::endl;
-  } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
-    // if we are in the mode with only one file
-    static std::ofstream* ti_unique_file = nullptr;
-
-    if (tracing_files.empty()) {
-      // generate unique run id with time
-      prefix = xbt_os_time();
-    }
-
-    if (not simgrid::config::get_value<bool>("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
-      std::string folder_name = TRACE_get_filename() + "_files";
-      std::string filename    = folder_name + "/" + std::to_string(prefix) + "_" + name_ + ".txt";
-#ifdef WIN32
-      _mkdir(folder_name.c_str());
-#else
-      mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
-      ti_unique_file = new std::ofstream(filename.c_str(), std::ofstream::out);
-      xbt_assert(not ti_unique_file->fail(), "Tracefile %s could not be opened for writing", filename.c_str());
-      tracing_file << filename << std::endl;
-    }
-    tracing_files.insert({this, ti_unique_file});
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
-void Container::log_destruction()
-{
-  std::stringstream stream;
-  double timestamp = SIMIX_get_clock();
-
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, timestamp);
-
-  if (trace_format == simgrid::instr::TraceFormat::Paje) {
-    stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DestroyContainer << " ";
-    stream << timestamp << " " << type_->get_id() << " " << id_;
-    XBT_DEBUG("Dump %s", stream.str().c_str());
-    tracing_file << stream.str() << std::endl;
-  } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
-    if (not simgrid::config::get_value<bool>("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) {
-      tracing_files.at(this)->close();
-      delete tracing_files.at(this);
-    }
-    tracing_files.erase(this);
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
-
 StateType* Container::get_state(const std::string& name)
 {
   return static_cast<StateType*>(type_->by_name(name)->set_calling_container(this));