From: Augustin Degomme Date: Mon, 12 Nov 2012 15:02:21 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_9_rc1~91^2~122 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fa798894e27f82493fa87e7a69d7e3f6b3815053?hp=6fb81dc07673c304971a87e3d96d2c89f12c6e37 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c index 19d993ccde..bb6d765e1a 100644 --- a/examples/msg/tracing/categories.c +++ b/examples/msg/tracing/categories.c @@ -15,8 +15,8 @@ * --cfg=tracing:1 * --cfg=tracing/categorized:1 * --cfg=tracing/uncategorized:1 - * --cfg=triva/categorized:triva_cat.plist - * --cfg=triva/uncategorized:triva_uncat.plist + * --cfg=viva/categorized:viva_cat.plist + * --cfg=viva/uncategorized:viva_uncat.plist * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/categories.tesh b/examples/msg/tracing/categories.tesh index 74468ada49..58da1df0f0 100644 --- a/examples/msg/tracing/categories.tesh +++ b/examples/msg/tracing/categories.tesh @@ -2,17 +2,16 @@ p Tracing multiple categories master/slave application -$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/categories.cat.plist --cfg=triva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=viva/categorized:tracing/categories.cat.plist --cfg=viva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/categories.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/categorized' to 'tracing/categories.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/uncategorized' to 'tracing/categories.uncat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/categories.cat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/categories.uncat.plist' $ $SG_TEST_EXENV cat tracing/categories.cat.plist -> { > node = ("HOST","LINK"); > edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1"); > @@ -26,10 +25,8 @@ $ $SG_TEST_EXENV cat tracing/categories.cat.plist > size = "bandwidth"; > values = ("bdata","bcompute","bfinalize","brequest"); > }; -> } $ $SG_TEST_EXENV cat tracing/categories.uncat.plist -> { > node = ("HOST","LINK"); > edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1"); > @@ -43,6 +40,5 @@ $ $SG_TEST_EXENV cat tracing/categories.uncat.plist > size = "bandwidth"; > values = ("bandwidth_used"); > }; -> } $ rm -rf tracing/categories.trace tracing/categories.cat.plist tracing/categories.uncat.plist diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c index 69fe71b72f..8b6d5ce603 100644 --- a/examples/msg/tracing/ms.c +++ b/examples/msg/tracing/ms.c @@ -14,8 +14,8 @@ * You might want to run this program with the following parameters: * --cfg=tracing/categorized:1 * --cfg=tracing/uncategorized:1 - * --cfg=triva/categorized:triva_cat.plist - * --cfg=triva/uncategorized:triva_uncat.plist + * --cfg=viva/categorized:viva_cat.plist + * --cfg=viva/uncategorized:viva_uncat.plist * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh index 482883fcce..8a054ecd1d 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -1,14 +1,14 @@ #! ./tesh p Tracing master/slave application -$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/categorized' to 'tracing/ms.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/uncategorized' to 'tracing/ms.uncat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist' > [4.485137] [msg_test/INFO] Declared tracing categories: > [4.485137] [msg_test/INFO] request > [4.485137] [msg_test/INFO] finalize @@ -21,15 +21,15 @@ p Not tracing master/slave application $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml p Testing tracing by process -$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/process:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/process:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/categorized' to 'tracing/ms.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/uncategorized' to 'tracing/ms.uncat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist' > [4.485137] [msg_test/INFO] Declared tracing categories: > [4.485137] [msg_test/INFO] request > [4.485137] [msg_test/INFO] finalize @@ -39,7 +39,6 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/ms > [4.485137] [msg_test/INFO] msmark $ $SG_TEST_EXENV cat tracing/ms.uncat.plist -> { > node = ("HOST","LINK"); > edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13"); > @@ -53,10 +52,8 @@ $ $SG_TEST_EXENV cat tracing/ms.uncat.plist > size = "bandwidth"; > values = ("bandwidth_used"); > }; -> } $ $SG_TEST_EXENV cat tracing/ms.cat.plist -> { > node = ("HOST","LINK"); > edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13"); > @@ -70,6 +67,5 @@ $ $SG_TEST_EXENV cat tracing/ms.cat.plist > size = "bandwidth"; > values = ("bcompute","breport","bfinalize","brequest"); > }; -> } $ rm -rf tracing/ms.trace tracing/ms.cat.plist tracing/ms.uncat.plist diff --git a/examples/msg/tracing/user_variables.c b/examples/msg/tracing/user_variables.c index 65697ff199..0ec8ebf56e 100644 --- a/examples/msg/tracing/user_variables.c +++ b/examples/msg/tracing/user_variables.c @@ -100,9 +100,9 @@ int main(int argc, char *argv[]) xbt_dynar_free (&link_variables); } - //create a customized triva graph configuration file + //create a customized viva graph configuration file FILE *fp; - fp = fopen ("triva_graph.plist", "w"); + fp = fopen ("viva_graph.plist", "w"); if (!fp){ return 1; } diff --git a/examples/msg/tracing/user_variables.tesh b/examples/msg/tracing/user_variables.tesh index 621494f016..168ba8ea42 100644 --- a/examples/msg/tracing/user_variables.tesh +++ b/examples/msg/tracing/user_variables.tesh @@ -16,7 +16,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/user_variables$EXEEXT --cfg=tracing:1 --cf > [0.004078] [msg_test/INFO] 0-HOST1-LINK3 > [0.004078] [msg_test/INFO] 0-LINK3-HOST1 -$ rm triva_graph.plist +$ rm viva_graph.plist p Not tracing user variables $ $SG_TEST_EXENV ${bindir:=.}/tracing/user_variables$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml diff --git a/examples/smpi/tracing/smpi_traced.tesh b/examples/smpi/tracing/smpi_traced.tesh index ac93a4542d..84923e1d84 100644 --- a/examples/smpi/tracing/smpi_traced.tesh +++ b/examples/smpi/tracing/smpi_traced.tesh @@ -43,8 +43,8 @@ $ ../../bin/smpirun -trace -trace-grouped -trace-file smpi_traced.trace -hostfil > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/group' to '1' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) -p Testing generation of triva configuration files -$ ../../bin/smpirun -trace -trace-resource -trace-triva -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced_simple +p Testing generation of viva configuration files +$ ../../bin/smpirun -trace -trace-resource -trace-viva -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced_simple > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' @@ -53,13 +53,13 @@ $ ../../bin/smpirun -trace -trace-resource -trace-triva -trace-file smpi_traced. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/categorized' to 'smpi_cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'triva/uncategorized' to 'smpi_uncat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'smpi_cat.plist' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'smpi_uncat.plist' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) -> [0.013981] [instr_config/INFO] No categories declared, ignoring generation of triva graph configuration +> [0.013981] [instr_config/INFO] No categories declared, ignoring generation of viva graph configuration p Testing with parameters but without activating them with the safe switch (-trace) -$ ../../bin/smpirun -trace-resource -trace-triva -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced_simple +$ ../../bin/smpirun -trace-resource -trace-viva -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced_simple > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' diff --git a/include/instr/instr.h b/include/instr/instr.h index 9e3d584939..08bcd93098 100644 --- a/include/instr/instr.h +++ b/include/instr/instr.h @@ -78,7 +78,7 @@ XBT_PUBLIC(void) TRACE_host_push_state (const char *host, const char *state, con 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 */ +/* for creating graph configuration files for Viva by hand */ XBT_PUBLIC(xbt_dynar_t) TRACE_get_node_types (void); XBT_PUBLIC(xbt_dynar_t) TRACE_get_edge_types (void); XBT_PUBLIC(void) TRACE_pause (void); diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 3c37551979..040f2c6dcf 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -14,6 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING "tracing" #define OPT_TRACING_PLATFORM "tracing/platform" +#define OPT_TRACING_TOPOLOGY "tracing/platform/topology" #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" #define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing" @@ -27,13 +28,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_BASIC "tracing/basic" #define OPT_TRACING_COMMENT "tracing/comment" #define OPT_TRACING_COMMENT_FILE "tracing/comment_file" -#define OPT_TRIVA_UNCAT_CONF "triva/uncategorized" -#define OPT_TRIVA_CAT_CONF "triva/categorized" #define OPT_VIVA_UNCAT_CONF "viva/uncategorized" #define OPT_VIVA_CAT_CONF "viva/categorized" static int trace_enabled; static int trace_platform; +static int trace_platform_topology; static int trace_smpi_enabled; static int trace_smpi_grouped; static int trace_smpi_computing; @@ -52,6 +52,7 @@ static void TRACE_getopts(void) { trace_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING); trace_platform = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM); + trace_platform_topology = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_TOPOLOGY); trace_smpi_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI); trace_smpi_grouped = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); trace_smpi_computing = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_COMPUTING); @@ -102,8 +103,6 @@ int TRACE_end() if (!trace_active) return 1; - TRACE_generate_triva_uncat_conf(); - TRACE_generate_triva_cat_conf(); TRACE_generate_viva_uncat_conf(); TRACE_generate_viva_cat_conf(); @@ -152,6 +151,11 @@ int TRACE_platform(void) return trace_platform; } +int TRACE_platform_topology(void) +{ + return trace_platform_topology; +} + int TRACE_is_configured(void) { return trace_configured; @@ -224,16 +228,6 @@ char *TRACE_get_filename(void) return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); } -char *TRACE_get_triva_uncat_conf (void) -{ - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_UNCAT_CONF); -} - -char *TRACE_get_triva_cat_conf (void) -{ - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_CAT_CONF); -} - char *TRACE_get_viva_uncat_conf (void) { return xbt_cfg_get_string(_surf_cfg_set, OPT_VIVA_UNCAT_CONF); @@ -263,10 +257,17 @@ void TRACE_global_init(int *argc, char **argv) /* register platform in the trace */ int default_tracing_platform = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, - "Register the platform in the trace as a graph.", + "Register the platform in the trace as a hierarchy.", xbt_cfgelm_int, &default_tracing_platform, 0, 1, NULL, NULL); + /* register platform in the trace */ + int default_tracing_platform_topology = 1; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_TOPOLOGY, + "Register the platform topology in the trace as a graph.", + xbt_cfgelm_int, &default_tracing_platform_topology, 0, 1, + NULL, NULL); + /* smpi */ int default_tracing_smpi = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI, @@ -351,20 +352,6 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_string, &default_tracing_comment_file, 1, 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, - "Triva Graph configuration file for uncategorized resource utilization traces.", - xbt_cfgelm_string, &default_triva_uncat_conf_file, 1, 1, - NULL, NULL); - - /* Triva graph configuration for uncategorized tracing */ - char *default_triva_cat_conf_file = xbt_strdup (""); - xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_CAT_CONF, - "Triva Graph configuration file for categorized resource utilization traces.", - xbt_cfgelm_string, &default_triva_cat_conf_file, 1, 1, - NULL, NULL); - /* Viva graph configuration for uncategorized tracing */ char *default_viva_uncat_conf_file = xbt_strdup (""); xbt_cfg_register(&_surf_cfg_set, OPT_VIVA_UNCAT_CONF, @@ -414,9 +401,10 @@ void TRACE_help (int detailed) detailed); print_line (OPT_TRACING_FILENAME, "Filename to register traces", " A file with this name will be created to register the simulation. The file\n" - " is in the Paje format and can be analyzed using Triva or Paje visualization\n" + " is in the Paje format and can be analyzed using Viva, Paje, and PajeNG visualization\n" " tools. More information can be found in these webpages:\n" - " http://triva.gforge.inria.fr/\n" + " http://github.com/schnorr/viva/\n" + " http://github.com/schnorr/pajeng/\n" " http://paje.sourceforge.net/", detailed); print_line (OPT_TRACING_SMPI, "Trace the MPI Interface (SMPI)", @@ -469,20 +457,6 @@ void TRACE_help (int detailed) print_line (OPT_TRACING_COMMENT_FILE, "File contents added to trace file as comment.", " Use this to add the contents of a file to the top of the trace file as comment.", 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" - " configuration for the Triva visualization analysis. This option\n" - " can be used with tracing/categorized:1 and tracing:1 options to\n" - " analyze an unmodified simulator before changing it to contain\n" - " categories.", - detailed); - print_line (OPT_TRIVA_CAT_CONF, "generate uncategorized graph configuration for Triva", - " This option can be used if this simulator uses tracing categories\n" - " in its code. The file specified by this option holds a graph configuration\n" - " file for the Triva visualization tool that can be used to analyze a categorized\n" - " resource utilization.", - detailed); print_line (OPT_VIVA_UNCAT_CONF, "Generate a graph configuration for Viva", " 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" @@ -497,6 +471,12 @@ void TRACE_help (int detailed) " file for the Viva visualization tool that can be used to analyze a categorized\n" " resource utilization.", detailed); + print_line (OPT_TRACING_TOPOLOGY, "Register the platform topology as a graph", + " This option (enabled by default) can be used to disable the tracing of\n" + " the platform topology in the trace file. Sometimes, such task is really\n" + " time consuming, since it must get the route from each host ot other hosts\n" + " within the same Autonomous System (AS).", + detailed); } static void output_types (const char *name, xbt_dynar_t types, FILE *file) @@ -614,16 +594,6 @@ static void generate_cat_configuration (const char *output, const char *name, in } } -void TRACE_generate_triva_uncat_conf (void) -{ - generate_uncat_configuration (TRACE_get_triva_uncat_conf (), "triva", 1); -} - -void TRACE_generate_triva_cat_conf (void) -{ - generate_cat_configuration (TRACE_get_triva_cat_conf(), "triva", 1); -} - void TRACE_generate_viva_uncat_conf (void) { generate_uncat_configuration (TRACE_get_viva_uncat_conf (), "viva", 0); @@ -667,6 +637,7 @@ void instr_resume_tracing (void) #undef OPT_TRACING #undef OPT_TRACING_PLATFORM +#undef OPT_TRACING_TOPOLOGY #undef OPT_TRACING_SMPI #undef OPT_TRACING_SMPI_GROUP #undef OPT_TRACING_CATEGORIZED @@ -679,8 +650,6 @@ void instr_resume_tracing (void) #undef OPT_TRACING_BASIC #undef OPT_TRACING_COMMENT #undef OPT_TRACING_COMMENT_FILE -#undef OPT_TRIVA_UNCAT_CONF -#undef OPT_TRIVA_CAT_CONF #undef OPT_VIVA_UNCAT_CONF #undef OPT_VIVA_CAT_CONF diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index b4b661f393..e04288b232 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -185,6 +185,7 @@ int TRACE_end (void); int TRACE_needs_platform (void); int TRACE_is_enabled(void); int TRACE_platform(void); +int TRACE_platform_topology(void); int TRACE_is_configured(void); int TRACE_smpi_is_enabled(void); int TRACE_smpi_is_grouped(void); @@ -199,14 +200,10 @@ int TRACE_basic (void); char *TRACE_get_comment (void); char *TRACE_get_comment_file (void); char *TRACE_get_filename(void); -char *TRACE_get_triva_uncat_conf (void); -char *TRACE_get_triva_cat_conf (void); char *TRACE_get_viva_uncat_conf (void); char *TRACE_get_viva_cat_conf (void); void TRACE_global_init(int *argc, char **argv); void TRACE_help(int detailed); -void TRACE_generate_triva_uncat_conf (void); -void TRACE_generate_triva_cat_conf (void); void TRACE_generate_viva_uncat_conf (void); void TRACE_generate_viva_cat_conf (void); void instr_pause_tracing (void); diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 256eb7c3dd..e4322171b3 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -139,6 +139,10 @@ static int graph_extraction_filter_out (container_t c1, container_t c2) static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t filter) { + if (!TRACE_platform_topology()){ + XBT_DEBUG("Graph extracing disable by user."); + return; + } XBT_DEBUG ("Graph extraction for routing_component = %s", rc->name); if (!xbt_dict_is_empty(rc->routing_sons)){ xbt_dict_cursor_t cursor = NULL; diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 70a4fba81a..cb94bd6b31 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -31,7 +31,7 @@ Options: -trace-comment-file # put file contents on the top of the trace file as comment -trace-grouped # group MPI processes by location -trace-resource # trace resource utilization - -trace-triva # generate configuration for Triva's GraphView + -trace-viva # generate configuration for Viva's GraphView -trace-file # name of the tracefile (simgrid_smpi.trace) -ext # additional parameter (reserved) @@ -121,8 +121,8 @@ while true; do shift 1 ;; - "-trace-triva") - TRACE_TRIVA="true" + "-trace-viva") + TRACE_VIVA="true" shift 1 ;; @@ -323,8 +323,8 @@ if [ -n "${TRACE_ACTIVE}" ]; then TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1" fi - if [ -n "${TRACE_TRIVA}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=triva/categorized:smpi_cat.plist --cfg=triva/uncategorized:smpi_uncat.plist" + if [ -n "${TRACE_VIVA}" ]; then + TRACEOPTIONS="${TRACEOPTIONS} --cfg=viva/categorized:smpi_cat.plist --cfg=viva/uncategorized:smpi_uncat.plist" fi fi ##---------------------- end SMPI TRACING OPTIONS ---------------------------------