X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92197c7e3516470da6ccee2253d0e515a70a70a9..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/instr/instr_paje_trace.cpp?ds=sidebyside

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 3b8d752fe4..46431388a3 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -1,67 +1,38 @@
-/* Copyright (c) 2010-2018. The SimGrid Team.
+/* Copyright (c) 2010-2022. 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/smpi/include/private.hpp"
-#include "typeinfo"
 #include <fstream>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system");
 
-static std::stringstream stream;
-extern std::ofstream tracing_file;
+namespace simgrid::instr {
+static std::vector<PajeEvent*> buffer;
 
-std::vector<simgrid::instr::PajeEvent*> buffer;
-void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf);
-
-void dump_comment(std::string comment)
-{
-  if (not comment.empty())
-    tracing_file << "# " << comment << std::endl;
-}
-
-void dump_comment_file(std::string filename)
-{
-  if (filename.empty())
-    return;
-  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 fs->eof()) {
-    std::string line;
-    tracing_file << "# ";
-    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();
+  } else {
+    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,35 +43,15 @@ void TRACE_paje_dump_buffer(bool force)
   XBT_DEBUG("%s: ends", __func__);
 }
 
-void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
-{
-  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();
-    XBT_DEBUG("%p %s", event, stream.str().c_str());
-    stream.str("");
-    stream.clear();
-  }
-  XBT_DEBUG("<<<<<<");
-}
-
 /* internal do the instrumentation module */
-void simgrid::instr::PajeEvent::insertIntoBuffer()
+void PajeEvent::insert_into_buffer()
 {
-  if (not TRACE_buffer()) {
-    print();
-    delete this;
-    return;
-  }
-  buffer_debug(&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;
   }
@@ -111,6 +62,6 @@ void simgrid::instr::PajeEvent::insertIntoBuffer()
   else
     XBT_DEBUG("%s: inserted at pos= %zd from its end", __func__, std::distance(buffer.rbegin(), i));
   buffer.insert(i.base(), this);
-
-  buffer_debug(&buffer);
 }
+
+} // namespace simgrid::instr