X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7cad16a187e10f78f94c63a490f474676702424..0ff40b115c4a7f131b2ffab880faf600e96cfc06:/src/instr/instr_config.cpp diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 8455e27199..eb86e1d068 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -1,11 +1,11 @@ -/* 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 "src/instr/instr_private.hpp" #include "surf/surf.h" +#include #include XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)"); @@ -63,7 +63,7 @@ static int trace_precision; static bool trace_configured = false; static bool trace_active = false; -static type_t 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,18 +117,11 @@ 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"); - - /* 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); } return 0; } @@ -146,20 +139,13 @@ 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; - 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); - /* close the trace files */ const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT); XBT_DEBUG("Tracing format %s\n", format); @@ -172,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"); } @@ -317,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."); @@ -365,7 +351,7 @@ 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) @@ -491,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 = *(static_cast(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) @@ -541,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 } @@ -574,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; } @@ -612,7 +597,7 @@ void instr_pause_tracing () }else{ XBT_DEBUG ("Tracing is being paused."); } - trace_enabled = 0; + trace_enabled = false; XBT_DEBUG ("Tracing is paused."); } @@ -627,26 +612,8 @@ 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; } - -#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