X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/46311148101eae2e8af8aa1d0f7c519de32df899..b82f3248c4c26f9e4f7bf76b2f827a4d6325b16e:/src/instr/instr_interface.c diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c index ee767b76c9..dce7e4844d 100644 --- a/src/instr/instr_interface.c +++ b/src/instr/instr_interface.c @@ -9,6 +9,14 @@ #ifdef HAVE_TRACING #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"); @@ -22,7 +30,7 @@ void TRACE_category_with_color (const char *category, const char *color) if (!(TRACE_is_active() && category != NULL)) return; - xbt_assert1 (instr_platform_traced(), + xbt_assert (instr_platform_traced(), "%s must be called after environment creation", __FUNCTION__); //check if category is already created @@ -42,25 +50,11 @@ void TRACE_category_with_color (const char *category, const char *color) snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color); } - DEBUG2("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"); -// - } + XBT_DEBUG("CAT,declare %s, %s", category, final_color); //define the type of this category on top of hosts and links if (TRACE_categorized ()){ - instr_new_user_variable_type (category, final_color); + instr_new_variable_type (category, final_color); } } @@ -71,8 +65,8 @@ void TRACE_declare_mark(const char *mark_type) if (!mark_type) return; - DEBUG1("MARK,declare %s", mark_type); - pajeDefineEventType(mark_type, "0", mark_type); + XBT_DEBUG("MARK,declare %s", mark_type); + getEventType(mark_type, NULL, getRootType()); } void TRACE_mark(const char *mark_type, const char *mark_value) @@ -82,66 +76,204 @@ void TRACE_mark(const char *mark_type, const char *mark_value) if (!mark_type || !mark_value) return; - DEBUG2("MARK %s %s", mark_type, mark_value); - pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value); + XBT_DEBUG("MARK %s %s", mark_type, mark_value); + type_t type = getEventType (mark_type, NULL, getRootContainer()->type); + val_t value = getValue (mark_value, NULL, type); + new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, value); } - -void TRACE_user_link_variable(double time, const char *resource, - const char *variable, - double value, const char *what) +static void instr_user_variable(double time, + const char *resource, + const char *variable, + const char *father_type, + double value, + InstrUserVariable what) { if (!TRACE_is_active()) return; - xbt_assert1 (instr_platform_traced(), + xbt_assert (instr_platform_traced(), "%s must be called after environment creation", __FUNCTION__); char valuestr[100]; snprintf(valuestr, 100, "%g", value); - if (strcmp(what, "declare") == 0) { - instr_new_user_link_variable_type (variable, NULL); - } else{ - char *variable_id = getVariableTypeIdByName(variable, getContainerByName(resource)->type); - char *resource_id = getContainerIdByName(resource); - if (strcmp(what, "set") == 0) { - pajeSetVariable(time, variable_id, resource_id, valuestr); - } else if (strcmp(what, "add") == 0) { - pajeAddVariable(time, variable_id, resource_id, valuestr); - } else if (strcmp(what, "sub") == 0) { - pajeSubVariable(time, variable_id, resource_id, valuestr); - } + switch (what){ + case INSTR_US_DECLARE: + instr_new_user_variable_type (father_type, variable, NULL); + break; + case INSTR_US_SET: + { + container_t container = getContainerByName(resource); + type_t type = getVariableType (variable, NULL, container->type); + new_pajeSetVariable(time, container, type, value); + break; + } + case INSTR_US_ADD: + { + container_t container = getContainerByName(resource); + type_t type = getVariableType (variable, NULL, container->type); + new_pajeAddVariable(time, container, type, value); + break; + } + case INSTR_US_SUB: + { + container_t container = getContainerByName(resource); + type_t type = getVariableType (variable, NULL, container->type); + new_pajeSubVariable(time, container, type, value); + break; + } + default: + //TODO: launch exception + break; + } +} + +static void instr_user_srcdst_variable(double time, + const char *src, + const char *dst, + const char *variable, + const char *father_type, + double value, + InstrUserVariable what) +{ + xbt_dynar_t route = global_routing->get_route (src, dst); + unsigned int i; + void *link; + xbt_dynar_foreach (route, i, link) { + char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; + instr_user_variable (time, link_name, variable, father_type, value, what); } } -void TRACE_user_host_variable(double time, const char *variable, - double value, const char *what) +const char *TRACE_node_name (xbt_node_t node) +{ + void *data = xbt_graph_node_get_data(node); + char *str = (char*)data; + return str; +} + +xbt_graph_t TRACE_platform_graph (void) { if (!TRACE_is_active()) - return; + return NULL; - xbt_assert1 (instr_platform_traced(), - "%s must be called after environment creation", __FUNCTION__); + return instr_routing_platform_graph (); +} - char valuestr[100]; - snprintf(valuestr, 100, "%g", value); +void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename) +{ + instr_routing_platform_graph_export_graphviz (g, filename); +} - if (strcmp(what, "declare") == 0) { - instr_new_user_host_variable_type (variable, NULL); - } else{ - char *host_name = MSG_host_self()->name; - char *variable_id = getVariableTypeIdByName(variable, getContainerByName(host_name)->type); - char *resource_id = getContainerIdByName(host_name); - if (strcmp(what, "set") == 0) { - pajeSetVariable(time, variable_id, resource_id, valuestr); - } else if (strcmp(what, "add") == 0) { - pajeAddVariable(time, variable_id, resource_id, valuestr); - } else if (strcmp(what, "sub") == 0) { - pajeSubVariable(time, variable_id, resource_id, valuestr); - } - } + +/* + * 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 */