X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e55e72933ce9336c43e103a0f03de3c21269da85..ec76e6ef1a0f86a5d674a502349111fe8618c009:/include/instr/instr.h diff --git a/include/instr/instr.h b/include/instr/instr.h index 250d263751..3cb23add55 100644 --- a/include/instr/instr.h +++ b/include/instr/instr.h @@ -16,94 +16,114 @@ #include "msg/msg.h" #include "simdag/simdag.h" +/* + * Functions to manage tracing categories + */ XBT_PUBLIC(void) TRACE_category(const char *category); XBT_PUBLIC(void) TRACE_category_with_color (const char *category, const char *color); -XBT_PUBLIC(void) TRACE_msg_set_task_category(m_task_t task, - const char *category); -void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color); -XBT_PUBLIC(void) TRACE_user_host_variable(double time, - const char *variable, - double value, const char *what); -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); -XBT_PUBLIC(void) TRACE_user_link_variable(double time, const char *resource, - const char *variable, - double value, const char *what); -XBT_PUBLIC(void) TRACE_declare_mark(const char *mark_type); -XBT_PUBLIC(void) TRACE_mark(const char *mark_type, const char *mark_value); +XBT_PUBLIC(xbt_dynar_t) TRACE_get_categories (void); XBT_PUBLIC(void) TRACE_smpi_set_category(const char *category); -XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task, - const char *category); - -#define TRACE_host_variable_declare(var) \ - TRACE_user_host_variable(0,var,0,"declare"); - -#define TRACE_host_variable_set_with_time(time,var,value) \ - TRACE_user_host_variable(time,var,value,"set"); - -#define TRACE_host_variable_add_with_time(time,var,value) \ - TRACE_user_host_variable(time,var,value,"add"); - -#define TRACE_host_variable_sub_with_time(time,var,value) \ - TRACE_user_host_variable(time,var,value,"sub"); - -#define TRACE_host_variable_set(var,value) \ - TRACE_user_host_variable(MSG_get_clock(),var,value,"set"); - -#define TRACE_host_variable_add(var,value) \ - TRACE_user_host_variable(MSG_get_clock(),var,value,"add"); - -#define TRACE_host_variable_sub(var,value) \ - TRACE_user_host_variable(MSG_get_clock(),var,value,"sub"); - -#define TRACE_link_variable_declare(var) \ - TRACE_user_link_variable(0,NULL,NULL,var,0,"declare"); - -#define TRACE_link_variable_set_with_time(time,link,var,value) \ - TRACE_user_link_variable(time,link,var,value,"set"); - -#define TRACE_link_variable_add_with_time(time,link,var,value) \ - TRACE_user_link_variable(time,link,var,value,"add"); - -#define TRACE_link_variable_sub_with_time(time,link,var,value) \ - TRACE_user_link_variable(time,link,var,value,"sub"); -#define TRACE_link_variable_set(link,var,value) \ - TRACE_user_link_variable(MSG_get_clock(),link,var,value,"set"); +/* + * Functions to manage tracing marks (used for trace comparison experiments) + */ +XBT_PUBLIC(void) TRACE_declare_mark(const char *mark_type); +XBT_PUBLIC(void) TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color); +XBT_PUBLIC(void) TRACE_declare_mark_value (const char *mark_type, const char *mark_value); +XBT_PUBLIC(void) TRACE_mark(const char *mark_type, const char *mark_value); +XBT_PUBLIC(xbt_dynar_t) TRACE_get_marks (void); + +/* + * Function used by graphicator (transform a SimGrid platform + * file in a graphviz dot file with the network topology) + */ +XBT_PUBLIC(int) TRACE_platform_graph_export_graphviz (const char *filename); + +/* + * User-variables related functions + */ +/* for host variables */ +XBT_PUBLIC(void) TRACE_host_variable_declare (const char *variable); +XBT_PUBLIC(void) TRACE_host_variable_declare_with_color (const char *variable, const char *color); +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); +XBT_PUBLIC(xbt_dynar_t) TRACE_get_host_variables (void); + +/* for link variables */ +XBT_PUBLIC(void) TRACE_link_variable_declare (const char *var); +XBT_PUBLIC(void) TRACE_link_variable_declare_with_color (const char *var, const char *color); +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); +XBT_PUBLIC(xbt_dynar_t) TRACE_get_link_variables (void); +XBT_PUBLIC(void) TRACE_host_state_declare (const char *state); +XBT_PUBLIC(void) TRACE_host_state_declare_value (const char *state, const char *value, const char *color); +XBT_PUBLIC(void) TRACE_host_set_state (const char *host, const char *state, const char *value); +XBT_PUBLIC(void) TRACE_host_push_state (const char *host, const char *state, const char *value); +XBT_PUBLIC(void) TRACE_host_pop_state (const char *host, const char *state); +XBT_PUBLIC(void) TRACE_host_reset_state (const char *host, const char *state); + +/* for creating graph configuration files for Triva by hand */ +XBT_PUBLIC(xbt_dynar_t) TRACE_get_node_types (void); +XBT_PUBLIC(xbt_dynar_t) TRACE_get_edge_types (void); -#define TRACE_link_variable_add(link,var,value) \ - TRACE_user_link_variable(MSG_get_clock(),link,var,value,"add"); +#else /* HAVE_TRACING */ -#define TRACE_link_variable_sub(link,var,value) \ - TRACE_user_link_variable(MSG_get_clock(),link,var,value,"sub"); +#define TRACE_category(category) +#define TRACE_category_with_color(category,color) +#define TRACE_get_categories() +#define TRACE_smpi_set_category(category) -#else /* HAVE_TRACING */ +#define TRACE_declare_mark(mark_type) +#define TRACE_mark(mark_type,mark_value) +#define TRACE_get_marks() -#define TRACE_category(cat) -#define TRACE_category_with_color(cat,color) -#define TRACE_msg_set_task_category(task,cat) -#define TRACE_msg_set_process_category(proc,cat,color) -#define TRACE_set_mask(mask) +#define TRACE_platform_graph_export_graphviz(filename) #define TRACE_host_variable_declare(var) -#define TRACE_host_variable_set_with_time(time,var,value) -#define TRACE_host_variable_add_with_time(time,var,value) -#define TRACE_host_variable_sub_with_time(time,var,value) -#define TRACE_host_variable_set(var,value) -#define TRACE_host_variable_add(var,value) -#define TRACE_host_variable_sub(var,value) +#define TRACE_host_variable_declare_with_color(var,color) +#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_get_host_variables() + #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_declare_with_color(var,color) #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_declare_mark(type) -#define TRACE_mark(type,value) -#define TRACE_smpi_set_category(cat) -#define TRACE_sd_set_task_category(task,cat) +#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) +#define TRACE_get_host_variables() + +#define TRACE_get_node_types() +#define TRACE_get_edge_types() #endif /* HAVE_TRACING */