X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b35b83061342281d4bfb1ef0b3e738dbcd0bee15..83c8fc90694724253dc3b67367d41c126d4dbd10:/src/instr/instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 8bbe263a69..546c055e44 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -3,7 +3,7 @@
 /* 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 "src/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
 #include "surf/surf.h"
 #include <string>
 #include <vector>
@@ -63,7 +63,7 @@ static int trace_precision;
 static bool trace_configured = false;
 static bool trace_active     = false;
 
-static Type* rootType = nullptr;        /* the root type */
+static simgrid::instr::Type* rootType = nullptr; /* the root type */
 
 instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
 
@@ -117,10 +117,10 @@ int TRACE_start()
     }
 
     /* activate trace */
-    if (trace_active == 1) {
+    if (trace_active) {
       THROWF(tracing_error, 0, "Tracing is already active");
     }
-    trace_active = 1;
+    trace_active = true;
     XBT_DEBUG("Tracing is on");
   }
   return 0;
@@ -139,12 +139,11 @@ int TRACE_end()
 
     /* dump trace buffer */
     TRACE_last_timestamp_to_dump = surf_get_clock();
-    TRACE_paje_dump_buffer(1);
+    TRACE_paje_dump_buffer(true);
 
     /* destroy all data structures of tracing (and free) */
-    PJ_container_free_all();
-    recursiveDestroyType (PJ_type_get_root());
-    PJ_container_release();
+    delete PJ_container_get_root();
+    delete simgrid::instr::Type::getRootType();
     rootType = nullptr;
 
     /* close the trace files */
@@ -159,7 +158,7 @@ int TRACE_end()
     }
 
     /* de-activate trace */
-    trace_active = 0;
+    trace_active = false;
     XBT_DEBUG("Tracing is off");
     XBT_DEBUG("Tracing system is shutdown");
   }
@@ -304,11 +303,11 @@ char *TRACE_get_viva_cat_conf ()
 
 void TRACE_global_init()
 {
-  static int is_initialised = 0;
+  static bool is_initialised = false;
   if (is_initialised)
     return;
 
-  is_initialised = 1;
+  is_initialised = true;
   /* name of the tracefile */
   xbt_cfg_register_string (OPT_TRACING_FILENAME, "simgrid.trace", nullptr, "Trace file created by the instrumented SimGrid.");
   xbt_cfg_register_boolean(OPT_TRACING, "no", nullptr, "Enable Tracing.");
@@ -352,16 +351,15 @@ void TRACE_global_init()
   xbt_cfg_register_alias(OPT_TRACING_ONELINK_ONLY, "tracing/onelink_only");
 
   /* instrumentation can be considered configured now */
-  trace_configured = 1;
+  trace_configured = true;
 }
 
 static void print_line (const char *option, const char *desc, const char *longdesc, int detailed)
 {
-  char str[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str, INSTR_DEFAULT_STR_SIZE, "--cfg=%s ", option);
+  std::string str = std::string("--cfg=") + option + " ";
 
-  int len = strlen (str);
-  printf ("%s%*.*s %s\n", str, 30-len, 30-len, "", desc);
+  int len = str.size();
+  printf("%s%*.*s %s\n", str.c_str(), 30 - len, 30 - len, "", desc);
   if (longdesc != nullptr && detailed){
     printf ("%s\n\n", longdesc);
   }
@@ -598,7 +596,7 @@ void instr_pause_tracing ()
   }else{
     XBT_DEBUG ("Tracing is being paused.");
   }
-  trace_enabled = 0;
+  trace_enabled = false;
   XBT_DEBUG ("Tracing is paused.");
 }
 
@@ -613,7 +611,7 @@ void instr_resume_tracing ()
   if (previous_trace_state != -1){
     trace_enabled = previous_trace_state;
   }else{
-    trace_enabled = 1;
+    trace_enabled = true;
   }
   XBT_DEBUG ("Tracing is resumed.");
   previous_trace_state = -1;