From a81bbe9d6d298459a0dacbdb558ddaef3febf538 Mon Sep 17 00:00:00 2001 From: schnorr Date: Mon, 13 Dec 2010 16:44:18 +0000 Subject: [PATCH] [trace] renaming function to follow up parameters git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9156 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/instr/instr_config.c | 12 ++++++------ src/instr/instr_interface.c | 4 ++-- src/instr/instr_private.h | 2 +- src/instr/instr_resource_utilization.c | 4 ++-- src/instr/instr_surf.c | 2 +- src/instr/instr_variables.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 2571250f91..6b8eaf67b7 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING "tracing" #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" -#define OPT_TRACING_PLATFORM "tracing/categorized" +#define OPT_TRACING_CATEGORIZED "tracing/categorized" #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized" #define OPT_TRACING_MSG_TASK "tracing/msg/task" #define OPT_TRACING_MSG_PROCESS "tracing/msg/process" @@ -187,9 +187,9 @@ int TRACE_smpi_is_grouped(void) return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); } -int TRACE_platform_is_enabled(void) +int TRACE_categorized (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED); } int TRACE_uncategorized (void) @@ -265,7 +265,7 @@ void TRACE_global_init(int *argc, char **argv) /* platform */ int default_tracing_platform = 0; - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED, "Tracing of categorized platform (host and link) utilization.", xbt_cfgelm_int, &default_tracing_platform, 0, 1, NULL, NULL); @@ -343,7 +343,7 @@ void TRACE_help (int detailed) " 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); - print_line (OPT_TRACING_PLATFORM, "Trace categorized resource utilization", + 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); @@ -510,7 +510,7 @@ void TRACE_generate_triva_cat_conf (void) #undef OPT_TRACING #undef OPT_TRACING_SMPI #undef OPT_TRACING_SMPI_GROUP -#undef OPT_TRACING_PLATFORM +#undef OPT_TRACING_CATEGORIZED #undef OPT_TRACING_UNCATEGORIZED #undef OPT_TRACING_MSG_TASK #undef OPT_TRACING_MSG_PROCESS diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c index ead66bb75f..33d2803785 100644 --- a/src/instr/instr_interface.c +++ b/src/instr/instr_interface.c @@ -111,10 +111,10 @@ int TRACE_create_category_with_color(const char *category, /* for registering application categories on top of platform */ snprintf(state, 100, "b%s", category); - if (TRACE_platform_is_enabled()) + if (TRACE_categorized ()) pajeDefineVariableTypeWithColor(state, "LINK", state, final_color); snprintf(state, 100, "p%s", category); - if (TRACE_platform_is_enabled()) + if (TRACE_categorized ()) pajeDefineVariableTypeWithColor(state, "HOST", state, final_color); val_one = xbt_strdup("1"); diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 18aa963351..5d86325215 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -150,7 +150,7 @@ int TRACE_is_enabled(void); int TRACE_is_configured(void); int TRACE_smpi_is_enabled(void); int TRACE_smpi_is_grouped(void); -int TRACE_platform_is_enabled(void); +int TRACE_categorized (void); int TRACE_uncategorized (void); int TRACE_msg_task_is_enabled(void); int TRACE_msg_process_is_enabled(void); diff --git a/src/instr/instr_resource_utilization.c b/src/instr/instr_resource_utilization.c index 9e0921cf2a..12b53ca231 100644 --- a/src/instr/instr_resource_utilization.c +++ b/src/instr/instr_resource_utilization.c @@ -39,7 +39,7 @@ static void __TRACE_surf_check_variable_set_to_zero(double now, xbt_dynar_t array = xbt_dynar_new(sizeof(char *), xbt_free); char *var_cpy = xbt_strdup(variable); xbt_dynar_push(array, &var_cpy); - if (TRACE_platform_is_enabled()) + if (TRACE_categorized ()) pajeSetVariable(now, variable, resource, "0"); xbt_dict_set(platform_variables, resource, array, xbt_dynar_free_voidp); @@ -56,7 +56,7 @@ static void __TRACE_surf_check_variable_set_to_zero(double now, if (flag == 0) { char *var_cpy = xbt_strdup(variable); xbt_dynar_push(array, &var_cpy); - if (TRACE_platform_is_enabled()) + if (TRACE_categorized ()) pajeSetVariable(now, variable, resource, "0"); } } diff --git a/src/instr/instr_surf.c b/src/instr/instr_surf.c index bfec1b8b9b..add2828595 100644 --- a/src/instr/instr_surf.c +++ b/src/instr/instr_surf.c @@ -265,7 +265,7 @@ void TRACE_surf_action(surf_action_t surf_action, const char *category) { if (!TRACE_is_active()) return; - if (!TRACE_platform_is_enabled()) + if (!TRACE_categorized ()) return; if (!category) return; diff --git a/src/instr/instr_variables.c b/src/instr/instr_variables.c index fd33b7d3fe..8b5c973f67 100644 --- a/src/instr/instr_variables.c +++ b/src/instr/instr_variables.c @@ -16,7 +16,7 @@ void TRACE_user_link_variable(double time, const char *src, const char *dst, const char *variable, double value, const char *what) { - if (!TRACE_is_active() || !TRACE_platform_is_enabled()) + if (!TRACE_is_active() || !TRACE_categorized ()) return; char valuestr[100]; @@ -51,7 +51,7 @@ void TRACE_user_host_variable(double time, const char *variable, double value, const char *what) { char valuestr[100]; - if (!TRACE_is_active() || !TRACE_platform_is_enabled()) + if (!TRACE_is_active() || !TRACE_categorized ()) return; snprintf(valuestr, 100, "%g", value); -- 2.20.1