From: Arnaud Giersch Date: Thu, 31 Oct 2013 13:07:49 +0000 (+0100) Subject: Use yes/no for tracing options instead of 1/0. X-Git-Tag: v3_10_rc1~29 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/253aec39d6b6cdae39cd320f47f952b7cd665048 Use yes/no for tracing options instead of 1/0. --- diff --git a/doc/doxygen/introduction.doc b/doc/doxygen/introduction.doc index 0cf579c8f4..e0915380fc 100644 --- a/doc/doxygen/introduction.doc +++ b/doc/doxygen/introduction.doc @@ -196,8 +196,8 @@ For a more "fancy" output, you can try: For a really fancy output, you should use [viva/triva][fn:1]: ~~~~{.sh} -./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:1 \ - --cfg=tracing/uncategorized:1 --cfg=viva/uncategorized:uncat.plist +./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:yes \ + --cfg=tracing/uncategorized:yes --cfg=viva/uncategorized:uncat.plist LANG=C ; viva simgrid.trace uncat.plist ~~~~ @@ -205,16 +205,16 @@ For a more classical Gantt-Chart visualization, you can produce a [Paje][fn:5] trace: ~~~~{.sh} -./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:1 \ - --cfg=tracing/msg/process:1 +./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:yes \ + --cfg=tracing/msg/process:yes LANG=C ; Paje simgrid.trace ~~~~ Alternatively, you can use [vite][fn:6]. ~~~~{.sh} -./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:1 \ - --cfg=tracing/msg/process:1 --cfg=tracing/basic:1 +./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:yes \ + --cfg=tracing/msg/process:yes --cfg=tracing/basic:yes vite simgrid.trace ~~~~ @@ -388,8 +388,8 @@ void MSG_task_set_category (msg_task_t task, const char *category); The outcome can then be visualized as follows: ~~~~{.sh} -./masterworker3 platforms/platform.xml deployment3.xml --cfg=tracing:1\ - --cfg=tracing/categorized:1 --cfg=viva/categorized:viva_cat.plist +./masterworker3 platforms/platform.xml deployment3.xml --cfg=tracing:yes\ + --cfg=tracing/categorized:yes --cfg=viva/categorized:viva_cat.plist LANG=C; viva simgrid.trace viva_cat.plist ~~~~ @@ -399,8 +399,8 @@ and there are several masters deployed on the platform. Using a Gantt-chart visualization may help: ~~~~{.sh} -./masterworker3 platforms/platform.xml deployment3.xml --cfg=tracing:1 \ - --cfg=tracing/msg/process:1 +./masterworker3 platforms/platform.xml deployment3.xml --cfg=tracing:yes \ + --cfg=tracing/msg/process:yes LANG=C; Paje simgrid.trace ~~~~ diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index 1461798c13..3cc9ea32b9 100644 --- a/doc/doxygen/options.doc +++ b/doc/doxygen/options.doc @@ -447,7 +447,7 @@ you never used the tracing API. - Any SimGrid-based simulator (MSG, SimDag, SMPI, ...) and raw traces: \verbatim ---cfg=tracing:1 --cfg=tracing/uncategorized:1 --cfg=triva/uncategorized:uncat.plist +--cfg=tracing:yes --cfg=tracing/uncategorized:yes --cfg=triva/uncategorized:uncat.plist \endverbatim The first parameter activates the tracing subsystem, the second tells it to trace host and link utilization (without any @@ -456,7 +456,7 @@ you never used the tracing API. - MSG or SimDag-based simulator and categorized traces (you need to declare categories and classify your tasks according to them) \verbatim ---cfg=tracing:1 --cfg=tracing/categorized:1 --cfg=triva/categorized:cat.plist +--cfg=tracing:yes --cfg=tracing/categorized:yes --cfg=triva/categorized:cat.plist \endverbatim The first parameter activates the tracing subsystem, the second tells it to trace host and link categorized utilization and the @@ -468,7 +468,7 @@ you never used the tracing API. smpirun -trace ... \endverbatim The -trace parameter for the smpirun script runs the -simulation with --cfg=tracing:1 and --cfg=tracing/smpi:1. Check the +simulation with --cfg=tracing:yes and --cfg=tracing/smpi:yes. Check the smpirun's -help parameter for additional tracing options. Sometimes you might want to put additional information on the trace to diff --git a/doc/doxygen/tracing.doc b/doc/doxygen/tracing.doc index 3b2a827412..2c4a4d894c 100644 --- a/doc/doxygen/tracing.doc +++ b/doc/doxygen/tracing.doc @@ -108,7 +108,7 @@ tracing Safe switch. It activates (or deactivates) the tracing system. No other tracing options take effect if this one is not activated. \verbatim ---cfg=tracing:1 +--cfg=tracing:yes \endverbatim \li \c @@ -117,7 +117,7 @@ tracing/categorized It activates the categorized resource utilization tracing. It should be enabled if tracing categories are used by this simulator. \verbatim ---cfg=tracing/categorized:1 +--cfg=tracing/categorized:yes \endverbatim \li \c @@ -127,7 +127,7 @@ tracing/uncategorized this simulator do not use tracing categories and resource use have to be traced. \verbatim ---cfg=tracing/uncategorized:1 +--cfg=tracing/uncategorized:yes \endverbatim \li \c @@ -151,7 +151,7 @@ tracing/onelink_only This option let the user tell the tracing system to use only the routes that are composed with just one link. \verbatim ---cfg=tracing/onelink_only:1 +--cfg=tracing/onelink_only:yes \endverbatim \li \c @@ -162,7 +162,7 @@ tracing/smpi visualizations. Every MPI function (implemented by SMPI) is transformed in a state, and point-to-point communications can be analyzed with arrows. \verbatim ---cfg=tracing/smpi:1 +--cfg=tracing/smpi:yes \endverbatim \li \c @@ -171,7 +171,7 @@ tracing/smpi/group This option only has effect if this simulator is SMPI-based. The processes are grouped by the hosts where they were executed. \verbatim ---cfg=tracing/smpi/group:1 +--cfg=tracing/smpi/group:yes \endverbatim \li \c @@ -180,7 +180,7 @@ tracing/smpi/computing This option only has effect if this simulator is SMPI-based. The parts external to SMPI are also outputted to the trace. Provides better way to analyze the data automatically. \verbatim ---cfg=tracing/smpi/computing:1 +--cfg=tracing/smpi/computing:yes \endverbatim \li \c @@ -189,7 +189,7 @@ tracing/smpi/internals This option only has effect if this simulator is SMPI-based. Display internal communications happening during a collective MPI call. \verbatim ---cfg=tracing/smpi/internals:1 +--cfg=tracing/smpi/internals:yes \endverbatim \li \c @@ -198,7 +198,7 @@ tracing/smpi/display_sizes This option only has effect if this simulator is SMPI-based. Display the sizes of the messages exchanged in the trace, both in the links and on the states. For collective, size means the global size of data sent by the process in general. \verbatim ---cfg=tracing/smpi/display_sizes:1 +--cfg=tracing/smpi/display_sizes:yes \endverbatim \li \c @@ -208,7 +208,7 @@ tracing/msg/process behavior of all categorized MSG processes, grouping them by hosts. This option can be used to track process location if this simulator has process migration. \verbatim ---cfg=tracing/msg/process:1 +--cfg=tracing/msg/process:yes \endverbatim \li \c @@ -221,7 +221,7 @@ tracing/buffer impacted if this option is activated, but you are sure to get a trace file with events sorted. \verbatim ---cfg=tracing/buffer:1 +--cfg=tracing/buffer:yes \endverbatim \li \c @@ -234,7 +234,7 @@ option is activated, only the routes with one link are used to register the topology within an AS. Routes among AS continue to be traced as usual. \verbatim ---cfg=tracing/onelink_only:1 +--cfg=tracing/onelink_only:yes \endverbatim \li \c @@ -244,7 +244,7 @@ Disable the destruction of containers at the end of simulation. This can be used with simulators that have a different notion of time (different from the simulated time). \verbatim ---cfg=tracing/disable_destroy:1 +--cfg=tracing/disable_destroy:yes \endverbatim \li \c @@ -255,7 +255,7 @@ Use this option if you are using one of these tools to visualize the simulation trace. Keep in mind that the trace might be incomplete, without all the information that would be registered otherwise. \verbatim ---cfg=tracing/basic:1 +--cfg=tracing/basic:yes \endverbatim \li \c @@ -307,8 +307,8 @@ with the following parameters (it will work with any Simgrid simulator): \verbatim ./your_simulator \ - --cfg=tracing:1 \ - --cfg=tracing/uncategorized:1 \ + --cfg=tracing:yes \ + --cfg=tracing/uncategorized:yes \ --cfg=tracing/filename:mytracefile.trace \ --cfg=viva/uncategorized:uncat.plist \endverbatim @@ -322,8 +322,8 @@ using the MSG_task_set_category (...) recompiling, run your simulator with the following parameters: \verbatim ./your_simulator \ - --cfg=tracing:1 \ - --cfg=tracing/categorized:1 \ + --cfg=tracing:yes \ + --cfg=tracing/categorized:yes \ --cfg=tracing/filename:mytracefile.trace \ --cfg=viva/categorized:cat.plist \endverbatim diff --git a/examples/java/tracing/tracingPingPong.tesh b/examples/java/tracing/tracingPingPong.tesh index 4d0e76fc22..9cb2458d3e 100644 --- a/examples/java/tracing/tracingPingPong.tesh +++ b/examples/java/tracing/tracingPingPong.tesh @@ -2,11 +2,11 @@ ! output sort -$ java -cp ${classpath:=.} tracing/TracingTest ${srcdir:=.}/platform.xml ${srcdir:=.}/tracing/tracingPingPongDeployment.xml --cfg=tracing:1 --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:1 +$ java -cp ${classpath:=.} tracing/TracingTest ${srcdir:=.}/platform.xml ${srcdir:=.}/tracing/tracingPingPongDeployment.xml --cfg=tracing:yes --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:yes > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' > [4.474401] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Boivin:tracing.Receiver:(2) 0.000000] [jmsg/INFO] hello! > [Boivin:tracing.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task diff --git a/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh b/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh index 6a2398374e..4b9dd457b3 100644 --- a/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh +++ b/examples/msg/actions/NAS_LU_S_4/instr_actions.tesh @@ -1,7 +1,7 @@ # A little tesh file testing most MPI-related actions -$ ../actions --cfg=tracing:1 --cfg=tracing/smpi:1 --log=surf_config.thresh:critical --cfg=network/model:SMPI platform.xml deploy_MPI_4.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' +$ ../actions --cfg=tracing:yes --cfg=tracing/smpi:yes --log=surf_config.thresh:critical --cfg=network/model:SMPI platform.xml deploy_MPI_4.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.095453] [actions/INFO] Simulation time 0.095453 diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh index dfededf100..975b8a9622 100644 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh +++ b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh @@ -2,9 +2,9 @@ p Testing dogbone communication pattern with GTNets model -$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/categorized:yes --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh index cd91f3662b..5c0e6cbc27 100644 --- a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh +++ b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh @@ -2,9 +2,9 @@ p Testing dogbone communication pattern with LV08 model -$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 +$ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/categorized:yes --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_lv08.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh index c571469a17..3941da61f7 100644 --- a/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh +++ b/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh @@ -2,9 +2,9 @@ p Testing onelink communication pattern with GTNets model -$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/categorized:yes --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' diff --git a/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh index ca6aac6ae4..a12fd42be5 100644 --- a/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh +++ b/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh @@ -2,9 +2,9 @@ p Testing onelink communication pattern with LV08 model -$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO +$ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/categorized:yes --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_lv08.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' diff --git a/examples/msg/gtnets/tracing-gtnets-waxman.tesh b/examples/msg/gtnets/tracing-gtnets-waxman.tesh index 5888081aab..886a19686c 100644 --- a/examples/msg/gtnets/tracing-gtnets-waxman.tesh +++ b/examples/msg/gtnets/tracing-gtnets-waxman.tesh @@ -3,9 +3,9 @@ p Testing waxman radom communication pattern with GTNets model, 200 nodes, 200 flows ! timeout 10 -$ gtnets/gtnets ${srcdir:=.}/gtnets/waxman-p.xml ${srcdir:=.}/gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets ${srcdir:=.}/gtnets/waxman-p.xml ${srcdir:=.}/gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/categorized:yes --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'waxman_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c index e62d9b5f0e..d0dadbd8a4 100644 --- a/examples/msg/tracing/categories.c +++ b/examples/msg/tracing/categories.c @@ -12,9 +12,9 @@ * used to classify tasks. When the program is executed, the tracing mechanism registers * the resource utilization of hosts and links according to these categories. You might * want to run this program with the following parameters: - * --cfg=tracing:1 - * --cfg=tracing/categorized:1 - * --cfg=tracing/uncategorized:1 + * --cfg=tracing:yes + * --cfg=tracing/categorized:yes + * --cfg=tracing/uncategorized:yes * --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 58da1df0f0..6260508153 100644 --- a/examples/msg/tracing/categories.tesh +++ b/examples/msg/tracing/categories.tesh @@ -2,12 +2,12 @@ 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=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' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --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 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [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 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [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' diff --git a/examples/msg/tracing/link_srcdst_user_variables.c b/examples/msg/tracing/link_srcdst_user_variables.c index 65c0e4c690..63a19e9004 100644 --- a/examples/msg/tracing/link_srcdst_user_variables.c +++ b/examples/msg/tracing/link_srcdst_user_variables.c @@ -16,8 +16,8 @@ * these two hosts, if there is one defined in the platform file, and update the variable * of all the links of that route to the value provided. * You might want to run this program with the following parameters: - * --cfg=tracing:1 - * --cfg=tracing/platform:1 + * --cfg=tracing:yes + * --cfg=tracing/platform:yes * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/link_srcdst_user_variables.tesh b/examples/msg/tracing/link_srcdst_user_variables.tesh index 2d087f7a7d..79818f6887 100644 --- a/examples/msg/tracing/link_srcdst_user_variables.tesh +++ b/examples/msg/tracing/link_srcdst_user_variables.tesh @@ -1,6 +1,6 @@ #! ./tesh p Tracing master/slave application -$ $SG_TEST_EXENV ${bindir:=.}/tracing/link_srcdst_user_variables$EXEEXT --cfg=tracing:1 --cfg=tracing/platform:1 ${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/platform' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/link_srcdst_user_variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' diff --git a/examples/msg/tracing/link_user_variables.c b/examples/msg/tracing/link_user_variables.c index 46af714f96..c9754607f0 100644 --- a/examples/msg/tracing/link_user_variables.c +++ b/examples/msg/tracing/link_user_variables.c @@ -13,8 +13,8 @@ * to provide the name of the link to update the value of the variable associated * to that link. * You might want to run this program with the following parameters: - * --cfg=tracing:1 - * --cfg=tracing/platform:1 + * --cfg=tracing:yes + * --cfg=tracing/platform:yes * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/link_user_variables.tesh b/examples/msg/tracing/link_user_variables.tesh index 9e5b700b8f..2e38c4d4de 100644 --- a/examples/msg/tracing/link_user_variables.tesh +++ b/examples/msg/tracing/link_user_variables.tesh @@ -1,6 +1,6 @@ #! ./tesh p Tracing master/slave application -$ $SG_TEST_EXENV ${bindir:=.}/tracing/link_user_variables$EXEEXT --cfg=tracing:1 --cfg=tracing/platform:1 ${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/platform' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/link_user_variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c index e831432d92..d9a713f13d 100644 --- a/examples/msg/tracing/ms.c +++ b/examples/msg/tracing/ms.c @@ -12,8 +12,8 @@ * enable the tracing of categorized resource utilization, the use of trace marks, * and user variables associated to the hosts of the platform file. * You might want to run this program with the following parameters: - * --cfg=tracing/categorized:1 - * --cfg=tracing/uncategorized:1 + * --cfg=tracing/categorized:yes + * --cfg=tracing/uncategorized:yes * --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 717dcc730a..dfa83e1bbd 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -1,12 +1,12 @@ #! ./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=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' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --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 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [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 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [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.214759] [msg_test/INFO] Declared tracing categories: @@ -21,13 +21,13 @@ 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=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' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --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 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [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 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [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.214759] [msg_test/INFO] Declared tracing categories: diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c index 59a1a796c0..c81c26a909 100644 --- a/examples/msg/tracing/procmig.c +++ b/examples/msg/tracing/procmig.c @@ -11,8 +11,8 @@ * of where the process has been during its execution. Migrations are represented by * arrows from the origin to the destination host. * You might want to run this program with the following parameters: - * --cfg=tracing:1 - * --cfg=tracing/msg/process:1 + * --cfg=tracing:yes + * --cfg=tracing/msg/process:yes * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/procmig.tesh b/examples/msg/tracing/procmig.tesh index 1a6e400425..50c1f2ecd2 100644 --- a/examples/msg/tracing/procmig.tesh +++ b/examples/msg/tracing/procmig.tesh @@ -1,42 +1,42 @@ #! ./tesh p Tracing processes -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/procmig.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=tracing/buffer:1 --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' 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 'tracing/buffer' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:yes --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/procmig.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=tracing/buffer:0 --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -> [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 'tracing/buffer' to '0' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:no --cfg=tracing/filename:tracing/procmig.trace --cfg=tracing/msg/process:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'no' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/procmig.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' $ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:0 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '0' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:no ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'no' -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/categorized:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:yes --cfg=tracing/categorized:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/uncategorized:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:yes --cfg=tracing/uncategorized:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' -$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.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' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' $ rm -rf tracing/procmig.trace simgrid.trace diff --git a/examples/msg/tracing/simple.c b/examples/msg/tracing/simple.c index e8b5ebbbac..cb25e32d3d 100644 --- a/examples/msg/tracing/simple.c +++ b/examples/msg/tracing/simple.c @@ -14,7 +14,7 @@ * * - tracing/simple.c very simple program where each process creates, executes and * destroy a task. You might want to run this program with the following parameters: - * --cfg=tracing/uncategorized:1 + * --cfg=tracing/uncategorized:yes * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/trace_platform.c b/examples/msg/tracing/trace_platform.c index a5cdfc0866..094c657b75 100644 --- a/examples/msg/tracing/trace_platform.c +++ b/examples/msg/tracing/trace_platform.c @@ -10,8 +10,8 @@ * platform file is traced to a Paje trace file format using the tracing * mechanism of Simgrid. * You might want to run this program with the following parameters: - * --cfg=tracing:1 - * --cfg=tracing/categorized:1 + * --cfg=tracing:yes + * --cfg=tracing/categorized:yes * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/trace_platform.tesh b/examples/msg/tracing/trace_platform.tesh index d69c95ace0..bc33b3d727 100644 --- a/examples/msg/tracing/trace_platform.tesh +++ b/examples/msg/tracing/trace_platform.tesh @@ -2,10 +2,10 @@ p Tracing master/slave application -$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:1 ${srcdir:=.}/tracing/platform.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/tracing/platform.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/trace_platform.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' $ tail -n +3 tracing/trace_platform.trace > %EventDef PajeDefineContainerType 0 @@ -216,10 +216,10 @@ $ tail -n +3 tracing/trace_platform.trace $ rm -rf tracing/trace_platform.trace -$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:1 ${srcdir:=.}/../platforms/g5k.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/../platforms/g5k.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/trace_platform.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' $ tail -n +3 tracing/trace_platform.trace > %EventDef PajeDefineContainerType 0 diff --git a/examples/msg/tracing/user_variables.c b/examples/msg/tracing/user_variables.c index 90e65ba95f..5017fc008c 100644 --- a/examples/msg/tracing/user_variables.c +++ b/examples/msg/tracing/user_variables.c @@ -9,8 +9,8 @@ * - tracing/user_variables.c: This program demonstrates how to * trace user variables associated to the hosts of the platform file. * You might want to run this program with the following parameters: - * --cfg=tracing:1 - * --cfg=tracing/platform:1 + * --cfg=tracing:yes + * --cfg=tracing/platform:yes * (See \ref tracing_tracing_options for details) */ diff --git a/examples/msg/tracing/user_variables.tesh b/examples/msg/tracing/user_variables.tesh index 168ba8ea42..171346f6b9 100644 --- a/examples/msg/tracing/user_variables.tesh +++ b/examples/msg/tracing/user_variables.tesh @@ -1,9 +1,9 @@ #! ./tesh p Tracing user variables -$ $SG_TEST_EXENV ${bindir:=.}/tracing/user_variables$EXEEXT --cfg=tracing:1 --cfg=tracing/platform:1 ${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/platform' to '1' +$ $SG_TEST_EXENV ${bindir:=.}/tracing/user_variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' > [0.004078] [msg_test/INFO] Declared host variables: > [0.004078] [msg_test/INFO] HDD_capacity > [0.004078] [msg_test/INFO] HDD_utilization diff --git a/examples/simdag/test_simdag_tracing.tesh b/examples/simdag/test_simdag_tracing.tesh index f4e160a717..f9ce3e8324 100644 --- a/examples/simdag/test_simdag_tracing.tesh +++ b/examples/simdag/test_simdag_tracing.tesh @@ -3,9 +3,9 @@ p Simple test of simdag -$ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:1 --cfg=tracing/categorized:1 ${srcdir:=.}/2clusters.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' +$ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:yes --cfg=tracing/categorized:yes ${srcdir:=.}/2clusters.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > [0.000000] [sd_seq_access/INFO] Access mode of C2-05 is sequential > [0.000000] [sd_seq_access/INFO] Access mode of C2-06 is sequential diff --git a/examples/smpi/replay/smpi_replay.tesh b/examples/smpi/replay/smpi_replay.tesh index 9c7edda863..10e130b021 100644 --- a/examples/smpi/replay/smpi_replay.tesh +++ b/examples/smpi/replay/smpi_replay.tesh @@ -38,13 +38,13 @@ p The same with tracing activated < replay/actions_bcast.txt $ mkfile replay/one_trace -$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=no_loc --cfg=tracing:1 --cfg=tracing/smpi:1 --cfg=tracing/smpi/computing:1 --cfg=smpi/cpu_threshold:1 -np 3 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay replay/one_trace +$ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=no_loc --cfg=tracing:yes --cfg=tracing/smpi:yes --cfg=tracing/smpi/computing:yes --cfg=smpi/cpu_threshold:1 -np 3 -platform ${srcdir:=.}/replay/replay_platform.xml -hostfile ${srcdir:=.}/hostfile ./smpi_replay replay/one_trace > [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' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '1' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) > [Fafard:2:(0) 19.691622] [smpi_replay/INFO] Simulation time 19.6916 diff --git a/examples/smpi/tracing/smpi_traced.tesh b/examples/smpi/tracing/smpi_traced.tesh index 2e5c4c2f16..90551a9e35 100644 --- a/examples/smpi/tracing/smpi_traced.tesh +++ b/examples/smpi/tracing/smpi_traced.tesh @@ -4,11 +4,11 @@ p Test instrumentation of SMPI $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_traced.trace' -> [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 'tracing/smpi' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [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' @@ -16,11 +16,11 @@ $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-file smpi_traced.t p Another SMPI test $ ../../smpi_script/bin/smpirun -trace -trace-resource -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 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_traced.trace' -> [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 'tracing/smpi' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [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' @@ -35,10 +35,10 @@ $ ../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/hostfile -platform ${srcd p Testing grouped tracing $ ../../smpi_script/bin/smpirun -trace -trace-grouped -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 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_traced.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/group' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/group' to 'yes' > [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' @@ -46,11 +46,11 @@ $ ../../smpi_script/bin/smpirun -trace -trace-grouped -trace-file smpi_traced.tr p Testing generation of viva configuration files $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-viva -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml --cfg=smpi/cpu_threshold:1 -np 3 ./smpi_traced_simple -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_traced.trace' -> [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 'tracing/smpi' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [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] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index d4e009e11f..c246771545 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -352,12 +352,12 @@ if [ -n "${TRACE_ACTIVE}" ]; then if [ -z "${TRACE_FILENAME}" ]; then TRACE_FILENAME="smpi_simgrid.txt" fi - TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1 --cfg=tracing/smpi/format:TI --cfg=tracing/smpi/computing:1" + TRACEOPTIONS="--cfg=tracing:yes --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:yes --cfg=tracing/smpi/format:TI --cfg=tracing/smpi/computing:yes" else if [ -z "${TRACE_FILENAME}" ]; then TRACE_FILENAME="smpi_simgrid.trace" fi - TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1" + TRACEOPTIONS="--cfg=tracing:yes --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:yes" fi if [ -n "${TRACE_COMMENT}" ]; then @@ -369,11 +369,11 @@ if [ -n "${TRACE_ACTIVE}" ]; then fi if [ -n "${TRACE_GROUPED}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:1" + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:yes" fi if [ -n "${TRACE_RESOURCE}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1" + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes" fi if [ -n "${TRACE_VIVA}" ]; then diff --git a/teshsuite/smpi/TI_output.tesh b/teshsuite/smpi/TI_output.tesh index 4dcf375b7f..0b444adfc0 100644 --- a/teshsuite/smpi/TI_output.tesh +++ b/teshsuite/smpi/TI_output.tesh @@ -8,11 +8,11 @@ $ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt > == pivot=1 : pingpong [1] <--> [2] > == pivot=2 : pingpong [2] <--> [3] > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_simgrid.txt' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format' to 'TI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [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' @@ -45,11 +45,11 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.:critical -trace-t > [rank 1] -> Jupiter > [rank 2] -> Fafard > [rank 3] -> Ginette -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'smpi_simgrid.txt' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format' to 'TI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [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/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c index cebd30da14..a035d51af8 100644 --- a/tools/graphicator/graphicator.c +++ b/tools/graphicator/graphicator.c @@ -31,7 +31,7 @@ int main(int argc, char **argv) int status = TRACE_platform_graph_export_graphviz (graphvizFile); if (status == 0){ - XBT_INFO ("%s expects --cfg=tracing:1 --cfg=tracing/platform:1", argv[0]); + XBT_INFO ("%s expects --cfg=tracing:yes --cfg=tracing/platform:yes", argv[0]); } #else XBT_INFO ("works only if simgrid was compiled with tracing enabled."); diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh index 58d754c8f3..2096fcbe76 100644 --- a/tools/graphicator/graphicator.tesh +++ b/tools/graphicator/graphicator.tesh @@ -1,7 +1,7 @@ #! ./tesh -$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/simdag/platforms/one_cluster.xml --cfg=tracing:1 --cfg=tracing/platform:1 test.dot -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/simdag/platforms/one_cluster.xml --cfg=tracing:yes --cfg=tracing/platform:yes test.dot +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' $ rm test.dot