X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..d33da686cea53f5b00a8f45239e6acc244740528:/examples/msg/trace-process-migration/trace-process-migration.tesh

diff --git a/examples/msg/trace-process-migration/trace-process-migration.tesh b/examples/msg/trace-process-migration/trace-process-migration.tesh
index b80073f1f0..6328a36cd1 100644
--- a/examples/msg/trace-process-migration/trace-process-migration.tesh
+++ b/examples/msg/trace-process-migration/trace-process-migration.tesh
@@ -1,7 +1,7 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Tracing processes
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.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 'procmig.trace'
@@ -117,147 +117,147 @@ $ tail -n +3 procmig.trace
 > %       Value string
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
-> 0 2 1 MSG_PROCESS
-> 2 3 2 MSG_PROCESS_STATE
+> 6 0.000000 1 1 0 "Tremblay"
+> 0 2 1 ACTOR
+> 2 3 2 ACTOR_STATE
 > 5 4 3 suspend "1 0 1"
 > 5 5 3 sleep "1 1 0"
 > 5 6 3 receive "1 0 0"
 > 5 7 3 send "0 0 1"
 > 5 8 3 task_execute "0 1 1"
-> 4 9 0 2 2 MSG_PROCESS_LINK
-> 4 10 0 2 2 MSG_PROCESS_TASK_LINK
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 6 0 6 1 0 "Jacquelin"
-> 6 0 7 1 0 "Boivin"
+> 4 9 0 2 2 ACTOR_LINK
+> 4 10 0 2 2 ACTOR_TASK_LINK
+> 6 0.000000 2 1 0 "Jupiter"
+> 6 0.000000 3 1 0 "Fafard"
+> 6 0.000000 4 1 0 "Ginette"
+> 6 0.000000 5 1 0 "Bourassa"
+> 6 0.000000 6 1 0 "Jacquelin"
+> 6 0.000000 7 1 0 "Boivin"
 > 0 11 0 LINK
-> 6 0 8 11 0 "6"
-> 6 0 9 11 0 "3"
-> 6 0 10 11 0 "7"
-> 6 0 11 11 0 "9"
-> 6 0 12 11 0 "2"
-> 6 0 13 11 0 "8"
-> 6 0 14 11 0 "1"
-> 6 0 15 11 0 "4"
-> 6 0 16 11 0 "0"
-> 6 0 17 11 0 "5"
-> 6 0 18 11 0 "145"
-> 6 0 19 11 0 "10"
-> 6 0 20 11 0 "11"
-> 6 0 21 11 0 "16"
-> 6 0 22 11 0 "17"
-> 6 0 23 11 0 "44"
-> 6 0 24 11 0 "47"
-> 6 0 25 11 0 "54"
-> 6 0 26 11 0 "56"
-> 6 0 27 11 0 "59"
-> 6 0 28 11 0 "78"
-> 6 0 29 11 0 "79"
-> 6 0 30 11 0 "80"
-> 6 0 31 11 0 "loopback"
+> 6 0.000000 8 11 0 "6"
+> 6 0.000000 9 11 0 "3"
+> 6 0.000000 10 11 0 "7"
+> 6 0.000000 11 11 0 "9"
+> 6 0.000000 12 11 0 "2"
+> 6 0.000000 13 11 0 "8"
+> 6 0.000000 14 11 0 "1"
+> 6 0.000000 15 11 0 "4"
+> 6 0.000000 16 11 0 "0"
+> 6 0.000000 17 11 0 "5"
+> 6 0.000000 18 11 0 "145"
+> 6 0.000000 19 11 0 "10"
+> 6 0.000000 20 11 0 "11"
+> 6 0.000000 21 11 0 "16"
+> 6 0.000000 22 11 0 "17"
+> 6 0.000000 23 11 0 "44"
+> 6 0.000000 24 11 0 "47"
+> 6 0.000000 25 11 0 "54"
+> 6 0.000000 26 11 0 "56"
+> 6 0.000000 27 11 0 "59"
+> 6 0.000000 28 11 0 "78"
+> 6 0.000000 29 11 0 "79"
+> 6 0.000000 30 11 0 "80"
+> 6 0.000000 31 11 0 "loopback"
 > 4 12 0 11 11 0-LINK11-LINK11
 > 4 13 0 1 11 0-HOST1-LINK11
 > 4 14 0 11 1 0-LINK11-HOST1
-> 15 0 12 0 topology 12 0
-> 16 0 12 0 topology 16 0
-> 15 0 12 0 topology 9 1
-> 16 0 12 0 topology 16 1
-> 15 0 12 0 topology 16 2
-> 16 0 12 0 topology 14 2
-> 15 0 12 0 topology 21 3
-> 16 0 12 0 topology 19 3
-> 15 0 12 0 topology 8 4
-> 16 0 12 0 topology 19 4
-> 15 0 12 0 topology 19 5
-> 16 0 12 0 topology 20 5
-> 15 0 12 0 topology 8 6
-> 16 0 12 0 topology 20 6
-> 15 0 12 0 topology 27 7
-> 16 0 12 0 topology 18 7
-> 15 0 13 0 topology 5 8
-> 16 0 13 0 topology 18 8
-> 15 0 13 0 topology 4 9
-> 16 0 13 0 topology 18 9
-> 15 0 13 0 topology 2 10
-> 16 0 13 0 topology 18 10
-> 15 0 12 0 topology 16 11
-> 16 0 12 0 topology 21 11
-> 15 0 12 0 topology 21 12
-> 16 0 12 0 topology 22 12
-> 15 0 12 0 topology 9 13
-> 16 0 12 0 topology 12 13
-> 15 0 12 0 topology 15 14
-> 16 0 12 0 topology 9 14
-> 15 0 13 0 topology 1 15
-> 16 0 13 0 topology 9 15
-> 15 0 12 0 topology 20 16
-> 16 0 12 0 topology 23 16
-> 15 0 12 0 topology 23 17
-> 16 0 12 0 topology 24 17
-> 15 0 13 0 topology 5 18
-> 16 0 13 0 topology 24 18
-> 15 0 13 0 topology 4 19
-> 16 0 13 0 topology 24 19
-> 15 0 13 0 topology 2 20
-> 16 0 13 0 topology 24 20
-> 15 0 12 0 topology 11 21
-> 16 0 12 0 topology 15 21
-> 15 0 13 0 topology 1 22
-> 16 0 13 0 topology 15 22
-> 15 0 12 0 topology 12 23
-> 16 0 12 0 topology 17 23
-> 15 0 12 0 topology 9 24
-> 16 0 12 0 topology 17 24
-> 15 0 12 0 topology 22 25
-> 16 0 12 0 topology 25 25
-> 15 0 12 0 topology 12 26
-> 16 0 12 0 topology 25 26
-> 15 0 12 0 topology 25 27
-> 16 0 12 0 topology 26 27
-> 15 0 12 0 topology 26 28
-> 16 0 12 0 topology 27 28
-> 15 0 12 0 topology 14 29
-> 16 0 12 0 topology 8 29
-> 15 0 12 0 topology 13 30
-> 16 0 12 0 topology 8 30
-> 15 0 12 0 topology 11 31
-> 16 0 12 0 topology 8 31
-> 15 0 12 0 topology 8 32
-> 16 0 12 0 topology 10 32
-> 15 0 12 0 topology 30 33
-> 16 0 12 0 topology 28 33
-> 15 0 13 0 topology 3 34
-> 16 0 13 0 topology 28 34
-> 15 0 12 0 topology 28 35
-> 16 0 12 0 topology 29 35
-> 15 0 13 0 topology 3 36
-> 16 0 13 0 topology 30 36
-> 15 0 12 0 topology 14 37
-> 16 0 12 0 topology 13 37
-> 15 0 12 0 topology 29 38
-> 16 0 12 0 topology 11 38
-> 15 0 13 0 topology 1 39
-> 16 0 13 0 topology 11 39
-> 15 0 14 0 topology 24 40
-> 16 0 14 0 topology 7 40
-> 15 0 14 0 topology 10 41
-> 16 0 14 0 topology 5 41
-> 15 0 14 0 topology 13 42
-> 16 0 14 0 topology 3 42
-> 15 0 14 0 topology 17 43
-> 16 0 14 0 topology 4 43
-> 15 0 14 0 topology 18 44
-> 16 0 14 0 topology 6 44
-> 15 0 14 0 topology 11 45
-> 16 0 14 0 topology 2 45
-> 6 0 32 2 3 "emigrant-1"
-> 6 0 33 2 1 "policeman-2"
-> 12 0 3 32 5
-> 12 0 3 33 7
-> 15 0 10 0 SR 33 p0
+> 15 0.000000 12 0 topology 12 0
+> 16 0.000000 12 0 topology 16 0
+> 15 0.000000 12 0 topology 9 1
+> 16 0.000000 12 0 topology 16 1
+> 15 0.000000 12 0 topology 16 2
+> 16 0.000000 12 0 topology 14 2
+> 15 0.000000 12 0 topology 21 3
+> 16 0.000000 12 0 topology 19 3
+> 15 0.000000 12 0 topology 8 4
+> 16 0.000000 12 0 topology 19 4
+> 15 0.000000 12 0 topology 19 5
+> 16 0.000000 12 0 topology 20 5
+> 15 0.000000 12 0 topology 8 6
+> 16 0.000000 12 0 topology 20 6
+> 15 0.000000 12 0 topology 27 7
+> 16 0.000000 12 0 topology 18 7
+> 15 0.000000 13 0 topology 5 8
+> 16 0.000000 13 0 topology 18 8
+> 15 0.000000 13 0 topology 4 9
+> 16 0.000000 13 0 topology 18 9
+> 15 0.000000 13 0 topology 2 10
+> 16 0.000000 13 0 topology 18 10
+> 15 0.000000 12 0 topology 16 11
+> 16 0.000000 12 0 topology 21 11
+> 15 0.000000 12 0 topology 21 12
+> 16 0.000000 12 0 topology 22 12
+> 15 0.000000 12 0 topology 9 13
+> 16 0.000000 12 0 topology 12 13
+> 15 0.000000 12 0 topology 15 14
+> 16 0.000000 12 0 topology 9 14
+> 15 0.000000 13 0 topology 1 15
+> 16 0.000000 13 0 topology 9 15
+> 15 0.000000 12 0 topology 20 16
+> 16 0.000000 12 0 topology 23 16
+> 15 0.000000 12 0 topology 23 17
+> 16 0.000000 12 0 topology 24 17
+> 15 0.000000 13 0 topology 5 18
+> 16 0.000000 13 0 topology 24 18
+> 15 0.000000 13 0 topology 4 19
+> 16 0.000000 13 0 topology 24 19
+> 15 0.000000 13 0 topology 2 20
+> 16 0.000000 13 0 topology 24 20
+> 15 0.000000 12 0 topology 11 21
+> 16 0.000000 12 0 topology 15 21
+> 15 0.000000 13 0 topology 1 22
+> 16 0.000000 13 0 topology 15 22
+> 15 0.000000 12 0 topology 12 23
+> 16 0.000000 12 0 topology 17 23
+> 15 0.000000 12 0 topology 9 24
+> 16 0.000000 12 0 topology 17 24
+> 15 0.000000 12 0 topology 22 25
+> 16 0.000000 12 0 topology 25 25
+> 15 0.000000 12 0 topology 12 26
+> 16 0.000000 12 0 topology 25 26
+> 15 0.000000 12 0 topology 25 27
+> 16 0.000000 12 0 topology 26 27
+> 15 0.000000 12 0 topology 26 28
+> 16 0.000000 12 0 topology 27 28
+> 15 0.000000 12 0 topology 14 29
+> 16 0.000000 12 0 topology 8 29
+> 15 0.000000 12 0 topology 13 30
+> 16 0.000000 12 0 topology 8 30
+> 15 0.000000 12 0 topology 11 31
+> 16 0.000000 12 0 topology 8 31
+> 15 0.000000 12 0 topology 8 32
+> 16 0.000000 12 0 topology 10 32
+> 15 0.000000 12 0 topology 30 33
+> 16 0.000000 12 0 topology 28 33
+> 15 0.000000 13 0 topology 3 34
+> 16 0.000000 13 0 topology 28 34
+> 15 0.000000 12 0 topology 28 35
+> 16 0.000000 12 0 topology 29 35
+> 15 0.000000 13 0 topology 3 36
+> 16 0.000000 13 0 topology 30 36
+> 15 0.000000 12 0 topology 14 37
+> 16 0.000000 12 0 topology 13 37
+> 15 0.000000 12 0 topology 29 38
+> 16 0.000000 12 0 topology 11 38
+> 15 0.000000 13 0 topology 1 39
+> 16 0.000000 13 0 topology 11 39
+> 15 0.000000 14 0 topology 24 40
+> 16 0.000000 14 0 topology 7 40
+> 15 0.000000 14 0 topology 10 41
+> 16 0.000000 14 0 topology 5 41
+> 15 0.000000 14 0 topology 13 42
+> 16 0.000000 14 0 topology 3 42
+> 15 0.000000 14 0 topology 17 43
+> 16 0.000000 14 0 topology 4 43
+> 15 0.000000 14 0 topology 18 44
+> 16 0.000000 14 0 topology 6 44
+> 15 0.000000 14 0 topology 11 45
+> 16 0.000000 14 0 topology 2 45
+> 6 0.000000 32 2 3 "emigrant-1"
+> 6 0.000000 33 2 1 "policeman-2"
+> 12 0.000000 3 32 5
+> 12 0.000000 3 33 7
+> 15 0.000000 10 0 SR 33 p0
 > 13 2.000000 3 32
 > 12 2.000000 3 32 6
 > 13 2.025708 3 33
@@ -393,7 +393,7 @@ $ tail -n +3 procmig.trace
 > 7 18.155073 1 1
 > 7 18.155073 11 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.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'
@@ -511,209 +511,209 @@ $ tail -n +3 procmig.trace
 > %       Value string
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
+> 6 0.000000 1 1 0 "Tremblay"
 > 1 2 1 power "1 1 1"
 > 1 3 1 power_used "0.5 0.5 0.5"
-> 0 4 1 MSG_PROCESS
-> 2 5 4 MSG_PROCESS_STATE
+> 0 4 1 ACTOR
+> 2 5 4 ACTOR_STATE
 > 5 6 5 suspend "1 0 1"
 > 5 7 5 sleep "1 1 0"
 > 5 8 5 receive "1 0 0"
 > 5 9 5 send "0 0 1"
 > 5 10 5 task_execute "0 1 1"
-> 4 11 0 4 4 MSG_PROCESS_LINK
-> 4 12 0 4 4 MSG_PROCESS_TASK_LINK
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 6 0 6 1 0 "Jacquelin"
-> 6 0 7 1 0 "Boivin"
+> 4 11 0 4 4 ACTOR_LINK
+> 4 12 0 4 4 ACTOR_TASK_LINK
+> 6 0.000000 2 1 0 "Jupiter"
+> 6 0.000000 3 1 0 "Fafard"
+> 6 0.000000 4 1 0 "Ginette"
+> 6 0.000000 5 1 0 "Bourassa"
+> 6 0.000000 6 1 0 "Jacquelin"
+> 6 0.000000 7 1 0 "Boivin"
 > 0 13 0 LINK
-> 6 0 8 13 0 "6"
+> 6 0.000000 8 13 0 "6"
 > 1 14 13 bandwidth "1 1 1"
 > 1 15 13 latency "1 1 1"
 > 1 16 13 bandwidth_used "0.5 0.5 0.5"
-> 6 0 9 13 0 "3"
-> 6 0 10 13 0 "7"
-> 6 0 11 13 0 "9"
-> 6 0 12 13 0 "2"
-> 6 0 13 13 0 "8"
-> 6 0 14 13 0 "1"
-> 6 0 15 13 0 "4"
-> 6 0 16 13 0 "0"
-> 6 0 17 13 0 "5"
-> 6 0 18 13 0 "145"
-> 6 0 19 13 0 "10"
-> 6 0 20 13 0 "11"
-> 6 0 21 13 0 "16"
-> 6 0 22 13 0 "17"
-> 6 0 23 13 0 "44"
-> 6 0 24 13 0 "47"
-> 6 0 25 13 0 "54"
-> 6 0 26 13 0 "56"
-> 6 0 27 13 0 "59"
-> 6 0 28 13 0 "78"
-> 6 0 29 13 0 "79"
-> 6 0 30 13 0 "80"
-> 6 0 31 13 0 "loopback"
+> 6 0.000000 9 13 0 "3"
+> 6 0.000000 10 13 0 "7"
+> 6 0.000000 11 13 0 "9"
+> 6 0.000000 12 13 0 "2"
+> 6 0.000000 13 13 0 "8"
+> 6 0.000000 14 13 0 "1"
+> 6 0.000000 15 13 0 "4"
+> 6 0.000000 16 13 0 "0"
+> 6 0.000000 17 13 0 "5"
+> 6 0.000000 18 13 0 "145"
+> 6 0.000000 19 13 0 "10"
+> 6 0.000000 20 13 0 "11"
+> 6 0.000000 21 13 0 "16"
+> 6 0.000000 22 13 0 "17"
+> 6 0.000000 23 13 0 "44"
+> 6 0.000000 24 13 0 "47"
+> 6 0.000000 25 13 0 "54"
+> 6 0.000000 26 13 0 "56"
+> 6 0.000000 27 13 0 "59"
+> 6 0.000000 28 13 0 "78"
+> 6 0.000000 29 13 0 "79"
+> 6 0.000000 30 13 0 "80"
+> 6 0.000000 31 13 0 "loopback"
 > 4 17 0 13 13 0-LINK13-LINK13
 > 4 18 0 1 13 0-HOST1-LINK13
 > 4 19 0 13 1 0-LINK13-HOST1
-> 8 0 2 1 98095000.000000
-> 8 0 2 2 76296000.000000
-> 8 0 2 3 76296000.000000
-> 8 0 2 4 48492000.000000
-> 8 0 2 5 48492000.000000
-> 8 0 2 6 137333000.000000
-> 8 0 2 7 98095000.000000
-> 8 0 14 8 41279125.000000
-> 8 0 15 8 0.000060
-> 8 0 14 9 34285625.000000
-> 8 0 15 9 0.000514
-> 8 0 14 10 11618875.000000
-> 8 0 15 10 0.000190
-> 8 0 14 11 7209750.000000
-> 8 0 15 11 0.001462
-> 8 0 14 12 118682500.000000
-> 8 0 15 12 0.000137
-> 8 0 14 13 8158000.000000
-> 8 0 15 13 0.000271
-> 8 0 14 14 34285625.000000
-> 8 0 15 14 0.000514
-> 8 0 14 15 10099625.000000
-> 8 0 15 15 0.000480
-> 8 0 14 16 41279125.000000
-> 8 0 15 16 0.000060
-> 8 0 14 17 27946250.000000
-> 8 0 15 17 0.000278
-> 8 0 14 18 2583375.000000
-> 8 0 15 18 0.000410
-> 8 0 14 19 34285625.000000
-> 8 0 15 19 0.000514
-> 8 0 14 20 118682500.000000
-> 8 0 15 20 0.000137
-> 8 0 14 21 34285625.000000
-> 8 0 15 21 0.000514
-> 8 0 14 22 118682500.000000
-> 8 0 15 22 0.000137
-> 8 0 14 23 10314625.000000
-> 8 0 15 23 0.006933
-> 8 0 14 24 10314625.000000
-> 8 0 15 24 0.006933
-> 8 0 14 25 15376875.000000
-> 8 0 15 25 0.035083
-> 8 0 14 26 21414750.000000
-> 8 0 15 26 0.029589
-> 8 0 14 27 11845375.000000
-> 8 0 15 27 0.000371
-> 8 0 14 28 27946250.000000
-> 8 0 15 28 0.000278
-> 8 0 14 29 8427250.000000
-> 8 0 15 29 0.000156
-> 8 0 14 30 15376875.000000
-> 8 0 15 30 0.035083
-> 8 0 14 31 498000000.000000
-> 8 0 15 31 0.000015
-> 15 0 17 0 topology 12 0
-> 16 0 17 0 topology 16 0
-> 15 0 17 0 topology 9 1
-> 16 0 17 0 topology 16 1
-> 15 0 17 0 topology 16 2
-> 16 0 17 0 topology 14 2
-> 15 0 17 0 topology 21 3
-> 16 0 17 0 topology 19 3
-> 15 0 17 0 topology 8 4
-> 16 0 17 0 topology 19 4
-> 15 0 17 0 topology 19 5
-> 16 0 17 0 topology 20 5
-> 15 0 17 0 topology 8 6
-> 16 0 17 0 topology 20 6
-> 15 0 17 0 topology 27 7
-> 16 0 17 0 topology 18 7
-> 15 0 18 0 topology 5 8
-> 16 0 18 0 topology 18 8
-> 15 0 18 0 topology 4 9
-> 16 0 18 0 topology 18 9
-> 15 0 18 0 topology 2 10
-> 16 0 18 0 topology 18 10
-> 15 0 17 0 topology 16 11
-> 16 0 17 0 topology 21 11
-> 15 0 17 0 topology 21 12
-> 16 0 17 0 topology 22 12
-> 15 0 17 0 topology 9 13
-> 16 0 17 0 topology 12 13
-> 15 0 17 0 topology 15 14
-> 16 0 17 0 topology 9 14
-> 15 0 18 0 topology 1 15
-> 16 0 18 0 topology 9 15
-> 15 0 17 0 topology 20 16
-> 16 0 17 0 topology 23 16
-> 15 0 17 0 topology 23 17
-> 16 0 17 0 topology 24 17
-> 15 0 18 0 topology 5 18
-> 16 0 18 0 topology 24 18
-> 15 0 18 0 topology 4 19
-> 16 0 18 0 topology 24 19
-> 15 0 18 0 topology 2 20
-> 16 0 18 0 topology 24 20
-> 15 0 17 0 topology 11 21
-> 16 0 17 0 topology 15 21
-> 15 0 18 0 topology 1 22
-> 16 0 18 0 topology 15 22
-> 15 0 17 0 topology 12 23
-> 16 0 17 0 topology 17 23
-> 15 0 17 0 topology 9 24
-> 16 0 17 0 topology 17 24
-> 15 0 17 0 topology 22 25
-> 16 0 17 0 topology 25 25
-> 15 0 17 0 topology 12 26
-> 16 0 17 0 topology 25 26
-> 15 0 17 0 topology 25 27
-> 16 0 17 0 topology 26 27
-> 15 0 17 0 topology 26 28
-> 16 0 17 0 topology 27 28
-> 15 0 17 0 topology 14 29
-> 16 0 17 0 topology 8 29
-> 15 0 17 0 topology 13 30
-> 16 0 17 0 topology 8 30
-> 15 0 17 0 topology 11 31
-> 16 0 17 0 topology 8 31
-> 15 0 17 0 topology 8 32
-> 16 0 17 0 topology 10 32
-> 15 0 17 0 topology 30 33
-> 16 0 17 0 topology 28 33
-> 15 0 18 0 topology 3 34
-> 16 0 18 0 topology 28 34
-> 15 0 17 0 topology 28 35
-> 16 0 17 0 topology 29 35
-> 15 0 18 0 topology 3 36
-> 16 0 18 0 topology 30 36
-> 15 0 17 0 topology 14 37
-> 16 0 17 0 topology 13 37
-> 15 0 17 0 topology 29 38
-> 16 0 17 0 topology 11 38
-> 15 0 18 0 topology 1 39
-> 16 0 18 0 topology 11 39
-> 15 0 19 0 topology 24 40
-> 16 0 19 0 topology 7 40
-> 15 0 19 0 topology 10 41
-> 16 0 19 0 topology 5 41
-> 15 0 19 0 topology 13 42
-> 16 0 19 0 topology 3 42
-> 15 0 19 0 topology 17 43
-> 16 0 19 0 topology 4 43
-> 15 0 19 0 topology 18 44
-> 16 0 19 0 topology 6 44
-> 15 0 19 0 topology 11 45
-> 16 0 19 0 topology 2 45
+> 8 0.000000 2 1 98095000.000000
+> 8 0.000000 2 2 76296000.000000
+> 8 0.000000 2 3 76296000.000000
+> 8 0.000000 2 4 48492000.000000
+> 8 0.000000 2 5 48492000.000000
+> 8 0.000000 2 6 137333000.000000
+> 8 0.000000 2 7 98095000.000000
+> 8 0.000000 14 8 41279125.000000
+> 8 0.000000 15 8 0.000060
+> 8 0.000000 14 9 34285625.000000
+> 8 0.000000 15 9 0.000514
+> 8 0.000000 14 10 11618875.000000
+> 8 0.000000 15 10 0.000190
+> 8 0.000000 14 11 7209750.000000
+> 8 0.000000 15 11 0.001462
+> 8 0.000000 14 12 118682500.000000
+> 8 0.000000 15 12 0.000137
+> 8 0.000000 14 13 8158000.000000
+> 8 0.000000 15 13 0.000271
+> 8 0.000000 14 14 34285625.000000
+> 8 0.000000 15 14 0.000514
+> 8 0.000000 14 15 10099625.000000
+> 8 0.000000 15 15 0.000480
+> 8 0.000000 14 16 41279125.000000
+> 8 0.000000 15 16 0.000060
+> 8 0.000000 14 17 27946250.000000
+> 8 0.000000 15 17 0.000278
+> 8 0.000000 14 18 2583375.000000
+> 8 0.000000 15 18 0.000410
+> 8 0.000000 14 19 34285625.000000
+> 8 0.000000 15 19 0.000514
+> 8 0.000000 14 20 118682500.000000
+> 8 0.000000 15 20 0.000137
+> 8 0.000000 14 21 34285625.000000
+> 8 0.000000 15 21 0.000514
+> 8 0.000000 14 22 118682500.000000
+> 8 0.000000 15 22 0.000137
+> 8 0.000000 14 23 10314625.000000
+> 8 0.000000 15 23 0.006933
+> 8 0.000000 14 24 10314625.000000
+> 8 0.000000 15 24 0.006933
+> 8 0.000000 14 25 15376875.000000
+> 8 0.000000 15 25 0.035083
+> 8 0.000000 14 26 21414750.000000
+> 8 0.000000 15 26 0.029589
+> 8 0.000000 14 27 11845375.000000
+> 8 0.000000 15 27 0.000371
+> 8 0.000000 14 28 27946250.000000
+> 8 0.000000 15 28 0.000278
+> 8 0.000000 14 29 8427250.000000
+> 8 0.000000 15 29 0.000156
+> 8 0.000000 14 30 15376875.000000
+> 8 0.000000 15 30 0.035083
+> 8 0.000000 14 31 498000000.000000
+> 8 0.000000 15 31 0.000015
+> 15 0.000000 17 0 topology 12 0
+> 16 0.000000 17 0 topology 16 0
+> 15 0.000000 17 0 topology 9 1
+> 16 0.000000 17 0 topology 16 1
+> 15 0.000000 17 0 topology 16 2
+> 16 0.000000 17 0 topology 14 2
+> 15 0.000000 17 0 topology 21 3
+> 16 0.000000 17 0 topology 19 3
+> 15 0.000000 17 0 topology 8 4
+> 16 0.000000 17 0 topology 19 4
+> 15 0.000000 17 0 topology 19 5
+> 16 0.000000 17 0 topology 20 5
+> 15 0.000000 17 0 topology 8 6
+> 16 0.000000 17 0 topology 20 6
+> 15 0.000000 17 0 topology 27 7
+> 16 0.000000 17 0 topology 18 7
+> 15 0.000000 18 0 topology 5 8
+> 16 0.000000 18 0 topology 18 8
+> 15 0.000000 18 0 topology 4 9
+> 16 0.000000 18 0 topology 18 9
+> 15 0.000000 18 0 topology 2 10
+> 16 0.000000 18 0 topology 18 10
+> 15 0.000000 17 0 topology 16 11
+> 16 0.000000 17 0 topology 21 11
+> 15 0.000000 17 0 topology 21 12
+> 16 0.000000 17 0 topology 22 12
+> 15 0.000000 17 0 topology 9 13
+> 16 0.000000 17 0 topology 12 13
+> 15 0.000000 17 0 topology 15 14
+> 16 0.000000 17 0 topology 9 14
+> 15 0.000000 18 0 topology 1 15
+> 16 0.000000 18 0 topology 9 15
+> 15 0.000000 17 0 topology 20 16
+> 16 0.000000 17 0 topology 23 16
+> 15 0.000000 17 0 topology 23 17
+> 16 0.000000 17 0 topology 24 17
+> 15 0.000000 18 0 topology 5 18
+> 16 0.000000 18 0 topology 24 18
+> 15 0.000000 18 0 topology 4 19
+> 16 0.000000 18 0 topology 24 19
+> 15 0.000000 18 0 topology 2 20
+> 16 0.000000 18 0 topology 24 20
+> 15 0.000000 17 0 topology 11 21
+> 16 0.000000 17 0 topology 15 21
+> 15 0.000000 18 0 topology 1 22
+> 16 0.000000 18 0 topology 15 22
+> 15 0.000000 17 0 topology 12 23
+> 16 0.000000 17 0 topology 17 23
+> 15 0.000000 17 0 topology 9 24
+> 16 0.000000 17 0 topology 17 24
+> 15 0.000000 17 0 topology 22 25
+> 16 0.000000 17 0 topology 25 25
+> 15 0.000000 17 0 topology 12 26
+> 16 0.000000 17 0 topology 25 26
+> 15 0.000000 17 0 topology 25 27
+> 16 0.000000 17 0 topology 26 27
+> 15 0.000000 17 0 topology 26 28
+> 16 0.000000 17 0 topology 27 28
+> 15 0.000000 17 0 topology 14 29
+> 16 0.000000 17 0 topology 8 29
+> 15 0.000000 17 0 topology 13 30
+> 16 0.000000 17 0 topology 8 30
+> 15 0.000000 17 0 topology 11 31
+> 16 0.000000 17 0 topology 8 31
+> 15 0.000000 17 0 topology 8 32
+> 16 0.000000 17 0 topology 10 32
+> 15 0.000000 17 0 topology 30 33
+> 16 0.000000 17 0 topology 28 33
+> 15 0.000000 18 0 topology 3 34
+> 16 0.000000 18 0 topology 28 34
+> 15 0.000000 17 0 topology 28 35
+> 16 0.000000 17 0 topology 29 35
+> 15 0.000000 18 0 topology 3 36
+> 16 0.000000 18 0 topology 30 36
+> 15 0.000000 17 0 topology 14 37
+> 16 0.000000 17 0 topology 13 37
+> 15 0.000000 17 0 topology 29 38
+> 16 0.000000 17 0 topology 11 38
+> 15 0.000000 18 0 topology 1 39
+> 16 0.000000 18 0 topology 11 39
+> 15 0.000000 19 0 topology 24 40
+> 16 0.000000 19 0 topology 7 40
+> 15 0.000000 19 0 topology 10 41
+> 16 0.000000 19 0 topology 5 41
+> 15 0.000000 19 0 topology 13 42
+> 16 0.000000 19 0 topology 3 42
+> 15 0.000000 19 0 topology 17 43
+> 16 0.000000 19 0 topology 4 43
+> 15 0.000000 19 0 topology 18 44
+> 16 0.000000 19 0 topology 6 44
+> 15 0.000000 19 0 topology 11 45
+> 16 0.000000 19 0 topology 2 45
 > 1 20 1 pmigration_order "0.800026 0.545312 0.857926"
 > 1 21 13 bmigration_order "0.800026 0.545312 0.857926"
-> 6 0 32 4 3 "emigrant-1"
-> 6 0 33 4 1 "policeman-2"
-> 12 0 5 32 7
-> 12 0 5 33 9
-> 15 0 12 0 SR 33 p0
+> 6 0.000000 32 4 3 "emigrant-1"
+> 6 0.000000 33 4 1 "policeman-2"
+> 12 0.000000 5 32 7
+> 12 0.000000 5 33 9
+> 15 0.000000 12 0 SR 33 p0
 > 13 2.000000 5 32
 > 12 2.000000 5 32 8
 > 8 2.025708 16 15 0.000000
@@ -996,7 +996,7 @@ $ tail -n +3 procmig.trace
 > 7 18.155073 1 1
 > 7 18.155073 13 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:no --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:no --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.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'
@@ -1113,209 +1113,209 @@ $ tail -n +3 procmig.trace
 > %       Value string
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
+> 6 0.000000 1 1 0 "Tremblay"
 > 1 2 1 power "1 1 1"
 > 1 3 1 power_used "0.5 0.5 0.5"
-> 0 4 1 MSG_PROCESS
-> 2 5 4 MSG_PROCESS_STATE
+> 0 4 1 ACTOR
+> 2 5 4 ACTOR_STATE
 > 5 6 5 suspend "1 0 1"
 > 5 7 5 sleep "1 1 0"
 > 5 8 5 receive "1 0 0"
 > 5 9 5 send "0 0 1"
 > 5 10 5 task_execute "0 1 1"
-> 4 11 0 4 4 MSG_PROCESS_LINK
-> 4 12 0 4 4 MSG_PROCESS_TASK_LINK
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 6 0 6 1 0 "Jacquelin"
-> 6 0 7 1 0 "Boivin"
+> 4 11 0 4 4 ACTOR_LINK
+> 4 12 0 4 4 ACTOR_TASK_LINK
+> 6 0.000000 2 1 0 "Jupiter"
+> 6 0.000000 3 1 0 "Fafard"
+> 6 0.000000 4 1 0 "Ginette"
+> 6 0.000000 5 1 0 "Bourassa"
+> 6 0.000000 6 1 0 "Jacquelin"
+> 6 0.000000 7 1 0 "Boivin"
 > 0 13 0 LINK
-> 6 0 8 13 0 "6"
+> 6 0.000000 8 13 0 "6"
 > 1 14 13 bandwidth "1 1 1"
 > 1 15 13 latency "1 1 1"
 > 1 16 13 bandwidth_used "0.5 0.5 0.5"
-> 6 0 9 13 0 "3"
-> 6 0 10 13 0 "7"
-> 6 0 11 13 0 "9"
-> 6 0 12 13 0 "2"
-> 6 0 13 13 0 "8"
-> 6 0 14 13 0 "1"
-> 6 0 15 13 0 "4"
-> 6 0 16 13 0 "0"
-> 6 0 17 13 0 "5"
-> 6 0 18 13 0 "145"
-> 6 0 19 13 0 "10"
-> 6 0 20 13 0 "11"
-> 6 0 21 13 0 "16"
-> 6 0 22 13 0 "17"
-> 6 0 23 13 0 "44"
-> 6 0 24 13 0 "47"
-> 6 0 25 13 0 "54"
-> 6 0 26 13 0 "56"
-> 6 0 27 13 0 "59"
-> 6 0 28 13 0 "78"
-> 6 0 29 13 0 "79"
-> 6 0 30 13 0 "80"
-> 6 0 31 13 0 "loopback"
+> 6 0.000000 9 13 0 "3"
+> 6 0.000000 10 13 0 "7"
+> 6 0.000000 11 13 0 "9"
+> 6 0.000000 12 13 0 "2"
+> 6 0.000000 13 13 0 "8"
+> 6 0.000000 14 13 0 "1"
+> 6 0.000000 15 13 0 "4"
+> 6 0.000000 16 13 0 "0"
+> 6 0.000000 17 13 0 "5"
+> 6 0.000000 18 13 0 "145"
+> 6 0.000000 19 13 0 "10"
+> 6 0.000000 20 13 0 "11"
+> 6 0.000000 21 13 0 "16"
+> 6 0.000000 22 13 0 "17"
+> 6 0.000000 23 13 0 "44"
+> 6 0.000000 24 13 0 "47"
+> 6 0.000000 25 13 0 "54"
+> 6 0.000000 26 13 0 "56"
+> 6 0.000000 27 13 0 "59"
+> 6 0.000000 28 13 0 "78"
+> 6 0.000000 29 13 0 "79"
+> 6 0.000000 30 13 0 "80"
+> 6 0.000000 31 13 0 "loopback"
 > 4 17 0 13 13 0-LINK13-LINK13
 > 4 18 0 1 13 0-HOST1-LINK13
 > 4 19 0 13 1 0-LINK13-HOST1
-> 8 0 2 1 98095000.000000
-> 8 0 2 2 76296000.000000
-> 8 0 2 3 76296000.000000
-> 8 0 2 4 48492000.000000
-> 8 0 2 5 48492000.000000
-> 8 0 2 6 137333000.000000
-> 8 0 2 7 98095000.000000
-> 8 0 14 8 41279125.000000
-> 8 0 15 8 0.000060
-> 8 0 14 9 34285625.000000
-> 8 0 15 9 0.000514
-> 8 0 14 10 11618875.000000
-> 8 0 15 10 0.000190
-> 8 0 14 11 7209750.000000
-> 8 0 15 11 0.001462
-> 8 0 14 12 118682500.000000
-> 8 0 15 12 0.000137
-> 8 0 14 13 8158000.000000
-> 8 0 15 13 0.000271
-> 8 0 14 14 34285625.000000
-> 8 0 15 14 0.000514
-> 8 0 14 15 10099625.000000
-> 8 0 15 15 0.000480
-> 8 0 14 16 41279125.000000
-> 8 0 15 16 0.000060
-> 8 0 14 17 27946250.000000
-> 8 0 15 17 0.000278
-> 8 0 14 18 2583375.000000
-> 8 0 15 18 0.000410
-> 8 0 14 19 34285625.000000
-> 8 0 15 19 0.000514
-> 8 0 14 20 118682500.000000
-> 8 0 15 20 0.000137
-> 8 0 14 21 34285625.000000
-> 8 0 15 21 0.000514
-> 8 0 14 22 118682500.000000
-> 8 0 15 22 0.000137
-> 8 0 14 23 10314625.000000
-> 8 0 15 23 0.006933
-> 8 0 14 24 10314625.000000
-> 8 0 15 24 0.006933
-> 8 0 14 25 15376875.000000
-> 8 0 15 25 0.035083
-> 8 0 14 26 21414750.000000
-> 8 0 15 26 0.029589
-> 8 0 14 27 11845375.000000
-> 8 0 15 27 0.000371
-> 8 0 14 28 27946250.000000
-> 8 0 15 28 0.000278
-> 8 0 14 29 8427250.000000
-> 8 0 15 29 0.000156
-> 8 0 14 30 15376875.000000
-> 8 0 15 30 0.035083
-> 8 0 14 31 498000000.000000
-> 8 0 15 31 0.000015
-> 15 0 17 0 topology 12 0
-> 16 0 17 0 topology 16 0
-> 15 0 17 0 topology 9 1
-> 16 0 17 0 topology 16 1
-> 15 0 17 0 topology 16 2
-> 16 0 17 0 topology 14 2
-> 15 0 17 0 topology 21 3
-> 16 0 17 0 topology 19 3
-> 15 0 17 0 topology 8 4
-> 16 0 17 0 topology 19 4
-> 15 0 17 0 topology 19 5
-> 16 0 17 0 topology 20 5
-> 15 0 17 0 topology 8 6
-> 16 0 17 0 topology 20 6
-> 15 0 17 0 topology 27 7
-> 16 0 17 0 topology 18 7
-> 15 0 18 0 topology 5 8
-> 16 0 18 0 topology 18 8
-> 15 0 18 0 topology 4 9
-> 16 0 18 0 topology 18 9
-> 15 0 18 0 topology 2 10
-> 16 0 18 0 topology 18 10
-> 15 0 17 0 topology 16 11
-> 16 0 17 0 topology 21 11
-> 15 0 17 0 topology 21 12
-> 16 0 17 0 topology 22 12
-> 15 0 17 0 topology 9 13
-> 16 0 17 0 topology 12 13
-> 15 0 17 0 topology 15 14
-> 16 0 17 0 topology 9 14
-> 15 0 18 0 topology 1 15
-> 16 0 18 0 topology 9 15
-> 15 0 17 0 topology 20 16
-> 16 0 17 0 topology 23 16
-> 15 0 17 0 topology 23 17
-> 16 0 17 0 topology 24 17
-> 15 0 18 0 topology 5 18
-> 16 0 18 0 topology 24 18
-> 15 0 18 0 topology 4 19
-> 16 0 18 0 topology 24 19
-> 15 0 18 0 topology 2 20
-> 16 0 18 0 topology 24 20
-> 15 0 17 0 topology 11 21
-> 16 0 17 0 topology 15 21
-> 15 0 18 0 topology 1 22
-> 16 0 18 0 topology 15 22
-> 15 0 17 0 topology 12 23
-> 16 0 17 0 topology 17 23
-> 15 0 17 0 topology 9 24
-> 16 0 17 0 topology 17 24
-> 15 0 17 0 topology 22 25
-> 16 0 17 0 topology 25 25
-> 15 0 17 0 topology 12 26
-> 16 0 17 0 topology 25 26
-> 15 0 17 0 topology 25 27
-> 16 0 17 0 topology 26 27
-> 15 0 17 0 topology 26 28
-> 16 0 17 0 topology 27 28
-> 15 0 17 0 topology 14 29
-> 16 0 17 0 topology 8 29
-> 15 0 17 0 topology 13 30
-> 16 0 17 0 topology 8 30
-> 15 0 17 0 topology 11 31
-> 16 0 17 0 topology 8 31
-> 15 0 17 0 topology 8 32
-> 16 0 17 0 topology 10 32
-> 15 0 17 0 topology 30 33
-> 16 0 17 0 topology 28 33
-> 15 0 18 0 topology 3 34
-> 16 0 18 0 topology 28 34
-> 15 0 17 0 topology 28 35
-> 16 0 17 0 topology 29 35
-> 15 0 18 0 topology 3 36
-> 16 0 18 0 topology 30 36
-> 15 0 17 0 topology 14 37
-> 16 0 17 0 topology 13 37
-> 15 0 17 0 topology 29 38
-> 16 0 17 0 topology 11 38
-> 15 0 18 0 topology 1 39
-> 16 0 18 0 topology 11 39
-> 15 0 19 0 topology 24 40
-> 16 0 19 0 topology 7 40
-> 15 0 19 0 topology 10 41
-> 16 0 19 0 topology 5 41
-> 15 0 19 0 topology 13 42
-> 16 0 19 0 topology 3 42
-> 15 0 19 0 topology 17 43
-> 16 0 19 0 topology 4 43
-> 15 0 19 0 topology 18 44
-> 16 0 19 0 topology 6 44
-> 15 0 19 0 topology 11 45
-> 16 0 19 0 topology 2 45
+> 8 0.000000 2 1 98095000.000000
+> 8 0.000000 2 2 76296000.000000
+> 8 0.000000 2 3 76296000.000000
+> 8 0.000000 2 4 48492000.000000
+> 8 0.000000 2 5 48492000.000000
+> 8 0.000000 2 6 137333000.000000
+> 8 0.000000 2 7 98095000.000000
+> 8 0.000000 14 8 41279125.000000
+> 8 0.000000 15 8 0.000060
+> 8 0.000000 14 9 34285625.000000
+> 8 0.000000 15 9 0.000514
+> 8 0.000000 14 10 11618875.000000
+> 8 0.000000 15 10 0.000190
+> 8 0.000000 14 11 7209750.000000
+> 8 0.000000 15 11 0.001462
+> 8 0.000000 14 12 118682500.000000
+> 8 0.000000 15 12 0.000137
+> 8 0.000000 14 13 8158000.000000
+> 8 0.000000 15 13 0.000271
+> 8 0.000000 14 14 34285625.000000
+> 8 0.000000 15 14 0.000514
+> 8 0.000000 14 15 10099625.000000
+> 8 0.000000 15 15 0.000480
+> 8 0.000000 14 16 41279125.000000
+> 8 0.000000 15 16 0.000060
+> 8 0.000000 14 17 27946250.000000
+> 8 0.000000 15 17 0.000278
+> 8 0.000000 14 18 2583375.000000
+> 8 0.000000 15 18 0.000410
+> 8 0.000000 14 19 34285625.000000
+> 8 0.000000 15 19 0.000514
+> 8 0.000000 14 20 118682500.000000
+> 8 0.000000 15 20 0.000137
+> 8 0.000000 14 21 34285625.000000
+> 8 0.000000 15 21 0.000514
+> 8 0.000000 14 22 118682500.000000
+> 8 0.000000 15 22 0.000137
+> 8 0.000000 14 23 10314625.000000
+> 8 0.000000 15 23 0.006933
+> 8 0.000000 14 24 10314625.000000
+> 8 0.000000 15 24 0.006933
+> 8 0.000000 14 25 15376875.000000
+> 8 0.000000 15 25 0.035083
+> 8 0.000000 14 26 21414750.000000
+> 8 0.000000 15 26 0.029589
+> 8 0.000000 14 27 11845375.000000
+> 8 0.000000 15 27 0.000371
+> 8 0.000000 14 28 27946250.000000
+> 8 0.000000 15 28 0.000278
+> 8 0.000000 14 29 8427250.000000
+> 8 0.000000 15 29 0.000156
+> 8 0.000000 14 30 15376875.000000
+> 8 0.000000 15 30 0.035083
+> 8 0.000000 14 31 498000000.000000
+> 8 0.000000 15 31 0.000015
+> 15 0.000000 17 0 topology 12 0
+> 16 0.000000 17 0 topology 16 0
+> 15 0.000000 17 0 topology 9 1
+> 16 0.000000 17 0 topology 16 1
+> 15 0.000000 17 0 topology 16 2
+> 16 0.000000 17 0 topology 14 2
+> 15 0.000000 17 0 topology 21 3
+> 16 0.000000 17 0 topology 19 3
+> 15 0.000000 17 0 topology 8 4
+> 16 0.000000 17 0 topology 19 4
+> 15 0.000000 17 0 topology 19 5
+> 16 0.000000 17 0 topology 20 5
+> 15 0.000000 17 0 topology 8 6
+> 16 0.000000 17 0 topology 20 6
+> 15 0.000000 17 0 topology 27 7
+> 16 0.000000 17 0 topology 18 7
+> 15 0.000000 18 0 topology 5 8
+> 16 0.000000 18 0 topology 18 8
+> 15 0.000000 18 0 topology 4 9
+> 16 0.000000 18 0 topology 18 9
+> 15 0.000000 18 0 topology 2 10
+> 16 0.000000 18 0 topology 18 10
+> 15 0.000000 17 0 topology 16 11
+> 16 0.000000 17 0 topology 21 11
+> 15 0.000000 17 0 topology 21 12
+> 16 0.000000 17 0 topology 22 12
+> 15 0.000000 17 0 topology 9 13
+> 16 0.000000 17 0 topology 12 13
+> 15 0.000000 17 0 topology 15 14
+> 16 0.000000 17 0 topology 9 14
+> 15 0.000000 18 0 topology 1 15
+> 16 0.000000 18 0 topology 9 15
+> 15 0.000000 17 0 topology 20 16
+> 16 0.000000 17 0 topology 23 16
+> 15 0.000000 17 0 topology 23 17
+> 16 0.000000 17 0 topology 24 17
+> 15 0.000000 18 0 topology 5 18
+> 16 0.000000 18 0 topology 24 18
+> 15 0.000000 18 0 topology 4 19
+> 16 0.000000 18 0 topology 24 19
+> 15 0.000000 18 0 topology 2 20
+> 16 0.000000 18 0 topology 24 20
+> 15 0.000000 17 0 topology 11 21
+> 16 0.000000 17 0 topology 15 21
+> 15 0.000000 18 0 topology 1 22
+> 16 0.000000 18 0 topology 15 22
+> 15 0.000000 17 0 topology 12 23
+> 16 0.000000 17 0 topology 17 23
+> 15 0.000000 17 0 topology 9 24
+> 16 0.000000 17 0 topology 17 24
+> 15 0.000000 17 0 topology 22 25
+> 16 0.000000 17 0 topology 25 25
+> 15 0.000000 17 0 topology 12 26
+> 16 0.000000 17 0 topology 25 26
+> 15 0.000000 17 0 topology 25 27
+> 16 0.000000 17 0 topology 26 27
+> 15 0.000000 17 0 topology 26 28
+> 16 0.000000 17 0 topology 27 28
+> 15 0.000000 17 0 topology 14 29
+> 16 0.000000 17 0 topology 8 29
+> 15 0.000000 17 0 topology 13 30
+> 16 0.000000 17 0 topology 8 30
+> 15 0.000000 17 0 topology 11 31
+> 16 0.000000 17 0 topology 8 31
+> 15 0.000000 17 0 topology 8 32
+> 16 0.000000 17 0 topology 10 32
+> 15 0.000000 17 0 topology 30 33
+> 16 0.000000 17 0 topology 28 33
+> 15 0.000000 18 0 topology 3 34
+> 16 0.000000 18 0 topology 28 34
+> 15 0.000000 17 0 topology 28 35
+> 16 0.000000 17 0 topology 29 35
+> 15 0.000000 18 0 topology 3 36
+> 16 0.000000 18 0 topology 30 36
+> 15 0.000000 17 0 topology 14 37
+> 16 0.000000 17 0 topology 13 37
+> 15 0.000000 17 0 topology 29 38
+> 16 0.000000 17 0 topology 11 38
+> 15 0.000000 18 0 topology 1 39
+> 16 0.000000 18 0 topology 11 39
+> 15 0.000000 19 0 topology 24 40
+> 16 0.000000 19 0 topology 7 40
+> 15 0.000000 19 0 topology 10 41
+> 16 0.000000 19 0 topology 5 41
+> 15 0.000000 19 0 topology 13 42
+> 16 0.000000 19 0 topology 3 42
+> 15 0.000000 19 0 topology 17 43
+> 16 0.000000 19 0 topology 4 43
+> 15 0.000000 19 0 topology 18 44
+> 16 0.000000 19 0 topology 6 44
+> 15 0.000000 19 0 topology 11 45
+> 16 0.000000 19 0 topology 2 45
 > 1 20 1 pmigration_order "0.800026 0.545312 0.857926"
 > 1 21 13 bmigration_order "0.800026 0.545312 0.857926"
-> 6 0 32 4 3 "emigrant-1"
-> 6 0 33 4 1 "policeman-2"
-> 12 0 5 32 7
-> 12 0 5 33 9
-> 15 0 12 0 SR 33 p0
+> 6 0.000000 32 4 3 "emigrant-1"
+> 6 0.000000 33 4 1 "policeman-2"
+> 12 0.000000 5 32 7
+> 12 0.000000 5 33 9
+> 15 0.000000 12 0 SR 33 p0
 > 13 2.000000 5 32
 > 12 2.000000 5 32 8
 > 8 2.025708 16 15 0.000000
@@ -1598,10 +1598,10 @@ $ tail -n +3 procmig.trace
 > 7 18.155073 1 1
 > 7 18.155073 13 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:no ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:no ${platfdir}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'no'
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/categorized:yes ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/categorized:yes ${platfdir}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 
@@ -1715,191 +1715,191 @@ $ tail -n +3 simgrid.trace
 > %       Value string
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
+> 6 0.000000 1 1 0 "Tremblay"
 > 1 2 1 power "1 1 1"
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 6 0 6 1 0 "Jacquelin"
-> 6 0 7 1 0 "Boivin"
+> 6 0.000000 2 1 0 "Jupiter"
+> 6 0.000000 3 1 0 "Fafard"
+> 6 0.000000 4 1 0 "Ginette"
+> 6 0.000000 5 1 0 "Bourassa"
+> 6 0.000000 6 1 0 "Jacquelin"
+> 6 0.000000 7 1 0 "Boivin"
 > 0 3 0 LINK
-> 6 0 8 3 0 "6"
+> 6 0.000000 8 3 0 "6"
 > 1 4 3 bandwidth "1 1 1"
 > 1 5 3 latency "1 1 1"
-> 6 0 9 3 0 "3"
-> 6 0 10 3 0 "7"
-> 6 0 11 3 0 "9"
-> 6 0 12 3 0 "2"
-> 6 0 13 3 0 "8"
-> 6 0 14 3 0 "1"
-> 6 0 15 3 0 "4"
-> 6 0 16 3 0 "0"
-> 6 0 17 3 0 "5"
-> 6 0 18 3 0 "145"
-> 6 0 19 3 0 "10"
-> 6 0 20 3 0 "11"
-> 6 0 21 3 0 "16"
-> 6 0 22 3 0 "17"
-> 6 0 23 3 0 "44"
-> 6 0 24 3 0 "47"
-> 6 0 25 3 0 "54"
-> 6 0 26 3 0 "56"
-> 6 0 27 3 0 "59"
-> 6 0 28 3 0 "78"
-> 6 0 29 3 0 "79"
-> 6 0 30 3 0 "80"
-> 6 0 31 3 0 "loopback"
+> 6 0.000000 9 3 0 "3"
+> 6 0.000000 10 3 0 "7"
+> 6 0.000000 11 3 0 "9"
+> 6 0.000000 12 3 0 "2"
+> 6 0.000000 13 3 0 "8"
+> 6 0.000000 14 3 0 "1"
+> 6 0.000000 15 3 0 "4"
+> 6 0.000000 16 3 0 "0"
+> 6 0.000000 17 3 0 "5"
+> 6 0.000000 18 3 0 "145"
+> 6 0.000000 19 3 0 "10"
+> 6 0.000000 20 3 0 "11"
+> 6 0.000000 21 3 0 "16"
+> 6 0.000000 22 3 0 "17"
+> 6 0.000000 23 3 0 "44"
+> 6 0.000000 24 3 0 "47"
+> 6 0.000000 25 3 0 "54"
+> 6 0.000000 26 3 0 "56"
+> 6 0.000000 27 3 0 "59"
+> 6 0.000000 28 3 0 "78"
+> 6 0.000000 29 3 0 "79"
+> 6 0.000000 30 3 0 "80"
+> 6 0.000000 31 3 0 "loopback"
 > 4 6 0 3 3 0-LINK3-LINK3
 > 4 7 0 1 3 0-HOST1-LINK3
 > 4 8 0 3 1 0-LINK3-HOST1
-> 8 0 2 1 98095000.000000
-> 8 0 2 2 76296000.000000
-> 8 0 2 3 76296000.000000
-> 8 0 2 4 48492000.000000
-> 8 0 2 5 48492000.000000
-> 8 0 2 6 137333000.000000
-> 8 0 2 7 98095000.000000
-> 8 0 4 8 41279125.000000
-> 8 0 5 8 0.000060
-> 8 0 4 9 34285625.000000
-> 8 0 5 9 0.000514
-> 8 0 4 10 11618875.000000
-> 8 0 5 10 0.000190
-> 8 0 4 11 7209750.000000
-> 8 0 5 11 0.001462
-> 8 0 4 12 118682500.000000
-> 8 0 5 12 0.000137
-> 8 0 4 13 8158000.000000
-> 8 0 5 13 0.000271
-> 8 0 4 14 34285625.000000
-> 8 0 5 14 0.000514
-> 8 0 4 15 10099625.000000
-> 8 0 5 15 0.000480
-> 8 0 4 16 41279125.000000
-> 8 0 5 16 0.000060
-> 8 0 4 17 27946250.000000
-> 8 0 5 17 0.000278
-> 8 0 4 18 2583375.000000
-> 8 0 5 18 0.000410
-> 8 0 4 19 34285625.000000
-> 8 0 5 19 0.000514
-> 8 0 4 20 118682500.000000
-> 8 0 5 20 0.000137
-> 8 0 4 21 34285625.000000
-> 8 0 5 21 0.000514
-> 8 0 4 22 118682500.000000
-> 8 0 5 22 0.000137
-> 8 0 4 23 10314625.000000
-> 8 0 5 23 0.006933
-> 8 0 4 24 10314625.000000
-> 8 0 5 24 0.006933
-> 8 0 4 25 15376875.000000
-> 8 0 5 25 0.035083
-> 8 0 4 26 21414750.000000
-> 8 0 5 26 0.029589
-> 8 0 4 27 11845375.000000
-> 8 0 5 27 0.000371
-> 8 0 4 28 27946250.000000
-> 8 0 5 28 0.000278
-> 8 0 4 29 8427250.000000
-> 8 0 5 29 0.000156
-> 8 0 4 30 15376875.000000
-> 8 0 5 30 0.035083
-> 8 0 4 31 498000000.000000
-> 8 0 5 31 0.000015
-> 15 0 6 0 topology 12 0
-> 16 0 6 0 topology 16 0
-> 15 0 6 0 topology 9 1
-> 16 0 6 0 topology 16 1
-> 15 0 6 0 topology 16 2
-> 16 0 6 0 topology 14 2
-> 15 0 6 0 topology 21 3
-> 16 0 6 0 topology 19 3
-> 15 0 6 0 topology 8 4
-> 16 0 6 0 topology 19 4
-> 15 0 6 0 topology 19 5
-> 16 0 6 0 topology 20 5
-> 15 0 6 0 topology 8 6
-> 16 0 6 0 topology 20 6
-> 15 0 6 0 topology 27 7
-> 16 0 6 0 topology 18 7
-> 15 0 7 0 topology 5 8
-> 16 0 7 0 topology 18 8
-> 15 0 7 0 topology 4 9
-> 16 0 7 0 topology 18 9
-> 15 0 7 0 topology 2 10
-> 16 0 7 0 topology 18 10
-> 15 0 6 0 topology 16 11
-> 16 0 6 0 topology 21 11
-> 15 0 6 0 topology 21 12
-> 16 0 6 0 topology 22 12
-> 15 0 6 0 topology 9 13
-> 16 0 6 0 topology 12 13
-> 15 0 6 0 topology 15 14
-> 16 0 6 0 topology 9 14
-> 15 0 7 0 topology 1 15
-> 16 0 7 0 topology 9 15
-> 15 0 6 0 topology 20 16
-> 16 0 6 0 topology 23 16
-> 15 0 6 0 topology 23 17
-> 16 0 6 0 topology 24 17
-> 15 0 7 0 topology 5 18
-> 16 0 7 0 topology 24 18
-> 15 0 7 0 topology 4 19
-> 16 0 7 0 topology 24 19
-> 15 0 7 0 topology 2 20
-> 16 0 7 0 topology 24 20
-> 15 0 6 0 topology 11 21
-> 16 0 6 0 topology 15 21
-> 15 0 7 0 topology 1 22
-> 16 0 7 0 topology 15 22
-> 15 0 6 0 topology 12 23
-> 16 0 6 0 topology 17 23
-> 15 0 6 0 topology 9 24
-> 16 0 6 0 topology 17 24
-> 15 0 6 0 topology 22 25
-> 16 0 6 0 topology 25 25
-> 15 0 6 0 topology 12 26
-> 16 0 6 0 topology 25 26
-> 15 0 6 0 topology 25 27
-> 16 0 6 0 topology 26 27
-> 15 0 6 0 topology 26 28
-> 16 0 6 0 topology 27 28
-> 15 0 6 0 topology 14 29
-> 16 0 6 0 topology 8 29
-> 15 0 6 0 topology 13 30
-> 16 0 6 0 topology 8 30
-> 15 0 6 0 topology 11 31
-> 16 0 6 0 topology 8 31
-> 15 0 6 0 topology 8 32
-> 16 0 6 0 topology 10 32
-> 15 0 6 0 topology 30 33
-> 16 0 6 0 topology 28 33
-> 15 0 7 0 topology 3 34
-> 16 0 7 0 topology 28 34
-> 15 0 6 0 topology 28 35
-> 16 0 6 0 topology 29 35
-> 15 0 7 0 topology 3 36
-> 16 0 7 0 topology 30 36
-> 15 0 6 0 topology 14 37
-> 16 0 6 0 topology 13 37
-> 15 0 6 0 topology 29 38
-> 16 0 6 0 topology 11 38
-> 15 0 7 0 topology 1 39
-> 16 0 7 0 topology 11 39
-> 15 0 8 0 topology 24 40
-> 16 0 8 0 topology 7 40
-> 15 0 8 0 topology 10 41
-> 16 0 8 0 topology 5 41
-> 15 0 8 0 topology 13 42
-> 16 0 8 0 topology 3 42
-> 15 0 8 0 topology 17 43
-> 16 0 8 0 topology 4 43
-> 15 0 8 0 topology 18 44
-> 16 0 8 0 topology 6 44
-> 15 0 8 0 topology 11 45
-> 16 0 8 0 topology 2 45
+> 8 0.000000 2 1 98095000.000000
+> 8 0.000000 2 2 76296000.000000
+> 8 0.000000 2 3 76296000.000000
+> 8 0.000000 2 4 48492000.000000
+> 8 0.000000 2 5 48492000.000000
+> 8 0.000000 2 6 137333000.000000
+> 8 0.000000 2 7 98095000.000000
+> 8 0.000000 4 8 41279125.000000
+> 8 0.000000 5 8 0.000060
+> 8 0.000000 4 9 34285625.000000
+> 8 0.000000 5 9 0.000514
+> 8 0.000000 4 10 11618875.000000
+> 8 0.000000 5 10 0.000190
+> 8 0.000000 4 11 7209750.000000
+> 8 0.000000 5 11 0.001462
+> 8 0.000000 4 12 118682500.000000
+> 8 0.000000 5 12 0.000137
+> 8 0.000000 4 13 8158000.000000
+> 8 0.000000 5 13 0.000271
+> 8 0.000000 4 14 34285625.000000
+> 8 0.000000 5 14 0.000514
+> 8 0.000000 4 15 10099625.000000
+> 8 0.000000 5 15 0.000480
+> 8 0.000000 4 16 41279125.000000
+> 8 0.000000 5 16 0.000060
+> 8 0.000000 4 17 27946250.000000
+> 8 0.000000 5 17 0.000278
+> 8 0.000000 4 18 2583375.000000
+> 8 0.000000 5 18 0.000410
+> 8 0.000000 4 19 34285625.000000
+> 8 0.000000 5 19 0.000514
+> 8 0.000000 4 20 118682500.000000
+> 8 0.000000 5 20 0.000137
+> 8 0.000000 4 21 34285625.000000
+> 8 0.000000 5 21 0.000514
+> 8 0.000000 4 22 118682500.000000
+> 8 0.000000 5 22 0.000137
+> 8 0.000000 4 23 10314625.000000
+> 8 0.000000 5 23 0.006933
+> 8 0.000000 4 24 10314625.000000
+> 8 0.000000 5 24 0.006933
+> 8 0.000000 4 25 15376875.000000
+> 8 0.000000 5 25 0.035083
+> 8 0.000000 4 26 21414750.000000
+> 8 0.000000 5 26 0.029589
+> 8 0.000000 4 27 11845375.000000
+> 8 0.000000 5 27 0.000371
+> 8 0.000000 4 28 27946250.000000
+> 8 0.000000 5 28 0.000278
+> 8 0.000000 4 29 8427250.000000
+> 8 0.000000 5 29 0.000156
+> 8 0.000000 4 30 15376875.000000
+> 8 0.000000 5 30 0.035083
+> 8 0.000000 4 31 498000000.000000
+> 8 0.000000 5 31 0.000015
+> 15 0.000000 6 0 topology 12 0
+> 16 0.000000 6 0 topology 16 0
+> 15 0.000000 6 0 topology 9 1
+> 16 0.000000 6 0 topology 16 1
+> 15 0.000000 6 0 topology 16 2
+> 16 0.000000 6 0 topology 14 2
+> 15 0.000000 6 0 topology 21 3
+> 16 0.000000 6 0 topology 19 3
+> 15 0.000000 6 0 topology 8 4
+> 16 0.000000 6 0 topology 19 4
+> 15 0.000000 6 0 topology 19 5
+> 16 0.000000 6 0 topology 20 5
+> 15 0.000000 6 0 topology 8 6
+> 16 0.000000 6 0 topology 20 6
+> 15 0.000000 6 0 topology 27 7
+> 16 0.000000 6 0 topology 18 7
+> 15 0.000000 7 0 topology 5 8
+> 16 0.000000 7 0 topology 18 8
+> 15 0.000000 7 0 topology 4 9
+> 16 0.000000 7 0 topology 18 9
+> 15 0.000000 7 0 topology 2 10
+> 16 0.000000 7 0 topology 18 10
+> 15 0.000000 6 0 topology 16 11
+> 16 0.000000 6 0 topology 21 11
+> 15 0.000000 6 0 topology 21 12
+> 16 0.000000 6 0 topology 22 12
+> 15 0.000000 6 0 topology 9 13
+> 16 0.000000 6 0 topology 12 13
+> 15 0.000000 6 0 topology 15 14
+> 16 0.000000 6 0 topology 9 14
+> 15 0.000000 7 0 topology 1 15
+> 16 0.000000 7 0 topology 9 15
+> 15 0.000000 6 0 topology 20 16
+> 16 0.000000 6 0 topology 23 16
+> 15 0.000000 6 0 topology 23 17
+> 16 0.000000 6 0 topology 24 17
+> 15 0.000000 7 0 topology 5 18
+> 16 0.000000 7 0 topology 24 18
+> 15 0.000000 7 0 topology 4 19
+> 16 0.000000 7 0 topology 24 19
+> 15 0.000000 7 0 topology 2 20
+> 16 0.000000 7 0 topology 24 20
+> 15 0.000000 6 0 topology 11 21
+> 16 0.000000 6 0 topology 15 21
+> 15 0.000000 7 0 topology 1 22
+> 16 0.000000 7 0 topology 15 22
+> 15 0.000000 6 0 topology 12 23
+> 16 0.000000 6 0 topology 17 23
+> 15 0.000000 6 0 topology 9 24
+> 16 0.000000 6 0 topology 17 24
+> 15 0.000000 6 0 topology 22 25
+> 16 0.000000 6 0 topology 25 25
+> 15 0.000000 6 0 topology 12 26
+> 16 0.000000 6 0 topology 25 26
+> 15 0.000000 6 0 topology 25 27
+> 16 0.000000 6 0 topology 26 27
+> 15 0.000000 6 0 topology 26 28
+> 16 0.000000 6 0 topology 27 28
+> 15 0.000000 6 0 topology 14 29
+> 16 0.000000 6 0 topology 8 29
+> 15 0.000000 6 0 topology 13 30
+> 16 0.000000 6 0 topology 8 30
+> 15 0.000000 6 0 topology 11 31
+> 16 0.000000 6 0 topology 8 31
+> 15 0.000000 6 0 topology 8 32
+> 16 0.000000 6 0 topology 10 32
+> 15 0.000000 6 0 topology 30 33
+> 16 0.000000 6 0 topology 28 33
+> 15 0.000000 7 0 topology 3 34
+> 16 0.000000 7 0 topology 28 34
+> 15 0.000000 6 0 topology 28 35
+> 16 0.000000 6 0 topology 29 35
+> 15 0.000000 7 0 topology 3 36
+> 16 0.000000 7 0 topology 30 36
+> 15 0.000000 6 0 topology 14 37
+> 16 0.000000 6 0 topology 13 37
+> 15 0.000000 6 0 topology 29 38
+> 16 0.000000 6 0 topology 11 38
+> 15 0.000000 7 0 topology 1 39
+> 16 0.000000 7 0 topology 11 39
+> 15 0.000000 8 0 topology 24 40
+> 16 0.000000 8 0 topology 7 40
+> 15 0.000000 8 0 topology 10 41
+> 16 0.000000 8 0 topology 5 41
+> 15 0.000000 8 0 topology 13 42
+> 16 0.000000 8 0 topology 3 42
+> 15 0.000000 8 0 topology 17 43
+> 16 0.000000 8 0 topology 4 43
+> 15 0.000000 8 0 topology 18 44
+> 16 0.000000 8 0 topology 6 44
+> 15 0.000000 8 0 topology 11 45
+> 16 0.000000 8 0 topology 2 45
 > 1 9 1 pmigration_order "0.800026 0.545312 0.857926"
 > 1 10 3 bmigration_order "0.800026 0.545312 0.857926"
 > 7 18.155073 3 16
@@ -1934,7 +1934,7 @@ $ tail -n +3 simgrid.trace
 > 7 18.155073 1 1
 > 7 18.155073 3 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/uncategorized:yes ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 
@@ -2048,193 +2048,193 @@ $ tail -n +3 simgrid.trace
 > %       Value string
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
+> 6 0.000000 1 1 0 "Tremblay"
 > 1 2 1 power "1 1 1"
 > 1 3 1 power_used "0.5 0.5 0.5"
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 6 0 6 1 0 "Jacquelin"
-> 6 0 7 1 0 "Boivin"
+> 6 0.000000 2 1 0 "Jupiter"
+> 6 0.000000 3 1 0 "Fafard"
+> 6 0.000000 4 1 0 "Ginette"
+> 6 0.000000 5 1 0 "Bourassa"
+> 6 0.000000 6 1 0 "Jacquelin"
+> 6 0.000000 7 1 0 "Boivin"
 > 0 4 0 LINK
-> 6 0 8 4 0 "6"
+> 6 0.000000 8 4 0 "6"
 > 1 5 4 bandwidth "1 1 1"
 > 1 6 4 latency "1 1 1"
 > 1 7 4 bandwidth_used "0.5 0.5 0.5"
-> 6 0 9 4 0 "3"
-> 6 0 10 4 0 "7"
-> 6 0 11 4 0 "9"
-> 6 0 12 4 0 "2"
-> 6 0 13 4 0 "8"
-> 6 0 14 4 0 "1"
-> 6 0 15 4 0 "4"
-> 6 0 16 4 0 "0"
-> 6 0 17 4 0 "5"
-> 6 0 18 4 0 "145"
-> 6 0 19 4 0 "10"
-> 6 0 20 4 0 "11"
-> 6 0 21 4 0 "16"
-> 6 0 22 4 0 "17"
-> 6 0 23 4 0 "44"
-> 6 0 24 4 0 "47"
-> 6 0 25 4 0 "54"
-> 6 0 26 4 0 "56"
-> 6 0 27 4 0 "59"
-> 6 0 28 4 0 "78"
-> 6 0 29 4 0 "79"
-> 6 0 30 4 0 "80"
-> 6 0 31 4 0 "loopback"
+> 6 0.000000 9 4 0 "3"
+> 6 0.000000 10 4 0 "7"
+> 6 0.000000 11 4 0 "9"
+> 6 0.000000 12 4 0 "2"
+> 6 0.000000 13 4 0 "8"
+> 6 0.000000 14 4 0 "1"
+> 6 0.000000 15 4 0 "4"
+> 6 0.000000 16 4 0 "0"
+> 6 0.000000 17 4 0 "5"
+> 6 0.000000 18 4 0 "145"
+> 6 0.000000 19 4 0 "10"
+> 6 0.000000 20 4 0 "11"
+> 6 0.000000 21 4 0 "16"
+> 6 0.000000 22 4 0 "17"
+> 6 0.000000 23 4 0 "44"
+> 6 0.000000 24 4 0 "47"
+> 6 0.000000 25 4 0 "54"
+> 6 0.000000 26 4 0 "56"
+> 6 0.000000 27 4 0 "59"
+> 6 0.000000 28 4 0 "78"
+> 6 0.000000 29 4 0 "79"
+> 6 0.000000 30 4 0 "80"
+> 6 0.000000 31 4 0 "loopback"
 > 4 8 0 4 4 0-LINK4-LINK4
 > 4 9 0 1 4 0-HOST1-LINK4
 > 4 10 0 4 1 0-LINK4-HOST1
-> 8 0 2 1 98095000.000000
-> 8 0 2 2 76296000.000000
-> 8 0 2 3 76296000.000000
-> 8 0 2 4 48492000.000000
-> 8 0 2 5 48492000.000000
-> 8 0 2 6 137333000.000000
-> 8 0 2 7 98095000.000000
-> 8 0 5 8 41279125.000000
-> 8 0 6 8 0.000060
-> 8 0 5 9 34285625.000000
-> 8 0 6 9 0.000514
-> 8 0 5 10 11618875.000000
-> 8 0 6 10 0.000190
-> 8 0 5 11 7209750.000000
-> 8 0 6 11 0.001462
-> 8 0 5 12 118682500.000000
-> 8 0 6 12 0.000137
-> 8 0 5 13 8158000.000000
-> 8 0 6 13 0.000271
-> 8 0 5 14 34285625.000000
-> 8 0 6 14 0.000514
-> 8 0 5 15 10099625.000000
-> 8 0 6 15 0.000480
-> 8 0 5 16 41279125.000000
-> 8 0 6 16 0.000060
-> 8 0 5 17 27946250.000000
-> 8 0 6 17 0.000278
-> 8 0 5 18 2583375.000000
-> 8 0 6 18 0.000410
-> 8 0 5 19 34285625.000000
-> 8 0 6 19 0.000514
-> 8 0 5 20 118682500.000000
-> 8 0 6 20 0.000137
-> 8 0 5 21 34285625.000000
-> 8 0 6 21 0.000514
-> 8 0 5 22 118682500.000000
-> 8 0 6 22 0.000137
-> 8 0 5 23 10314625.000000
-> 8 0 6 23 0.006933
-> 8 0 5 24 10314625.000000
-> 8 0 6 24 0.006933
-> 8 0 5 25 15376875.000000
-> 8 0 6 25 0.035083
-> 8 0 5 26 21414750.000000
-> 8 0 6 26 0.029589
-> 8 0 5 27 11845375.000000
-> 8 0 6 27 0.000371
-> 8 0 5 28 27946250.000000
-> 8 0 6 28 0.000278
-> 8 0 5 29 8427250.000000
-> 8 0 6 29 0.000156
-> 8 0 5 30 15376875.000000
-> 8 0 6 30 0.035083
-> 8 0 5 31 498000000.000000
-> 8 0 6 31 0.000015
-> 15 0 8 0 topology 12 0
-> 16 0 8 0 topology 16 0
-> 15 0 8 0 topology 9 1
-> 16 0 8 0 topology 16 1
-> 15 0 8 0 topology 16 2
-> 16 0 8 0 topology 14 2
-> 15 0 8 0 topology 21 3
-> 16 0 8 0 topology 19 3
-> 15 0 8 0 topology 8 4
-> 16 0 8 0 topology 19 4
-> 15 0 8 0 topology 19 5
-> 16 0 8 0 topology 20 5
-> 15 0 8 0 topology 8 6
-> 16 0 8 0 topology 20 6
-> 15 0 8 0 topology 27 7
-> 16 0 8 0 topology 18 7
-> 15 0 9 0 topology 5 8
-> 16 0 9 0 topology 18 8
-> 15 0 9 0 topology 4 9
-> 16 0 9 0 topology 18 9
-> 15 0 9 0 topology 2 10
-> 16 0 9 0 topology 18 10
-> 15 0 8 0 topology 16 11
-> 16 0 8 0 topology 21 11
-> 15 0 8 0 topology 21 12
-> 16 0 8 0 topology 22 12
-> 15 0 8 0 topology 9 13
-> 16 0 8 0 topology 12 13
-> 15 0 8 0 topology 15 14
-> 16 0 8 0 topology 9 14
-> 15 0 9 0 topology 1 15
-> 16 0 9 0 topology 9 15
-> 15 0 8 0 topology 20 16
-> 16 0 8 0 topology 23 16
-> 15 0 8 0 topology 23 17
-> 16 0 8 0 topology 24 17
-> 15 0 9 0 topology 5 18
-> 16 0 9 0 topology 24 18
-> 15 0 9 0 topology 4 19
-> 16 0 9 0 topology 24 19
-> 15 0 9 0 topology 2 20
-> 16 0 9 0 topology 24 20
-> 15 0 8 0 topology 11 21
-> 16 0 8 0 topology 15 21
-> 15 0 9 0 topology 1 22
-> 16 0 9 0 topology 15 22
-> 15 0 8 0 topology 12 23
-> 16 0 8 0 topology 17 23
-> 15 0 8 0 topology 9 24
-> 16 0 8 0 topology 17 24
-> 15 0 8 0 topology 22 25
-> 16 0 8 0 topology 25 25
-> 15 0 8 0 topology 12 26
-> 16 0 8 0 topology 25 26
-> 15 0 8 0 topology 25 27
-> 16 0 8 0 topology 26 27
-> 15 0 8 0 topology 26 28
-> 16 0 8 0 topology 27 28
-> 15 0 8 0 topology 14 29
-> 16 0 8 0 topology 8 29
-> 15 0 8 0 topology 13 30
-> 16 0 8 0 topology 8 30
-> 15 0 8 0 topology 11 31
-> 16 0 8 0 topology 8 31
-> 15 0 8 0 topology 8 32
-> 16 0 8 0 topology 10 32
-> 15 0 8 0 topology 30 33
-> 16 0 8 0 topology 28 33
-> 15 0 9 0 topology 3 34
-> 16 0 9 0 topology 28 34
-> 15 0 8 0 topology 28 35
-> 16 0 8 0 topology 29 35
-> 15 0 9 0 topology 3 36
-> 16 0 9 0 topology 30 36
-> 15 0 8 0 topology 14 37
-> 16 0 8 0 topology 13 37
-> 15 0 8 0 topology 29 38
-> 16 0 8 0 topology 11 38
-> 15 0 9 0 topology 1 39
-> 16 0 9 0 topology 11 39
-> 15 0 10 0 topology 24 40
-> 16 0 10 0 topology 7 40
-> 15 0 10 0 topology 10 41
-> 16 0 10 0 topology 5 41
-> 15 0 10 0 topology 13 42
-> 16 0 10 0 topology 3 42
-> 15 0 10 0 topology 17 43
-> 16 0 10 0 topology 4 43
-> 15 0 10 0 topology 18 44
-> 16 0 10 0 topology 6 44
-> 15 0 10 0 topology 11 45
-> 16 0 10 0 topology 2 45
+> 8 0.000000 2 1 98095000.000000
+> 8 0.000000 2 2 76296000.000000
+> 8 0.000000 2 3 76296000.000000
+> 8 0.000000 2 4 48492000.000000
+> 8 0.000000 2 5 48492000.000000
+> 8 0.000000 2 6 137333000.000000
+> 8 0.000000 2 7 98095000.000000
+> 8 0.000000 5 8 41279125.000000
+> 8 0.000000 6 8 0.000060
+> 8 0.000000 5 9 34285625.000000
+> 8 0.000000 6 9 0.000514
+> 8 0.000000 5 10 11618875.000000
+> 8 0.000000 6 10 0.000190
+> 8 0.000000 5 11 7209750.000000
+> 8 0.000000 6 11 0.001462
+> 8 0.000000 5 12 118682500.000000
+> 8 0.000000 6 12 0.000137
+> 8 0.000000 5 13 8158000.000000
+> 8 0.000000 6 13 0.000271
+> 8 0.000000 5 14 34285625.000000
+> 8 0.000000 6 14 0.000514
+> 8 0.000000 5 15 10099625.000000
+> 8 0.000000 6 15 0.000480
+> 8 0.000000 5 16 41279125.000000
+> 8 0.000000 6 16 0.000060
+> 8 0.000000 5 17 27946250.000000
+> 8 0.000000 6 17 0.000278
+> 8 0.000000 5 18 2583375.000000
+> 8 0.000000 6 18 0.000410
+> 8 0.000000 5 19 34285625.000000
+> 8 0.000000 6 19 0.000514
+> 8 0.000000 5 20 118682500.000000
+> 8 0.000000 6 20 0.000137
+> 8 0.000000 5 21 34285625.000000
+> 8 0.000000 6 21 0.000514
+> 8 0.000000 5 22 118682500.000000
+> 8 0.000000 6 22 0.000137
+> 8 0.000000 5 23 10314625.000000
+> 8 0.000000 6 23 0.006933
+> 8 0.000000 5 24 10314625.000000
+> 8 0.000000 6 24 0.006933
+> 8 0.000000 5 25 15376875.000000
+> 8 0.000000 6 25 0.035083
+> 8 0.000000 5 26 21414750.000000
+> 8 0.000000 6 26 0.029589
+> 8 0.000000 5 27 11845375.000000
+> 8 0.000000 6 27 0.000371
+> 8 0.000000 5 28 27946250.000000
+> 8 0.000000 6 28 0.000278
+> 8 0.000000 5 29 8427250.000000
+> 8 0.000000 6 29 0.000156
+> 8 0.000000 5 30 15376875.000000
+> 8 0.000000 6 30 0.035083
+> 8 0.000000 5 31 498000000.000000
+> 8 0.000000 6 31 0.000015
+> 15 0.000000 8 0 topology 12 0
+> 16 0.000000 8 0 topology 16 0
+> 15 0.000000 8 0 topology 9 1
+> 16 0.000000 8 0 topology 16 1
+> 15 0.000000 8 0 topology 16 2
+> 16 0.000000 8 0 topology 14 2
+> 15 0.000000 8 0 topology 21 3
+> 16 0.000000 8 0 topology 19 3
+> 15 0.000000 8 0 topology 8 4
+> 16 0.000000 8 0 topology 19 4
+> 15 0.000000 8 0 topology 19 5
+> 16 0.000000 8 0 topology 20 5
+> 15 0.000000 8 0 topology 8 6
+> 16 0.000000 8 0 topology 20 6
+> 15 0.000000 8 0 topology 27 7
+> 16 0.000000 8 0 topology 18 7
+> 15 0.000000 9 0 topology 5 8
+> 16 0.000000 9 0 topology 18 8
+> 15 0.000000 9 0 topology 4 9
+> 16 0.000000 9 0 topology 18 9
+> 15 0.000000 9 0 topology 2 10
+> 16 0.000000 9 0 topology 18 10
+> 15 0.000000 8 0 topology 16 11
+> 16 0.000000 8 0 topology 21 11
+> 15 0.000000 8 0 topology 21 12
+> 16 0.000000 8 0 topology 22 12
+> 15 0.000000 8 0 topology 9 13
+> 16 0.000000 8 0 topology 12 13
+> 15 0.000000 8 0 topology 15 14
+> 16 0.000000 8 0 topology 9 14
+> 15 0.000000 9 0 topology 1 15
+> 16 0.000000 9 0 topology 9 15
+> 15 0.000000 8 0 topology 20 16
+> 16 0.000000 8 0 topology 23 16
+> 15 0.000000 8 0 topology 23 17
+> 16 0.000000 8 0 topology 24 17
+> 15 0.000000 9 0 topology 5 18
+> 16 0.000000 9 0 topology 24 18
+> 15 0.000000 9 0 topology 4 19
+> 16 0.000000 9 0 topology 24 19
+> 15 0.000000 9 0 topology 2 20
+> 16 0.000000 9 0 topology 24 20
+> 15 0.000000 8 0 topology 11 21
+> 16 0.000000 8 0 topology 15 21
+> 15 0.000000 9 0 topology 1 22
+> 16 0.000000 9 0 topology 15 22
+> 15 0.000000 8 0 topology 12 23
+> 16 0.000000 8 0 topology 17 23
+> 15 0.000000 8 0 topology 9 24
+> 16 0.000000 8 0 topology 17 24
+> 15 0.000000 8 0 topology 22 25
+> 16 0.000000 8 0 topology 25 25
+> 15 0.000000 8 0 topology 12 26
+> 16 0.000000 8 0 topology 25 26
+> 15 0.000000 8 0 topology 25 27
+> 16 0.000000 8 0 topology 26 27
+> 15 0.000000 8 0 topology 26 28
+> 16 0.000000 8 0 topology 27 28
+> 15 0.000000 8 0 topology 14 29
+> 16 0.000000 8 0 topology 8 29
+> 15 0.000000 8 0 topology 13 30
+> 16 0.000000 8 0 topology 8 30
+> 15 0.000000 8 0 topology 11 31
+> 16 0.000000 8 0 topology 8 31
+> 15 0.000000 8 0 topology 8 32
+> 16 0.000000 8 0 topology 10 32
+> 15 0.000000 8 0 topology 30 33
+> 16 0.000000 8 0 topology 28 33
+> 15 0.000000 9 0 topology 3 34
+> 16 0.000000 9 0 topology 28 34
+> 15 0.000000 8 0 topology 28 35
+> 16 0.000000 8 0 topology 29 35
+> 15 0.000000 9 0 topology 3 36
+> 16 0.000000 9 0 topology 30 36
+> 15 0.000000 8 0 topology 14 37
+> 16 0.000000 8 0 topology 13 37
+> 15 0.000000 8 0 topology 29 38
+> 16 0.000000 8 0 topology 11 38
+> 15 0.000000 9 0 topology 1 39
+> 16 0.000000 9 0 topology 11 39
+> 15 0.000000 10 0 topology 24 40
+> 16 0.000000 10 0 topology 7 40
+> 15 0.000000 10 0 topology 10 41
+> 16 0.000000 10 0 topology 5 41
+> 15 0.000000 10 0 topology 13 42
+> 16 0.000000 10 0 topology 3 42
+> 15 0.000000 10 0 topology 17 43
+> 16 0.000000 10 0 topology 4 43
+> 15 0.000000 10 0 topology 18 44
+> 16 0.000000 10 0 topology 6 44
+> 15 0.000000 10 0 topology 11 45
+> 16 0.000000 10 0 topology 2 45
 > 8 2.025708 7 15 0.000000
 > 9 2.025708 7 15 7536438.095238
 > 10 2.025708 7 15 7536438.095238
@@ -2414,7 +2414,7 @@ $ tail -n +3 simgrid.trace
 > 7 18.155073 1 1
 > 7 18.155073 4 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes ${srcdir:=.}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes ${platfdir}/small_platform.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'
 
@@ -2528,147 +2528,147 @@ $ tail -n +3 simgrid.trace
 > %       Value string
 > %EndEventDef
 > 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
-> 0 2 1 MSG_PROCESS
-> 2 3 2 MSG_PROCESS_STATE
+> 6 0.000000 1 1 0 "Tremblay"
+> 0 2 1 ACTOR
+> 2 3 2 ACTOR_STATE
 > 5 4 3 suspend "1 0 1"
 > 5 5 3 sleep "1 1 0"
 > 5 6 3 receive "1 0 0"
 > 5 7 3 send "0 0 1"
 > 5 8 3 task_execute "0 1 1"
-> 4 9 0 2 2 MSG_PROCESS_LINK
-> 4 10 0 2 2 MSG_PROCESS_TASK_LINK
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 6 0 6 1 0 "Jacquelin"
-> 6 0 7 1 0 "Boivin"
+> 4 9 0 2 2 ACTOR_LINK
+> 4 10 0 2 2 ACTOR_TASK_LINK
+> 6 0.000000 2 1 0 "Jupiter"
+> 6 0.000000 3 1 0 "Fafard"
+> 6 0.000000 4 1 0 "Ginette"
+> 6 0.000000 5 1 0 "Bourassa"
+> 6 0.000000 6 1 0 "Jacquelin"
+> 6 0.000000 7 1 0 "Boivin"
 > 0 11 0 LINK
-> 6 0 8 11 0 "6"
-> 6 0 9 11 0 "3"
-> 6 0 10 11 0 "7"
-> 6 0 11 11 0 "9"
-> 6 0 12 11 0 "2"
-> 6 0 13 11 0 "8"
-> 6 0 14 11 0 "1"
-> 6 0 15 11 0 "4"
-> 6 0 16 11 0 "0"
-> 6 0 17 11 0 "5"
-> 6 0 18 11 0 "145"
-> 6 0 19 11 0 "10"
-> 6 0 20 11 0 "11"
-> 6 0 21 11 0 "16"
-> 6 0 22 11 0 "17"
-> 6 0 23 11 0 "44"
-> 6 0 24 11 0 "47"
-> 6 0 25 11 0 "54"
-> 6 0 26 11 0 "56"
-> 6 0 27 11 0 "59"
-> 6 0 28 11 0 "78"
-> 6 0 29 11 0 "79"
-> 6 0 30 11 0 "80"
-> 6 0 31 11 0 "loopback"
+> 6 0.000000 8 11 0 "6"
+> 6 0.000000 9 11 0 "3"
+> 6 0.000000 10 11 0 "7"
+> 6 0.000000 11 11 0 "9"
+> 6 0.000000 12 11 0 "2"
+> 6 0.000000 13 11 0 "8"
+> 6 0.000000 14 11 0 "1"
+> 6 0.000000 15 11 0 "4"
+> 6 0.000000 16 11 0 "0"
+> 6 0.000000 17 11 0 "5"
+> 6 0.000000 18 11 0 "145"
+> 6 0.000000 19 11 0 "10"
+> 6 0.000000 20 11 0 "11"
+> 6 0.000000 21 11 0 "16"
+> 6 0.000000 22 11 0 "17"
+> 6 0.000000 23 11 0 "44"
+> 6 0.000000 24 11 0 "47"
+> 6 0.000000 25 11 0 "54"
+> 6 0.000000 26 11 0 "56"
+> 6 0.000000 27 11 0 "59"
+> 6 0.000000 28 11 0 "78"
+> 6 0.000000 29 11 0 "79"
+> 6 0.000000 30 11 0 "80"
+> 6 0.000000 31 11 0 "loopback"
 > 4 12 0 11 11 0-LINK11-LINK11
 > 4 13 0 1 11 0-HOST1-LINK11
 > 4 14 0 11 1 0-LINK11-HOST1
-> 15 0 12 0 topology 12 0
-> 16 0 12 0 topology 16 0
-> 15 0 12 0 topology 9 1
-> 16 0 12 0 topology 16 1
-> 15 0 12 0 topology 16 2
-> 16 0 12 0 topology 14 2
-> 15 0 12 0 topology 21 3
-> 16 0 12 0 topology 19 3
-> 15 0 12 0 topology 8 4
-> 16 0 12 0 topology 19 4
-> 15 0 12 0 topology 19 5
-> 16 0 12 0 topology 20 5
-> 15 0 12 0 topology 8 6
-> 16 0 12 0 topology 20 6
-> 15 0 12 0 topology 27 7
-> 16 0 12 0 topology 18 7
-> 15 0 13 0 topology 5 8
-> 16 0 13 0 topology 18 8
-> 15 0 13 0 topology 4 9
-> 16 0 13 0 topology 18 9
-> 15 0 13 0 topology 2 10
-> 16 0 13 0 topology 18 10
-> 15 0 12 0 topology 16 11
-> 16 0 12 0 topology 21 11
-> 15 0 12 0 topology 21 12
-> 16 0 12 0 topology 22 12
-> 15 0 12 0 topology 9 13
-> 16 0 12 0 topology 12 13
-> 15 0 12 0 topology 15 14
-> 16 0 12 0 topology 9 14
-> 15 0 13 0 topology 1 15
-> 16 0 13 0 topology 9 15
-> 15 0 12 0 topology 20 16
-> 16 0 12 0 topology 23 16
-> 15 0 12 0 topology 23 17
-> 16 0 12 0 topology 24 17
-> 15 0 13 0 topology 5 18
-> 16 0 13 0 topology 24 18
-> 15 0 13 0 topology 4 19
-> 16 0 13 0 topology 24 19
-> 15 0 13 0 topology 2 20
-> 16 0 13 0 topology 24 20
-> 15 0 12 0 topology 11 21
-> 16 0 12 0 topology 15 21
-> 15 0 13 0 topology 1 22
-> 16 0 13 0 topology 15 22
-> 15 0 12 0 topology 12 23
-> 16 0 12 0 topology 17 23
-> 15 0 12 0 topology 9 24
-> 16 0 12 0 topology 17 24
-> 15 0 12 0 topology 22 25
-> 16 0 12 0 topology 25 25
-> 15 0 12 0 topology 12 26
-> 16 0 12 0 topology 25 26
-> 15 0 12 0 topology 25 27
-> 16 0 12 0 topology 26 27
-> 15 0 12 0 topology 26 28
-> 16 0 12 0 topology 27 28
-> 15 0 12 0 topology 14 29
-> 16 0 12 0 topology 8 29
-> 15 0 12 0 topology 13 30
-> 16 0 12 0 topology 8 30
-> 15 0 12 0 topology 11 31
-> 16 0 12 0 topology 8 31
-> 15 0 12 0 topology 8 32
-> 16 0 12 0 topology 10 32
-> 15 0 12 0 topology 30 33
-> 16 0 12 0 topology 28 33
-> 15 0 13 0 topology 3 34
-> 16 0 13 0 topology 28 34
-> 15 0 12 0 topology 28 35
-> 16 0 12 0 topology 29 35
-> 15 0 13 0 topology 3 36
-> 16 0 13 0 topology 30 36
-> 15 0 12 0 topology 14 37
-> 16 0 12 0 topology 13 37
-> 15 0 12 0 topology 29 38
-> 16 0 12 0 topology 11 38
-> 15 0 13 0 topology 1 39
-> 16 0 13 0 topology 11 39
-> 15 0 14 0 topology 24 40
-> 16 0 14 0 topology 7 40
-> 15 0 14 0 topology 10 41
-> 16 0 14 0 topology 5 41
-> 15 0 14 0 topology 13 42
-> 16 0 14 0 topology 3 42
-> 15 0 14 0 topology 17 43
-> 16 0 14 0 topology 4 43
-> 15 0 14 0 topology 18 44
-> 16 0 14 0 topology 6 44
-> 15 0 14 0 topology 11 45
-> 16 0 14 0 topology 2 45
-> 6 0 32 2 3 "emigrant-1"
-> 6 0 33 2 1 "policeman-2"
-> 12 0 3 32 5
-> 12 0 3 33 7
-> 15 0 10 0 SR 33 p0
+> 15 0.000000 12 0 topology 12 0
+> 16 0.000000 12 0 topology 16 0
+> 15 0.000000 12 0 topology 9 1
+> 16 0.000000 12 0 topology 16 1
+> 15 0.000000 12 0 topology 16 2
+> 16 0.000000 12 0 topology 14 2
+> 15 0.000000 12 0 topology 21 3
+> 16 0.000000 12 0 topology 19 3
+> 15 0.000000 12 0 topology 8 4
+> 16 0.000000 12 0 topology 19 4
+> 15 0.000000 12 0 topology 19 5
+> 16 0.000000 12 0 topology 20 5
+> 15 0.000000 12 0 topology 8 6
+> 16 0.000000 12 0 topology 20 6
+> 15 0.000000 12 0 topology 27 7
+> 16 0.000000 12 0 topology 18 7
+> 15 0.000000 13 0 topology 5 8
+> 16 0.000000 13 0 topology 18 8
+> 15 0.000000 13 0 topology 4 9
+> 16 0.000000 13 0 topology 18 9
+> 15 0.000000 13 0 topology 2 10
+> 16 0.000000 13 0 topology 18 10
+> 15 0.000000 12 0 topology 16 11
+> 16 0.000000 12 0 topology 21 11
+> 15 0.000000 12 0 topology 21 12
+> 16 0.000000 12 0 topology 22 12
+> 15 0.000000 12 0 topology 9 13
+> 16 0.000000 12 0 topology 12 13
+> 15 0.000000 12 0 topology 15 14
+> 16 0.000000 12 0 topology 9 14
+> 15 0.000000 13 0 topology 1 15
+> 16 0.000000 13 0 topology 9 15
+> 15 0.000000 12 0 topology 20 16
+> 16 0.000000 12 0 topology 23 16
+> 15 0.000000 12 0 topology 23 17
+> 16 0.000000 12 0 topology 24 17
+> 15 0.000000 13 0 topology 5 18
+> 16 0.000000 13 0 topology 24 18
+> 15 0.000000 13 0 topology 4 19
+> 16 0.000000 13 0 topology 24 19
+> 15 0.000000 13 0 topology 2 20
+> 16 0.000000 13 0 topology 24 20
+> 15 0.000000 12 0 topology 11 21
+> 16 0.000000 12 0 topology 15 21
+> 15 0.000000 13 0 topology 1 22
+> 16 0.000000 13 0 topology 15 22
+> 15 0.000000 12 0 topology 12 23
+> 16 0.000000 12 0 topology 17 23
+> 15 0.000000 12 0 topology 9 24
+> 16 0.000000 12 0 topology 17 24
+> 15 0.000000 12 0 topology 22 25
+> 16 0.000000 12 0 topology 25 25
+> 15 0.000000 12 0 topology 12 26
+> 16 0.000000 12 0 topology 25 26
+> 15 0.000000 12 0 topology 25 27
+> 16 0.000000 12 0 topology 26 27
+> 15 0.000000 12 0 topology 26 28
+> 16 0.000000 12 0 topology 27 28
+> 15 0.000000 12 0 topology 14 29
+> 16 0.000000 12 0 topology 8 29
+> 15 0.000000 12 0 topology 13 30
+> 16 0.000000 12 0 topology 8 30
+> 15 0.000000 12 0 topology 11 31
+> 16 0.000000 12 0 topology 8 31
+> 15 0.000000 12 0 topology 8 32
+> 16 0.000000 12 0 topology 10 32
+> 15 0.000000 12 0 topology 30 33
+> 16 0.000000 12 0 topology 28 33
+> 15 0.000000 13 0 topology 3 34
+> 16 0.000000 13 0 topology 28 34
+> 15 0.000000 12 0 topology 28 35
+> 16 0.000000 12 0 topology 29 35
+> 15 0.000000 13 0 topology 3 36
+> 16 0.000000 13 0 topology 30 36
+> 15 0.000000 12 0 topology 14 37
+> 16 0.000000 12 0 topology 13 37
+> 15 0.000000 12 0 topology 29 38
+> 16 0.000000 12 0 topology 11 38
+> 15 0.000000 13 0 topology 1 39
+> 16 0.000000 13 0 topology 11 39
+> 15 0.000000 14 0 topology 24 40
+> 16 0.000000 14 0 topology 7 40
+> 15 0.000000 14 0 topology 10 41
+> 16 0.000000 14 0 topology 5 41
+> 15 0.000000 14 0 topology 13 42
+> 16 0.000000 14 0 topology 3 42
+> 15 0.000000 14 0 topology 17 43
+> 16 0.000000 14 0 topology 4 43
+> 15 0.000000 14 0 topology 18 44
+> 16 0.000000 14 0 topology 6 44
+> 15 0.000000 14 0 topology 11 45
+> 16 0.000000 14 0 topology 2 45
+> 6 0.000000 32 2 3 "emigrant-1"
+> 6 0.000000 33 2 1 "policeman-2"
+> 12 0.000000 3 32 5
+> 12 0.000000 3 33 7
+> 15 0.000000 10 0 SR 33 p0
 > 13 2.000000 3 32
 > 12 2.000000 3 32 6
 > 13 2.025708 3 33