From d4ec0a086f41795afaa1e1ea759774aca06745cf Mon Sep 17 00:00:00 2001 From: Lucas Schnorr Date: Thu, 14 Apr 2011 09:28:14 +0200 Subject: [PATCH] new tracing option, use only onelink routes to trace platform details: - useful for gtnets - and those that have a graph as platform topology and describe it using one link routes --- src/instr/instr_config.c | 21 +++++++++++++++++++++ src/instr/instr_private.h | 1 + src/instr/instr_routing.c | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 2ca1451707..680fa68ce0 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -22,6 +22,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_MSG_VOLUME "tracing/msg/volume" #define OPT_TRACING_FILENAME "tracing/filename" #define OPT_TRACING_BUFFER "tracing/buffer" +#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only" #define OPT_TRIVA_UNCAT_CONF "triva/uncategorized" #define OPT_TRIVA_CAT_CONF "triva/categorized" @@ -158,6 +159,12 @@ int TRACE_buffer (void) TRACE_is_enabled(); } +int TRACE_onelink_only (void) +{ + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_ONELINK_ONLY) && + TRACE_is_enabled(); +} + char *TRACE_get_filename(void) { return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); @@ -246,6 +253,13 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_buffer, 0, 1, NULL, NULL); + /* msg volume (experimental) */ + int default_onelink_only = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_ONELINK_ONLY, + "Use only routes with one link to trace platform.", + xbt_cfgelm_int, &default_onelink_only, 0, 1, + NULL, NULL); + /* Triva graph configuration for uncategorized tracing */ char *default_triva_uncat_conf_file = xbt_strdup (""); xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF, @@ -330,6 +344,13 @@ void TRACE_help (int detailed) " simulator performance can be severely impacted if this option is activated,\n" " but you are sure to get a trace file with events sorted.", detailed); + print_line (OPT_TRACING_ONELINK_ONLY, "Consider only one link routes to trace platform", + " This option changes the way SimGrid register its platform on the trace file.\n" + " Normally, the tracing considers all routes (no matter their size) on the\n" + " platform file to re-create the resource topology. If this option is activated,\n" + " only the routes with one link are used to register the topology within an AS.\n" + " Routes among AS continue to be traced as usual.", + detailed); print_line (OPT_TRIVA_UNCAT_CONF, "Generate graph configuration for Triva", " This option can be used in all types of simulators build with SimGrid\n" " to generate a uncategorized resource utilization graph to be used as\n" diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 39e25c10ae..bd95342ef2 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -169,6 +169,7 @@ int TRACE_msg_task_is_enabled(void); int TRACE_msg_process_is_enabled(void); int TRACE_msg_volume_is_enabled(void); int TRACE_buffer (void); +int TRACE_onelink_only (void); char *TRACE_get_filename(void); char *TRACE_get_triva_uncat_conf (void); char *TRACE_get_triva_cat_conf (void); diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 5613849568..a0a7cc38f9 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -110,6 +110,9 @@ static void recursiveGraphExtraction (routing_component_t rc, container_t contai strcmp (child1_name, child2_name) != 0){ xbt_dynar_t route = global_routing->get_route (child1_name, child2_name); + if (TRACE_onelink_only()){ + if (xbt_dynar_length (route) > 1) continue; + } unsigned int cpt; void *link; container_t previous = child1; @@ -432,6 +435,9 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb strcmp (child1_name, child2_name) != 0){ xbt_dynar_t route = global_routing->get_route (child1_name, child2_name); + if (TRACE_onelink_only()){ + if (xbt_dynar_length (route) > 1) continue; + } unsigned int cpt; void *link; xbt_node_t current, previous = new_xbt_graph_node(graph, child1_name, nodes); -- 2.20.1