X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5f13796049934534009468a92c64392d0092510..eb9843bb5d46f053935c36f741d37f21520c1e96:/src/instr/instr_interface.c diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c index 17515ef4b2..4472a8285b 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) @@ -20,16 +27,18 @@ void TRACE_category(const char *category) void TRACE_category_with_color (const char *category, const char *color) { - if (!(TRACE_is_active() && category != NULL)) - return; + /* safe switch */ + if (!TRACE_is_enabled()) return; + + if (!(TRACE_categorized() && category != NULL)) return; - xbt_assert (instr_platform_traced(), - "%s must be called after environment creation", __FUNCTION__); + /* if platform is not traced, we can't deal with categories */ + if (!TRACE_needs_platform()) return; //check if category is already created char *created = xbt_dict_get_or_null(created_categories, category); if (created) return; - xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free); + xbt_dict_set (created_categories, category, xbt_strdup("1"), NULL); //define final_color char final_color[INSTR_DEFAULT_STR_SIZE]; @@ -45,88 +54,79 @@ 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); - } + instr_new_variable_type (category, final_color); } void TRACE_declare_mark(const char *mark_type) { - if (!TRACE_is_active()) - return; - if (!mark_type) - return; + /* safe switch */ + if (!TRACE_is_enabled()) return; + + if (!mark_type) return; XBT_DEBUG("MARK,declare %s", mark_type); - getEventType(mark_type, NULL, getRootType()); + PJ_type_event_new(mark_type, NULL, PJ_type_get_root()); } void TRACE_mark(const char *mark_type, const char *mark_value) { - if (!TRACE_is_active()) - return; - if (!mark_type || !mark_value) - return; + /* safe switch */ + if (!TRACE_is_enabled()) return; + + if (!mark_type || !mark_value) return; 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); + type_t type = PJ_type_get (mark_type, PJ_type_get_root()); + if (type == NULL){ + THROWF (tracing_error, 1, "mark_type with name (%s) not declared before", mark_type); + } + val_t value = PJ_value_get (mark_value, type); + if (value == NULL){ + value = PJ_value_new (mark_value, NULL, type); + } + new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), 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, double value, - InstrUserVariable what) + InstrUserVariable what, + const char *color) { - if (!TRACE_is_active()) - return; + /* safe switch */ + if (!TRACE_is_enabled()) return; - xbt_assert (instr_platform_traced(), - "%s must be called after environment creation", __FUNCTION__); + /* if platform is not traced, we can't deal user variables */ + if (!TRACE_needs_platform()) return; char valuestr[100]; snprintf(valuestr, 100, "%g", value); switch (what){ case INSTR_US_DECLARE: - instr_new_user_variable_type (father_type, variable, NULL); + instr_new_user_variable_type (father_type, variable, color); break; case INSTR_US_SET: { - container_t container = getContainerByName(resource); - type_t type = getVariableType (variable, NULL, container->type); + container_t container = PJ_container_get(resource); + type_t type = PJ_type_get (variable, 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); + container_t container = PJ_container_get(resource); + type_t type = PJ_type_get (variable, 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); + container_t container = PJ_container_get(resource); + type_t type = PJ_type_get (variable, container->type); new_pajeSubVariable(time, container, type, value); break; } @@ -136,7 +136,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, @@ -144,27 +144,28 @@ void TRACE_user_srcdst_variable(double time, double value, InstrUserVariable what) { - xbt_dynar_t route = global_routing->get_route (src, dst); + xbt_dynar_t route=NULL; + network_element_t src_elm = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL); + if(!src_elm) src_elm = xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL); + if(!src_elm) xbt_die("Element '%s' not found!",src); + + network_element_t dst_elm = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL); + if(!dst_elm) dst_elm = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL); + if(!dst_elm) xbt_die("Element '%s' not found!",dst); + + routing_get_route_and_latency (src_elm, dst_elm, &route,NULL); unsigned int i; 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, NULL); } } -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 NULL; - + if (!TRACE_is_enabled()) return NULL; return instr_routing_platform_graph (); } @@ -173,4 +174,124 @@ 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, NULL); +} + +void TRACE_host_variable_declare_with_color (const char *var, const char *color) +{ + instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, color); +} + +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, NULL); +} + +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, NULL); +} + +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, NULL); +} + +/* for link variables */ +void TRACE_link_variable_declare (const char *var) +{ + instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, NULL); +} + +void TRACE_link_variable_declare_with_color (const char *var, const char *color) +{ + instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, color); +} + +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, NULL); +} + +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, NULL); +} + +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, NULL); +} + +/* 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 */