X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..HEAD:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index e5fd2dc593..abf4956af2 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -1,66 +1,38 @@
-/* Copyright (c) 2010-2020. The SimGrid Team.
+/* 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. */
 
 #include "simgrid/Exception.hpp"
-#include "simgrid/sg_config.hpp"
 #include "src/instr/instr_private.hpp"
 #include "src/instr/instr_smpi.hpp"
+#include "src/simgrid/sg_config.hpp"
 #include "src/smpi/include/private.hpp"
-#include "typeinfo"
 #include <fstream>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system");
 
-extern std::ofstream tracing_file;
+namespace simgrid::instr {
+static std::vector<PajeEvent*> buffer;
 
-static std::vector<simgrid::instr::PajeEvent*> buffer;
-
-void dump_comment(const std::string& comment)
-{
-  if (not comment.empty())
-    tracing_file << "# " << comment << std::endl;
-}
-
-void dump_comment_file(const std::string& filename)
-{
-  if (filename.empty())
-    return;
-  std::ifstream fs(filename.c_str(), std::ifstream::in);
-
-  if (fs.fail())
-    throw simgrid::TracingError(
-        XBT_THROW_POINT,
-        simgrid::xbt::string_printf("Comment file %s could not be opened for reading.", filename.c_str()));
-
-  while (not fs.eof()) {
-    std::string line;
-    std::getline(fs, line);
-    tracing_file << "# " << line;
-  }
-  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(bool force)
+double last_timestamp_to_dump = 0;
+// dumps the trace file until the last_timestamp_to_dump
+void dump_buffer(bool force)
 {
   if (not TRACE_is_enabled())
     return;
-  XBT_DEBUG("%s: dump until %f. starts", __func__, TRACE_last_timestamp_to_dump);
-  if (force){
+  XBT_DEBUG("%s: dump until %f. starts", __func__, last_timestamp_to_dump);
+  if (force || (trace_format == TraceFormat::Ti)){
     for (auto const& event : buffer) {
       event->print();
       delete event;
     }
     buffer.clear();
   } else {
-    std::vector<simgrid::instr::PajeEvent*>::iterator i = buffer.begin();
+    auto i = buffer.begin();
     for (auto const& event : buffer) {
-      double head_timestamp = event->timestamp_;
-      if (head_timestamp > TRACE_last_timestamp_to_dump)
+      if (event->timestamp_ > last_timestamp_to_dump)
         break;
       event->print();
       delete event;
@@ -72,13 +44,14 @@ void TRACE_paje_dump_buffer(bool force)
 }
 
 /* internal do the instrumentation module */
-void simgrid::instr::PajeEvent::insert_into_buffer()
+void PajeEvent::insert_into_buffer()
 {
-  XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __func__, eventType_, timestamp_, buffer.size());
-  std::vector<simgrid::instr::PajeEvent*>::reverse_iterator i;
+  XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __func__, static_cast<unsigned>(eventType_),
+            timestamp_, buffer.size());
+  std::vector<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 %u; timestamp:%f", e1, e1->eventType_, e1->timestamp_);
+    PajeEvent* e1 = *i;
+    XBT_DEBUG("compare to %p is of type %u; timestamp:%f", e1, static_cast<unsigned>(e1->eventType_), e1->timestamp_);
     if (e1->timestamp_ <= timestamp_)
       break;
   }
@@ -90,3 +63,5 @@ void simgrid::instr::PajeEvent::insert_into_buffer()
     XBT_DEBUG("%s: inserted at pos= %zd from its end", __func__, std::distance(buffer.rbegin(), i));
   buffer.insert(i.base(), this);
 }
+
+} // namespace simgrid::instr