#include "src/instr/instr_private.h"
#include "simgrid/sg_config.h"
#include "surf/surf.h"
+#include <functional>
+#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");
#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"
#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(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);
+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 = NULL;
+ 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 std::vector<std::function<void()>> TRACE_start_functions;
+
void TRACE_add_start_function(void (*func) ())
{
- if (TRACE_start_functions == NULL)
- TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), NULL);
- xbt_dynar_push(TRACE_start_functions, &func);
+ TRACE_start_functions.push_back(func);
}
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 = 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();
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) {
- void (*func) ();
- unsigned int iter;
- xbt_dynar_foreach(TRACE_start_functions, iter, func) {
- func();
- }
- }
+ for (auto func: TRACE_start_functions)
+ func();
}
- xbt_dynar_free(&TRACE_start_functions);
+ TRACE_start_functions.clear();
return 0;
}
-static xbt_dynar_t TRACE_end_functions = NULL;
+static std::vector<std::function<void()>> TRACE_end_functions;
void TRACE_add_end_function(void (*func) (void))
{
- if (TRACE_end_functions == NULL)
- TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL);
- xbt_dynar_push(TRACE_end_functions, &func);
+ TRACE_end_functions.push_back(func);
}
int TRACE_end()
PJ_container_release();
PJ_type_release();
- if (TRACE_end_functions != NULL) {
- void (*func) (void);
- unsigned int iter;
- xbt_dynar_foreach(TRACE_end_functions, iter, func) {
- func();
- }
- }
+ for (auto func: TRACE_end_functions)
+ func();
+ TRACE_start_functions.clear();
xbt_dict_free(&user_link_variables);
xbt_dict_free(&user_host_variables);
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();
}else{
xbt_die("Unknown trace format :%s ", format);
}
- /* close internal buffer */
- TRACE_finalize();
+
/* de-activate trace */
trace_active = 0;
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;
}
-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());
}
-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();
}
-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(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)
{
static int is_initialised = 0;
- if (is_initialised) return;
+ if (is_initialised)
+ return;
is_initialised = 1;
/* name of the tracefile */
- xbt_cfg_register_string (OPT_TRACING_FILENAME, "Trace file created by the instrumented SimGrid.", "simgrid.trace", NULL);
- xbt_cfg_register_boolean(OPT_TRACING, "Enable Tracing.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_PLATFORM, "Register the platform in the trace as a hierarchy.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_TOPOLOGY, "Register the platform topology in the trace as a graph.", "yes", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_SMPI, "Tracing of the SMPI interface.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_SMPI_GROUP, "Group MPI processes by host.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_SMPI_COMPUTING, "Generate states for timing out of SMPI parts of the application", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_SMPI_SLEEPING, "Generate states for timing out of SMPI parts of the application", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_SMPI_INTERNALS, "View internal messages sent by Collective communications in SMPI", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_CATEGORIZED, "Tracing categorized resource utilization of hosts and links.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_UNCATEGORIZED, "Tracing uncategorized resource utilization of hosts and links.", "no", NULL);
-
- xbt_cfg_register_boolean(OPT_TRACING_MSG_PROCESS, "Tracing of MSG process behavior.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_MSG_VM, "Tracing of MSG process behavior.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_DISABLE_LINK, "Do not trace link bandwidth and latency.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_DISABLE_POWER, "Do not trace host power.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_BUFFER, "Buffer trace events to put them in temporal order.", "yes", NULL);
-
- xbt_cfg_register_boolean(OPT_TRACING_ONELINK_ONLY, "Use only routes with one link to trace platform.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction.", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_BASIC, "Avoid extended events (impoverished trace file).", "no", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_DISPLAY_SIZES, "(smpi only) Extended events with message size information", "no", NULL);
- xbt_cfg_register_string(OPT_TRACING_FORMAT, "(smpi only) Switch the output format of Tracing" ,"Paje", NULL);
- xbt_cfg_register_boolean(OPT_TRACING_FORMAT_TI_ONEFILE, "(smpi only) For replay format only : output to one file only", "no", NULL);
- xbt_cfg_register_string(OPT_TRACING_COMMENT, "Comment to be added on the top of the trace file.", "", NULL);
- xbt_cfg_register_string(OPT_TRACING_COMMENT_FILE,
- "The contents of the file are added to the top of the trace file as comment.", "", NULL);
- xbt_cfg_register_int(OPT_TRACING_PRECISION, "Numerical precision used when timestamping events "
- "(expressed in number of digits after decimal point)", 6, NULL);
+ 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_string(OPT_VIVA_UNCAT_CONF, "Viva Graph configuration file for uncategorized resource utilization traces.", "", NULL);
- xbt_cfg_register_string(OPT_VIVA_CAT_CONF, "Viva Graph configuration file for categorized resource utilization traces.", "", NULL);
+ 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.");
+
+ 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;
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);
}
}
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, ",");
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<char**>(xbt_dynar_get_ptr(cats, i - 1)));
fprintf (file, "\"%s%s\"", name, cat);
if (i - 1 > 0){
fprintf (file, ",");
{
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);
}
}
}
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);
}
}
}
-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()){
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.");
