X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd271c6d040ba0a229bf3bfeac563da0f8a1d7e9..0ff40b115c4a7f131b2ffab880faf600e96cfc06:/src/instr/instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 3e443a351f..eb86e1d068 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -1,12 +1,12 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. 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 "src/instr/instr_private.h"
-#include "simgrid/sg_config.h"
+#include "src/instr/instr_private.hpp"
 #include "surf/surf.h"
+#include <string>
+#include <vector>
 
 XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
@@ -63,7 +63,11 @@ static int trace_precision;
 static bool trace_configured = false;
 static bool trace_active     = false;
 
-static void TRACE_getopts(void)
+static simgrid::instr::Type* rootType = nullptr; /* the root type */
+
+instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
+
+static void TRACE_getopts()
 {
   trace_enabled             = xbt_cfg_get_boolean(OPT_TRACING);
   trace_platform            = xbt_cfg_get_boolean(OPT_TRACING_PLATFORM);
@@ -87,14 +91,6 @@ static void TRACE_getopts(void)
   trace_precision           = xbt_cfg_get_int(OPT_TRACING_PRECISION);
 }
 
-static xbt_dynar_t TRACE_start_functions = nullptr;
-void TRACE_add_start_function(void (*func) ())
-{
-  if (TRACE_start_functions == nullptr)
-    TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), nullptr);
-  xbt_dynar_push(TRACE_start_functions, &func);
-}
-
 int TRACE_start()
 {
   if (TRACE_is_configured())
@@ -107,60 +103,33 @@ int TRACE_start()
 
     XBT_DEBUG("Tracing starts");
     /* init the tracing module to generate the right output */
-    /* open internal buffer */
-    TRACE_init();
 
     /* 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")){
-      TRACE_paje_init();
+    if (not strcmp(format, "Paje")) {
       TRACE_paje_start();
-    }else if (!strcmp(format, "TI")){
-      TRACE_TI_init();
+    } else if (not strcmp(format, "TI")) {
+      instr_fmt_type = instr_fmt_TI;
       TRACE_TI_start();
     }else{
       xbt_die("Unknown trace format :%s ", format);
     }
 
     /* 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");
-
-    /* other trace initialization */
-    created_categories = xbt_dict_new_homogeneous(xbt_free_f);
-    declared_marks = xbt_dict_new_homogeneous(xbt_free_f);
-    user_host_variables = xbt_dict_new_homogeneous(xbt_free_f);
-    user_vm_variables = xbt_dict_new_homogeneous(xbt_free_f);
-    user_link_variables = xbt_dict_new_homogeneous(xbt_free_f);
-
-    if (TRACE_start_functions != nullptr) {
-      void (*func) ();
-      unsigned int iter;
-      xbt_dynar_foreach(TRACE_start_functions, iter, func) {
-        func();
-      }
-    }
   }
-  xbt_dynar_free(&TRACE_start_functions);
   return 0;
 }
 
-static xbt_dynar_t TRACE_end_functions = nullptr;
-void TRACE_add_end_function(void (*func) (void))
-{
-  if (TRACE_end_functions == nullptr)
-    TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), nullptr);
-  xbt_dynar_push(TRACE_end_functions, &func);
-}
-
 int TRACE_end()
 {
   int retval;
-  if (!trace_active) {
+  if (not trace_active) {
     retval = 1;
   } else {
     retval = 0;
@@ -170,192 +139,175 @@ 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();
-    PJ_type_free_all();
-    PJ_container_release();
-    PJ_type_release();
-
-    if (TRACE_end_functions != nullptr) {
-      void (*func) (void);
-      unsigned int iter;
-      xbt_dynar_foreach(TRACE_end_functions, iter, func) {
-        func();
-      }
-    }
-
-    xbt_dict_free(&user_link_variables);
-    xbt_dict_free(&user_host_variables);
-    xbt_dict_free(&user_vm_variables);
-    xbt_dict_free(&declared_marks);
-    xbt_dict_free(&created_categories);
+    delete PJ_container_get_root();
+    delete simgrid::instr::Type::getRootType();
+    rootType = nullptr;
 
     /* 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();
-    }else if (!strcmp(format, "TI")){
+    } else if (not strcmp(format, "TI")) {
       TRACE_TI_end();
     }else{
       xbt_die("Unknown trace format :%s ", format);
     }
-    /* close internal buffer */
-    TRACE_finalize();
+
     /* de-activate trace */
-    trace_active = 0;
+    trace_active = false;
     XBT_DEBUG("Tracing is off");
     XBT_DEBUG("Tracing system is shutdown");
   }
-  xbt_dynar_free(&TRACE_start_functions); /* useful when exiting early */
-  xbt_dynar_free(&TRACE_end_functions);
   return retval;
 }
 
-bool TRACE_needs_platform (void)
+bool TRACE_needs_platform ()
 {
   return TRACE_msg_process_is_enabled() || TRACE_msg_vm_is_enabled() || TRACE_categorized() ||
          TRACE_uncategorized() || TRACE_platform () || (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped());
 }
 
-bool TRACE_is_enabled(void)
+bool TRACE_is_enabled()
 {
   return trace_enabled;
 }
 
-bool TRACE_platform(void)
+bool TRACE_platform()
 {
   return trace_platform;
 }
 
-bool TRACE_platform_topology(void)
+bool TRACE_platform_topology()
 {
   return trace_platform_topology;
 }
 
-bool TRACE_is_configured(void)
+bool TRACE_is_configured()
 {
   return trace_configured;
 }
 
-bool TRACE_smpi_is_enabled(void)
+bool TRACE_smpi_is_enabled()
 {
   return (trace_smpi_enabled || TRACE_smpi_is_grouped()) && TRACE_is_enabled();
 }
 
-bool TRACE_smpi_is_grouped(void)
+bool TRACE_smpi_is_grouped()
 {
   return trace_smpi_grouped;
 }
 
-bool TRACE_smpi_is_computing(void)
+bool TRACE_smpi_is_computing()
 {
   return trace_smpi_computing;
 }
 
-bool TRACE_smpi_is_sleeping(void)
+bool TRACE_smpi_is_sleeping()
 {
   return trace_smpi_sleeping;
 }
 
-bool TRACE_smpi_view_internals(void)
+bool TRACE_smpi_view_internals()
 {
   return trace_view_internals;
 }
 
-bool TRACE_categorized (void)
+bool TRACE_categorized ()
 {
   return trace_categorized;
 }
 
-bool TRACE_uncategorized (void)
+bool TRACE_uncategorized ()
 {
   return trace_uncategorized;
 }
 
-bool TRACE_msg_process_is_enabled(void)
+bool TRACE_msg_process_is_enabled()
 {
   return trace_msg_process_enabled && TRACE_is_enabled();
 }
 
-bool TRACE_msg_vm_is_enabled(void)
+bool TRACE_msg_vm_is_enabled()
 {
   return trace_msg_vm_enabled && TRACE_is_enabled();
 }
 
-bool TRACE_disable_link(void)
+bool TRACE_disable_link()
 {
   return trace_disable_link && TRACE_is_enabled();
 }
 
-bool TRACE_disable_speed(void)
+bool TRACE_disable_speed()
 {
   return trace_disable_power && TRACE_is_enabled();
 }
 
-bool TRACE_buffer (void)
+bool TRACE_buffer ()
 {
   return trace_buffer && TRACE_is_enabled();
 }
 
-bool TRACE_onelink_only (void)
+bool TRACE_onelink_only ()
 {
   return trace_onelink_only && TRACE_is_enabled();
 }
 
-bool TRACE_disable_destroy (void)
+bool TRACE_disable_destroy ()
 {
   return trace_disable_destroy && TRACE_is_enabled();
 }
 
-bool TRACE_basic (void)
+bool TRACE_basic ()
 {
   return trace_basic && TRACE_is_enabled();
 }
 
-bool TRACE_display_sizes (void)
+bool TRACE_display_sizes ()
 {
    return trace_display_sizes && trace_smpi_enabled && TRACE_is_enabled();
 }
 
-char *TRACE_get_comment (void)
+char *TRACE_get_comment ()
 {
   return xbt_cfg_get_string(OPT_TRACING_COMMENT);
 }
 
-char *TRACE_get_comment_file (void)
+char *TRACE_get_comment_file ()
 {
   return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE);
 }
 
-int TRACE_precision (void)
+int TRACE_precision ()
 {
   return xbt_cfg_get_int(OPT_TRACING_PRECISION);
 }
 
-char *TRACE_get_filename(void)
+char *TRACE_get_filename()
 {
   return xbt_cfg_get_string(OPT_TRACING_FILENAME);
 }
 
-char *TRACE_get_viva_uncat_conf (void)
+char *TRACE_get_viva_uncat_conf ()
 {
   return xbt_cfg_get_string(OPT_VIVA_UNCAT_CONF);
 }
 
-char *TRACE_get_viva_cat_conf (void)
+char *TRACE_get_viva_cat_conf ()
 {
   return xbt_cfg_get_string(OPT_VIVA_CAT_CONF);
 }
 
-void TRACE_global_init(int *argc, char **argv)
+void TRACE_global_init()
 {
-  static int is_initialised = 0;
-  if (is_initialised) return;
+  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.");
@@ -399,7 +351,7 @@ void TRACE_global_init(int *argc, char **argv)
   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)
@@ -409,7 +361,7 @@ static void print_line (const char *option, const char *desc, const char *longde
 
   int len = strlen (str);
   printf ("%s%*.*s %s\n", str, 30-len, 30-len, "", desc);
-  if (!!longdesc && detailed){
+  if (longdesc != nullptr && detailed){
     printf ("%s\n\n", longdesc);
   }
 }
@@ -505,7 +457,7 @@ void TRACE_help (int detailed)
   print_line (OPT_TRACING_TOPOLOGY, "Register the platform topology as a graph",
         "  This option (enabled by default) can be used to disable the tracing of\n"
         "  the platform topology in the trace file. Sometimes, such task is really\n"
-        "  time consuming, since it must get the route from each host ot other hosts\n"
+        "  time consuming, since it must get the route from each host to other hosts\n"
         "  within the same Autonomous System (AS).", detailed);
 }
 
@@ -514,7 +466,7 @@ static void output_types (const char *name, xbt_dynar_t types, FILE *file)
   unsigned int i;
   fprintf (file, "  %s = (", name);
   for (i = xbt_dynar_length(types); i > 0; i--) {
-    char *type = *(char**)xbt_dynar_get_ptr(types, i - 1);
+    char *type = *(static_cast<char**>(xbt_dynar_get_ptr(types, i - 1)));
     fprintf (file, "\"%s\"", type);
     if (i - 1 > 0){
       fprintf (file, ",");
@@ -525,20 +477,19 @@ static void output_types (const char *name, xbt_dynar_t types, FILE *file)
   xbt_dynar_free (&types);
 }
 
-static void output_categories (const char *name, xbt_dynar_t cats, FILE *file)
+static void output_categories(const char* name, FILE* file)
 {
-  unsigned int i;
+  unsigned int i = created_categories.size();
   fprintf (file, "    values = (");
-  for (i = xbt_dynar_length(cats); i > 0; i--) {
-    char *cat = *(char**)xbt_dynar_get_ptr(cats, i - 1);
-    fprintf (file, "\"%s%s\"", name, cat);
-    if (i - 1 > 0){
+  for (auto const& cat : created_categories) {
+    --i;
+    fprintf(file, "\"%s%s\"", name, cat.c_str());
+    if (i > 0) {
       fprintf (file, ",");
     }else{
       fprintf (file, ");\n");
     }
   }
-  xbt_dynar_free (&cats);
 }
 
 static void uncat_configuration (FILE *file)
@@ -575,13 +526,13 @@ static void cat_configuration (FILE *file)
            "  host = {\n"
            "    type = \"square\";\n"
            "    size = \"power\";\n");
-  output_categories ("p", TRACE_get_categories(), file);
+  output_categories("p", file);
   fprintf (file,
            "  };\n"
            "  link = {\n"
            "    type = \"rhombus\";\n"
            "    size = \"bandwidth\";\n");
-  output_categories ("b", TRACE_get_categories(), file);
+  output_categories("b", file);
   fprintf (file, "  };\n");
   //close
 }
@@ -591,13 +542,15 @@ static void generate_uncat_configuration (const char *output, const char *name,
   if (output && strlen(output) > 0){
     FILE *file = fopen (output, "w");
     if (file == nullptr){
-      THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph "
-          "configuration (uncategorized).", output, name);
+      THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph configuration (uncategorized).",
+              output, name);
     }
 
-    if (brackets) fprintf (file, "{\n");
+    if (brackets)
+      fprintf (file, "{\n");
     uncat_configuration (file);
-    if (brackets) fprintf (file, "}\n");
+    if (brackets)
+      fprintf (file, "}\n");
     fclose (file);
   }
 }
@@ -606,7 +559,7 @@ static void generate_cat_configuration (const char *output, const char *name, in
 {
   if (output && strlen(output) > 0){
     //check if we do have categories declared
-    if (xbt_dict_is_empty(created_categories)){
+    if (created_categories.empty()) {
       XBT_INFO("No categories declared, ignoring generation of %s graph configuration", name);
       return;
     }
@@ -624,31 +577,31 @@ static void generate_cat_configuration (const char *output, const char *name, in
   }
 }
 
-void TRACE_generate_viva_uncat_conf (void)
+void TRACE_generate_viva_uncat_conf ()
 {
   generate_uncat_configuration (TRACE_get_viva_uncat_conf (), "viva", 0);
 }
 
-void TRACE_generate_viva_cat_conf (void)
+void TRACE_generate_viva_cat_conf ()
 {
   generate_cat_configuration (TRACE_get_viva_cat_conf(), "viva", 0);
 }
 
 static int previous_trace_state = -1;
 
-void instr_pause_tracing (void)
+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.");
   }
-  trace_enabled = 0;
+  trace_enabled = false;
   XBT_DEBUG ("Tracing is paused.");
 }
 
-void instr_resume_tracing (void)
+void instr_resume_tracing ()
 {
   if (TRACE_is_enabled()){
     XBT_DEBUG ("Tracing is already running while trying to resume, therefore do nothing.");
@@ -659,26 +612,8 @@ void instr_resume_tracing (void)
   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;
 }
-
-#undef OPT_TRACING
-#undef OPT_TRACING_PLATFORM
-#undef OPT_TRACING_TOPOLOGY
-#undef OPT_TRACING_SMPI
-#undef OPT_TRACING_SMPI_GROUP
-#undef OPT_TRACING_CATEGORIZED
-#undef OPT_TRACING_UNCATEGORIZED
-#undef OPT_TRACING_MSG_PROCESS
-#undef OPT_TRACING_FILENAME
-#undef OPT_TRACING_BUFFER
-#undef OPT_TRACING_ONELINK_ONLY
-#undef OPT_TRACING_DISABLE_DESTROY
-#undef OPT_TRACING_BASIC
-#undef OPT_TRACING_COMMENT
-#undef OPT_TRACING_COMMENT_FILE
-#undef OPT_VIVA_UNCAT_CONF
-#undef OPT_VIVA_CAT_CONF