Concatenate nested namespaces (sonar).

[simgrid.git] / src / instr / instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 460b43a..4643138 100644 (file)
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. 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
@@ -13,8 +13,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system");
 
-namespace simgrid {
-namespace instr {
+namespace simgrid::instr {
 static std::vector<PajeEvent*> buffer;
 
 double last_timestamp_to_dump = 0;
@@ -24,7 +23,7 @@ void dump_buffer(bool force)
   if (not TRACE_is_enabled())
     return;
   XBT_DEBUG("%s: dump until %f. starts", __func__, last_timestamp_to_dump);
-  if (force){
+  if (force || (trace_format == TraceFormat::Ti)){
     for (auto const& event : buffer) {
       event->print();
       delete event;
@@ -33,8 +32,7 @@ void dump_buffer(bool force)
   } else {
     auto i = buffer.begin();
     for (auto const& event : buffer) {
-      double head_timestamp = event->timestamp_;
-      if (head_timestamp > last_timestamp_to_dump)
+      if (event->timestamp_ > last_timestamp_to_dump)
         break;
       event->print();
       delete event;
@@ -66,5 +64,4 @@ void PajeEvent::insert_into_buffer()
   buffer.insert(i.base(), this);
 }
 
-} // namespace instr
-} // namespace simgrid
+} // namespace simgrid::instr