some optimizations

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

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 8b923a6..82b951f 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -63,6 +63,8 @@ static int trace_precision;
 static bool trace_configured = false;
 static bool trace_active     = false;
 
 static bool trace_configured = false;
 static bool trace_active     = false;
 

+static type_t rootType = nullptr;        /* the root type */
+

 instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
 
 static void TRACE_getopts()
 instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
 
 static void TRACE_getopts()


@@ -105,9 +107,9 @@ int TRACE_start()
     /* open the trace file(s) */
     const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
     XBT_DEBUG("Tracing format %s\n", format);
     /* open the trace file(s) */
     const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
     XBT_DEBUG("Tracing format %s\n", format);

-    if(!strcmp(format, "Paje")){
+    if (not strcmp(format, "Paje")) {

       TRACE_paje_start();
       TRACE_paje_start();

-    }else if (!strcmp(format, "TI")){
+    } else if (not strcmp(format, "TI")) {

       instr_fmt_type = instr_fmt_TI;
       TRACE_TI_start();
     }else{
       instr_fmt_type = instr_fmt_TI;
       TRACE_TI_start();
     }else{


@@ -134,7 +136,7 @@ int TRACE_start()
 int TRACE_end()
 {
   int retval;
 int TRACE_end()
 {
   int retval;

-  if (!trace_active) {
+  if (not trace_active) {

     retval = 1;
   } else {
     retval = 0;
     retval = 1;
   } else {
     retval = 0;


@@ -148,9 +150,9 @@ int TRACE_end()
 
     /* destroy all data structures of tracing (and free) */
     PJ_container_free_all();
 
     /* destroy all data structures of tracing (and free) */
     PJ_container_free_all();

-    PJ_type_free_all();
+    recursiveDestroyType (PJ_type_get_root());

     PJ_container_release();
     PJ_container_release();

-    PJ_type_release();
+    rootType = nullptr;

 
     xbt_dict_free(&user_link_variables);
     xbt_dict_free(&user_host_variables);
 
     xbt_dict_free(&user_link_variables);
     xbt_dict_free(&user_host_variables);


@@ -161,9 +163,9 @@ int TRACE_end()
     /* close the trace files */
     const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
     XBT_DEBUG("Tracing format %s\n", format);
     /* close the trace files */
     const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
     XBT_DEBUG("Tracing format %s\n", format);

-    if(!strcmp(format, "Paje")){
+    if (not strcmp(format, "Paje")) {

       TRACE_paje_end();
       TRACE_paje_end();

-    }else if (!strcmp(format, "TI")){
+    } else if (not strcmp(format, "TI")) {

       TRACE_TI_end();
     }else{
       xbt_die("Unknown trace format :%s ", format);
       TRACE_TI_end();
     }else{
       xbt_die("Unknown trace format :%s ", format);


@@ -605,7 +607,7 @@ static int previous_trace_state = -1;
 void instr_pause_tracing ()
 {
   previous_trace_state = trace_enabled;
 void instr_pause_tracing ()
 {
   previous_trace_state = trace_enabled;

-  if (!TRACE_is_enabled()){
+  if (not TRACE_is_enabled()) {

     XBT_DEBUG ("Tracing is already paused, therefore do nothing.");
   }else{
     XBT_DEBUG ("Tracing is being paused.");
     XBT_DEBUG ("Tracing is already paused, therefore do nothing.");
   }else{
     XBT_DEBUG ("Tracing is being paused.");