From: Lucas Schnorr Date: Tue, 24 May 2011 10:51:27 +0000 (+0200) Subject: [trace] interface cosmetics: removing pre-processor defines, substitute by function... X-Git-Tag: v3_6_rc3~14^2~8 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b82f3248c4c26f9e4f7bf76b2f827a4d6325b16e [trace] interface cosmetics: removing pre-processor defines, substitute by function calls --- diff --git a/include/instr/instr.h b/include/instr/instr.h index 4449bdd6f0..1c97865db8 100644 --- a/include/instr/instr.h +++ b/include/instr/instr.h @@ -30,92 +30,34 @@ XBT_PUBLIC(const char *) TRACE_node_name (xbt_node_t node); XBT_PUBLIC(xbt_graph_t) TRACE_platform_graph (void); XBT_PUBLIC(void) TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename); - /* * User-variables related functions */ -typedef enum { - INSTR_US_DECLARE, - INSTR_US_SET, - INSTR_US_ADD, - INSTR_US_SUB, -} InstrUserVariable; - -XBT_PUBLIC(void) TRACE_user_variable(double time, - const char *resource, - const char *variable, - const char *father_type, - double value, - InstrUserVariable what); -XBT_PUBLIC(void) TRACE_user_srcdst_variable(double time, - const char *src, - const char *dst, - const char *variable, - const char *father_type, - double value, - InstrUserVariable what); - -#define TRACE_host_variable_declare(var) \ - TRACE_user_variable(0,NULL,var,"HOST",0,INSTR_US_DECLARE); - -#define TRACE_host_variable_set_with_time(time,host,var,value) \ - TRACE_user_variable(time,host,var,"HOST",value,INSTR_US_SET); - -#define TRACE_host_variable_add_with_time(time,host,var,value) \ - TRACE_user_variable(time,host,var,"HOST",value,INSTR_US_ADD); - -#define TRACE_host_variable_sub_with_time(time,host,var,value) \ - TRACE_user_variable(time,host,var,"HOST",value,INSTR_US_SUB); - -#define TRACE_host_variable_set(host,var,value) \ - TRACE_user_variable(MSG_get_clock(),host,var,"HOST",value,INSTR_US_SET); - -#define TRACE_host_variable_add(host,var,value) \ - TRACE_user_variable(MSG_get_clock(),host,var,"HOST",value,INSTR_US_ADD); - -#define TRACE_host_variable_sub(host,var,value) \ - TRACE_user_variable(MSG_get_clock(),host,var,"HOST",value,INSTR_US_SUB); - -#define TRACE_link_variable_declare(var) \ - TRACE_user_variable(0,NULL,var,"LINK",0,INSTR_US_DECLARE); - -#define TRACE_link_variable_set_with_time(time,link,var,value) \ - TRACE_user_variable(time,link,var,"LINK",value,INSTR_US_SET); - -#define TRACE_link_variable_add_with_time(time,link,var,value) \ - TRACE_user_variable(time,link,var,"LINK",value,INSTR_US_ADD); - -#define TRACE_link_variable_sub_with_time(time,link,var,value) \ - TRACE_user_variable(time,link,var,"LINK",value,INSTR_US_SUB); - -#define TRACE_link_variable_set(link,var,value) \ - TRACE_user_variable(MSG_get_clock(),link,var,"LINK",value,INSTR_US_SET); - -#define TRACE_link_variable_add(link,var,value) \ - TRACE_user_variable(MSG_get_clock(),link,var,"LINK",value,INSTR_US_ADD); - -#define TRACE_link_variable_sub(link,var,value) \ - TRACE_user_variable(MSG_get_clock(),link,var,"LINK",value,INSTR_US_SUB); - -//user provides src and dst, we set the value for the variables of all -//links connecting src and dst -#define TRACE_link_srcdst_variable_set_with_time(time,src,dst,var,value) \ - TRACE_user_srcdst_variable(time,src,dst,,var,"LINK",value,INSTR_US_SET); - -#define TRACE_link_srcdst_variable_add_with_time(time,src,dst,var,value) \ - TRACE_user_srcdst_variable(time,src,dst,var,"LINK",value,INSTR_US_ADD); - -#define TRACE_link_srcdst_variable_sub_with_time(time,src,dst,var,value) \ - TRACE_user_srcdst_variable(time,src,dst,var,"LINK",value,INSTR_US_SUB); - -#define TRACE_link_srcdst_variable_set(src,dst,var,value) \ - TRACE_user_srcdst_variable(MSG_get_clock(),src,dst,var,"LINK",value,INSTR_US_SET); - -#define TRACE_link_srcdst_variable_add(src,dst,var,value) \ - TRACE_user_srcdst_variable(MSG_get_clock(),src,dst,var,"LINK",value,INSTR_US_ADD); - -#define TRACE_link_srcdst_variable_sub(src,dst,var,value) \ - TRACE_user_srcdst_variable(MSG_get_clock(),src,dst,var,"LINK",value,INSTR_US_SUB); +/* for host variables */ +XBT_PUBLIC(void) TRACE_host_variable_declare (const char *var); +XBT_PUBLIC(void) TRACE_host_variable_set (const char *host, const char *variable, double value); +XBT_PUBLIC(void) TRACE_host_variable_add (const char *host, const char *variable, double value); +XBT_PUBLIC(void) TRACE_host_variable_sub (const char *host, const char *variable, double value); +XBT_PUBLIC(void) TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value); +XBT_PUBLIC(void) TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value); +XBT_PUBLIC(void) TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value); + +/* for link variables */ +XBT_PUBLIC(void) TRACE_link_variable_declare (const char *var); +XBT_PUBLIC(void) TRACE_link_variable_set (const char *link, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_variable_add (const char *link, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_variable_sub (const char *link, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value); + +/* for link variables, but with src and dst used for get_route */ +XBT_PUBLIC(void) TRACE_link_srcdst_variable_set (const char *src, const char *dst, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_srcdst_variable_add (const char *src, const char *dst, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_srcdst_variable_set_with_time (double time, const char *src, const char *dst, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_srcdst_variable_add_with_time (double time, const char *src, const char *dst, const char *variable, double value); +XBT_PUBLIC(void) TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, const char *dst, const char *variable, double value); #else /* HAVE_TRACING */ @@ -125,34 +67,36 @@ XBT_PUBLIC(void) TRACE_user_srcdst_variable(double time, #define TRACE_msg_set_process_category(process,category,color) #define TRACE_smpi_set_category(category) #define TRACE_sd_set_task_category(task,category) + #define TRACE_declare_mark(mark_type) #define TRACE_mark(mark_type,mark_value) + #define TRACE_node_name(node) #define TRACE_platform_graph(void) #define TRACE_platform_graph_export_graphviz(g,filename) #define TRACE_host_variable_declare(var) -#define TRACE_host_variable_set_with_time(time,host,var,value) -#define TRACE_host_variable_add_with_time(time,host,var,value) -#define TRACE_host_variable_sub_with_time(time,host,var,value) #define TRACE_host_variable_set(host,var,value) #define TRACE_host_variable_add(host,var,value) #define TRACE_host_variable_sub(host,var,value) +#define TRACE_host_variable_set_with_time(time,host,var,value) +#define TRACE_host_variable_add_with_time(time,host,var,value) +#define TRACE_host_variable_sub_with_time(time,host,var,value) + #define TRACE_link_variable_declare(var) -#define TRACE_link_variable_set_with_time(time,link,var,value) -#define TRACE_link_variable_add_with_time(time,link,var,value) -#define TRACE_link_variable_sub_with_time(time,link,var,value) #define TRACE_link_variable_set(link,var,value) #define TRACE_link_variable_add(link,var,value) #define TRACE_link_variable_sub(link,var,value) -#define TRACE_link_srcdst_variable_set_with_time(time,src,dst,var,value) -#define TRACE_link_srcdst_variable_add_with_time(time,src,dst,var,value) -#define TRACE_link_srcdst_variable_sub_with_time(time,src,dst,var,value) +#define TRACE_link_variable_set_with_time(time,link,var,value) +#define TRACE_link_variable_add_with_time(time,link,var,value) +#define TRACE_link_variable_sub_with_time(time,link,var,value) + #define TRACE_link_srcdst_variable_set(src,dst,var,value) #define TRACE_link_srcdst_variable_add(src,dst,var,value) #define TRACE_link_srcdst_variable_sub(src,dst,var,value) - - +#define TRACE_link_srcdst_variable_set_with_time(time,src,dst,var,value) +#define TRACE_link_srcdst_variable_add_with_time(time,src,dst,var,value) +#define TRACE_link_srcdst_variable_sub_with_time(time,src,dst,var,value) #endif /* HAVE_TRACING */ diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c index 17515ef4b2..dce7e4844d 100644 --- a/src/instr/instr_interface.c +++ b/src/instr/instr_interface.c @@ -11,6 +11,13 @@ #include "instr/instr_private.h" #include "surf/network_private.h" +typedef enum { + INSTR_US_DECLARE, + INSTR_US_SET, + INSTR_US_ADD, + INSTR_US_SUB, +} InstrUserVariable; + XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API"); void TRACE_category(const char *category) @@ -45,20 +52,6 @@ void TRACE_category_with_color (const char *category, const char *color) XBT_DEBUG("CAT,declare %s, %s", category, final_color); -//FIXME -// - if (final) { -// - //for m_process_t -// - if (TRACE_msg_process_is_enabled()) -// - pajeDefineContainerType("process", type, "process"); -// - if (TRACE_msg_process_is_enabled()) -// - pajeDefineStateType("process-state", "process", "process-state"); -// - -// - if (TRACE_msg_task_is_enabled()) -// - pajeDefineContainerType("task", type, "task"); -// - if (TRACE_msg_task_is_enabled()) -// - pajeDefineStateType("task-state", "task", "task-state"); -// - } - //define the type of this category on top of hosts and links if (TRACE_categorized ()){ instr_new_variable_type (category, final_color); @@ -89,7 +82,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value) new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, value); } -void TRACE_user_variable(double time, +static void instr_user_variable(double time, const char *resource, const char *variable, const char *father_type, @@ -136,7 +129,7 @@ void TRACE_user_variable(double time, } } -void TRACE_user_srcdst_variable(double time, +static void instr_user_srcdst_variable(double time, const char *src, const char *dst, const char *variable, @@ -149,7 +142,7 @@ void TRACE_user_srcdst_variable(double time, void *link; xbt_dynar_foreach (route, i, link) { char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; - TRACE_user_variable (time, link_name, variable, father_type, value, what); + instr_user_variable (time, link_name, variable, father_type, value, what); } } @@ -173,4 +166,114 @@ void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename) instr_routing_platform_graph_export_graphviz (g, filename); } + +/* + * Derived functions that use instr_user_variable and TRACE_user_srcdst_variable. + * They were previously defined as pre-processors directives, but were transformed + * into functions so the user can track them using gdb. + */ + +/* for host variables */ +void TRACE_host_variable_declare (const char *var) +{ + instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE); +} + +void TRACE_host_variable_set (const char *host, const char *variable, double value) +{ + TRACE_host_variable_set_with_time (MSG_get_clock(), host, variable, value); +} + +void TRACE_host_variable_add (const char *host, const char *variable, double value) +{ + TRACE_host_variable_add_with_time (MSG_get_clock(), host, variable, value); +} + +void TRACE_host_variable_sub (const char *host, const char *variable, double value) +{ + TRACE_host_variable_sub_with_time (MSG_get_clock(), host, variable, value); +} + +void TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value) +{ + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET); +} + +void TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value) +{ + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD); +} + +void TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value) +{ + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB); +} + +/* for link variables */ +void TRACE_link_variable_declare (const char *var) +{ + instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE); +} + +void TRACE_link_variable_set (const char *link, const char *variable, double value) +{ + TRACE_link_variable_set_with_time (MSG_get_clock(), link, variable, value); +} + +void TRACE_link_variable_add (const char *link, const char *variable, double value) +{ + TRACE_link_variable_add_with_time (MSG_get_clock(), link, variable, value); +} + +void TRACE_link_variable_sub (const char *link, const char *variable, double value) +{ + TRACE_link_variable_sub_with_time (MSG_get_clock(), link, variable, value); +} + +void TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value) +{ + instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET); +} + +void TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value) +{ + instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD); +} + +void TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value) +{ + instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB); +} + +/* for link variables, but with src and dst used for get_route */ +void TRACE_link_srcdst_variable_set (const char *src, const char *dst, const char *variable, double value) +{ + TRACE_link_srcdst_variable_set_with_time (MSG_get_clock(), src, dst, variable, value); +} + +void TRACE_link_srcdst_variable_add (const char *src, const char *dst, const char *variable, double value) +{ + TRACE_link_srcdst_variable_add_with_time (MSG_get_clock(), src, dst, variable, value); +} + +void TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const char *variable, double value) +{ + TRACE_link_srcdst_variable_sub_with_time (MSG_get_clock(), src, dst, variable, value); +} + +void TRACE_link_srcdst_variable_set_with_time (double time, const char *src, const char *dst, const char *variable, double value) +{ + instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SET); +} + +void TRACE_link_srcdst_variable_add_with_time (double time, const char *src, const char *dst, const char *variable, double value) +{ + instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_ADD); +} + +void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, const char *dst, const char *variable, double value) +{ + instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SUB); +} + #endif /* HAVE_TRACING */