X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..831de10adaaf8910940aa280e2ac2dd075b5ffe5:/src/instr/instr_config.cpp diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 059ab243d4..72cfabd53b 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -14,18 +14,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_BASIC "tracing/basic" #define OPT_TRACING_BUFFER "tracing/buffer" #define OPT_TRACING_CATEGORIZED "tracing/categorized" -#define OPT_TRACING_COMMENT_FILE "tracing/comment_file" +#define OPT_TRACING_COMMENT_FILE "tracing/comment-file" #define OPT_TRACING_COMMENT "tracing/comment" -#define OPT_TRACING_DISABLE_DESTROY "tracing/disable_destroy" -#define OPT_TRACING_DISABLE_LINK "tracing/disable_link" -#define OPT_TRACING_DISABLE_POWER "tracing/disable_power" -#define OPT_TRACING_DISPLAY_SIZES "tracing/smpi/display_sizes" +#define OPT_TRACING_DISABLE_DESTROY "tracing/disable-destroy" +#define OPT_TRACING_DISABLE_LINK "tracing/disable-link" +#define OPT_TRACING_DISABLE_POWER "tracing/disable-power" +#define OPT_TRACING_DISPLAY_SIZES "tracing/smpi/display-sizes" #define OPT_TRACING_FILENAME "tracing/filename" -#define OPT_TRACING_FORMAT_TI_ONEFILE "tracing/smpi/format/ti_one_file" +#define OPT_TRACING_FORMAT_TI_ONEFILE "tracing/smpi/format/ti-one-file" #define OPT_TRACING_FORMAT "tracing/smpi/format" #define OPT_TRACING_MSG_PROCESS "tracing/msg/process" #define OPT_TRACING_MSG_VM "tracing/msg/vm" -#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only" +#define OPT_TRACING_ONELINK_ONLY "tracing/onelink-only" #define OPT_TRACING_PLATFORM "tracing/platform" #define OPT_TRACING_PRECISION "tracing/precision" #define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing" @@ -39,61 +39,59 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_VIVA_CAT_CONF "viva/categorized" #define OPT_VIVA_UNCAT_CONF "viva/uncategorized" -static int trace_enabled = 0; -static int trace_platform; -static int trace_platform_topology; -static int trace_smpi_enabled; -static int trace_smpi_grouped; -static int trace_smpi_computing; -static int trace_smpi_sleeping; -static int trace_view_internals; -static int trace_categorized; -static int trace_uncategorized; -static int trace_msg_process_enabled; -static int trace_msg_vm_enabled; -static int trace_buffer; -static int trace_onelink_only; -static int trace_disable_destroy; -static int trace_basic; -static int trace_display_sizes = 0; -static int trace_disable_link; -static int trace_disable_power; +static bool trace_enabled = false; +static bool trace_platform; +static bool trace_platform_topology; +static bool trace_smpi_enabled; +static bool trace_smpi_grouped; +static bool trace_smpi_computing; +static bool trace_smpi_sleeping; +static bool trace_view_internals; +static bool trace_categorized; +static bool trace_uncategorized; +static bool trace_msg_process_enabled; +static bool trace_msg_vm_enabled; +static bool trace_buffer; +static bool trace_onelink_only; +static bool trace_disable_destroy; +static bool trace_basic; +static bool trace_display_sizes = false; +static bool trace_disable_link; +static bool trace_disable_power; static int trace_precision; -static int trace_configured = 0; -static int trace_active = 0; - - - -static void TRACE_getopts(void) -{ - trace_enabled = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING); - trace_platform = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_PLATFORM); - trace_platform_topology = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_TOPOLOGY); - trace_smpi_enabled = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI); - trace_smpi_grouped = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_GROUP); - trace_smpi_computing = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING); - trace_smpi_sleeping = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING); - trace_view_internals = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS); - trace_categorized = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_CATEGORIZED); - trace_uncategorized = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED); - trace_msg_process_enabled = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_MSG_PROCESS); - trace_msg_vm_enabled = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_MSG_VM); - trace_buffer = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_BUFFER); - trace_onelink_only = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY); - trace_disable_destroy = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY); - trace_basic = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_BASIC); - trace_display_sizes = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES); - trace_disable_link = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_LINK); - trace_disable_power = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_POWER); - trace_precision = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_PRECISION); -} - -static xbt_dynar_t TRACE_start_functions = NULL; +static bool trace_configured = false; +static bool trace_active = false; + +static void TRACE_getopts() +{ + trace_enabled = xbt_cfg_get_boolean(OPT_TRACING); + trace_platform = xbt_cfg_get_boolean(OPT_TRACING_PLATFORM); + trace_platform_topology = xbt_cfg_get_boolean(OPT_TRACING_TOPOLOGY); + trace_smpi_enabled = xbt_cfg_get_boolean(OPT_TRACING_SMPI); + trace_smpi_grouped = xbt_cfg_get_boolean(OPT_TRACING_SMPI_GROUP); + trace_smpi_computing = xbt_cfg_get_boolean(OPT_TRACING_SMPI_COMPUTING); + trace_smpi_sleeping = xbt_cfg_get_boolean(OPT_TRACING_SMPI_SLEEPING); + trace_view_internals = xbt_cfg_get_boolean(OPT_TRACING_SMPI_INTERNALS); + trace_categorized = xbt_cfg_get_boolean(OPT_TRACING_CATEGORIZED); + trace_uncategorized = xbt_cfg_get_boolean(OPT_TRACING_UNCATEGORIZED); + trace_msg_process_enabled = xbt_cfg_get_boolean(OPT_TRACING_MSG_PROCESS); + trace_msg_vm_enabled = xbt_cfg_get_boolean(OPT_TRACING_MSG_VM); + trace_buffer = xbt_cfg_get_boolean(OPT_TRACING_BUFFER); + trace_onelink_only = xbt_cfg_get_boolean(OPT_TRACING_ONELINK_ONLY); + trace_disable_destroy = xbt_cfg_get_boolean(OPT_TRACING_DISABLE_DESTROY); + trace_basic = xbt_cfg_get_boolean(OPT_TRACING_BASIC); + trace_display_sizes = xbt_cfg_get_boolean(OPT_TRACING_DISPLAY_SIZES); + trace_disable_link = xbt_cfg_get_boolean(OPT_TRACING_DISABLE_LINK); + trace_disable_power = xbt_cfg_get_boolean(OPT_TRACING_DISABLE_POWER); + 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 == NULL) - TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), NULL); + if (TRACE_start_functions == nullptr) + TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), nullptr); xbt_dynar_push(TRACE_start_functions, &func); } @@ -108,13 +106,12 @@ int TRACE_start() if (TRACE_is_enabled()) { 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 = sg_cfg_get_string(OPT_TRACING_FORMAT); + const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT); XBT_DEBUG("Tracing format %s\n", format); if(!strcmp(format, "Paje")){ TRACE_paje_init(); @@ -140,9 +137,9 @@ int TRACE_start() user_vm_variables = xbt_dict_new_homogeneous(xbt_free_f); user_link_variables = xbt_dict_new_homogeneous(xbt_free_f); - if (TRACE_start_functions != NULL) { + if (TRACE_start_functions != nullptr) { void (*func) (); - unsigned int iter = xbt_dynar_length(TRACE_start_functions); + unsigned int iter; xbt_dynar_foreach(TRACE_start_functions, iter, func) { func(); } @@ -152,11 +149,11 @@ int TRACE_start() return 0; } -static xbt_dynar_t TRACE_end_functions = NULL; +static xbt_dynar_t TRACE_end_functions = nullptr; void TRACE_add_end_function(void (*func) (void)) { - if (TRACE_end_functions == NULL) - TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL); + if (TRACE_end_functions == nullptr) + TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), nullptr); xbt_dynar_push(TRACE_end_functions, &func); } @@ -181,7 +178,7 @@ int TRACE_end() PJ_container_release(); PJ_type_release(); - if (TRACE_end_functions != NULL) { + if (TRACE_end_functions != nullptr) { void (*func) (void); unsigned int iter; xbt_dynar_foreach(TRACE_end_functions, iter, func) { @@ -196,7 +193,7 @@ int TRACE_end() xbt_dict_free(&created_categories); /* close the trace files */ - const char* format = sg_cfg_get_string(OPT_TRACING_FORMAT); + const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT); XBT_DEBUG("Tracing format %s\n", format); if(!strcmp(format, "Paje")){ TRACE_paje_end(); @@ -217,317 +214,190 @@ int TRACE_end() return retval; } -int 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()); + 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()); } -int TRACE_is_enabled(void) +bool TRACE_is_enabled() { return trace_enabled; } -int TRACE_platform(void) +bool TRACE_platform() { return trace_platform; } -int TRACE_platform_topology(void) +bool TRACE_platform_topology() { return trace_platform_topology; } -int TRACE_is_configured(void) +bool TRACE_is_configured() { return trace_configured; } -int TRACE_smpi_is_enabled(void) +bool TRACE_smpi_is_enabled() { - return (trace_smpi_enabled || TRACE_smpi_is_grouped()) - && TRACE_is_enabled(); + return (trace_smpi_enabled || TRACE_smpi_is_grouped()) && TRACE_is_enabled(); } -int TRACE_smpi_is_grouped(void) +bool TRACE_smpi_is_grouped() { return trace_smpi_grouped; } -int TRACE_smpi_is_computing(void) +bool TRACE_smpi_is_computing() { return trace_smpi_computing; } -int TRACE_smpi_is_sleeping(void) +bool TRACE_smpi_is_sleeping() { return trace_smpi_sleeping; } -int TRACE_smpi_view_internals(void) +bool TRACE_smpi_view_internals() { return trace_view_internals; } -int TRACE_categorized (void) +bool TRACE_categorized () { return trace_categorized; } -int TRACE_uncategorized (void) +bool TRACE_uncategorized () { return trace_uncategorized; } -int TRACE_msg_process_is_enabled(void) +bool TRACE_msg_process_is_enabled() { return trace_msg_process_enabled && TRACE_is_enabled(); } -int TRACE_msg_vm_is_enabled(void) +bool TRACE_msg_vm_is_enabled() { return trace_msg_vm_enabled && TRACE_is_enabled(); } -int TRACE_disable_link(void) +bool TRACE_disable_link() { return trace_disable_link && TRACE_is_enabled(); } -int TRACE_disable_speed(void) +bool TRACE_disable_speed() { return trace_disable_power && TRACE_is_enabled(); } -int TRACE_buffer (void) +bool TRACE_buffer () { return trace_buffer && TRACE_is_enabled(); } -int TRACE_onelink_only (void) +bool TRACE_onelink_only () { return trace_onelink_only && TRACE_is_enabled(); } -int TRACE_disable_destroy (void) +bool TRACE_disable_destroy () { return trace_disable_destroy && TRACE_is_enabled(); } -int TRACE_basic (void) +bool TRACE_basic () { return trace_basic && TRACE_is_enabled(); } -int 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(_sg_cfg_set, OPT_TRACING_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(_sg_cfg_set, OPT_TRACING_COMMENT_FILE); + return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE); } -int TRACE_precision (void) +int TRACE_precision () { - return xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_PRECISION); + return xbt_cfg_get_int(OPT_TRACING_PRECISION); } -char *TRACE_get_filename(void) +char *TRACE_get_filename() { - return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_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(_sg_cfg_set, OPT_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(_sg_cfg_set, OPT_VIVA_CAT_CONF); + return xbt_cfg_get_string(OPT_VIVA_CAT_CONF); } void TRACE_global_init(int *argc, char **argv) { static int is_initialised = 0; - if (is_initialised) return; + if (is_initialised) + return; is_initialised = 1; /* name of the tracefile */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FILENAME, - "Trace file created by the instrumented SimGrid.", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_FILENAME, "simgrid.trace"); - - /* tracing */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING, - "Enable Tracing.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING, "no"); - - /* register platform in the trace */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_PLATFORM, - "Register the platform in the trace as a hierarchy.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_PLATFORM, "no"); - - /* register platform in the trace */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_TOPOLOGY, - "Register the platform topology in the trace as a graph.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_TOPOLOGY, "yes"); - - /* smpi */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI, - "Tracing of the SMPI interface.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI, "no"); - - /* smpi grouped */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_GROUP, - "Group MPI processes by host.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI_GROUP, "no"); - - /* smpi computing */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING, - "Generate states for timing out of SMPI parts of the application", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING, "no"); - -/* smpi sleeping */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING, - "Generate states for timing out of SMPI parts of the application", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING, "no"); - - - /* smpi internals */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS, - "View internal messages sent by Collective communications in SMPI", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS, "no"); - - /* tracing categorized resource utilization traces */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_CATEGORIZED, - "Tracing categorized resource utilization of hosts and links.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_CATEGORIZED, "no"); - - /* tracing uncategorized resource utilization */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_UNCATEGORIZED, - "Tracing uncategorized resource utilization of hosts and links.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED, "no"); - - /* msg process */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_PROCESS, - "Tracing of MSG process behavior.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_MSG_PROCESS, "no"); - - /* msg process */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM, - "Tracing of MSG process behavior.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_MSG_VM, "no"); - - /* disable tracing link */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_LINK, - "Do not trace link bandwidth and latency.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_LINK, "no"); - - /* disable tracing link */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_POWER, - "Do not trace host power.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_POWER, "no"); - - - /* tracing buffer */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER, - "Buffer trace events to put them in temporal order.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_BUFFER, "yes"); - - /* tracing one link only */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_ONELINK_ONLY, - "Use only routes with one link to trace platform.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY, "no"); - - /* disable destroy */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY, - "Disable platform containers destruction.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY, "no"); - - /* basic -- Avoid extended events (impoverished trace file) */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BASIC, - "Avoid extended events (impoverished trace file).", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_BASIC, "no"); - - /* display_sizes -- Extended events with message size information */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES, - "(smpi only for now) Extended events with message size information", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES, "no"); - - /* format -- Switch the ouput format of Tracing */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FORMAT, - "(smpi only for now) Switch the output format of Tracing", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_FORMAT, "Paje"); - - - /* format -- Switch the ouput format of Tracing */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FORMAT_TI_ONEFILE, - "(smpi only for now) For replay format only : output to one file only", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_FORMAT_TI_ONEFILE, "no"); - - /* comment */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT, - "Comment to be added on the top of the trace file.", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_COMMENT, ""); - - /* comment_file */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT_FILE, - "The contents of the file are added to the top of the trace file as comment.", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_COMMENT_FILE, ""); - - /* trace timestamp precision */ - xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_PRECISION, - "Numerical precision used when timestamping events (hence this value is expressed in number of digits after decimal point)", - xbt_cfgelm_int, 1, 1, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_PRECISION, 6); - + 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."); + xbt_cfg_register_boolean(OPT_TRACING_PLATFORM, "no", nullptr, "Register the platform in the trace as a hierarchy."); + xbt_cfg_register_boolean(OPT_TRACING_TOPOLOGY, "yes", nullptr, "Register the platform topology in the trace as a graph."); + xbt_cfg_register_boolean(OPT_TRACING_SMPI, "no", nullptr, "Tracing of the SMPI interface."); + xbt_cfg_register_boolean(OPT_TRACING_SMPI_GROUP,"no", nullptr, "Group MPI processes by host."); + xbt_cfg_register_boolean(OPT_TRACING_SMPI_COMPUTING, "no", nullptr, "Generate states for timing out of SMPI parts of the application"); + xbt_cfg_register_boolean(OPT_TRACING_SMPI_SLEEPING, "no", nullptr, "Generate states for timing out of SMPI parts of the application"); + xbt_cfg_register_boolean(OPT_TRACING_SMPI_INTERNALS, "no", nullptr, "View internal messages sent by Collective communications in SMPI"); + xbt_cfg_register_boolean(OPT_TRACING_CATEGORIZED, "no", nullptr, "Tracing categorized resource utilization of hosts and links."); + xbt_cfg_register_boolean(OPT_TRACING_UNCATEGORIZED, "no", nullptr, "Tracing uncategorized resource utilization of hosts and links."); + + xbt_cfg_register_boolean(OPT_TRACING_MSG_PROCESS, "no", nullptr, "Tracing of MSG process behavior."); + xbt_cfg_register_boolean(OPT_TRACING_MSG_VM, "no", nullptr, "Tracing of MSG process behavior."); + xbt_cfg_register_boolean(OPT_TRACING_DISABLE_LINK, "no", nullptr, "Do not trace link bandwidth and latency."); + xbt_cfg_register_boolean(OPT_TRACING_DISABLE_POWER, "no", nullptr, "Do not trace host power."); + xbt_cfg_register_boolean(OPT_TRACING_BUFFER, "yes", nullptr, "Buffer trace events to put them in temporal order."); + + xbt_cfg_register_boolean(OPT_TRACING_ONELINK_ONLY, "no", nullptr, "Use only routes with one link to trace platform."); + xbt_cfg_register_boolean(OPT_TRACING_DISABLE_DESTROY, "no", nullptr, "Disable platform containers destruction."); + xbt_cfg_register_boolean(OPT_TRACING_BASIC, "no", nullptr, "Avoid extended events (impoverished trace file)."); + xbt_cfg_register_boolean(OPT_TRACING_DISPLAY_SIZES, "no", nullptr, "(smpi only) Extended events with message size information"); + xbt_cfg_register_string(OPT_TRACING_FORMAT, "Paje", nullptr, "(smpi only) Switch the output format of Tracing"); + xbt_cfg_register_boolean(OPT_TRACING_FORMAT_TI_ONEFILE, "no", nullptr, "(smpi only) For replay format only : output to one file only"); + xbt_cfg_register_string(OPT_TRACING_COMMENT, "", nullptr, "Comment to be added on the top of the trace file."); + xbt_cfg_register_string(OPT_TRACING_COMMENT_FILE, "", nullptr, + "The contents of the file are added to the top of the trace file as comment."); + xbt_cfg_register_int(OPT_TRACING_PRECISION, 6, nullptr, "Numerical precision used when timestamping events " + "(expressed in number of digits after decimal point)"); /* Viva graph configuration for uncategorized tracing */ - xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_UNCAT_CONF, - "Viva Graph configuration file for uncategorized resource utilization traces.", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, OPT_VIVA_UNCAT_CONF, ""); + xbt_cfg_register_string(OPT_VIVA_UNCAT_CONF, "", nullptr, "Viva Graph configuration file for uncategorized resource utilization traces."); + xbt_cfg_register_string(OPT_VIVA_CAT_CONF, "", nullptr, "Viva Graph configuration file for categorized resource utilization traces."); - /* Viva graph configuration for uncategorized tracing */ - xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_CAT_CONF, - "Viva Graph configuration file for categorized resource utilization traces.", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, OPT_VIVA_CAT_CONF, ""); + xbt_cfg_register_alias(OPT_TRACING_COMMENT_FILE,"tracing/comment_file"); + xbt_cfg_register_alias(OPT_TRACING_DISABLE_DESTROY, "tracing/disable_destroy"); + xbt_cfg_register_alias(OPT_TRACING_DISABLE_LINK, "tracing/disable_link"); + xbt_cfg_register_alias(OPT_TRACING_DISABLE_POWER, "tracing/disable_power"); + xbt_cfg_register_alias(OPT_TRACING_DISPLAY_SIZES, "tracing/smpi/display_sizes"); + xbt_cfg_register_alias(OPT_TRACING_FORMAT_TI_ONEFILE, "tracing/smpi/format/ti_one_file"); + xbt_cfg_register_alias(OPT_TRACING_ONELINK_ONLY, "tracing/onelink_only"); /* instrumentation can be considered configured now */ trace_configured = 1; @@ -540,127 +410,104 @@ 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); } } void TRACE_help (int detailed) { - printf( - "Description of the tracing options accepted by this simulator:\n\n"); + printf("Description of the tracing options accepted by this simulator:\n\n"); print_line (OPT_TRACING, "Enable the tracing system", " It activates the tracing system and register the simulation platform\n" - " in the trace file. You have to enable this option to others take effect.", - detailed); + " in the trace file. You have to enable this option to others take effect.", detailed); print_line (OPT_TRACING_CATEGORIZED, "Trace categorized resource utilization", " It activates the categorized resource utilization tracing. It should\n" - " be enabled if tracing categories are used by this simulator.", - detailed); + " be enabled if tracing categories are used by this simulator.", detailed); print_line (OPT_TRACING_UNCATEGORIZED, "Trace uncategorized resource utilization", " It activates the uncategorized resource utilization tracing. Use it if\n" " this simulator do not use tracing categories and resource use have to be\n" - " traced.", - detailed); + " traced.", detailed); print_line (OPT_TRACING_FILENAME, "Filename to register traces", " A file with this name will be created to register the simulation. The file\n" " is in the Paje format and can be analyzed using Viva, Paje, and PajeNG visualization\n" " tools. More information can be found in these webpages:\n" " http://github.com/schnorr/viva/\n" " http://github.com/schnorr/pajeng/\n" - " http://paje.sourceforge.net/", - detailed); + " http://paje.sourceforge.net/", detailed); print_line (OPT_TRACING_SMPI, "Trace the MPI Interface (SMPI)", " This option only has effect if this simulator is SMPI-based. Traces the MPI\n" " interface and generates a trace that can be analyzed using Gantt-like\n" " visualizations. Every MPI function (implemented by SMPI) is transformed in a\n" - " state, and point-to-point communications can be analyzed with arrows.", - detailed); + " state, and point-to-point communications can be analyzed with arrows.", detailed); print_line (OPT_TRACING_SMPI_GROUP, "Group MPI processes by host (SMPI)", " This option only has effect if this simulator is SMPI-based. The processes\n" - " are grouped by the hosts where they were executed.", - detailed); + " are grouped by the hosts where they were executed.", detailed); print_line (OPT_TRACING_SMPI_COMPUTING, "Generates a \" Computing \" State", " This option aims at tracing computations in the application, outside SMPI\n" - " to allow further study of simulated or real computation time", - detailed); + " to allow further study of simulated or real computation time", detailed); print_line (OPT_TRACING_SMPI_SLEEPING, "Generates a \" Sleeping \" State", " This option aims at tracing sleeps in the application, outside SMPI\n" - " to allow further study of simulated or real sleep time", - detailed); + " to allow further study of simulated or real sleep time", detailed); print_line (OPT_TRACING_SMPI_INTERNALS, "Generates tracing events corresponding", - " to point-to-point messages sent by collective communications", - detailed); + " to point-to-point messages sent by collective communications", detailed); print_line (OPT_TRACING_MSG_PROCESS, "Trace processes behavior (MSG)", " This option only has effect if this simulator is MSG-based. It traces the\n" " behavior of all categorized MSG processes, grouping them by hosts. This option\n" - " can be used to track process location if this simulator has process migration.", - detailed); + " can be used to track process location if this simulator has process migration.", detailed); print_line (OPT_TRACING_BUFFER, "Buffer events to put them in temporal order", " This option put some events in a time-ordered buffer using the insertion\n" " sort algorithm. The process of acquiring and releasing locks to access this\n" " buffer and the cost of the sorting algorithm make this process slow. The\n" " simulator performance can be severely impacted if this option is activated,\n" - " but you are sure to get a trace file with events sorted.", - detailed); + " but you are sure to get a trace file with events sorted.", detailed); print_line (OPT_TRACING_ONELINK_ONLY, "Consider only one link routes to trace platform", " This option changes the way SimGrid register its platform on the trace file.\n" " Normally, the tracing considers all routes (no matter their size) on the\n" " platform file to re-create the resource topology. If this option is activated,\n" " only the routes with one link are used to register the topology within an AS.\n" - " Routes among AS continue to be traced as usual.", - detailed); + " Routes among AS continue to be traced as usual.", detailed); print_line (OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction", " Disable the destruction of containers at the end of simulation. This can be\n" " used with simulators that have a different notion of time (different from\n" - " the simulated time).", - detailed); + " the simulated time).", detailed); print_line (OPT_TRACING_BASIC, "Avoid extended events (impoverished trace file).", " Some visualization tools are not able to parse correctly the Paje file format.\n" " Use this option if you are using one of these tools to visualize the simulation\n" " trace. Keep in mind that the trace might be incomplete, without all the\n" - " information that would be registered otherwise.", - detailed); + " information that would be registered otherwise.", detailed); print_line (OPT_TRACING_DISPLAY_SIZES, "Only works for SMPI now. Add message size information", " Message size (in bytes) is added to links, and to states. For collectives,\n" " the displayed value is the more relevant to the collective (total sent by\n" - " the process, usually)", - detailed); + " the process, usually)", detailed); print_line (OPT_TRACING_FORMAT, "Only works for SMPI now. Switch output format", " Default format is Paje. Time independent traces are also supported,\n" - " to output traces that can later be used by the trace replay tool", - detailed); + " to output traces that can later be used by the trace replay tool", detailed); print_line (OPT_TRACING_FORMAT_TI_ONEFILE, "Only works for SMPI now, and TI output format", " By default, each process outputs to a separate file, inside a filename_files folder\n" " By setting this option to yes, all processes will output to only one file\n" - " This is meant to avoid opening thousands of files with large simulations", - detailed); + " This is meant to avoid opening thousands of files with large simulations", detailed); print_line (OPT_TRACING_COMMENT, "Comment to be added on the top of the trace file.", - " Use this to add a comment line to the top of the trace file.", - detailed); + " Use this to add a comment line to the top of the trace file.", detailed); print_line (OPT_TRACING_COMMENT_FILE, "File contents added to trace file as comment.", - " Use this to add the contents of a file to the top of the trace file as comment.", - detailed); + " Use this to add the contents of a file to the top of the trace file as comment.", detailed); print_line (OPT_VIVA_UNCAT_CONF, "Generate a graph configuration for Viva", " This option can be used in all types of simulators build with SimGrid\n" " to generate a uncategorized resource utilization graph to be used as\n" " configuration for the Viva visualization tool. This option\n" " can be used with tracing/categorized:1 and tracing:1 options to\n" " analyze an unmodified simulator before changing it to contain\n" - " categories.", - detailed); + " categories.", detailed); print_line (OPT_VIVA_CAT_CONF, "Generate an uncategorized graph configuration for Viva", " This option can be used if this simulator uses tracing categories\n" " in its code. The file specified by this option holds a graph configuration\n" " file for the Viva visualization tool that can be used to analyze a categorized\n" - " resource utilization.", - detailed); + " resource utilization.", 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" - " within the same Autonomous System (AS).", - detailed); + " within the same Autonomous System (AS).", detailed); } static void output_types (const char *name, xbt_dynar_t types, FILE *file) @@ -668,7 +515,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(xbt_dynar_get_ptr(types, i - 1))); fprintf (file, "\"%s\"", type); if (i - 1 > 0){ fprintf (file, ","); @@ -684,7 +531,7 @@ static void output_categories (const char *name, xbt_dynar_t cats, FILE *file) unsigned int i; fprintf (file, " values = ("); for (i = xbt_dynar_length(cats); i > 0; i--) { - char *cat = *(char**)xbt_dynar_get_ptr(cats, i - 1); + char *cat = *(static_cast(xbt_dynar_get_ptr(cats, i - 1))); fprintf (file, "\"%s%s\"", name, cat); if (i - 1 > 0){ fprintf (file, ","); @@ -744,14 +591,16 @@ static void generate_uncat_configuration (const char *output, const char *name, { if (output && strlen(output) > 0){ FILE *file = fopen (output, "w"); - if (file == NULL){ - THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph " - "configuration (uncategorized).", output, name); + if (file == nullptr){ + 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); } } @@ -766,7 +615,7 @@ static void generate_cat_configuration (const char *output, const char *name, in } FILE *file = fopen (output, "w"); - if (file == NULL){ + if (file == nullptr){ THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph " "configuration (categorized).", output, name); } @@ -778,19 +627,19 @@ 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()){ @@ -802,7 +651,7 @@ void instr_pause_tracing (void) 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.");