From 83ab92262519600b52ea187de3ce0ed0d70c0648 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 22 Jan 2016 11:51:18 +0100 Subject: [PATCH] revalidate tesh files when maestro is given a process name in the logs --- examples/java/async/async.tesh | 4 +- examples/java/cloud/cloud.tesh | 10 +- examples/java/masterslave/masterslave.tesh | 4 +- examples/java/migration/migration.tesh | 4 +- examples/java/priority/priority.tesh | 4 +- examples/java/suspend/suspend.tesh | 4 +- examples/msg/actions/actions.tesh | 12 +- examples/msg/chainsend/chainsend.tesh | 2 +- examples/msg/chord/chord.tesh | 14 +- examples/msg/chord/chord_crosstraffic.tesh | 10 +- .../consumption/energy_consumption.tesh | 9 +- examples/msg/energy/onoff/onoff.tesh | 6 +- examples/msg/energy/pstate/pstate.tesh | 5 +- examples/msg/energy/vm/energy_vm.tesh | 12 +- examples/msg/exception/exception.tesh | 4 +- examples/msg/icomms/peer.tesh | 10 +- examples/msg/io/io.tesh | 8 +- examples/msg/io/storage.tesh | 2 +- examples/msg/kademlia/kademlia.tesh | 4 +- examples/msg/masterslave/masterslave.tesh | 4 +- .../msg/masterslave/masterslave_bypass.tesh | 4 +- .../msg/masterslave/masterslave_cpu_ti.tesh | 22 ++-- .../masterslave_cpu_ti_crosstraffic.tesh | 22 ++-- .../masterslave/masterslave_crosstraffic.tesh | 2 +- .../msg/masterslave/masterslave_failure.tesh | 8 +- .../masterslave_failure_crosstraffic.tesh | 8 +- .../masterslave/masterslave_forwarder.tesh | 4 +- .../masterslave_forwarder_crosstraffic.tesh | 2 +- .../msg/masterslave/masterslave_mailbox.tesh | 4 +- .../masterslave_mailbox_crosstraffic.tesh | 2 +- examples/msg/mc/bugged1.tesh | 36 +++--- examples/msg/mc/bugged1_liveness.tesh | 62 ++++----- examples/msg/mc/bugged1_liveness_sparse.tesh | 62 ++++----- examples/msg/mc/bugged1_liveness_visited.tesh | 120 +++++++++--------- .../mc/bugged1_liveness_visited_sparse.tesh | 120 +++++++++--------- examples/msg/mc/bugged2.tesh | 30 ++--- examples/msg/migration/migration.tesh | 2 +- examples/msg/parallel_task/parallel_task.tesh | 8 +- examples/msg/pastry/pastry_crosstraffic.tesh | 10 +- examples/msg/priority/priority.tesh | 2 +- examples/msg/properties/msg_prop.tesh | 16 +-- examples/msg/sendrecv/sendrecv_CLM03.tesh | 8 +- examples/msg/sendrecv/sendrecv_Reno.tesh | 10 +- examples/msg/sendrecv/sendrecv_Vegas.tesh | 10 +- .../msg/start_kill_time/start_kill_time.tesh | 8 +- examples/msg/suspend/suspend.tesh | 2 +- examples/msg/token_ring/token_ring.tesh | 14 +- examples/scala/masterslave/masterslave.tesh | 4 +- .../java/sleep_host_off/sleep_host_off.tesh | 4 +- teshsuite/lua/lua_platforms.tesh | 4 +- teshsuite/mc/replay/random_bug.tesh | 22 ++-- teshsuite/mc/replay/random_bug_replay.tesh | 2 +- teshsuite/msg/storage/storage_basic.tesh | 4 +- teshsuite/msg/trace/trace.tesh | 90 ++++++------- teshsuite/simdag/basic/basic1.tesh | 4 +- teshsuite/simdag/basic/basic2.tesh | 4 +- .../network/mxn/test_intra_all2all.tesh | 2 +- .../mxn/test_intra_independent_comm.tesh | 2 +- .../network/mxn/test_intra_scatter.tesh | 2 +- .../simdag/network/p2p/test_latency1.tesh | 6 +- .../simdag/network/p2p/test_latency2.tesh | 6 +- .../simdag/network/p2p/test_latency3.tesh | 6 +- .../network/p2p/test_latency_bound.tesh | 2 +- .../simdag/network/test_reinit_costs.tesh | 4 +- .../simdag/partask/test_comp_only_par.tesh | 4 +- .../simdag/partask/test_comp_only_seq.tesh | 2 +- .../simdag/platforms/basic_link_test.tesh | 28 ++-- .../simdag/platforms/basic_parsing_test.tesh | 34 ++--- .../platforms/basic_parsing_test_failing.tesh | 4 +- .../basic_parsing_test_sym_full.tesh | 10 +- .../platforms/bogus_disk_attachment.tesh | 6 +- .../platforms/bogus_missing_gateway.tesh | 12 +- .../platforms/bogus_two_hosts_asymetric.tesh | 12 +- teshsuite/simdag/platforms/flatifier.tesh | 40 +++--- teshsuite/xbt/log_usage/log_usage.tesh | 36 +++--- teshsuite/xbt/log_usage/log_usage_ndebug.tesh | 28 ++-- 76 files changed, 556 insertions(+), 558 deletions(-) diff --git a/examples/java/async/async.tesh b/examples/java/async/async.tesh index 1b4b2a7ca0..8a33bbb201 100644 --- a/examples/java/async/async.tesh +++ b/examples/java/async/async.tesh @@ -3,7 +3,7 @@ ! output sort 19 ! timeout 30 $ java -classpath ${classpath:=.} async/AsyncTest ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/async/asyncDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (10:async.Slave@Robert) Receiving on 'slave_8' > [ 0.000000] (11:async.Slave@Sirois) Receiving on 'slave_9' > [ 0.000000] (12:async.Slave@Monique) Receiving on 'slave_10' @@ -53,4 +53,4 @@ $ java -classpath ${classpath:=.} async/AsyncTest ${srcdir:=.}/../platforms/plat > [ 25.000000] (1:async.Master@Jacquelin) Goodbye now! > [ 25.851463] (2:async.Forwarder@Jackson) I'm done. See you! > [ 26.357007] (3:async.Forwarder@Casavant) I'm done. See you! -> [ 29.000728] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 29.000728] (0:maestro@) MSG_main finished; Cleaning up the simulation... diff --git a/examples/java/cloud/cloud.tesh b/examples/java/cloud/cloud.tesh index d7386cf69b..1318b2bc42 100644 --- a/examples/java/cloud/cloud.tesh +++ b/examples/java/cloud/cloud.tesh @@ -3,10 +3,10 @@ ! output sort 19 $ java -classpath ${classpath:=.} cloud/Cloud ${srcdir:=.}/../platforms/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. -> [ 0.000000] (0:@) Start2 hosts -> [ 0.000000] (0:@) Create VM(VM00)@PM(Intel) with 0 mounted disks -> [ 0.000000] (0:@) Create VM(VM01)@PM(Provost) with 0 mounted disks +> [ 0.000000] (0:maestro@) Using regular java threads. +> [ 0.000000] (0:maestro@) Start2 hosts +> [ 0.000000] (0:maestro@) Create VM(VM00)@PM(Intel) with 0 mounted disks +> [ 0.000000] (0:maestro@) Create VM(VM01)@PM(Provost) with 0 mounted disks > [ 0.000000] (1:Master@Jacquelin) create VM00 > [ 0.000000] (1:Master@Jacquelin) Put Worker WRK00 on VM00 > [ 0.000000] (1:Master@Jacquelin) create VM01 @@ -32,6 +32,6 @@ $ java -classpath ${classpath:=.} cloud/Cloud ${srcdir:=.}/../platforms/platform > [1000.000000] (5:__pr_mig_tx:VM00(Intel-Fernand)@Intel) Stage 1: Gonna send 1073741824 > [3467.577368] (1:Master@Jacquelin) Migrate VM01fromProvostto Fernand > [3467.577368] (7:__pr_mig_tx:VM01(Provost-Fernand)@Provost) Stage 1: Gonna send 1073741824 -> [5931.433875] (0:@) MSG_main finished; Cleaning up the simulation... +> [5931.433875] (0:maestro@) MSG_main finished; Cleaning up the simulation... > [5931.433875] (1:Master@Jacquelin) Let's shut down the simulation and kill everyone. > [5931.433875] (1:Master@Jacquelin) Master done. diff --git a/examples/java/masterslave/masterslave.tesh b/examples/java/masterslave/masterslave.tesh index 2ff28488b1..189988dd62 100644 --- a/examples/java/masterslave/masterslave.tesh +++ b/examples/java/masterslave/masterslave.tesh @@ -3,7 +3,7 @@ ! output sort 19 $ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process > [ 0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0' > [ 0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1' @@ -27,6 +27,6 @@ $ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/../platfo > [ 13.977355] (5:masterslave.Slave@Bousquet) Received Finalize. I'm done. See you! > [ 15.421041] (6:masterslave.Slave@Soucy) Received Finalize. I'm done. See you! > [ 16.278350] (7:masterslave.Slave@Kuenning) Received Finalize. I'm done. See you! -> [ 17.251680] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 17.251680] (0:maestro@) MSG_main finished; Cleaning up the simulation... > [ 17.251680] (1:masterslave.Master@Jacquelin) Goodbye now! > [ 17.251680] (8:masterslave.Slave@Browne) Received Finalize. I'm done. See you! diff --git a/examples/java/migration/migration.tesh b/examples/java/migration/migration.tesh index 3497f43657..8c35b9d348 100644 --- a/examples/java/migration/migration.tesh +++ b/examples/java/migration/migration.tesh @@ -3,12 +3,12 @@ ! output sort 19 $ java -classpath ${classpath:=.} migration/Migration ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/migration/migrationDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:migration.Emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener. > [ 0.000000] (1:migration.Emigrant@Boivin) Yeah, found something to do > [ 1.000000] (2:migration.Policeman@Boivin) Wait a bit before migrating the emigrant. > [ 3.000000] (1:migration.Emigrant@Boivin) Moving back to home after work -> [ 7.000000] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 7.000000] (0:maestro@) MSG_main finished; Cleaning up the simulation... > [ 7.000000] (1:migration.Emigrant@Jacquelin) I've been moved on this new host:Jacquelin > [ 7.000000] (1:migration.Emigrant@Jacquelin) Uh, nothing to do here. Stopping now > [ 7.000000] (2:migration.Policeman@Boivin) I moved the emigrant diff --git a/examples/java/priority/priority.tesh b/examples/java/priority/priority.tesh index 19879a64ab..004ef19c2d 100644 --- a/examples/java/priority/priority.tesh +++ b/examples/java/priority/priority.tesh @@ -3,9 +3,9 @@ ! output sort 19 $ java -classpath ${classpath:=.} priority/Priority ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/priority/priorityDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0 > [ 0.000000] (2:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0 > [ 0.833332] (2:priority.Test@Fafard) Goodbye now! -> [ 1.111109] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 1.111109] (0:maestro@) MSG_main finished; Cleaning up the simulation... > [ 1.111109] (1:priority.Test@Fafard) Goodbye now! diff --git a/examples/java/suspend/suspend.tesh b/examples/java/suspend/suspend.tesh index 37b148b08e..7803c786f3 100644 --- a/examples/java/suspend/suspend.tesh +++ b/examples/java/suspend/suspend.tesh @@ -2,11 +2,11 @@ ! output sort 19 $ java -classpath ${classpath:=.} suspend/Suspend ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/suspend/suspendDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:suspend.DreamMaster@Jacquelin) Let's create a lazy guy. > [ 0.000000] (1:suspend.DreamMaster@Jacquelin) Let's wait a little bit... > [ 0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep. -> [ 10.000000] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 10.000000] (0:maestro@) MSG_main finished; Cleaning up the simulation... > [ 10.000000] (1:suspend.DreamMaster@Jacquelin) Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!! > [ 10.000000] (1:suspend.DreamMaster@Jacquelin) OK, goodbye now. > [ 10.000000] (2:Lazy@Jacquelin) Uuuh ? Did somebody call me ? diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh index 0817df9236..0873dae249 100644 --- a/examples/msg/actions/actions.tesh +++ b/examples/msg/actions/actions.tesh @@ -8,7 +8,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 20.703314] (2:p1@Ruby) p1 send p0 1e10 20.703314 > [ 20.703314] (1:p0@Tremblay) p0 compute 12 0.000000 > [ 32.703314] (2:p1@Ruby) p1 sleep 12 12.000000 -> [ 32.703314] (0:@) Simulation time 32.7033 +> [ 32.703314] (0:maestro@) Simulation time 32.7033 ! output sort 19 $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_allReduce.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -21,7 +21,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 12.268239] (2:p1@Ruby) p1 compute 5e8 5.097100 > [ 12.268239] (1:p0@Tremblay) p0 compute 5e8 5.097100 > [ 12.268239] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 12.268239] (0:@) Simulation time 12.2682 +> [ 12.268239] (0:maestro@) Simulation time 12.2682 ! output sort 19 $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_barrier.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -35,7 +35,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 0.063430] (3:p2@Perl) p2 compute 4E6 0.040777 > [ 0.063430] (2:p1@Ruby) p1 compute 4E6 0.040777 > [ 0.068527] (1:p0@Tremblay) p0 compute 4.5E6 0.045874 -> [ 0.068527] (0:@) Simulation time 0.0685268 +> [ 0.068527] (0:maestro@) Simulation time 0.0685268 ! output sort 19 $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_bcast.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -57,7 +57,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 13.305258] (2:p1@Ruby) p1 reduce 5e8 5e8 4.095279 > [ 13.305258] (3:p2@Perl) p2 reduce 5e8 5e8 1.037020 > [ 18.402358] (1:p0@Tremblay) p0 reduce 5e8 5e8 6.134119 -> [ 18.402358] (0:@) Simulation time 18.4024 +> [ 18.402358] (0:maestro@) Simulation time 18.4024 ! output sort 19 $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_reduce.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -70,7 +70,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 6.134119] (1:p0@Tremblay) p0 reduce 5e8 5e8 6.134119 > [ 6.134119] (3:p2@Perl) p2 compute 5e8 5.097100 > [ 11.231219] (1:p0@Tremblay) p0 compute 5e8 5.097100 -> [ 11.231219] (0:@) Simulation time 11.2312 +> [ 11.231219] (0:maestro@) Simulation time 11.2312 ! output sort 19 $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_with_isend.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -88,4 +88,4 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 12.266287] (3:p2@Perl) p2 Isend p0 1e9 0.000000 > [ 14.338375] (1:p0@Tremblay) p0 recv p2 2.072088 > [ 17.363387] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 17.363387] (0:@) Simulation time 17.3634 +> [ 17.363387] (0:maestro@) Simulation time 17.3634 diff --git a/examples/msg/chainsend/chainsend.tesh b/examples/msg/chainsend/chainsend.tesh index c2db3205d0..dd74f2227d 100644 --- a/examples/msg/chainsend/chainsend.tesh +++ b/examples/msg/chainsend/chainsend.tesh @@ -13,4 +13,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/chainsend ${srcdir:=.}/../../platforms/platform.xm > [ 873.276724] (7:peer@iRMX) ### 873.276733 16777216 bytes (Avg 0.018322 MB/s); copy finished (simulated). > [ 873.752754] (9:peer@Gatien) ### 873.752747 16777216 bytes (Avg 0.018312 MB/s); copy finished (simulated). > [ 873.752754] (8:peer@McGee) ### 873.752747 16777216 bytes (Avg 0.018312 MB/s); copy finished (simulated). -> [ 873.752754] (0:@) Total simulation time: 8.737528e+02 +> [ 873.752754] (0:maestro@) Total simulation time: 8.737528e+02 diff --git a/examples/msg/chord/chord.tesh b/examples/msg/chord/chord.tesh index 8da419cd56..ec7d079252 100644 --- a/examples/msg/chord/chord.tesh +++ b/examples/msg/chord/chord.tesh @@ -4,7 +4,7 @@ p Testing the Chord implementation with MSG ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/chord.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:node@Gatien) Joining the ring with id 48, knowing node 1 > [ 0.000000] (2:node@McGee) Joining the ring with id 42, knowing node 1 > [ 0.000000] (3:node@iRMX) Joining the ring with id 38, knowing node 1 @@ -453,13 +453,13 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../../platfor > [577.413817] (3:node@iRMX) 54 | 38 > [577.413817] (3:node@iRMX) 6 | 38 > [577.413817] (3:node@iRMX) Predecessor: 32 -> [804.364963] (0:@) Messages created: 788 -> [804.364963] (0:@) Simulated time: 804.365 +> [804.364963] (0:maestro@) Messages created: 788 +> [804.364963] (0:maestro@) Simulated time: 804.365 ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/routing_none.xml ${srcdir:=.}/chord10.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Constant' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (1:node@node-0.acme.org) My finger table: > [ 0.000000] (1:node@node-0.acme.org) Start | Succ > [ 0.000000] (1:node@node-0.acme.org) 43 | 42 @@ -2953,5 +2953,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/routing_ > [ 990.991700] (8:node@node-7.acme.org) 14199064 | 10004760 > [ 990.991700] (8:node@node-7.acme.org) 1616152 | 10004760 > [ 990.991700] (8:node@node-7.acme.org) Predecessor: 6518808 -> [1201.991400] (0:@) Messages created: 2208 -> [1201.991400] (0:@) Simulated time: 1201.99 +> [1201.991400] (0:maestro@) Messages created: 2208 +> [1201.991400] (0:maestro@) Simulated time: 1201.99 diff --git a/examples/msg/chord/chord_crosstraffic.tesh b/examples/msg/chord/chord_crosstraffic.tesh index ab33866b5e..209bb5d2aa 100644 --- a/examples/msg/chord/chord_crosstraffic.tesh +++ b/examples/msg/chord/chord_crosstraffic.tesh @@ -452,12 +452,12 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../../platfor > [577.413922] (3:node@iRMX) 54 | 38 > [577.413922] (3:node@iRMX) 6 | 38 > [577.413922] (3:node@iRMX) Predecessor: 32 -> [804.365058] (0:@) Messages created: 788 -> [804.365058] (0:@) Simulated time: 804.365 +> [804.365058] (0:maestro@) Messages created: 788 +> [804.365058] (0:maestro@) Simulated time: 804.365 ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/routing_none.xml ${srcdir:=.}/chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Constant' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (1:node@node-0.acme.org) My finger table: > [ 0.000000] (1:node@node-0.acme.org) Start | Succ > [ 0.000000] (1:node@node-0.acme.org) 43 | 42 @@ -2951,5 +2951,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/routing_ > [ 990.991700] (8:node@node-7.acme.org) 14199064 | 10004760 > [ 990.991700] (8:node@node-7.acme.org) 1616152 | 10004760 > [ 990.991700] (8:node@node-7.acme.org) Predecessor: 6518808 -> [1201.991400] (0:@) Messages created: 2208 -> [1201.991400] (0:@) Simulated time: 1201.99 +> [1201.991400] (0:maestro@) Messages created: 2208 +> [1201.991400] (0:maestro@) Simulated time: 1201.99 diff --git a/examples/msg/energy/consumption/energy_consumption.tesh b/examples/msg/energy/consumption/energy_consumption.tesh index 4f91d8dcd2..aa76c11124 100644 --- a/examples/msg/energy/consumption/energy_consumption.tesh +++ b/examples/msg/energy/consumption/energy_consumption.tesh @@ -2,7 +2,6 @@ p Testing the mechanism for computing host energy consumption -! output sort 19 $ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/consumption/deployment_consumption.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:200.0, 93.0:170.0, 90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J @@ -16,8 +15,8 @@ $ $SG_TEST_EXENV energy/consumption/energy_consumption$EXEEXT ${srcdir:=.}/../pl > [ 16.000000] (1:dvfs_test@MyHost1) Sleep for 4 seconds > [ 20.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 4.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=2310 J > [ 20.000000] (1:dvfs_test@MyHost1) Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated 2000 J so far. -> [ 30.000000] (0:@) Total simulation time: 30.00 -> [ 30.000000] (0:@) Total energy of host MyHost1: 3210.000000 Joules -> [ 30.000000] (0:@) Total energy of host MyHost2: 2100.000000 Joules -> [ 30.000000] (0:@) Total energy of host MyHost3: 3000.000000 Joules > [ 30.000000] (1:dvfs_test@MyHost1) Done sleeping (duration: 10.00 s). Current peak speed=2E+07 flop/s; Energy dissipated=3210 J +> [ 30.000000] (0:maestro@) Total simulation time: 30.00 +> [ 30.000000] (0:maestro@) Total energy of host MyHost1: 3210.000000 Joules +> [ 30.000000] (0:maestro@) Total energy of host MyHost2: 2100.000000 Joules +> [ 30.000000] (0:maestro@) Total energy of host MyHost3: 3000.000000 Joules diff --git a/examples/msg/energy/onoff/onoff.tesh b/examples/msg/energy/onoff/onoff.tesh index d9ad58a20a..a796429cb3 100644 --- a/examples/msg/energy/onoff/onoff.tesh +++ b/examples/msg/energy/onoff/onoff.tesh @@ -18,8 +18,8 @@ $ $SG_TEST_EXENV energy/onoff/onoff$EXEEXT ${srcdir:=.}/energy/onoff/platform_on > [ 26.997901] (1:onoff_test@MyHost2) Switch to virtual pstate 3, that encodes the shutting down state in the XML file of that example > [ 26.997901] (1:onoff_test@MyHost2) Actually start the host > [ 26.997901] (1:onoff_test@MyHost2) Simulate the boot up by executing one flop on that host -> [176.997893] (0:@) Total simulation time: 177.00 -> [176.997893] (0:@) Total energy of host MyHost1: 19819.768169 Joules -> [176.997893] (0:@) Total energy of host MyHost2: 17699.789313 Joules +> [176.997893] (0:maestro@) Total simulation time: 177.00 +> [176.997893] (0:maestro@) Total energy of host MyHost1: 19819.768169 Joules +> [176.997893] (0:maestro@) Total energy of host MyHost2: 17699.789313 Joules > [176.997893] (1:onoff_test@MyHost2) Switch back to previously selected pstate 0 > [176.997893] (1:onoff_test@MyHost2) Host1 is now ON again. Current peak speed=1E+08 flop/s; Energy dissipated=19820 J diff --git a/examples/msg/energy/pstate/pstate.tesh b/examples/msg/energy/pstate/pstate.tesh index 6e461c1791..33c44d168c 100644 --- a/examples/msg/energy/pstate/pstate.tesh +++ b/examples/msg/energy/pstate/pstate.tesh @@ -2,7 +2,6 @@ p Testing the DVFS-related functions -! output sort 19 $ $SG_TEST_EXENV energy/pstate/pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/pstate/deployment_pstate.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -15,9 +14,9 @@ $ $SG_TEST_EXENV energy/pstate/pstate$EXEEXT ${srcdir:=.}/../platforms/energy_pl > [ 1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 > [ 1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00 -> [ 6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00 > [ 6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 +> [ 6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00 > [ 6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 > [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 -> [ 6.000000] (0:@) Total simulation time: 6.000000e+00 +> [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 diff --git a/examples/msg/energy/vm/energy_vm.tesh b/examples/msg/energy/vm/energy_vm.tesh index 975a6ba2ea..e886b9faac 100644 --- a/examples/msg/energy/vm/energy_vm.tesh +++ b/examples/msg/energy/vm/energy_vm.tesh @@ -4,8 +4,8 @@ p Testing the mechanism for computing host energy consumption in case of VMs $ $SG_TEST_EXENV energy/vm/energy_vm$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dvfs@MyHost1) Creating and starting two VMs -> [ 0.000000] (0:@) Create VM(vm_host1)@PM(MyHost1) with 0 mounted disks -> [ 0.000000] (0:@) Create VM(vm_host3)@PM(MyHost3) with 0 mounted disks +> [ 0.000000] (0:maestro@) Create VM(vm_host1)@PM(MyHost1) with 0 mounted disks +> [ 0.000000] (0:maestro@) Create VM(vm_host3)@PM(MyHost3) with 0 mounted disks > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: one inside a VM, the other directly on the host > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: both directly on the host > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both inside a VM @@ -17,7 +17,7 @@ $ $SG_TEST_EXENV energy/vm/energy_vm$EXEEXT ${srcdir:=.}/../platforms/energy_pla > [ 6.000000] (2:p11@vm_host1) This worker is done. > [ 6.000000] (6:p31@vm_host3) This worker is done. > [ 6.000000] (7:p32@vm_host3) This worker is done. -> [ 10.000000] (0:@) Total simulation time: 10.00; All hosts must have the exact same energy consumption. -> [ 10.000000] (0:@) Total energy of host MyHost1: 1600.000000 Joules -> [ 10.000000] (0:@) Total energy of host MyHost2: 1600.000000 Joules -> [ 10.000000] (0:@) Total energy of host MyHost3: 1600.000000 Joules +> [ 10.000000] (0:maestro@) Total simulation time: 10.00; All hosts must have the exact same energy consumption. +> [ 10.000000] (0:maestro@) Total energy of host MyHost1: 1600.000000 Joules +> [ 10.000000] (0:maestro@) Total energy of host MyHost2: 1600.000000 Joules +> [ 10.000000] (0:maestro@) Total energy of host MyHost3: 1600.000000 Joules diff --git a/examples/msg/exception/exception.tesh b/examples/msg/exception/exception.tesh index b03a3f6712..ca5307a01c 100644 --- a/examples/msg/exception/exception.tesh +++ b/examples/msg/exception/exception.tesh @@ -19,7 +19,7 @@ $ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml ${sr > ** SimGrid: UNCAUGHT EXCEPTION received on exception/exception(2): category: action canceled; value: 0 > ** Canceled > ** Thrown by () on process 0 -> [ 0.000000] (0:@) Configuration change: Set 'exception/cutpath' to '1' +> [ 0.000000] (0:maestro@) Configuration change: Set 'exception/cutpath' to '1' > [ 3.000000] (2:victim@Jacquelin) Canceled > > ** In SIMIX_execution_finish() at smx_host.c @@ -33,4 +33,4 @@ $ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml ${sr > [ 6.000000] (2:victim@Jacquelin) The MSG_process_sleep caught the exception for me and returned 8) > [ 6.000000] (2:victim@Jacquelin) Let's try a last time to do something on something > [ 16.000000] (2:victim@Jacquelin) That's enough now. I quit. -> [ 16.000000] (0:@) Simulation time 16 +> [ 16.000000] (0:maestro@) Simulation time 16 diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh index 184334ea9a..bd05eccf78 100644 --- a/examples/msg/icomms/peer.tesh +++ b/examples/msg/icomms/peer.tesh @@ -24,7 +24,7 @@ $ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/de > [ 6.829130] (2:receiver@Ruby) "Task_2" done > [ 6.829130] (2:receiver@Ruby) Wait to receive a task > [ 6.900000] (1:sender@Tremblay) Goodbye now! -> [ 6.929130] (0:@) Simulation time 6.92913 +> [ 6.929130] (0:maestro@) Simulation time 6.92913 > [ 6.929130] (2:receiver@Ruby) Received "finalize" > [ 6.929130] (2:receiver@Ruby) I'm done. See you! @@ -52,7 +52,7 @@ $ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/de > [ 6.829130] (2:receiver@Ruby) "Task_2" done > [ 6.829130] (2:receiver@Ruby) Wait to receive a task > [ 6.900000] (1:sender@Tremblay) Goodbye now! -> [ 6.929130] (0:@) Simulation time 6.92913 +> [ 6.929130] (0:maestro@) Simulation time 6.92913 > [ 6.929130] (2:receiver@Ruby) Received "finalize" > [ 6.929130] (2:receiver@Ruby) I'm done. See you! @@ -79,7 +79,7 @@ $ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/de > [ 6.031485] (2:receiver@Ruby) Processing "Task_2" > [ 6.541195] (2:receiver@Ruby) "Task_2" done > [ 6.541195] (2:receiver@Ruby) Wait to receive a task -> [ 6.543146] (0:@) Simulation time 6.54315 +> [ 6.543146] (0:maestro@) Simulation time 6.54315 > [ 6.543146] (1:sender@Tremblay) Goodbye now! > [ 6.543146] (2:receiver@Ruby) Received "finalize" > [ 6.543146] (2:receiver@Ruby) I'm done. See you! @@ -108,7 +108,7 @@ $ ./peer ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/de > [ 6.031485] (2:receiver@Ruby) Processing "Task_2" > [ 6.541195] (2:receiver@Ruby) "Task_2" done > [ 6.541195] (2:receiver@Ruby) Wait to receive a task -> [ 6.543146] (0:@) Simulation time 6.54315 +> [ 6.543146] (0:maestro@) Simulation time 6.54315 > [ 6.543146] (1:sender@Tremblay) Goodbye now! > [ 6.543146] (2:receiver@Ruby) Received "finalize" > [ 6.543146] (2:receiver@Ruby) I'm done. See you! @@ -134,7 +134,7 @@ $ ./peer2 ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml ${srcdir:=.}/d > [ 11.031485] (2:receiver@Ruby) Processing "Task_2" > [ 11.541195] (2:receiver@Ruby) "Task_2" done > [ 11.541195] (2:receiver@Ruby) Wait to receive a task -> [ 11.543146] (0:@) Simulation time 11.5431 +> [ 11.543146] (0:maestro@) Simulation time 11.5431 > [ 11.543146] (1:sender@Tremblay) Goodbye now! > [ 11.543146] (2:receiver@Ruby) Received "finalize" > [ 11.543146] (2:receiver@Ruby) I'm done. See you! diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh index cfe5ef3cb9..8dda20cbfe 100644 --- a/examples/msg/io/io.tesh +++ b/examples/msg/io/io.tesh @@ -1,7 +1,7 @@ #! ./tesh $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Number of host '4' +> [ 0.000000] (0:maestro@) Number of host '4' > [ 0.000000] (2:1@alice) Open file 'c:\Windows\setupact.log' > [ 0.000000] (3:2@carl) Open file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' > [ 0.000000] (4:3@bob) Open file '/home/doc/simgrid/examples/platforms/nancy.xml' @@ -54,14 +54,14 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage/storage.xml "--lo > [ 0.008326] (3:2@carl) Have written 110000 in '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml'. Size now is: 110000 > [ 0.008326] (3:2@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 37033408 / 536870912000 > [ 0.008326] (3:2@carl) Close file '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' -> [ 0.008326] (0:@) Simulation time 0.00832645 +> [ 0.008326] (0:maestro@) Simulation time 0.00832645 $ ${bindir:=.}/io/file_unlink ${srcdir:=.}/examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Number of host '4' +> [ 0.000000] (0:maestro@) Number of host '4' > [ 0.000000] (1:0@denise) Open file '/home/doc/simgrid/examples/platforms/g5k.xml' > [ 0.000000] (1:0@denise) Unlink file '/home/doc/simgrid/examples/platforms/g5k.xml' > [ 0.000000] (1:0@denise) Open file '/home/doc/simgrid/examples/platforms/g5k.xml' > [ 0.001667] (1:0@denise) Have written 100000 on /home/doc/simgrid/examples/platforms/g5k.xml > [ 0.003333] (1:0@denise) Have written 100000 on /home/doc/simgrid/examples/platforms/g5k.xml > [ 0.003333] (1:0@denise) Close file '/home/doc/simgrid/examples/platforms/g5k.xml' -> [ 0.003333] (0:@) Simulation time 0.00333333 +> [ 0.003333] (0:maestro@) Simulation time 0.00333333 diff --git a/examples/msg/io/storage.tesh b/examples/msg/io/storage.tesh index 662489eec7..fa556488c2 100644 --- a/examples/msg/io/storage.tesh +++ b/examples/msg/io/storage.tesh @@ -106,4 +106,4 @@ $ ${bindir:=.}/io/storage$EXEEXT ${srcdir:=.}/examples/platforms/storage/storage > [ 0.006000] (1:(null)@denise) /doc/simgrid/examples/platforms/g5k.xml size: 17028 bytes > [ 0.006000] (1:(null)@denise) /include/surf/simgrid_dtd.h size: 23583 bytes > [ 0.006000] (1:(null)@denise) /bin/smpicc size: 918 bytes -> [ 0.006000] (0:@) Simulated time: 0.006 +> [ 0.006000] (0:maestro@) Simulated time: 0.006 diff --git a/examples/msg/kademlia/kademlia.tesh b/examples/msg/kademlia/kademlia.tesh index 991e80b234..2dfb2f0f02 100644 --- a/examples/msg/kademlia/kademlia.tesh +++ b/examples/msg/kademlia/kademlia.tesh @@ -17,8 +17,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/kademlia ${srcdir:=.}/../../platforms/platform.xml > [ 0.000000] (11:node@Tanguay) Hi, I'm going to join the network with id 000003ff > [ 0.000000] (12:node@Morin) Hi, I'm going to join the network with id 000007ff > [ 0.000000] (13:node@Ethernet) Hi, I'm going to join the network with id 00000fff -> [900.000000] ( 0:@) Messages created: 1277 -> [900.000000] ( 0:@) Simulated time: 900 +> [900.000000] ( 0:maestro@) Messages created: 1277 +> [900.000000] ( 0:maestro@) Simulated time: 900 > [900.000000] ( 1:node@Jacquelin) 8/8 FIND_NODE have succeeded > [900.000000] ( 2:node@Boivin) 7/7 FIND_NODE have succeeded > [900.000000] ( 3:node@Jean_Yves) 6/6 FIND_NODE have succeeded diff --git a/examples/msg/masterslave/masterslave.tesh b/examples/msg/masterslave/masterslave.tesh index eec7035e7d..bfbcb45e7b 100644 --- a/examples/msg/masterslave/masterslave.tesh +++ b/examples/msg/masterslave/masterslave.tesh @@ -4,7 +4,7 @@ p Testing a simple master/slave example application ! output sort 19 $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter" > [ 0.162005] (1:master@Tremblay) Sent @@ -119,7 +119,7 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platfo > [ 5.067164] (6:slave@Bourassa) "Task_18" done > [ 5.092603] (6:slave@Bourassa) Received "finalize" > [ 5.092603] (6:slave@Bourassa) I'm done. See you! -> [ 5.092798] (0:@) Simulation time 5.0928 +> [ 5.092798] (0:maestro@) Simulation time 5.0928 > [ 5.092798] (1:master@Tremblay) Goodbye now! > [ 5.092798] (2:slave@Tremblay) Received "finalize" > [ 5.092798] (2:slave@Tremblay) I'm done. See you! diff --git a/examples/msg/masterslave/masterslave_bypass.tesh b/examples/msg/masterslave/masterslave_bypass.tesh index f04c8c5f0e..f45b783975 100644 --- a/examples/msg/masterslave/masterslave_bypass.tesh +++ b/examples/msg/masterslave/masterslave_bypass.tesh @@ -3,7 +3,7 @@ p Testing the bypassing of the flexml parser ! output sort 19 $ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. +> [ 0.000000] (0:maestro@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [ 0.000000] (1:master@host A) Got 1 slave(s) : > [ 0.000000] (1:master@host A) host B > [ 0.000000] (1:master@host A) Got 20 task to process : @@ -129,7 +129,7 @@ $ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc "--log=root.fmt:[% > [ 53.206495] (2:slave@host B) Received "Task_19" > [ 53.206495] (2:slave@host B) Processing "Task_19" > [ 53.256495] (2:slave@host B) "Task_19" done -> [ 55.858495] (0:@) Simulation time 55.8585 +> [ 55.858495] (0:maestro@) Simulation time 55.8585 > [ 55.858495] (1:master@host A) Goodbye now! > [ 55.858495] (2:slave@host B) Received "finalize" > [ 55.858495] (2:slave@host B) I'm done. See you! diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh index c3a19d3079..bdad446dbf 100644 --- a/examples/msg/masterslave/masterslave_cpu_ti.tesh +++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh @@ -4,8 +4,8 @@ p Testing a simple master/slave example application ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml masterslave/deployment_masterslave.xml --cfg=network/crosstraffic:0 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter" > [ 0.165962] (1:master@Tremblay) Sent @@ -120,7 +120,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platf > [ 5.512455] (6:slave@Bourassa) "Task_18" done > [ 5.532791] (6:slave@Bourassa) Received "finalize" > [ 5.532791] (6:slave@Bourassa) I'm done. See you! -> [ 5.532947] (0:@) Simulation time 5.53295 +> [ 5.532947] (0:maestro@) Simulation time 5.53295 > [ 5.532947] (1:master@Tremblay) Goodbye now! > [ 5.532947] (2:slave@Tremblay) Received "finalize" > [ 5.532947] (2:slave@Tremblay) I'm done. See you! @@ -129,8 +129,8 @@ p Testing a master/slave example application with a forwarder module ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=network/crosstraffic:0 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX" > [ 4.772530] (1:master@Jacquelin) Sent @@ -271,7 +271,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml mast > [ 54.529294] (7:slave@Kuenning) I'm done. See you! > [ 55.971757] (8:slave@Browne) Received "finalize" > [ 55.971757] (8:slave@Browne) I'm done. See you! -> [ 58.132075] (0:@) Simulation time 58.1321 +> [ 58.132075] (0:maestro@) Simulation time 58.1321 > [ 58.132075] (2:forwarder@Jackson) I'm done. See you! > [ 58.132075] (9:slave@Stephen) Received "finalize" > [ 58.132075] (9:slave@Stephen) I'm done. See you! @@ -280,7 +280,7 @@ p Testing a simple master/slave example application handling failures ! output sort 19 $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=network/crosstraffic:0 --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' +> [ 0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : > [ 0.000000] (1:master@Tremblay) Jupiter > [ 0.000000] (1:master@Tremblay) Fafard @@ -365,7 +365,7 @@ $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_ > [ 73.473416] (4:slave@Ginette) I'm done. See you! > [ 73.493752] (5:slave@Bourassa) Received "finalize" > [ 73.493752] (5:slave@Bourassa) I'm done. See you! -> [ 73.493908] (0:@) Simulation time 73.4939 +> [ 73.493908] (0:maestro@) Simulation time 73.4939 > [ 73.493908] (1:master@Tremblay) Goodbye now! > [ 73.493908] (2:slave@Tremblay) Received "finalize" > [ 73.493908] (2:slave@Tremblay) I'm done. See you! @@ -374,8 +374,8 @@ p Testing the bypassing of the flexml parser ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [ 0.000000] (1:master@host A) Got 1 slave(s) : > [ 0.000000] (1:master@host A) host B > [ 0.000000] (1:master@host A) Got 20 task to process : @@ -501,7 +501,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI > [ 82.550000] (2:slave@host B) Received "Task_19" > [ 82.550000] (2:slave@host B) Processing "Task_19" > [ 82.600000] (2:slave@host B) "Task_19" done -> [ 84.680000] (0:@) Simulation time 84.68 +> [ 84.680000] (0:maestro@) Simulation time 84.68 > [ 84.680000] (1:master@host A) Goodbye now! > [ 84.680000] (2:slave@host B) Received "finalize" > [ 84.680000] (2:slave@host B) I'm done. See you! diff --git a/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh b/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh index b357b913f9..85c83f3f83 100644 --- a/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh +++ b/examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh @@ -4,7 +4,7 @@ p Testing a simple master/slave example application ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml masterslave/deployment_masterslave.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter" > [ 0.169155] (1:master@Tremblay) Sent @@ -119,7 +119,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platf > [ 5.106151] (6:slave@Bourassa) "Task_18" done > [ 5.131590] (6:slave@Bourassa) Received "finalize" > [ 5.131590] (6:slave@Bourassa) I'm done. See you! -> [ 5.131785] (0:@) Simulation time 5.13179 +> [ 5.131785] (0:maestro@) Simulation time 5.13179 > [ 5.131785] (1:master@Tremblay) Goodbye now! > [ 5.131785] (2:slave@Tremblay) Received "finalize" > [ 5.131785] (2:slave@Tremblay) I'm done. See you! @@ -129,7 +129,7 @@ p Testing a master/slave example application with a forwarder module ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX" > [ 3.222579] (1:master@Jacquelin) Sent @@ -270,7 +270,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platf > [ 40.792212] (7:slave@Kuenning) I'm done. See you! > [ 42.596677] (8:slave@Browne) Received "finalize" > [ 42.596677] (8:slave@Browne) I'm done. See you! -> [ 45.299152] (0:@) Simulation time 45.2992 +> [ 45.299152] (0:maestro@) Simulation time 45.2992 > [ 45.299152] (2:forwarder@Jackson) I'm done. See you! > [ 45.299152] (9:slave@Stephen) Received "finalize" > [ 45.299152] (9:slave@Stephen) I'm done. See you! @@ -280,7 +280,7 @@ p Testing a simple master/slave example application handling failures ! output sort 19 $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/../platforms/small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' +> [ 0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : > [ 0.000000] (1:master@Tremblay) Jupiter > [ 0.000000] (1:master@Tremblay) Fafard @@ -288,10 +288,10 @@ $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_ > [ 0.000000] (1:master@Tremblay) Bourassa > [ 0.000000] (1:master@Tremblay) Tremblay > [ 0.000000] (1:master@Tremblay) Got 20 task to process : -> [ 1.000000] (0:@) Restart processes on host: Fafard +> [ 1.000000] (0:maestro@) Restart processes on host: Fafard > [ 1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going! > [ 1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you! -> [ 2.000000] (0:@) Restart processes on host: Jupiter +> [ 2.000000] (0:maestro@) Restart processes on host: Jupiter > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going! > [ 12.082474] (1:master@Tremblay) Send completed > [ 12.082474] (4:slave@Ginette) Received "Task" @@ -368,7 +368,7 @@ $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_ > [ 50.785567] (6:slave@Jupiter) I'm done. See you! > [ 51.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going! > [ 52.774742] (5:slave@Bourassa) "Task" done -> [ 52.785567] (0:@) Simulation time 52.7856 +> [ 52.785567] (0:maestro@) Simulation time 52.7856 > [ 52.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going! > [ 52.785567] (1:master@Tremblay) Goodbye now! > [ 52.785567] (2:slave@Tremblay) "Task" done @@ -381,8 +381,8 @@ p Testing the bypassing of the flexml parser ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' -> [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [ 0.000000] (1:master@host A) Got 1 slave(s) : > [ 0.000000] (1:master@host A) host B > [ 0.000000] (1:master@host A) Got 20 task to process : @@ -508,7 +508,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI > [ 53.206495] (2:slave@host B) Received "Task_19" > [ 53.206495] (2:slave@host B) Processing "Task_19" > [ 53.256495] (2:slave@host B) "Task_19" done -> [ 55.858495] (0:@) Simulation time 55.8585 +> [ 55.858495] (0:maestro@) Simulation time 55.8585 > [ 55.858495] (1:master@host A) Goodbye now! > [ 55.858495] (2:slave@host B) Received "finalize" > [ 55.858495] (2:slave@host B) I'm done. See you! diff --git a/examples/msg/masterslave/masterslave_crosstraffic.tesh b/examples/msg/masterslave/masterslave_crosstraffic.tesh index 6a7f328581..4f38eb4335 100644 --- a/examples/msg/masterslave/masterslave_crosstraffic.tesh +++ b/examples/msg/masterslave/masterslave_crosstraffic.tesh @@ -120,4 +120,4 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platfo > [ 5.131785] (2:slave@Tremblay) Received "finalize" > [ 5.131785] (2:slave@Tremblay) I'm done. See you! > [ 5.131785] (1:master@Tremblay) Goodbye now! -> [ 5.131785] (0:@) Simulation time 5.13179 +> [ 5.131785] (0:maestro@) Simulation time 5.13179 diff --git a/examples/msg/masterslave/masterslave_failure.tesh b/examples/msg/masterslave/masterslave_failure.tesh index 7ff5688d09..f66de1fce4 100644 --- a/examples/msg/masterslave/masterslave_failure.tesh +++ b/examples/msg/masterslave/masterslave_failure.tesh @@ -4,7 +4,7 @@ p Testing a simple master/slave example application handling failures ! output sort 19 $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/../platforms/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' +> [ 0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : > [ 0.000000] (1:master@Tremblay) Jupiter > [ 0.000000] (1:master@Tremblay) Fafard @@ -12,10 +12,10 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l > [ 0.000000] (1:master@Tremblay) Bourassa > [ 0.000000] (1:master@Tremblay) Tremblay > [ 0.000000] (1:master@Tremblay) Got 20 task to process : -> [ 1.000000] (0:@) Restart processes on host: Fafard +> [ 1.000000] (0:maestro@) Restart processes on host: Fafard > [ 1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going! > [ 1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you! -> [ 2.000000] (0:@) Restart processes on host: Jupiter +> [ 2.000000] (0:maestro@) Restart processes on host: Jupiter > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going! > [ 12.030928] (1:master@Tremblay) Send completed > [ 12.030928] (4:slave@Ginette) Received "Task" @@ -92,7 +92,7 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l > [ 50.319588] (6:slave@Jupiter) I'm done. See you! > [ 51.319588] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going! > [ 52.309278] (5:slave@Bourassa) "Task" done -> [ 52.319588] (0:@) Simulation time 52.3196 +> [ 52.319588] (0:maestro@) Simulation time 52.3196 > [ 52.319588] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going! > [ 52.319588] (1:master@Tremblay) Goodbye now! > [ 52.319588] (2:slave@Tremblay) "Task" done diff --git a/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh b/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh index c555d3c468..1a1fbbe34b 100644 --- a/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh +++ b/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh @@ -4,7 +4,7 @@ p Testing a simple master/slave example application handling failures ! output sort 19 $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/../platforms/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' +> [ 0.000000] (0:maestro@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : > [ 0.000000] (1:master@Tremblay) Jupiter > [ 0.000000] (1:master@Tremblay) Fafard @@ -12,10 +12,10 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l > [ 0.000000] (1:master@Tremblay) Bourassa > [ 0.000000] (1:master@Tremblay) Tremblay > [ 0.000000] (1:master@Tremblay) Got 20 task to process : -> [ 1.000000] (0:@) Restart processes on host: Fafard +> [ 1.000000] (0:maestro@) Restart processes on host: Fafard > [ 1.000000] (1:master@Tremblay) Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going! > [ 1.000000] (3:slave@Jupiter) Gloups. The cpu on which I'm running just turned off!. See you! -> [ 2.000000] (0:@) Restart processes on host: Jupiter +> [ 2.000000] (0:maestro@) Restart processes on host: Jupiter > [ 11.000000] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going! > [ 12.082474] (1:master@Tremblay) Send completed > [ 12.082474] (4:slave@Ginette) Received "Task" @@ -92,7 +92,7 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l > [ 50.785567] (6:slave@Jupiter) I'm done. See you! > [ 51.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going! > [ 52.774742] (5:slave@Bourassa) "Task" done -> [ 52.785567] (0:@) Simulation time 52.7856 +> [ 52.785567] (0:maestro@) Simulation time 52.7856 > [ 52.785567] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'Ginette'. Nevermind. Let's keep going! > [ 52.785567] (1:master@Tremblay) Goodbye now! > [ 52.785567] (2:slave@Tremblay) "Task" done diff --git a/examples/msg/masterslave/masterslave_forwarder.tesh b/examples/msg/masterslave/masterslave_forwarder.tesh index ebe95818e0..65f5eb9215 100644 --- a/examples/msg/masterslave/masterslave_forwarder.tesh +++ b/examples/msg/masterslave/masterslave_forwarder.tesh @@ -4,7 +4,7 @@ p Testing a master/slave example application with a forwarder module ! output sort 19 $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX" > [ 3.214059] (1:master@Jacquelin) Sent @@ -145,7 +145,7 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platfo > [ 40.685835] (7:slave@Kuenning) I'm done. See you! > [ 42.490301] (8:slave@Browne) Received "finalize" > [ 42.490301] (8:slave@Browne) I'm done. See you! -> [ 45.192775] (0:@) Simulation time 45.1928 +> [ 45.192775] (0:maestro@) Simulation time 45.1928 > [ 45.192775] (2:forwarder@Jackson) I'm done. See you! > [ 45.192775] (9:slave@Stephen) Received "finalize" > [ 45.192775] (9:slave@Stephen) I'm done. See you! diff --git a/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh b/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh index 2ef8f94b72..fb4202de84 100644 --- a/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh +++ b/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh @@ -146,4 +146,4 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/../platfo > [ 45.299152] (9:slave@Stephen) Received "finalize" > [ 45.299152] (9:slave@Stephen) I'm done. See you! > [ 45.299152] (2:forwarder@Jackson) I'm done. See you! -> [ 45.299152] (0:@) Simulation time 45.2992 +> [ 45.299152] (0:maestro@) Simulation time 45.2992 diff --git a/examples/msg/masterslave/masterslave_mailbox.tesh b/examples/msg/masterslave/masterslave_mailbox.tesh index 325823a64e..2e8cecd238 100644 --- a/examples/msg/masterslave/masterslave_mailbox.tesh +++ b/examples/msg/masterslave/masterslave_mailbox.tesh @@ -4,7 +4,7 @@ p Testing a simple master/slave example application (mailbox version) ! output sort 19 $ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/../platforms/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0" > [ 0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1" @@ -31,5 +31,5 @@ $ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/../platform > [ 4.057541] (3:slave@Jupiter) I'm done. See you! > [ 4.083249] (4:slave@Fafard) I'm done. See you! > [ 4.931805] (5:slave@Ginette) I'm done. See you! -> [ 5.094868] (0:@) Simulation time 5.09487 +> [ 5.094868] (0:maestro@) Simulation time 5.09487 > [ 5.094868] (6:slave@Bourassa) I'm done. See you! diff --git a/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh b/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh index eb56a8ca71..12859b446b 100644 --- a/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh +++ b/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh @@ -30,4 +30,4 @@ $ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/../platform > [ 4.122236] (4:slave@Fafard) I'm done. See you! > [ 4.965689] (5:slave@Ginette) I'm done. See you! > [ 5.133855] (6:slave@Bourassa) I'm done. See you! -> [ 5.133855] (0:@) Simulation time 5.13386 +> [ 5.133855] (0:maestro@) Simulation time 5.13386 diff --git a/examples/msg/mc/bugged1.tesh b/examples/msg/mc/bugged1.tesh index 3fe39980ad..201f5d8598 100644 --- a/examples/msg/mc/bugged1.tesh +++ b/examples/msg/mc/bugged1.tesh @@ -3,7 +3,7 @@ ! expect return 1 ! timeout 20 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack_size:256 -> [ 0.000000] (0:@) Check a safety property +> [ 0.000000] (0:maestro@) Check a safety property > [ 0.000000] (2:client@HostB) Sent! > [ 0.000000] (3:client@HostC) Sent! > [ 0.000000] (1:server@HostA) OK @@ -17,20 +17,20 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1 "--log=root.fmt:[%10 > [ 0.000000] (2:client@HostB) Sent! > [ 0.000000] (3:client@HostC) Sent! > [ 0.000000] (2:client@HostB) Sent! -> [ 0.000000] (0:@) ************************** -> [ 0.000000] (0:@) *** PROPERTY NOT VALID *** -> [ 0.000000] (0:@) ************************** -> [ 0.000000] (0:@) Counter-example execution trace: -> [ 0.000000] (0:@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)HostB (client)] iSend(src=(2)HostB (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)HostA (server)] Wait(comm=(verbose only) [(2)HostB (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)HostB (client)] Wait(comm=(verbose only) [(2)HostB (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) [(4)HostD (client)] iSend(src=(4)HostD (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)HostA (server)] Wait(comm=(verbose only) [(4)HostD (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)HostC (client)] iSend(src=(3)HostC (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)HostA (server)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) Expanded states = 22 -> [ 0.000000] (0:@) Visited states = 56 -> [ 0.000000] (0:@) Executed transitions = 52 +> [ 0.000000] (0:maestro@) ************************** +> [ 0.000000] (0:maestro@) *** PROPERTY NOT VALID *** +> [ 0.000000] (0:maestro@) ************************** +> [ 0.000000] (0:maestro@) Counter-example execution trace: +> [ 0.000000] (0:maestro@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)HostB (client)] iSend(src=(2)HostB (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] Wait(comm=(verbose only) [(2)HostB (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)HostB (client)] Wait(comm=(verbose only) [(2)HostB (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) [(4)HostD (client)] iSend(src=(4)HostD (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] Wait(comm=(verbose only) [(4)HostD (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)HostC (client)] iSend(src=(3)HostC (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) Expanded states = 22 +> [ 0.000000] (0:maestro@) Visited states = 56 +> [ 0.000000] (0:maestro@) Executed transitions = 52 diff --git a/examples/msg/mc/bugged1_liveness.tesh b/examples/msg/mc/bugged1_liveness.tesh index 0b0d494c35..688ea49ada 100644 --- a/examples/msg/mc/bugged1_liveness.tesh +++ b/examples/msg/mc/bugged1_liveness.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 20 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack_size:256 --cfg=model-check/property:promela_bugged1_liveness -> [ 0.000000] (0:@) Check the liveness property promela_bugged1_liveness +> [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request > [ 0.000000] (2:client@Boivin) Propositions changed : r=1, cs=0 @@ -12,33 +12,33 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=. > [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle > [ 0.000000] (3:client@Fafard) Ask the request > [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly -> [ 0.000000] (0:@) Pair 23 already reached (equal to pair 11) ! -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) | ACCEPTANCE CYCLE | -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) Counter-example that violates formula : -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(3)Fafard (client)] iRecv(dst=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) Expanded pairs = 23 -> [ 0.000000] (0:@) Visited pairs = 21 -> [ 0.000000] (0:@) Executed transitions = 21 -> [ 0.000000] (0:@) Counter-example depth : 22 +> [ 0.000000] (0:maestro@) Pair 23 already reached (equal to pair 11) ! +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) | ACCEPTANCE CYCLE | +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) Counter-example that violates formula : +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iRecv(dst=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) Expanded pairs = 23 +> [ 0.000000] (0:maestro@) Visited pairs = 21 +> [ 0.000000] (0:maestro@) Executed transitions = 21 +> [ 0.000000] (0:maestro@) Counter-example depth : 22 diff --git a/examples/msg/mc/bugged1_liveness_sparse.tesh b/examples/msg/mc/bugged1_liveness_sparse.tesh index 927463ad52..d358f21ea1 100644 --- a/examples/msg/mc/bugged1_liveness_sparse.tesh +++ b/examples/msg/mc/bugged1_liveness_sparse.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 60 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack_size:256 --cfg=model-check/sparse-checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness -> [ 0.000000] (0:@) Check the liveness property promela_bugged1_liveness +> [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request > [ 0.000000] (2:client@Boivin) Propositions changed : r=1, cs=0 @@ -12,33 +12,33 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=. > [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle > [ 0.000000] (3:client@Fafard) Ask the request > [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly -> [ 0.000000] (0:@) Pair 23 already reached (equal to pair 11) ! -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) | ACCEPTANCE CYCLE | -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) Counter-example that violates formula : -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(3)Fafard (client)] iRecv(dst=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) Expanded pairs = 23 -> [ 0.000000] (0:@) Visited pairs = 21 -> [ 0.000000] (0:@) Executed transitions = 21 -> [ 0.000000] (0:@) Counter-example depth : 22 +> [ 0.000000] (0:maestro@) Pair 23 already reached (equal to pair 11) ! +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) | ACCEPTANCE CYCLE | +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) Counter-example that violates formula : +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iRecv(dst=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (3)Fafard (client)]) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) Expanded pairs = 23 +> [ 0.000000] (0:maestro@) Visited pairs = 21 +> [ 0.000000] (0:maestro@) Executed transitions = 21 +> [ 0.000000] (0:maestro@) Counter-example depth : 22 diff --git a/examples/msg/mc/bugged1_liveness_visited.tesh b/examples/msg/mc/bugged1_liveness_visited.tesh index 54470cb66b..0c83464556 100644 --- a/examples/msg/mc/bugged1_liveness_visited.tesh +++ b/examples/msg/mc/bugged1_liveness_visited.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 90 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack_size:256 --cfg=model-check/property:promela_bugged1_liveness -> [ 0.000000] (0:@) Check the liveness property promela_bugged1_liveness +> [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request > [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly @@ -69,62 +69,62 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=. > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly > [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it -> [ 0.000000] (0:@) Pair 58 already reached (equal to pair 46) ! -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) | ACCEPTANCE CYCLE | -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) Counter-example that violates formula : -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) Expanded pairs = 58 -> [ 0.000000] (0:@) Visited pairs = 201 -> [ 0.000000] (0:@) Executed transitions = 207 -> [ 0.000000] (0:@) Counter-example depth : 51 +> [ 0.000000] (0:maestro@) Pair 58 already reached (equal to pair 46) ! +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) | ACCEPTANCE CYCLE | +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) Counter-example that violates formula : +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) Expanded pairs = 58 +> [ 0.000000] (0:maestro@) Visited pairs = 201 +> [ 0.000000] (0:maestro@) Executed transitions = 207 +> [ 0.000000] (0:maestro@) Counter-example depth : 51 diff --git a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh index 64f7cbe622..835d8f5b83 100644 --- a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh +++ b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 90 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack_size:256 --cfg=model-check/sparse-checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness -> [ 0.000000] (0:@) Check the liveness property promela_bugged1_liveness +> [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request > [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly @@ -69,62 +69,62 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=. > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly > [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it -> [ 0.000000] (0:@) Pair 58 already reached (equal to pair 46) ! -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) | ACCEPTANCE CYCLE | -> [ 0.000000] (0:@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -> [ 0.000000] (0:@) Counter-example that violates formula : -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) -> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) Expanded pairs = 58 -> [ 0.000000] (0:@) Visited pairs = 201 -> [ 0.000000] (0:@) Executed transitions = 207 -> [ 0.000000] (0:@) Counter-example depth : 51 +> [ 0.000000] (0:maestro@) Pair 58 already reached (equal to pair 46) ! +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) | ACCEPTANCE CYCLE | +> [ 0.000000] (0:maestro@) *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +> [ 0.000000] (0:maestro@) Counter-example that violates formula : +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] iSend(src=(3)Fafard (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)Fafard (client)] Wait(comm=(verbose only) [(3)Fafard (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iSend(src=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(2)Boivin (client)-> (1)Tremblay (coordinator)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iRecv(dst=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(1)Tremblay (coordinator)] iRecv(dst=(1)Tremblay (coordinator), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) +> [ 0.000000] (0:maestro@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) Expanded pairs = 58 +> [ 0.000000] (0:maestro@) Visited pairs = 201 +> [ 0.000000] (0:maestro@) Executed transitions = 207 +> [ 0.000000] (0:maestro@) Counter-example depth : 51 diff --git a/examples/msg/mc/bugged2.tesh b/examples/msg/mc/bugged2.tesh index b25adad262..a271e350d2 100644 --- a/examples/msg/mc/bugged2.tesh +++ b/examples/msg/mc/bugged2.tesh @@ -3,7 +3,7 @@ ! expect return 1 ! timeout 20 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack_size:256 -> [ 0.000000] (0:@) Check a safety property +> [ 0.000000] (0:maestro@) Check a safety property > [ 0.000000] (2:client@HostB) Send 1! > [ 0.000000] (3:client@HostC) Send 2! > [ 0.000000] (1:server@HostA) Received 1 @@ -882,17 +882,17 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged2 "--log=root.fmt:[%10 > [ 0.000000] (1:server@HostA) Received 2 > [ 0.000000] (3:client@HostC) Send 2! > [ 0.000000] (1:server@HostA) Received 2 -> [ 0.000000] (0:@) ************************** -> [ 0.000000] (0:@) *** PROPERTY NOT VALID *** -> [ 0.000000] (0:@) ************************** -> [ 0.000000] (0:@) Counter-example execution trace: -> [ 0.000000] (0:@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)HostC (client)] iSend(src=(3)HostC (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)HostA (server)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) [(3)HostC (client)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(3)HostC (client)] iSend(src=(3)HostC (client), buff=(verbose only), size=(verbose only)) -> [ 0.000000] (0:@) [(1)HostA (server)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) -> [ 0.000000] (0:@) Expanded states = 461 -> [ 0.000000] (0:@) Visited states = 2271 -> [ 0.000000] (0:@) Executed transitions = 2117 +> [ 0.000000] (0:maestro@) ************************** +> [ 0.000000] (0:maestro@) *** PROPERTY NOT VALID *** +> [ 0.000000] (0:maestro@) ************************** +> [ 0.000000] (0:maestro@) Counter-example execution trace: +> [ 0.000000] (0:maestro@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)HostC (client)] iSend(src=(3)HostC (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) [(3)HostC (client)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] iRecv(dst=(1)HostA (server), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(3)HostC (client)] iSend(src=(3)HostC (client), buff=(verbose only), size=(verbose only)) +> [ 0.000000] (0:maestro@) [(1)HostA (server)] Wait(comm=(verbose only) [(3)HostC (client)-> (1)HostA (server)]) +> [ 0.000000] (0:maestro@) Expanded states = 461 +> [ 0.000000] (0:maestro@) Visited states = 2271 +> [ 0.000000] (0:maestro@) Executed transitions = 2117 diff --git a/examples/msg/migration/migration.tesh b/examples/msg/migration/migration.tesh index 4c95507198..01630be40e 100644 --- a/examples/msg/migration/migration.tesh +++ b/examples/msg/migration/migration.tesh @@ -8,7 +8,7 @@ $ $SG_TEST_EXENV migration/migration ${srcdir:=.}/../platforms/platform.xml ${sr > [ 0.000000] (1:emigrant@Boivin) Yeah, found something to do > [ 0.000000] (2:policeman@Boivin) Wait a bit before migrating the emigrant. > [ 3.000000] (1:emigrant@Boivin) Moving back home after work -> [ 7.000000] (0:@) Simulation time 7 +> [ 7.000000] (0:maestro@) Simulation time 7 > [ 7.000000] (1:emigrant@Jacquelin) I've been moved on this new host: Jacquelin > [ 7.000000] (1:emigrant@Jacquelin) Uh, nothing to do here. Stopping now > [ 7.000000] (2:policeman@Boivin) I moved the emigrant diff --git a/examples/msg/parallel_task/parallel_task.tesh b/examples/msg/parallel_task/parallel_task.tesh index 7d331e8a42..a5078fad19 100644 --- a/examples/msg/parallel_task/parallel_task.tesh +++ b/examples/msg/parallel_task/parallel_task.tesh @@ -4,13 +4,13 @@ p Testing a simple master/slave example application ! output sort 19 $ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.009378] (1:test@Fafard) Goodbye now! -> [ 0.009378] (0:@) Simulation time 0.00937836 +> [ 0.009378] (0:maestro@) Simulation time 0.00937836 ! output sort 19 $ $SG_TEST_EXENV parallel_task/test_ptask$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/parallel_task/test_ptask_deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 20.625396] (1:execute@Ginette) execution_time=20.6254 > [ 83.232398] (2:redistribute@Ginette) redistribution_time=83.2324 -> [ 83.232398] (0:@) Simulation time 83.2324 +> [ 83.232398] (0:maestro@) Simulation time 83.2324 diff --git a/examples/msg/pastry/pastry_crosstraffic.tesh b/examples/msg/pastry/pastry_crosstraffic.tesh index 903f207b56..3097fb6f71 100644 --- a/examples/msg/pastry/pastry_crosstraffic.tesh +++ b/examples/msg/pastry/pastry_crosstraffic.tesh @@ -434,12 +434,12 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../msg_platfo > [577.866994] (4:node@Geoff) 48 | 32 > [577.866994] (4:node@Geoff) 0 | 32 > [577.866994] (4:node@Geoff) Predecessor: 21 -> [803.668999] (0:@) Messages created: 768 -> [803.668999] (0:@) Simulated time: 803.669 +> [803.668999] (0:maestro@) Messages created: 768 +> [803.668999] (0:maestro@) Simulated time: 803.669 ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/cluster.xml ${srcdir:=.}/chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Constant' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (10:node@node-9.acme.org) Joining the ring with id 2015253, knowing node 1319738 > [ 0.000000] (1:node@node-0.acme.org) My finger table: > [ 0.000000] (1:node@node-0.acme.org) Start | Succ @@ -3014,5 +3014,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/cluster. > [ 982.000000] (1:node@node-0.acme.org) 4194346 | 42 > [ 982.000000] (1:node@node-0.acme.org) 8388650 | 42 > [ 982.000000] (1:node@node-0.acme.org) Predecessor: 16728096 -> [1154.000000] (0:@) Messages created: 2049 -> [1154.000000] (0:@) Simulated time: 1154 +> [1154.000000] (0:maestro@) Messages created: 2049 +> [1154.000000] (0:maestro@) Simulated time: 1154 diff --git a/examples/msg/priority/priority.tesh b/examples/msg/priority/priority.tesh index 41838595d6..2edd5089b0 100644 --- a/examples/msg/priority/priority.tesh +++ b/examples/msg/priority/priority.tesh @@ -7,5 +7,5 @@ $ $SG_TEST_EXENV priority/priority$EXEEXT ${srcdir:=.}/../platforms/small_platfo > [ 0.000000] (1:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 1 > [ 0.000000] (2:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 2 > [ 1.500000] (2:test@Fafard) Goodbye now! -> [ 2.000000] (0:@) Simulation time 2 +> [ 2.000000] (0:maestro@) Simulation time 2 > [ 2.000000] (1:test@Fafard) Goodbye now! diff --git a/examples/msg/properties/msg_prop.tesh b/examples/msg/properties/msg_prop.tesh index d62e091e75..e35366db5f 100644 --- a/examples/msg/properties/msg_prop.tesh +++ b/examples/msg/properties/msg_prop.tesh @@ -4,14 +4,14 @@ p Testing a MSG application with properties in the XML for Hosts, Links and Proc ! output sort 19 $ $SG_TEST_EXENV properties/msg_prop$EXEEXT ${srcdir:=.}/../platforms/prop.xml ${srcdir:=.}/properties/deployment_properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) There are 7 hosts in the environment -> [ 0.000000] (0:@) Host 'node-3.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:@) Host 'node-0.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:@) Host 'node-4.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:@) Host 'node-1.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:@) Host 'node-2.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:@) Host 'host1' runs at 1000000000 flops/s -> [ 0.000000] (0:@) Host 'host2' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) There are 7 hosts in the environment +> [ 0.000000] (0:maestro@) Host 'node-3.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-0.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-4.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-1.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-2.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s > [ 0.000000] (1:alice@host1) == Print the properties of the host 'host1' > [ 0.000000] (1:alice@host1) Host property: 'mem' -> '4' > [ 0.000000] (1:alice@host1) Host property: 'Hdd' -> '180' diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh index 6f8f5b658f..eb9d53f061 100644 --- a/examples/msg/sendrecv/sendrecv_CLM03.tesh +++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh @@ -4,9 +4,9 @@ p Testing the deprecated CM02 network model ! output sort 19 $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) test_all +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) test_all > [ 0.000000] (1:sender@Tremblay) sender > [ 0.000000] (1:sender@Tremblay) host = Jupiter > [ 0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00 @@ -18,4 +18,4 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platfo > [138.703988] (2:receiver@Jupiter) Task received : bandwidth task > [138.703988] (2:receiver@Jupiter) Communic. time 1.387025e+02 > [138.703988] (2:receiver@Jupiter) --- bw 7209674.030423 ---- -> [138.703988] (0:@) Total simulation time: 1.387040e+02 +> [138.703988] (0:maestro@) Total simulation time: 1.387040e+02 diff --git a/examples/msg/sendrecv/sendrecv_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh index 888699d8bb..b67abaaea6 100644 --- a/examples/msg/sendrecv/sendrecv_Reno.tesh +++ b/examples/msg/sendrecv/sendrecv_Reno.tesh @@ -4,10 +4,10 @@ p Testing the surf network Reno fairness model using lagrangian approach ! output sort 19 $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Reno' -> [ 0.000000] (0:@) test_all +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Reno' +> [ 0.000000] (0:maestro@) test_all > [ 0.000000] (1:sender@Tremblay) sender > [ 0.000000] (1:sender@Tremblay) host = Jupiter > [ 0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00 @@ -19,4 +19,4 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platfo > [150.792426] (2:receiver@Jupiter) Task received : bandwidth task > [150.792426] (2:receiver@Jupiter) Communic. time 1.507772e+02 > [150.792426] (2:receiver@Jupiter) --- bw 6632301.333611 ---- -> [150.792426] (0:@) Total simulation time: 1.507924e+02 +> [150.792426] (0:maestro@) Total simulation time: 1.507924e+02 diff --git a/examples/msg/sendrecv/sendrecv_Vegas.tesh b/examples/msg/sendrecv/sendrecv_Vegas.tesh index 3fa0467ca6..47f4e6012c 100644 --- a/examples/msg/sendrecv/sendrecv_Vegas.tesh +++ b/examples/msg/sendrecv/sendrecv_Vegas.tesh @@ -4,10 +4,10 @@ p Testing the surf network Vegas fairness model using lagrangian approach ! output sort 19 $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Vegas' -> [ 0.000000] (0:@) test_all +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Vegas' +> [ 0.000000] (0:maestro@) test_all > [ 0.000000] (1:sender@Tremblay) sender > [ 0.000000] (1:sender@Tremblay) host = Jupiter > [ 0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00 @@ -19,4 +19,4 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platfo > [150.792426] (2:receiver@Jupiter) Task received : bandwidth task > [150.792426] (2:receiver@Jupiter) Communic. time 1.507772e+02 > [150.792426] (2:receiver@Jupiter) --- bw 6632301.333611 ---- -> [150.792426] (0:@) Total simulation time: 1.507924e+02 +> [150.792426] (0:maestro@) Total simulation time: 1.507924e+02 diff --git a/examples/msg/start_kill_time/start_kill_time.tesh b/examples/msg/start_kill_time/start_kill_time.tesh index b0cd29c9c0..f38d83ad46 100644 --- a/examples/msg/start_kill_time/start_kill_time.tesh +++ b/examples/msg/start_kill_time/start_kill_time.tesh @@ -6,7 +6,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat > [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. > [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping. > [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). -> [ 10.000000] (0:@) Simulation time 10 +> [ 10.000000] (0:maestro@) Simulation time 10 p Test1 Process with start time @@ -29,7 +29,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat > [ 14.000000] (5:sleeper@node-4.acme.org) Exiting now (done sleeping or got killed). > [ 15.000000] (6:sleeper@node-5.acme.org) Done sleeping. > [ 15.000000] (6:sleeper@node-5.acme.org) Exiting now (done sleeping or got killed). -> [ 15.000000] (0:@) Simulation time 15 +> [ 15.000000] (0:maestro@) Simulation time 15 p Test1 Process with kill time @@ -41,7 +41,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat > [ 6.000000] (2:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). > [ 6.000000] (3:sleeper@node-3.acme.org) Done sleeping. > [ 6.000000] (3:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). -> [ 6.000000] (0:@) Simulation time 6 +> [ 6.000000] (0:maestro@) Simulation time 6 p Test2 Process with start and kill times @@ -60,4 +60,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat > [ 7.000000] (4:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). > [ 9.000000] (5:sleeper@node-4.acme.org) Exiting now (done sleeping or got killed). > [ 10.000000] (6:sleeper@node-5.acme.org) Exiting now (done sleeping or got killed). -> [ 10.000000] (0:@) Simulation time 10 +> [ 10.000000] (0:maestro@) Simulation time 10 diff --git a/examples/msg/suspend/suspend.tesh b/examples/msg/suspend/suspend.tesh index 4a6f59da09..22766aaa03 100644 --- a/examples/msg/suspend/suspend.tesh +++ b/examples/msg/suspend/suspend.tesh @@ -19,6 +19,6 @@ $ $SG_TEST_EXENV suspend/suspend ${srcdir:=.}/../platforms/platform.xml ${srcdir > [ 30.000000] (1:dream_master@Jacquelin) This time, don't let him finish his siesta. > [ 32.000000] (1:dream_master@Jacquelin) Wake up, lazy guy! > [ 32.000000] (1:dream_master@Jacquelin) OK, goodbye now. -> [ 35.000000] (0:@) Simulation time 35 +> [ 35.000000] (0:maestro@) Simulation time 35 > [ 35.000000] (2:Lazy@Jacquelin) Waking up once for all! > [ 35.000000] (2:Lazy@Jacquelin) Mmmh, goodbye now. diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh index 908624d54b..32d33810cc 100644 --- a/examples/msg/token_ring/token_ring.tesh +++ b/examples/msg/token_ring/token_ring.tesh @@ -1,7 +1,7 @@ #! ./tesh $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Number of host '6' +> [ 0.000000] (0:maestro@) Number of host '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" > [ 0.017354] (2:1@host2) Host "1" send 'Token' to Host "2" @@ -14,19 +14,19 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/routing > [ 0.101019] (6:5@host6) Host "5" received "Token" > [ 0.101019] (6:5@host6) Host "5" send 'Token' to Host "0" > [ 0.131796] (1:0@host1) Host "0" received "Token" -> [ 0.131796] (0:@) Simulation time 0.131796 +> [ 0.131796] (0:maestro@) Simulation time 0.131796 $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'network/coordinates' to 'yes' -> [ 0.000000] (0:@) Number of host '2' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes' +> [ 0.000000] (0:maestro@) Number of host '2' > [ 0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1" > [ 0.637910] (2:1@peer_100036570) Host "1" received "Token" > [ 0.637910] (2:1@peer_100036570) Host "1" send 'Token' to Host "0" > [ 1.275820] (1:0@peer_100030591) Host "0" received "Token" -> [ 1.275820] (0:@) Simulation time 1.27582 +> [ 1.275820] (0:maestro@) Simulation time 1.27582 $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Number of host '60' +> [ 0.000000] (0:maestro@) Number of host '60' > [ 0.000000] (1:0@host-2.cluster1) Host "0" send 'Token' to Host "1" > [ 0.030364] (2:1@host-2.cluster2) Host "1" received "Token" > [ 0.030364] (2:1@host-2.cluster2) Host "1" send 'Token' to Host "2" @@ -147,4 +147,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/meta_cl > [ 1.583341] (60:59@host-28.cluster2) Host "59" received "Token" > [ 1.583341] (60:59@host-28.cluster2) Host "59" send 'Token' to Host "0" > [ 1.613705] (1:0@host-2.cluster1) Host "0" received "Token" -> [ 1.613705] (0:@) Simulation time 1.61371 +> [ 1.613705] (0:maestro@) Simulation time 1.61371 diff --git a/examples/scala/masterslave/masterslave.tesh b/examples/scala/masterslave/masterslave.tesh index 2ff28488b1..189988dd62 100644 --- a/examples/scala/masterslave/masterslave.tesh +++ b/examples/scala/masterslave/masterslave.tesh @@ -3,7 +3,7 @@ ! output sort 19 $ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process > [ 0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0' > [ 0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1' @@ -27,6 +27,6 @@ $ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/../platfo > [ 13.977355] (5:masterslave.Slave@Bousquet) Received Finalize. I'm done. See you! > [ 15.421041] (6:masterslave.Slave@Soucy) Received Finalize. I'm done. See you! > [ 16.278350] (7:masterslave.Slave@Kuenning) Received Finalize. I'm done. See you! -> [ 17.251680] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 17.251680] (0:maestro@) MSG_main finished; Cleaning up the simulation... > [ 17.251680] (1:masterslave.Master@Jacquelin) Goodbye now! > [ 17.251680] (8:masterslave.Slave@Browne) Received Finalize. I'm done. See you! diff --git a/teshsuite/java/sleep_host_off/sleep_host_off.tesh b/teshsuite/java/sleep_host_off/sleep_host_off.tesh index fa4ff1c88d..5e77e1749f 100644 --- a/teshsuite/java/sleep_host_off/sleep_host_off.tesh +++ b/teshsuite/java/sleep_host_off/sleep_host_off.tesh @@ -1,5 +1,5 @@ $ java -classpath ${classpath:=.} sleep_host_off.Main ${srcdir:=.}/../../examples/platforms/small_platform.xml ${srcdir:=.}/sleep_host_off/sleep_host_off_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Using regular java threads. +> [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:sleep_host_off.SleepHostOff@Tremblay) **** **** **** ***** ***** Test Sleep ***** ***** **** **** **** > [ 0.000000] (1:sleep_host_off.SleepHostOff@Tremblay) Test sleep: Create a process on Jupiter, the process simply make periodic sleep, turn off Jupiter > [ 0.000000] (2:sleep@Jupiter) I'm not dead @@ -10,4 +10,4 @@ $ java -classpath ${classpath:=.} sleep_host_off.Main ${srcdir:=.}/../../example > [ 0.020000] (1:sleep_host_off.SleepHostOff@Tremblay) Jupiter has been stopped > [ 0.320000] (1:sleep_host_off.SleepHostOff@Tremblay) Test sleep seems ok, cool !(number of Process : 1, it should be 1 (i.e. the Test one)) > -> [ 0.320000] (0:@) MSG_main finished; Cleaning up the simulation... +> [ 0.320000] (0:maestro@) MSG_main finished; Cleaning up the simulation... diff --git a/teshsuite/lua/lua_platforms.tesh b/teshsuite/lua/lua_platforms.tesh index a147e7dfe9..f3c7aa130d 100644 --- a/teshsuite/lua/lua_platforms.tesh +++ b/teshsuite/lua/lua_platforms.tesh @@ -3,7 +3,7 @@ $ ${srcdir:=.}/../../examples/msg/masterslave/masterslave_arg ${srcdir:=.}/../.. > [3.095754] [msg_test/INFO] Simulation time 3.09575 $ $SG_TEST_EXENV ${bindir:=.}/../../examples/msg/token_ring/token_ring ${srcdir:=.}/../../examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Number of host '6' +> [ 0.000000] (0:maestro@) Number of host '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" > [ 0.017354] (2:1@host2) Host "1" send 'Token' to Host "2" @@ -16,4 +16,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/../../examples/msg/token_ring/token_ring ${srcdir: > [ 0.101019] (6:5@host6) Host "5" received "Token" > [ 0.101019] (6:5@host6) Host "5" send 'Token' to Host "0" > [ 0.131796] (1:0@host1) Host "0" received "Token" -> [ 0.131796] (0:@) Simulation time 0.131796 +> [ 0.131796] (0:maestro@) Simulation time 0.131796 diff --git a/teshsuite/mc/replay/random_bug.tesh b/teshsuite/mc/replay/random_bug.tesh index 062c422b50..b37fc24799 100644 --- a/teshsuite/mc/replay/random_bug.tesh +++ b/teshsuite/mc/replay/random_bug.tesh @@ -1,14 +1,14 @@ #!/usr/bin/env tesh ! expect return 1 $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random_bug ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/random_bug.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=model-check/record:1 -> [ 0.000000] (0:@) Check a safety property -> [ 0.000000] (0:@) ************************** -> [ 0.000000] (0:@) *** PROPERTY NOT VALID *** -> [ 0.000000] (0:@) ************************** -> [ 0.000000] (0:@) Counter-example execution trace: -> [ 0.000000] (0:@) Path = 1/3;1/4 -> [ 0.000000] (0:@) [(1)Tremblay (app)] MC_RANDOM(3) -> [ 0.000000] (0:@) [(1)Tremblay (app)] MC_RANDOM(4) -> [ 0.000000] (0:@) Expanded states = 27 -> [ 0.000000] (0:@) Visited states = 68 -> [ 0.000000] (0:@) Executed transitions = 46 +> [ 0.000000] (0:maestro@) Check a safety property +> [ 0.000000] (0:maestro@) ************************** +> [ 0.000000] (0:maestro@) *** PROPERTY NOT VALID *** +> [ 0.000000] (0:maestro@) ************************** +> [ 0.000000] (0:maestro@) Counter-example execution trace: +> [ 0.000000] (0:maestro@) Path = 1/3;1/4 +> [ 0.000000] (0:maestro@) [(1)Tremblay (app)] MC_RANDOM(3) +> [ 0.000000] (0:maestro@) [(1)Tremblay (app)] MC_RANDOM(4) +> [ 0.000000] (0:maestro@) Expanded states = 27 +> [ 0.000000] (0:maestro@) Visited states = 68 +> [ 0.000000] (0:maestro@) Executed transitions = 46 diff --git a/teshsuite/mc/replay/random_bug_replay.tesh b/teshsuite/mc/replay/random_bug_replay.tesh index 977f595c7a..59cebd2f25 100644 --- a/teshsuite/mc/replay/random_bug_replay.tesh +++ b/teshsuite/mc/replay/random_bug_replay.tesh @@ -1,4 +1,4 @@ #!/usr/bin/env tesh $ ${bindir:=.}/random_bug ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/random_bug.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4" -> [ 0.000000] (0:@) path=1/3;1/4 +> [ 0.000000] (0:maestro@) path=1/3;1/4 > Error reached diff --git a/teshsuite/msg/storage/storage_basic.tesh b/teshsuite/msg/storage/storage_basic.tesh index 9f626c6175..d42b9ce74e 100644 --- a/teshsuite/msg/storage/storage_basic.tesh +++ b/teshsuite/msg/storage/storage_basic.tesh @@ -1,5 +1,5 @@ $ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/platforms/storage/storage.xml ${srcdir:=.}/deployment.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) The custom configuration 'path' is already defined by user! +> [ 0.000000] (0:maestro@) The custom configuration 'path' is already defined by user! > [ 0.000000] (1:server@alice) *** Storage info on alice *** > [ 0.000000] (1:server@alice) Storage name: Disk2, mount name: c: > [ 0.000000] (1:server@alice) Free size: 534479374867 bytes @@ -106,4 +106,4 @@ $ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/ > [ 1.207952] (1:server@alice) Storage Disk2 is attached to alice > [ 1.207952] (1:server@alice) Storage Disk3 is attached to carl > [ 1.207952] (1:server@alice) Storage Disk4 is attached to denise -> [ 1.207952] (0:@) Simulated time: 1.20795 +> [ 1.207952] (0:maestro@) Simulated time: 1.20795 diff --git a/teshsuite/msg/trace/trace.tesh b/teshsuite/msg/trace/trace.tesh index 0a1cf8469c..657da7e2ce 100644 --- a/teshsuite/msg/trace/trace.tesh +++ b/teshsuite/msg/trace/trace.tesh @@ -5,9 +5,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c0s1.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s0-c0s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@Cpu B) Task size: 40.000000 > [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -17,9 +17,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c0s2.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s1-c0s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 40.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -29,9 +29,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s0.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s2-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 20.000000] (1:test_trace@Cpu B) Task size: 40.000000 > [ 20.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -41,9 +41,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c1s0.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s0-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@Cpu B) Task size: 220.000000 > [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -53,9 +53,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s1.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s2-c1s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 20.000000] (1:test_trace@Cpu B) Task size: 140.000000 > [ 20.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -65,9 +65,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c2s2.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s1-c2s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 260.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -77,9 +77,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c1s2.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c1s1-c1s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 40.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 40.000000] (1:test_trace@Cpu B) Task size: 40.000000 > [ 40.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -89,9 +89,9 @@ p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c3s2.xml, test_ ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c1s1-c3s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 40.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 40.000000] (1:test_trace@Cpu B) Task size: 260.000000 > [ 40.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -101,9 +101,9 @@ p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two pr ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 150.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.500000 @@ -117,9 +117,9 @@ p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two pr ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp2.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 50.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 2.500000 @@ -133,9 +133,9 @@ p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two pr ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp2.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 50.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 2.500000 @@ -149,9 +149,9 @@ p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.0-hbp1.0-hbp1.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 0.000000] (1:test_trace@Cpu B) Task size: 170.000000 > [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -169,9 +169,9 @@ p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -189,9 +189,9 @@ p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 @@ -209,9 +209,9 @@ p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, ! output sort $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability_included.xml ./test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'host/model' to 'compound' -> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' -> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI' +> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' +> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 diff --git a/teshsuite/simdag/basic/basic1.tesh b/teshsuite/simdag/basic/basic1.tesh index 1e251eb505..c6f62d986e 100644 --- a/teshsuite/simdag/basic/basic1.tesh +++ b/teshsuite/simdag/basic/basic1.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. -> [ 16.000100] (0:@) Simulation time: 16.000100 +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. +> [ 16.000100] (0:maestro@) Simulation time: 16.000100 diff --git a/teshsuite/simdag/basic/basic2.tesh b/teshsuite/simdag/basic/basic2.tesh index 7728ee8437..8dadc8e627 100644 --- a/teshsuite/simdag/basic/basic2.tesh +++ b/teshsuite/simdag/basic/basic2.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/basic2 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. -> [ 8.800100] (0:@) Simulation time: 8.800100 +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. +> [ 8.800100] (0:maestro@) Simulation time: 8.800100 diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh index af6a3f81e8..af092a1cad 100644 --- a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh @@ -3,5 +3,5 @@ p all 2 all test, only fat pipe switch is used concurrently ! output sort $ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 8 diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh index 95b2a62595..34920d30a7 100644 --- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh @@ -3,5 +3,5 @@ p sending on different paths test ! output sort $ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 3 diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh index 51cfb1aaeb..53c84c2f5c 100644 --- a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh @@ -3,5 +3,5 @@ p scatter test ! output sort $ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 8 diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh index 66109b0aa0..98668ede9c 100644 --- a/teshsuite/simdag/network/p2p/test_latency1.tesh +++ b/teshsuite/simdag/network/p2p/test_latency1.tesh @@ -3,19 +3,19 @@ p latency check, 1 byte, shared link ! output sort $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 1 byte, fat pipe ! output sort $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 1 byte, link - switch - link ! output sort $ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 3 diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh index 3ee1a07fa9..c9d664644d 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.tesh +++ b/teshsuite/simdag/network/p2p/test_latency2.tesh @@ -3,19 +3,19 @@ p latency check, 2 x 1 byte, same direction, shared link ! output sort $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 2.5 p latency check, 2 x 1 byte, same direction, fat pipe ! output sort $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 2 x 1 byte, same direction, link - switch - link ! output sort $ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 4 diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh index 7ba096d23d..adce22c390 100644 --- a/teshsuite/simdag/network/p2p/test_latency3.tesh +++ b/teshsuite/simdag/network/p2p/test_latency3.tesh @@ -3,19 +3,19 @@ p latency check, 2 x 1 byte, opposite direction, shared link ! output sort $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 2.5 p latency check, 2 x 1 byte, opposite direction, fat pipe ! output sort $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 2 x 1 byte, opposite direction, link - switch - link ! output sort $ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 4 diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/test_latency_bound.tesh index 138c7281de..e743543b3b 100644 --- a/teshsuite/simdag/network/p2p/test_latency_bound.tesh +++ b/teshsuite/simdag/network/p2p/test_latency_bound.tesh @@ -3,5 +3,5 @@ p latency bounded by large latency link ! output sort $ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 10001.5 diff --git a/teshsuite/simdag/network/test_reinit_costs.tesh b/teshsuite/simdag/network/test_reinit_costs.tesh index 45248fa02c..a2defbfb23 100644 --- a/teshsuite/simdag/network/test_reinit_costs.tesh +++ b/teshsuite/simdag/network/test_reinit_costs.tesh @@ -3,6 +3,6 @@ p Reinitialization test ! expect signal SIGABRT $ simdag/network/test_reinit_costs ${srcdir:=.}/simdag/network/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. -> [ 0.000000] (0:@) This function is not working since the C++ links and others. Please report the problem if you really need that function. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) This function is not working since the C++ links and others. Please report the problem if you really need that function. diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh index 1ef2fafcd5..720f847f6d 100644 --- a/teshsuite/simdag/partask/test_comp_only_par.tesh +++ b/teshsuite/simdag/partask/test_comp_only_par.tesh @@ -2,11 +2,11 @@ p par task comp only, no comm, homogeneous ! output sort $ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1 p par task comp only, no comm, heterogeneous ! output sort $ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1 diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh index 39fee75e89..a4fe86222f 100644 --- a/teshsuite/simdag/partask/test_comp_only_seq.tesh +++ b/teshsuite/simdag/partask/test_comp_only_seq.tesh @@ -3,5 +3,5 @@ p seq task comp only, no comm ! output sort $ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1 diff --git a/teshsuite/simdag/platforms/basic_link_test.tesh b/teshsuite/simdag/platforms/basic_link_test.tesh index 632a84ff2c..304258b4e5 100644 --- a/teshsuite/simdag/platforms/basic_link_test.tesh +++ b/teshsuite/simdag/platforms/basic_link_test.tesh @@ -1,17 +1,17 @@ #! ./tesh $ ${bindir:=.}/basic_link_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. -> [ 0.000000] (0:@) Link count: 12 -> [ 0.000000] (0:@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 -> [ 0.000000] (0:@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_0_DOWN: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_0_UP: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_2_DOWN: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_2_UP: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_3_DOWN: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_3_UP: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_4_DOWN: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_4_UP: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_6_DOWN: latency = 0.00005, bandwidth = 125000000.000000 -> [ 0.000000] (0:@) bob_cluster_link_6_UP: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Link count: 12 +> [ 0.000000] (0:maestro@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_0_DOWN: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_0_UP: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_2_DOWN: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_2_UP: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_3_DOWN: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_3_UP: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_4_DOWN: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_4_UP: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_6_DOWN: latency = 0.00005, bandwidth = 125000000.000000 +> [ 0.000000] (0:maestro@) bob_cluster_link_6_UP: latency = 0.00005, bandwidth = 125000000.000000 diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 3f8e691bf7..98e5f16483 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -1,71 +1,71 @@ ! output sort $ ${bindir:=.}/basic_parsing_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 12 $ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_state_off.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_state_on.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_host.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic_parsing_test one_link_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test one_link_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test one_link_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 2 $ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 3, link number: 4 $ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 10, link number: 24 $ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 4 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 2 $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh index c7a8495dfe..e64f4bbcc1 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh @@ -1,7 +1,7 @@ ! output sort $ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'path' to 'simdag/platforms' +> [ 0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms' ! output sort $ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Configuration change: Set 'path' to 'simdag/platforms' +> [ 0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms' diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index 361ae21666..e16f261d9e 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -2,7 +2,7 @@ ! output sort $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 12 > Route between bob3.hamburger.edu and bob3.hamburger.edu > Route size 3 @@ -156,7 +156,7 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=ro > Route latency = 0.000600, route bandwidth = 125000000.000000 $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 4, link number: 12 > Route between bob1.hamburger.edu and bob1.hamburger.edu > Route size 3 @@ -272,7 +272,7 @@ $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=ro > Route latency = 0.000600, route bandwidth = 125000000.000000 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 4 > Route between alice and alice > Route size 1 @@ -296,7 +296,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK " > Route latency = 0.000015, route bandwidth = 498000000.000000 $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 3 > Route between alice and alice > Route size 1 @@ -316,7 +316,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "- > Route latency = 0.000015, route bandwidth = 498000000.000000 $ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) Switching to the L07 model to handle parallel tasks. +> [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 6 > Route between NODO01 and NODO01 > Route size 1 diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh index ef254d2485..c80744625e 100644 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh +++ b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh @@ -1,5 +1,5 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:@] Parse error at bogus_disk_attachment.xml:26: Unable to attach storage cdisk: host plouf doesn't exist. -> [ 0.000000] [0:@] Exiting now +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at bogus_disk_attachment.xml:26: Unable to attach storage cdisk: host plouf doesn't exist. +> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh index 5392c51b8c..0237bad818 100644 --- a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh +++ b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh @@ -1,11 +1,11 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:@] Parse error at bogus_missing_src_gateway.xml:16: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr" -> [ 0.000000] [0:@] Exiting now +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at bogus_missing_src_gateway.xml:16: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr" +> [ 0.000000] [0:maestro@] Exiting now ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:@] Parse error at bogus_missing_dst_gateway.xml:16: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr" -> [ 0.000000] [0:@] Exiting now +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at bogus_missing_dst_gateway.xml:16: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr" +> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh index c4e90d51fd..2403429d87 100644 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh @@ -1,11 +1,11 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:@] Parse error at bogus_two_hosts_asymetric.xml:24: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. -> [ 0.000000] [0:@] Exiting now +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at bogus_two_hosts_asymetric.xml:24: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. +> [ 0.000000] [0:maestro@] Exiting now ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_two_hosts_asymetric-2.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:@] Parse error at bogus_two_hosts_asymetric-2.xml:26: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. -> [ 0.000000] [0:@] Exiting now +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Parse error at bogus_two_hosts_asymetric-2.xml:26: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. +> [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index 67c8874c69..afa52367a8 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -3,7 +3,7 @@ ! output sort $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -138,7 +138,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P > $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -272,7 +272,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -286,7 +286,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -304,7 +304,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -318,7 +318,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -332,7 +332,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]% > $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -346,7 +346,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e > $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -360,7 +360,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -374,7 +374,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -388,7 +388,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h > $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -403,7 +403,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6 > $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -418,7 +418,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[ > $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -433,7 +433,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[% > $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -448,7 +448,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -491,7 +491,7 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root. > $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -968,7 +968,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:% > $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -995,7 +995,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r] > $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -1020,7 +1020,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]% > $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > @@ -1155,7 +1155,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/torus_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Switching to the L07 model to handle parallel tasks. +> [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > > diff --git a/teshsuite/xbt/log_usage/log_usage.tesh b/teshsuite/xbt/log_usage/log_usage.tesh index 1df8cbbb60..0ef0851d11 100644 --- a/teshsuite/xbt/log_usage/log_usage.tesh +++ b/teshsuite/xbt/log_usage/log_usage.tesh @@ -1,21 +1,21 @@ #! ./tesh $ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Test with the settings '' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' ' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:info root.thres:info ' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:debug ' -> [ 0.000000] [0:@] val=1 -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:verbose root.thres:error ' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:critical ' -> [ 0.000000] [0:@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings '' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' ' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:info root.thres:info ' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:debug ' +> [ 0.000000] [0:maestro@] val=1 +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:verbose root.thres:error ' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:critical ' +> [ 0.000000] [0:maestro@] false alarm! diff --git a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh index 40485cc813..bbfa13a92d 100644 --- a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh +++ b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh @@ -1,17 +1,17 @@ #! ./tesh $ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] Test with the settings '' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' ' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:info root.thres:info ' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:verbose root.thres:error ' -> [ 0.000000] [0:@] val=2 -> [ 0.000000] [0:@] false alarm! -> [ 0.000000] [0:@] Test with the settings ' test.thres:critical ' -> [ 0.000000] [0:@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings '' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' ' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:info root.thres:info ' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:verbose root.thres:error ' +> [ 0.000000] [0:maestro@] val=2 +> [ 0.000000] [0:maestro@] false alarm! +> [ 0.000000] [0:maestro@] Test with the settings ' test.thres:critical ' +> [ 0.000000] [0:maestro@] false alarm! -- 2.20.1