X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43bcc7a70e8f2f69fb3563226b55be8483e793f6..6847a26d9973030337f6ef9f18464b1f04ce7452:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index c8a069aea9..a811e79cf6 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
+/* Copyright (c) 2010-2018. 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/sg_config.h"
+#include "simgrid/sg_config.hpp"
 #include "src/instr/instr_private.hpp"
 #include "src/instr/instr_smpi.hpp"
 #include "src/smpi/include/private.hpp"
@@ -52,7 +52,7 @@ void TRACE_paje_dump_buffer(bool force)
 {
   if (not TRACE_is_enabled())
     return;
-  XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
+  XBT_DEBUG("%s: dump until %f. starts", __func__, TRACE_last_timestamp_to_dump);
   if (force){
     for (auto const& event : buffer) {
       event->print();
@@ -71,12 +71,13 @@ void TRACE_paje_dump_buffer(bool force)
     }
     buffer.erase(buffer.begin(), i);
   }
-  XBT_DEBUG("%s: ends", __FUNCTION__);
+  XBT_DEBUG("%s: ends", __func__);
 }
 
 void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
 {
-  return;
+  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();
@@ -97,8 +98,7 @@ void simgrid::instr::PajeEvent::insertIntoBuffer()
   }
   buffer_debug(&buffer);
 
-  XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __FUNCTION__, eventType_, timestamp_,
-            buffer.size());
+  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) {
     simgrid::instr::PajeEvent* e1 = *i;
@@ -107,24 +107,24 @@ void simgrid::instr::PajeEvent::insertIntoBuffer()
       break;
   }
   if (i == buffer.rend())
-    XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
+    XBT_DEBUG("%s: inserted at beginning", __func__);
   else if (i == buffer.rbegin())
-    XBT_DEBUG("%s: inserted at end", __FUNCTION__);
+    XBT_DEBUG("%s: inserted at end", __func__);
   else
-    XBT_DEBUG("%s: inserted at pos= %zd from its end", __FUNCTION__, std::distance(buffer.rbegin(), i));
+    XBT_DEBUG("%s: inserted at pos= %zd from its end", __func__, std::distance(buffer.rbegin(), i));
   buffer.insert(i.base(), this);
 
   buffer_debug(&buffer);
 }
 
 void TRACE_paje_start() {
-  char *filename = TRACE_get_filename();
-  tracing_file = fopen(filename, "w");
+  std::string filename = TRACE_get_filename();
+  tracing_file         = fopen(filename.c_str(), "w");
   if (tracing_file == nullptr){
-    THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename);
+    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str());
   }
 
-  XBT_DEBUG("Filename %s is open for writing", filename);
+  XBT_DEBUG("Filename %s is open for writing", filename.c_str());
 
   /* output generator version */
   fprintf (tracing_file, "#This file was generated using SimGrid-%d.%d.%d\n",
@@ -149,19 +149,19 @@ void TRACE_paje_start() {
 
 void TRACE_paje_end() {
   fclose(tracing_file);
-  char *filename = TRACE_get_filename();
-  XBT_DEBUG("Filename %s is closed", filename);
+  XBT_DEBUG("Filename %s is closed", TRACE_get_filename().c_str());
 }
 
 
 void TRACE_TI_start()
 {
-  char *filename = TRACE_get_filename();
-  tracing_file = fopen(filename, "w");
-  if (tracing_file == nullptr)
-    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename);
+  std::string filename = TRACE_get_filename();
+  tracing_file         = fopen(filename.c_str(), "w");
+  if (tracing_file == nullptr) {
+    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str());
+  }
 
-  XBT_DEBUG("Filename %s is open for writing", filename);
+  XBT_DEBUG("Filename %s is open for writing", filename.c_str());
 
   /* output one line comment */
   dump_comment(TRACE_get_comment());
@@ -173,5 +173,5 @@ void TRACE_TI_start()
 void TRACE_TI_end()
 {
   fclose(tracing_file);
-  XBT_DEBUG("Filename %s is closed", TRACE_get_filename());
+  XBT_DEBUG("Filename %s is closed", TRACE_get_filename().c_str());
 }