From 30efef2e7f65c83e4ee7c4fc491b07fc659478e9 Mon Sep 17 00:00:00 2001 From: suter Date: Mon, 26 Nov 2012 16:21:29 +0100 Subject: [PATCH] revalidate tesh output for tracing ms and simdag --- examples/msg/tracing/ms.tesh | 28 ++++++------ examples/simdag/test_simdag_tracing.tesh | 58 ++++++++++++------------ 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh index 8a054ecd1d..717dcc730a 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -9,13 +9,13 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/bu > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' > [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 -> [4.485137] [msg_test/INFO] report -> [4.485137] [msg_test/INFO] compute -> [4.485137] [msg_test/INFO] Declared marks: -> [4.485137] [msg_test/INFO] msmark +> [4.214759] [msg_test/INFO] Declared tracing categories: +> [4.214759] [msg_test/INFO] request +> [4.214759] [msg_test/INFO] finalize +> [4.214759] [msg_test/INFO] report +> [4.214759] [msg_test/INFO] compute +> [4.214759] [msg_test/INFO] Declared marks: +> [4.214759] [msg_test/INFO] msmark p Not tracing master/slave application $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml @@ -30,13 +30,13 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/ms > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' > [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 -> [4.485137] [msg_test/INFO] report -> [4.485137] [msg_test/INFO] compute -> [4.485137] [msg_test/INFO] Declared marks: -> [4.485137] [msg_test/INFO] msmark +> [4.214759] [msg_test/INFO] Declared tracing categories: +> [4.214759] [msg_test/INFO] request +> [4.214759] [msg_test/INFO] finalize +> [4.214759] [msg_test/INFO] report +> [4.214759] [msg_test/INFO] compute +> [4.214759] [msg_test/INFO] Declared marks: +> [4.214759] [msg_test/INFO] msmark $ $SG_TEST_EXENV cat tracing/ms.uncat.plist > node = ("HOST","LINK"); diff --git a/examples/simdag/test_simdag_tracing.tesh b/examples/simdag/test_simdag_tracing.tesh index c02396670a..2f7e3b83ca 100644 --- a/examples/simdag/test_simdag_tracing.tesh +++ b/examples/simdag/test_simdag_tracing.tesh @@ -12,10 +12,10 @@ $ $SG_TEST_EXENV ./simdag_tracing --cfg=tracing:1 --cfg=tracing/categorized:1 ${ > [0.000000] [sd_seq_access/INFO] There is no task running on C2-06 > [0.400000] [sd_seq_access/INFO] Task B is currently running on C2-05 (SD_TASK_COMM_E2E) > [0.400000] [sd_seq_access/INFO] Task B is currently running on C2-06 (SD_TASK_COMM_E2E) -> [30.400300] [sd_seq_access/INFO] Task C is currently running on C2-05 (SD_TASK_COMP_SEQ) -> [30.400300] [sd_seq_access/INFO] There is no task running on C2-06 -> [30.800300] [sd_seq_access/INFO] There is no task running on C2-05 -> [30.800300] [sd_seq_access/INFO] There is no task running on C2-06 +> [8.400300] [sd_seq_access/INFO] Task C is currently running on C2-05 (SD_TASK_COMP_SEQ) +> [8.400300] [sd_seq_access/INFO] There is no task running on C2-06 +> [8.800300] [sd_seq_access/INFO] There is no task running on C2-05 +> [8.800300] [sd_seq_access/INFO] There is no task running on C2-06 $ tail -n +3 ./simgrid.trace > %EventDef PajeDefineContainerType 0 @@ -253,30 +253,30 @@ $ tail -n +3 ./simgrid.trace > 1 12 1 ptaskB "0.176643 0.364602 0.091331" > 1 13 3 btaskC "0.092298 0.487217 0.526750" > 1 14 1 ptaskC "0.092298 0.487217 0.526750" -> 7 30.800300 1 10 -> 7 30.800300 1 1 -> 7 30.800300 1 3 -> 7 30.800300 1 6 -> 7 30.800300 1 4 -> 7 30.800300 1 9 -> 7 30.800300 3 24 -> 7 30.800300 1 7 -> 7 30.800300 3 12 -> 7 30.800300 1 5 -> 7 30.800300 3 16 -> 7 30.800300 1 2 -> 7 30.800300 3 23 -> 7 30.800300 1 8 -> 7 30.800300 3 18 -> 7 30.800300 3 22 -> 7 30.800300 3 20 -> 7 30.800300 3 17 -> 7 30.800300 3 13 -> 7 30.800300 3 21 -> 7 30.800300 3 25 -> 7 30.800300 3 11 -> 7 30.800300 3 14 -> 7 30.800300 3 19 -> 7 30.800300 3 15 +> 7 8.800300 1 10 +> 7 8.800300 1 1 +> 7 8.800300 1 3 +> 7 8.800300 1 6 +> 7 8.800300 1 4 +> 7 8.800300 1 9 +> 7 8.800300 3 24 +> 7 8.800300 1 7 +> 7 8.800300 3 12 +> 7 8.800300 1 5 +> 7 8.800300 3 16 +> 7 8.800300 1 2 +> 7 8.800300 3 23 +> 7 8.800300 1 8 +> 7 8.800300 3 18 +> 7 8.800300 3 22 +> 7 8.800300 3 20 +> 7 8.800300 3 17 +> 7 8.800300 3 13 +> 7 8.800300 3 21 +> 7 8.800300 3 25 +> 7 8.800300 3 11 +> 7 8.800300 3 14 +> 7 8.800300 3 19 +> 7 8.800300 3 15 $ rm -f simgrid.trace -- 2.20.1