[trace] fixing tracing tesh'es due to changes in event order

[simgrid.git] / examples / msg / tracing / procmig.tesh

diff --git a/examples/msg/tracing/procmig.tesh b/examples/msg/tracing/procmig.tesh
index 74244657c7a211fad41bc9433fc834a6a28bbc11..c80eb48bc808a72f61de2004b279f847c82336f8 100644 (file)
--- a/examples/msg/tracing/procmig.tesh
+++ b/examples/msg/tracing/procmig.tesh
@@ -6,7 +6,6 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/procmig$EXEEXT --cfg=tracing:1 --cfg=traci
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
 > [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'
-> [Fafard:emigrant:(1) 0.000000] [msg_test/INFO] Setting process category
 > [Fafard:emigrant:(1) 2.020551] [msg_test/INFO] Migrating to Tremblay
 > [Tremblay:emigrant:(1) 4.020707] [msg_test/INFO] Migrating to Jupiter
 > [Jupiter:emigrant:(1) 6.035906] [msg_test/INFO] Migrating to Fafard
@@ -367,136 +366,124 @@ $ cat tracing/procmig.trace
 > 14 0 12 1 G 26 86
 > 13 0 13 1 G 26 87
 > 14 0 13 1 G 5 87
-> 5 0 27 4 4 emigrant
-> 1 17 4 emigrant "1 0 0"
-> 5 0 28 4 2 master
-> 1 18 4 master "1 0 0"
-> 7 0 17 27 1.000000
+> 5 0 27 4 4 emigrant-1
+> 5 0 28 4 2 master-2
 > 10 0 5 27 executing
-> 11 0 5 27 sleep
-> 7 0 18 28 1.000000
 > 10 0 5 28 executing
+> 11 0 5 27 sleep
 > 11 0 5 28 send
 > 13 0 7 0 SR 28 p0
 > 12 2.000000 5 27
 > 11 2.000000 5 27 receive
+> 12 2.020551 5 28
+> 11 2.020551 5 28 send
+> 13 2.020551 7 0 SR 28 p1
 > 12 2.020551 5 27
 > 14 2.020551 7 0 SR 27 p0
-> 12 2.020551 5 28
 > 13 2.020551 6 0 M 27 0
 > 6 2.020551 4 27
-> 5 2.020551 29 4 2 emigrant
-> 7 2.020551 17 29 1.000000
+> 5 2.020551 29 4 2 emigrant-1
 > 10 2.020551 5 29 executing
 > 14 2.020551 6 0 M 29 0
-> 11 2.020551 5 28 send
-> 13 2.020551 7 0 SR 28 p1
 > 11 2.020551 5 29 sleep
 > 12 4.020551 5 29
 > 11 4.020551 5 29 receive
+> 12 4.020707 5 28
+> 11 4.020707 5 28 send
+> 13 4.020707 7 0 SR 28 p2
 > 12 4.020707 5 29
 > 14 4.020707 7 0 SR 29 p1
-> 12 4.020707 5 28
 > 13 4.020707 6 0 M 29 1
 > 6 4.020707 4 29
-> 5 4.020707 30 4 3 emigrant
-> 7 4.020707 17 30 1.000000
+> 5 4.020707 30 4 3 emigrant-1
 > 10 4.020707 5 30 executing
 > 14 4.020707 6 0 M 30 1
-> 11 4.020707 5 28 send
-> 13 4.020707 7 0 SR 28 p2
 > 11 4.020707 5 30 sleep
 > 12 6.020707 5 30
 > 11 6.020707 5 30 receive
+> 12 6.035906 5 28
+> 11 6.035906 5 28 send
+> 13 6.035906 7 0 SR 28 p3
 > 12 6.035906 5 30
 > 14 6.035906 7 0 SR 30 p2
-> 12 6.035906 5 28
 > 13 6.035906 6 0 M 30 2
 > 6 6.035906 4 30
-> 5 6.035906 31 4 4 emigrant
-> 7 6.035906 17 31 1.000000
+> 5 6.035906 31 4 4 emigrant-1
 > 10 6.035906 5 31 executing
 > 14 6.035906 6 0 M 31 2
-> 11 6.035906 5 28 send
-> 13 6.035906 7 0 SR 28 p3
 > 11 6.035906 5 31 sleep
 > 12 8.035906 5 31
 > 11 8.035906 5 31 receive
+> 12 8.056457 5 28
+> 11 8.056457 5 28 send
+> 13 8.056457 7 0 SR 28 p4
 > 12 8.056457 5 31
 > 14 8.056457 7 0 SR 31 p3
-> 12 8.056457 5 28
 > 13 8.056457 6 0 M 31 3
 > 6 8.056457 4 31
-> 5 8.056457 32 4 5 emigrant
-> 7 8.056457 17 32 1.000000
+> 5 8.056457 32 4 5 emigrant-1
 > 10 8.056457 5 32 executing
 > 14 8.056457 6 0 M 32 3
-> 11 8.056457 5 28 send
-> 13 8.056457 7 0 SR 28 p4
 > 11 8.056457 5 32 sleep
 > 12 10.056457 5 32
 > 11 10.056457 5 32 receive
+> 12 10.069689 5 28
+> 11 10.069689 5 28 send
+> 13 10.069689 7 0 SR 28 p5
 > 12 10.069689 5 32
 > 14 10.069689 7 0 SR 32 p4
-> 12 10.069689 5 28
 > 13 10.069689 6 0 M 32 4
 > 6 10.069689 4 32
-> 5 10.069689 33 4 6 emigrant
-> 7 10.069689 17 33 1.000000
+> 5 10.069689 33 4 6 emigrant-1
 > 10 10.069689 5 33 executing
 > 14 10.069689 6 0 M 33 4
-> 11 10.069689 5 28 send
-> 13 10.069689 7 0 SR 28 p5
 > 11 10.069689 5 33 sleep
 > 12 12.069689 5 33
 > 11 12.069689 5 33 receive
+> 12 12.090025 5 28
+> 11 12.090025 5 28 send
+> 13 12.090025 7 0 SR 28 p6
 > 12 12.090025 5 33
 > 14 12.090025 7 0 SR 33 p5
-> 12 12.090025 5 28
 > 13 12.090025 6 0 M 33 5
 > 6 12.090025 4 33
-> 5 12.090025 34 4 4 emigrant
-> 7 12.090025 17 34 1.000000
+> 5 12.090025 34 4 4 emigrant-1
 > 10 12.090025 5 34 executing
 > 14 12.090025 6 0 M 34 5
-> 11 12.090025 5 28 send
-> 13 12.090025 7 0 SR 28 p6
 > 11 12.090025 5 34 sleep
 > 12 14.090025 5 34
 > 11 14.090025 5 34 receive
+> 12 14.110575 5 28
+> 11 14.110575 5 28 send
+> 13 14.110575 7 0 SR 28 p7
 > 12 14.110575 5 34
 > 14 14.110575 7 0 SR 34 p6
-> 12 14.110575 5 28
 > 13 14.110575 6 0 M 34 6
 > 6 14.110575 4 34
-> 5 14.110575 35 4 2 emigrant
-> 7 14.110575 17 35 1.000000
+> 5 14.110575 35 4 2 emigrant-1
 > 10 14.110575 5 35 executing
 > 14 14.110575 6 0 M 35 6
-> 11 14.110575 5 28 send
-> 13 14.110575 7 0 SR 28 p7
 > 11 14.110575 5 35 sleep
 > 12 16.110575 5 35
 > 11 16.110575 5 35 receive
+> 12 16.110731 5 28
+> 11 16.110731 5 28 send
+> 13 16.110731 7 0 SR 28 p8
 > 12 16.110731 5 35
 > 14 16.110731 7 0 SR 35 p7
-> 12 16.110731 5 28
 > 13 16.110731 6 0 M 35 7
 > 6 16.110731 4 35
-> 5 16.110731 36 4 5 emigrant
-> 7 16.110731 17 36 1.000000
+> 5 16.110731 36 4 5 emigrant-1
 > 10 16.110731 5 36 executing
 > 14 16.110731 6 0 M 36 7
-> 11 16.110731 5 28 send
-> 13 16.110731 7 0 SR 28 p8
 > 11 16.110731 5 36 sleep
 > 12 18.110731 5 36
 > 11 18.110731 5 36 receive
+> 12 18.123963 5 28
+> 6 18.123963 4 28
 > 12 18.123963 5 36
 > 14 18.123963 7 0 SR 36 p8
-> 12 18.123963 5 28
 > 6 18.123963 4 36
-> 6 18.123963 4 28
 > 6 18.123963 2 4
 > 6 18.123963 8 9
 > 6 18.123963 8 7