X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a493dab29fff80a4d222c18c3057c811b8b06d3f..5ec2b80b686983f84ebab7c7398a29e73286deee:/src/instr/instr_config.cpp?ds=sidebyside

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 22ad0fe78f..19d9e9eb22 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. 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. */
@@ -11,9 +11,6 @@
 #include "xbt/xbt_os_time.h"
 
 #include <sys/stat.h>
-#ifdef WIN32
-#include <direct.h> // _mkdir
-#endif
 
 #include <fstream>
 #include <string>
@@ -206,8 +203,7 @@ void TRACE_help()
              "  within the same Autonomous System (AS).");
 }
 
-namespace simgrid {
-namespace instr {
+namespace simgrid::instr {
 static bool trace_active = false;
 TraceFormat trace_format = TraceFormat::Paje;
 int trace_precision;
@@ -241,7 +237,7 @@ static void on_container_creation_paje(const Container& c)
     stream << "rank-" << stoi(c.get_name().substr(5)) - 1 << "\"";
 
   XBT_DEBUG("Dump %s", stream.str().c_str());
-  tracing_file << stream.str() << std::endl;
+  tracing_file << stream.str() << '\n';
 }
 
 static void on_container_destruction_paje(const Container& c)
@@ -257,7 +253,7 @@ static void on_container_destruction_paje(const Container& c)
     stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DestroyContainer << " ";
     stream << timestamp << " " << c.get_type()->get_id() << " " << c.get_id();
     XBT_DEBUG("Dump %s", stream.str().c_str());
-    tracing_file << stream.str() << std::endl;
+    tracing_file << stream.str() << '\n';
   }
 }
 
@@ -277,14 +273,10 @@ static void on_container_creation_ti(const Container& c)
   if (not simgrid::config::get_value<bool>("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
     std::string folder_name = simgrid::config::get_value<std::string>("tracing/filename") + "_files";
     std::string filename    = folder_name + "/" + std::to_string(prefix) + "_" + c.get_name() + ".txt";
-#ifdef WIN32
-    _mkdir(folder_name.c_str());
-#else
-    mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
+    mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
     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_file << filename << '\n';
   }
   tracing_files.insert({&c, ti_unique_file});
 }
@@ -309,7 +301,7 @@ static void on_entity_value_creation(const EntityValue& value)
   if (not value.get_color().empty())
     stream << " \"" << value.get_color() << "\"";
   XBT_DEBUG("Dump %s", stream.str().c_str());
-  tracing_file << stream.str() << std::endl;
+  tracing_file << stream.str() << '\n';
 }
 
 static void on_event_creation(PajeEvent& event)
@@ -324,13 +316,13 @@ static void on_event_creation(PajeEvent& event)
 static void on_event_destruction(const PajeEvent& event)
 {
   XBT_DEBUG("Dump %s", event.stream_.str().c_str());
-  tracing_file << event.stream_.str() << std::endl;
+  tracing_file << event.stream_.str() << '\n';
 }
 
 static void on_state_event_destruction(const StateEvent& event)
 {
   if (event.has_extra())
-    *tracing_files.at(event.get_container()) << event.stream_.str() << std::endl;
+    *tracing_files.at(event.get_container()) << event.stream_.str() << '\n';
 }
 
 static void on_type_creation(const Type& type, PajeEventType event_type)
@@ -345,7 +337,7 @@ static void on_type_creation(const Type& type, PajeEventType event_type)
   if (type.is_colored())
     stream << " \"" << type.get_color() << "\"";
   XBT_DEBUG("Dump %s", stream.str().c_str());
-  tracing_file << stream.str() << std::endl;
+  tracing_file << stream.str() << '\n';
 }
 
 static void on_link_type_creation(const Type& type, const Type& source, const Type& dest)
@@ -356,7 +348,7 @@ static void on_link_type_creation(const Type& type, const Type& source, const Ty
   stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_parent()->get_id();
   stream << " " << source.get_id() << " " << dest.get_id() << " " << type.get_name();
   XBT_DEBUG("Dump %s", stream.str().c_str());
-  tracing_file << stream.str() << std::endl;
+  tracing_file << stream.str() << '\n';
 }
 
 static void on_simulation_start()
@@ -396,7 +388,7 @@ static void on_simulation_start()
 
     /* output one line comment */
     if (auto comment = simgrid::config::get_value<std::string>("tracing/comment"); not comment.empty())
-      tracing_file << "# " << comment << std::endl;
+      tracing_file << "# " << comment << '\n';
 
     /* output comment file */
     paje::dump_comment_file(config::get_value<std::string>(OPT_TRACING_COMMENT_FILE));
@@ -468,5 +460,4 @@ void init()
   s4u::Engine::on_deadlock_cb(on_simulation_end);
   s4u::Engine::on_simulation_end_cb(on_simulation_end);
 }
-} // namespace instr
-} // namespace simgrid
+} // namespace simgrid::instr