From: schnorr Date: Mon, 6 Dec 2010 00:56:05 +0000 (+0000) Subject: [trace] configuration option tracing/platform renamed to tracing/categorized X-Git-Tag: v3.6_beta2~925 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cf75850220edfeb6e0f46881e8b3b11fe85a25cc [trace] configuration option tracing/platform renamed to tracing/categorized git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8997 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake index f109505dda..ad18418865 100644 --- a/buildtools/Cmake/memcheck_tests.cmake +++ b/buildtools/Cmake/memcheck_tests.cmake @@ -148,11 +148,11 @@ ADD_TEST(memcheck-msg_actions-4 ${CMAKE_HOME_DIRECTORY}/examples/msg/actions/act ADD_TEST(memcheck-msg_actions-5 ${CMAKE_HOME_DIRECTORY}/examples/msg/actions/actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions/) IF(HAVE_TRACING) -ADD_TEST(memcheck-tracing-ms-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/ms --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/platform:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-tracing-categories-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/categories --cfg=tracing:1 --cfg=tracing/filename:categories.trace --cfg=tracing/platform:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-tracing-ms-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/ms --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/categorized:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-tracing-categories-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/categories --cfg=tracing:1 --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-tracing-volume-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/volume --cfg=tracing:1 --cfg=tracing/filename:volume.trace --cfg=tracing/msg/volume:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-tracing-tasks-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/tasks --cfg=tracing:1 --cfg=tracing/msg/task:1 --cfg=tracing/filename:tasks.trace ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-tracing-process-migration-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/procmig --cfg=tracing:1 --cfg=tracing/platform:1 --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:1 ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-tracing-process-migration-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/procmig --cfg=tracing:1 --cfg=tracing/categorized:1 --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:1 ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) ENDIF(HAVE_TRACING) IF(${ARCH_32_BITS}) @@ -203,11 +203,11 @@ ADD_TEST(memcheck-msg-gtnets-onelink-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtne ADD_TEST(memcheck-msg-gtnets-dogbone-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-gtnets-onelink-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) if(HAVE_TRACING) -ADD_TEST(memcheck-msg-tracing-gtnets-waxman-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) -ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/platform: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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-tracing-gtnets-waxman-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/waxman-p.xml 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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml 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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml 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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml 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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) +ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml 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 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-gtnets-fullduplex-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:0 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) ADD_TEST(memcheck-msg-gtnets-fullduplex-1 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:1 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/) endif(HAVE_TRACING) diff --git a/doc/FAQ.doc b/doc/FAQ.doc index 9a57335e4a..a629b3065f 100644 --- a/doc/FAQ.doc +++ b/doc/FAQ.doc @@ -1865,7 +1865,7 @@ tracing in the trace file. You have to enable this option to others take effect. \li \c -tracing/platform +tracing/categorized : It activates the categorized resource utilization tracing. It should be enabled if tracing categories are used by this simulator. diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh index da74d14e11..6ccc0b8ae4 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 gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets gtnets/dogbone-p.xml 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 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [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 941c58269a..fa24ce6355 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 gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 +$ gtnets/gtnets gtnets/dogbone-p.xml 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 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'dogbone_lv08.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [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 8b9b76741d..0f94d2a558 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 gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets gtnets/onelink-p.xml 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 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [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 d0c5afc450..8499ca65d3 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 gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/platform: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 gtnets/onelink-p.xml 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 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'onelink_lv08.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [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 113906f7fe..d7b2f12ced 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 gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets +$ gtnets/gtnets gtnets/waxman-p.xml 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 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'waxman_gtnets.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [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.tesh b/examples/msg/tracing/categories.tesh index b3cff0ac6e..211abf16df 100644 --- a/examples/msg/tracing/categories.tesh +++ b/examples/msg/tracing/categories.tesh @@ -2,8 +2,8 @@ p Tracing multiple categories master/slave application -$ $SG_TEST_EXENV tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:categories.trace --cfg=tracing/platform:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV tracing/categories$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:categories.trace --cfg=tracing/categorized: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/filename' to 'categories.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [4.018878] [msg_test/INFO] Simulation time 4.01888 diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh index 30d894f104..6b30797526 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -2,8 +2,8 @@ p Tracing master/slave application -$ $SG_TEST_EXENV tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/platform:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/categorized: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/filename' to 'ms.trace' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [4.441598] [msg_test/INFO] Simulation time 4.4416 diff --git a/examples/msg/tracing/procmig.tesh b/examples/msg/tracing/procmig.tesh index 4344823a0d..aa56a15fb4 100644 --- a/examples/msg/tracing/procmig.tesh +++ b/examples/msg/tracing/procmig.tesh @@ -2,9 +2,9 @@ p Tracing processes -$ $SG_TEST_EXENV tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/platform:1 --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/procmig-deploy.xml +$ $SG_TEST_EXENV tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=tracing/categorized:1 --cfg=tracing/filename: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/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'procmig.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to '1' > [Fafard:emigrant:(1) 0.000000] [msg_test/INFO] Setting process category diff --git a/examples/smpi/smpi_traced.tesh b/examples/smpi/smpi_traced.tesh index dc839b26e1..3fed5d7203 100644 --- a/examples/smpi/smpi_traced.tesh +++ b/examples/smpi/smpi_traced.tesh @@ -8,5 +8,5 @@ $ ../../bin/smpirun -trace smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -pl > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1' > [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/platform' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 1fe98ba24f..eebe5bca65 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING "tracing" #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" -#define OPT_TRACING_PLATFORM "tracing/platform" +#define OPT_TRACING_PLATFORM "tracing/categorized" #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized" #define OPT_TRACING_MSG_TASK "tracing/msg/task" #define OPT_TRACING_MSG_PROCESS "tracing/msg/process" diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index b5e1398204..f8268eb8df 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -199,7 +199,7 @@ APPLICATIONFOOT ##---------------------- SMPI TRACING OPTIONS --------------------------------- if [ -n "${TRACEOPT}" ]; then - TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACEOPT} --cfg=tracing/smpi:1 --cfg=tracing/platform:1" + TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACEOPT} --cfg=tracing/smpi:1 --cfg=tracing/categorized:1" else TRACEOPTIONS="" fi