also use ofstream for tracing_files

[simgrid.git] / src / instr / instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index f509556..2cea47f 100644 (file)
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -3,16 +3,14 @@
 /* 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 <xbt/config.hpp>
-
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/instr/instr_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
-extern FILE* tracing_file;
-extern std::map<container_t, FILE*> tracing_files; // TI specific
+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 */
@@ -37,7 +35,7 @@ container_t Container::getRoot()
 NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father)
     : Container::Container(name, "", father)
 {
-  netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+  netpoint_ = simgrid::s4u::Engine::get_instance()->getNetpointByNameOrNull(name);
   xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
   if (father_) {
     type_ = father_->type_->getOrCreateContainerType(std::string("L") + std::to_string(level));
@@ -53,7 +51,7 @@ RouterContainer::RouterContainer(std::string name, Container* father) : Containe
 {
   xbt_assert(father, "Only the Root container has no father");
 
-  netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+  netpoint_ = simgrid::s4u::Engine::get_instance()->getNetpointByNameOrNull(name);
   xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
 
   trivaNodeTypes.insert(type_->get_name());
@@ -156,17 +154,17 @@ void Container::logCreation()
     stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_CreateContainer << " ";
     stream << timestamp << " " << id_ << " " << type_->get_id() << " " << father_->id_ << " \"" << name_ << "\"";
     XBT_DEBUG("Dump %s", stream.str().c_str());
-    fprintf(tracing_file, "%s\n", 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 FILE* ti_unique_file = nullptr;
+    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_config<bool>("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
+    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
@@ -174,9 +172,9 @@ void Container::logCreation()
 #else
       mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
 #endif
-      ti_unique_file = fopen(filename.c_str(), "w");
-      xbt_assert(ti_unique_file, "Tracefile %s could not be opened for writing: %s", filename.c_str(), strerror(errno));
-      fprintf(tracing_file, "%s\n", filename.c_str());
+      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 {
@@ -195,10 +193,11 @@ void Container::logDestruction()
     stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DestroyContainer << " ";
     stream << timestamp << " " << type_->get_id() << " " << id_;
     XBT_DEBUG("Dump %s", stream.str().c_str());
-    fprintf(tracing_file, "%s\n", stream.str().c_str());
+    tracing_file << stream.str() << std::endl;
   } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
-    if (not simgrid::config::get_config<bool>("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) {
-      fclose(tracing_files.at(this));
+    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 {