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

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 49aa668d92..927a8dbfe8 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -1,9 +1,10 @@
-/* Copyright (c) 2010-2018. The SimGrid Team.
+/* Copyright (c) 2010-2019. 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"
@@ -15,22 +16,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system")
 
 extern std::ofstream tracing_file;
 
-std::vector<simgrid::instr::PajeEvent*> buffer;
+static std::vector<simgrid::instr::PajeEvent*> buffer;
 
-void dump_comment(std::string comment)
+void dump_comment(const std::string& comment)
 {
   if (not comment.empty())
     tracing_file << "# " << comment << std::endl;
 }
 
-void dump_comment_file(std::string filename)
+void dump_comment_file(const std::string& filename)
 {
   if (filename.empty())
     return;
   std::ifstream fs(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());
+    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;
@@ -68,30 +71,9 @@ void TRACE_paje_dump_buffer(bool force)
   XBT_DEBUG("%s: ends", __func__);
 }
 
-static 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, event->stream_.str().c_str());
-    event->stream_.str("");
-    event->stream_.clear();
-  }
-  XBT_DEBUG("<<<<<<");
-}
-
 /* internal do the instrumentation module */
 void simgrid::instr::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;
   for (i = buffer.rbegin(); i != buffer.rend(); ++i) {
@@ -107,6 +89,4 @@ void simgrid::instr::PajeEvent::insert_into_buffer()
   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);
 }