X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e697d0a3c14acfc95f73f509af52d1872a85b0c..403af5e6247ce6452b721f418a5b41e4548efac4:/src/instr/instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 3e229a12c2..41b7c85897 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -3,7 +3,8 @@
 /* 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 "include/xbt/config.hpp"
+#include "src/instr/instr_private.hpp"
 #include "surf/surf.h"
 #include <string>
 #include <vector>
@@ -63,8 +64,6 @@ static int trace_precision;
 static bool trace_configured = false;
 static bool trace_active     = false;
 
-static simgrid::instr::Type* rootType = nullptr; /* the root type */
-
 instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
 
 static void TRACE_getopts()
@@ -105,22 +104,22 @@ int TRACE_start()
     /* init the tracing module to generate the right output */
 
     /* open the trace file(s) */
-    const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
-    XBT_DEBUG("Tracing format %s\n", format);
-    if (not strcmp(format, "Paje")) {
+    std::string format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
+    XBT_DEBUG("Tracing format %s\n", format.c_str());
+    if (format == "Paje") {
       TRACE_paje_start();
-    } else if (not strcmp(format, "TI")) {
+    } else if (format == "TI") {
       instr_fmt_type = instr_fmt_TI;
       TRACE_TI_start();
     }else{
-      xbt_die("Unknown trace format :%s ", format);
+      xbt_die("Unknown trace format :%s ", format.c_str());
     }
 
     /* 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,27 +138,26 @@ int TRACE_end()
 
     /* dump trace buffer */
     TRACE_last_timestamp_to_dump = surf_get_clock();
-    TRACE_paje_dump_buffer(1);
+    TRACE_paje_dump_buffer(true);
 
+    simgrid::instr::Type* root_type = simgrid::instr::Container::getRoot()->type_;
     /* destroy all data structures of tracing (and free) */
-    PJ_container_free_all();
-    recursiveDestroyType (PJ_type_get_root());
-    PJ_container_release();
-    rootType = nullptr;
+    delete simgrid::instr::Container::getRoot();
+    delete root_type;
 
     /* close the trace files */
-    const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
-    XBT_DEBUG("Tracing format %s\n", format);
-    if (not strcmp(format, "Paje")) {
+    std::string format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
+    XBT_DEBUG("Tracing format %s\n", format.c_str());
+    if (format == "Paje") {
       TRACE_paje_end();
-    } else if (not strcmp(format, "TI")) {
+    } else if (format == "TI") {
       TRACE_TI_end();
     }else{
-      xbt_die("Unknown trace format :%s ", format);
+      xbt_die("Unknown trace format :%s ", format.c_str());
     }
 
     /* de-activate trace */
-    trace_active = 0;
+    trace_active = false;
     XBT_DEBUG("Tracing is off");
     XBT_DEBUG("Tracing system is shutdown");
   }
@@ -272,12 +270,12 @@ bool TRACE_display_sizes ()
    return trace_display_sizes && trace_smpi_enabled && TRACE_is_enabled();
 }
 
-char *TRACE_get_comment ()
+std::string TRACE_get_comment()
 {
   return xbt_cfg_get_string(OPT_TRACING_COMMENT);
 }
 
-char *TRACE_get_comment_file ()
+std::string TRACE_get_comment_file()
 {
   return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE);
 }
@@ -287,28 +285,28 @@ int TRACE_precision ()
   return xbt_cfg_get_int(OPT_TRACING_PRECISION);
 }
 
-char *TRACE_get_filename()
+std::string TRACE_get_filename()
 {
   return xbt_cfg_get_string(OPT_TRACING_FILENAME);
 }
 
-char *TRACE_get_viva_uncat_conf ()
+std::string TRACE_get_viva_uncat_conf()
 {
   return xbt_cfg_get_string(OPT_VIVA_UNCAT_CONF);
 }
 
-char *TRACE_get_viva_cat_conf ()
+std::string TRACE_get_viva_cat_conf()
 {
   return xbt_cfg_get_string(OPT_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 +350,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);
   }
@@ -580,12 +577,12 @@ static void generate_cat_configuration (const char *output, const char *name, in
 
 void TRACE_generate_viva_uncat_conf ()
 {
-  generate_uncat_configuration (TRACE_get_viva_uncat_conf (), "viva", 0);
+  generate_uncat_configuration(TRACE_get_viva_uncat_conf().c_str(), "viva", 0);
 }
 
 void TRACE_generate_viva_cat_conf ()
 {
-  generate_cat_configuration (TRACE_get_viva_cat_conf(), "viva", 0);
+  generate_cat_configuration(TRACE_get_viva_cat_conf().c_str(), "viva", 0);
 }
 
 static int previous_trace_state = -1;
@@ -598,7 +595,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 +610,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;