From: Arnaud Giersch Date: Mon, 13 Nov 2017 10:41:45 +0000 (+0100) Subject: Revalidate tesh files (trivial changes). X-Git-Tag: v3.18~242^2~47 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/052f2fd101a3866da0d22ff065f32c65d678b951?hp=b56f5db19216ad6717f65e0c52383c87bad6e043 Revalidate tesh files (trivial changes). Since the algorithm has changed for action heap, actions which are available at the same time may be picked in a different order. --- diff --git a/examples/java/async/dsend/async-dsend.tesh b/examples/java/async/dsend/async-dsend.tesh index c886a6488a..94b00158ca 100644 --- a/examples/java/async/dsend/async-dsend.tesh +++ b/examples/java/async/dsend/async-dsend.tesh @@ -17,9 +17,9 @@ $ java -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../platforms/sma > [ 0.000000] (1:Sender@Boivin) Sending "Task_5" to "Jupiter" > [ 0.000000] (1:Sender@Boivin) Sending "Task_6" to "Tremblay" > [ 0.000000] (1:Sender@Boivin) All tasks have been (asynchronously) dispatched. Let's sleep for 20s so that nobody gets a message from a terminated process. -> [ 1.933362] (2:Receiver@Bourassa) Received a task. I'm done. See you! -> [ 1.933362] (4:Receiver@Ginette) Received a task. I'm done. See you! > [ 1.933362] (6:Receiver@Jupiter) Received a task. I'm done. See you! +> [ 1.933362] (4:Receiver@Ginette) Received a task. I'm done. See you! +> [ 1.933362] (2:Receiver@Bourassa) Received a task. I'm done. See you! > [ 2.449247] (7:Receiver@Tremblay) Received a task. I'm done. See you! > [ 2.964768] (3:Receiver@Fafard) Received a task. I'm done. See you! > [ 4.162002] (5:Receiver@Jacquelin) Received a task. I'm done. See you! diff --git a/examples/java/async/waitall/async-waitall.tesh b/examples/java/async/waitall/async-waitall.tesh index d518e7d940..9f7ccea295 100644 --- a/examples/java/async/waitall/async-waitall.tesh +++ b/examples/java/async/waitall/async-waitall.tesh @@ -16,9 +16,9 @@ $ java -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/../platforms/s > [ 0.000000] (1:Sender@Boivin) Start the Sending 'Task_5' to 'Jupiter' > [ 0.000000] (1:Sender@Boivin) Start the Sending 'Task_6' to 'Tremblay' > [ 0.000000] (1:Sender@Boivin) All tasks have been (asynchronously) dispatched. Let's wait for their completion. -> [ 1.933362] (2:Receiver@Bourassa) I got my task, good bye. -> [ 1.933362] (4:Receiver@Ginette) I got my task, good bye. > [ 1.933362] (6:Receiver@Jupiter) I got my task, good bye. +> [ 1.933362] (4:Receiver@Ginette) I got my task, good bye. +> [ 1.933362] (2:Receiver@Bourassa) I got my task, good bye. > [ 2.449247] (7:Receiver@Tremblay) I got my task, good bye. > [ 2.964768] (3:Receiver@Fafard) I got my task, good bye. > [ 4.162002] (5:Receiver@Jacquelin) I got my task, good bye. diff --git a/examples/java/energy/vm/energy-vm.tesh b/examples/java/energy/vm/energy-vm.tesh index 3afdf2d021..7bae428688 100644 --- a/examples/java/energy/vm/energy-vm.tesh +++ b/examples/java/energy/vm/energy-vm.tesh @@ -8,12 +8,12 @@ $ java -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../platforms/energ > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host3: both inside a VM > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds) > [MyHost1:energy VM runner:(1) 5.000000] [java/INFO] Wait another 5 seconds. The tasks stop at some point in between -> [MyHost3:p31:(6) 6.000000] [java/INFO] This worker is done. -> [MyHost3:p312:(7) 6.000000] [java/INFO] This worker is done. > [MyHost2:p22:(5) 6.000000] [java/INFO] This worker is done. +> [MyHost3:p312:(7) 6.000000] [java/INFO] This worker is done. +> [MyHost3:p31:(6) 6.000000] [java/INFO] This worker is done. > [vmHost1:p12:(3) 6.000000] [java/INFO] This worker is done. -> [vmHost3:p21:(4) 6.000000] [java/INFO] This worker is done. > [vmHost1:p11:(2) 6.000000] [java/INFO] This worker is done. +> [vmHost3:p21:(4) 6.000000] [java/INFO] This worker is done. > [10.000000] [surf_energy/INFO] Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000) > [10.000000] [java/INFO] MSG_main finished; Cleaning up the simulation... > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 1120.000000 Joules diff --git a/examples/msg/async-waitany/async-waitany.tesh b/examples/msg/async-waitany/async-waitany.tesh index 6637734a1a..97c19dd08d 100644 --- a/examples/msg/async-waitany/async-waitany.tesh +++ b/examples/msg/async-waitany/async-waitany.tesh @@ -17,18 +17,18 @@ $ $SG_TEST_EXENV ${bindir:=.}/async-waitany ${srcdir:=.}/small_platform.xml ${sr > [ 10.000000] (3:receiver@Jupiter) Wait to receive task 1 > [ 10.000000] (3:receiver@Jupiter) Wait to receive task 2 > [ 10.423774] (2:receiver@Fafard) Processing "Task_4" -> [ 10.469435] (3:receiver@Jupiter) Processing "Task_3" +> [ 10.469435] (3:receiver@Jupiter) Processing "Task_5" > [ 11.079116] (2:receiver@Fafard) "Task_4" done > [ 11.079116] (2:receiver@Fafard) Processing "Task_0" -> [ 11.124778] (3:receiver@Jupiter) "Task_3" done +> [ 11.124778] (3:receiver@Jupiter) "Task_5" done > [ 11.124778] (3:receiver@Jupiter) Processing "Task_1" > [ 11.734459] (2:receiver@Fafard) "Task_0" done > [ 11.734459] (2:receiver@Fafard) Processing "Task_2" > [ 11.780120] (3:receiver@Jupiter) "Task_1" done -> [ 11.780120] (3:receiver@Jupiter) Processing "Task_5" +> [ 11.780120] (3:receiver@Jupiter) Processing "Task_3" > [ 12.389801] (2:receiver@Fafard) "Task_2" done > [ 12.415509] (2:receiver@Fafard) I'm done. See you! -> [ 12.435462] (3:receiver@Jupiter) "Task_5" done +> [ 12.435462] (3:receiver@Jupiter) "Task_3" done > [ 12.454477] (0:maestro@) Simulation time 12.4545 > [ 12.454477] (1:sender@Tremblay) Goodbye now! > [ 12.454477] (3:receiver@Jupiter) I'm done. See you! diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/msg/energy-vm/energy-vm.tesh index 965e8ac013..2735dac214 100644 --- a/examples/msg/energy-vm/energy-vm.tesh +++ b/examples/msg/energy-vm/energy-vm.tesh @@ -9,12 +9,12 @@ $ ${bindir:=.}/energy-vm/energy-vm$EXEEXT ${srcdir:=.}/../platforms/energy_platf > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds) > [ 5.000000] (1:dvfs@MyHost1) Wait another 5 seconds. The tasks stop at some point in between -> [ 6.000000] (6:p31@MyHost3) This worker is done. -> [ 6.000000] (7:p32@MyHost3) This worker is done. > [ 6.000000] (5:p22@MyHost2) This worker is done. +> [ 6.000000] (7:p32@MyHost3) This worker is done. +> [ 6.000000] (6:p31@MyHost3) This worker is done. > [ 6.000000] (3:p12@vm_host1) This worker is done. -> [ 6.000000] (4:p21@vm_host3) This worker is done. > [ 6.000000] (2:p11@vm_host1) This worker is done. +> [ 6.000000] (4:p21@vm_host3) This worker is done. > [ 10.000000] (0:maestro@) Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000) > [ 10.000000] (0:maestro@) Total simulation time: 10.00; Host2 and Host3 must have the exact same energy consumption; Host1 is multi-core and will differ. > [ 10.000000] (0:maestro@) Energy consumption of host MyHost1: 1120.000000 Joules diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh index 54a448f858..5c702a0f34 100644 --- a/examples/smpi/replay/replay.tesh +++ b/examples/smpi/replay/replay.tesh @@ -163,8 +163,8 @@ $ tail -n +3 ./simgrid.trace > 13 0 2 3 > 5 6 2 action_bcast "0 0.78 0.39" > 12 0 2 1 6 -> 12 0 2 3 6 > 12 0 2 2 6 +> 12 0 2 3 6 > 13 0 2 1 > 12 0 2 1 4 > 13 0.015036 2 2 diff --git a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh index c6c2296313..3ff450c9a8 100644 --- a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh +++ b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh @@ -37,8 +37,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > Passed: (Xx)2 with 1 load (100000000flops) took 0.1s as expected > ### Test '( ooo )2'. 3 tasks on a bicore PM > Passed: (xxX)2 with 0.6667 load (66666666flops) took 0.1s as expected -> Passed: (Xxx)2 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: (xXx)2 with 0.6667 load (66666666flops) took 0.1s as expected +> Passed: (Xxx)2 with 0.6667 load (66666666flops) took 0.1s as expected > # TEST ON TWO-CORE PMs AND SINGLE-CORE VMs > ## Check impact of a single VM (no degradation for the moment) > ### Test '( [o]1 )2'. A task in a VM on a bicore PM @@ -62,8 +62,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > Passed: ( [x]1 [X]1 [ ]1 )2 with 1 load (100000000flops) took 0.1s as expected > ### Put three VMs on a PM, and put a task to each VM > Passed: ( [X]1 [o]1 [o]1 )2 with 0.6667 load (66666666flops) took 0.1s as expected -> Passed: ( [o]1 [o]1 [X]1 )2 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: ( [o]1 [X]1 [o]1 )2 with 0.6667 load (66666666flops) took 0.1s as expected +> Passed: ( [o]1 [o]1 [X]1 )2 with 0.6667 load (66666666flops) took 0.1s as expected > # TEST ON TWO-CORE PMs AND TWO-CORE VMs > ## Check impact of a single VM (there is no degradation for the moment) > ### Put a VM on a PM, and put a task to the VM @@ -73,8 +73,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > Passed: ( [Xo]2 )2 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put three tasks to the VM > Passed: ( [ooX]2 )2 with 0.6667 load (66666666flops) took 0.1s as expected -> Passed: ( [Xoo]2 )2 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: ( [oXo]2 )2 with 0.6667 load (66666666flops) took 0.1s as expected +> Passed: ( [Xoo]2 )2 with 0.6667 load (66666666flops) took 0.1s as expected > ## Check impact of a single VM collocated with a task (there is no degradation for the moment) > ### Put a VM on a PM, and put a task to the PM > Passed: ( [ ]2 X )2 with 1 load (100000000flops) took 0.1s as expected @@ -88,26 +88,26 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > ### Put a VM on a PM, put one task to the PM and three tasks to the VM > Passed: ( [ooo]2 X )2 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: ( [ooX]2 o )2 with 0.4444 load (44444444flops) took 0.1s as expected -> Passed: ( [Xoo]2 o )2 with 0.4444 load (44444444flops) took 0.1s as expected > Passed: ( [oXo]2 o )2 with 0.4444 load (44444444flops) took 0.1s as expected +> Passed: ( [Xoo]2 o )2 with 0.4444 load (44444444flops) took 0.1s as expected > ### Put a VM on a PM, and put two tasks to the PM > Passed: ( [ ]2 oX )2 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [ ]2 Xo )2 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, put one task to the PM and one task to the VM -> Passed: ( [o]2 Xo )2 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: ( [o]2 oX )2 with 0.6667 load (66666666flops) took 0.1s as expected +> Passed: ( [o]2 Xo )2 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: ( [X]2 oo )2 with 0.6667 load (66666666flops) took 0.1s as expected > ### Put a VM on a PM, put one task to the PM and two tasks to the VM -> Passed: ( [oo]2 Xo )2 with 0.5 load (50000000flops) took 0.1s as expected > Passed: ( [oo]2 oX )2 with 0.5 load (50000000flops) took 0.1s as expected +> Passed: ( [oo]2 Xo )2 with 0.5 load (50000000flops) took 0.1s as expected > Passed: ( [oX]2 oo )2 with 0.5 load (50000000flops) took 0.1s as expected > Passed: ( [Xo]2 oo )2 with 0.5 load (50000000flops) took 0.1s as expected > ### Put a VM on a PM, put one task to the PM and three tasks to the VM -> Passed: ( [ooo]2 Xo )2 with 0.5 load (50000000flops) took 0.1s as expected > Passed: ( [ooo]2 oX )2 with 0.5 load (50000000flops) took 0.1s as expected +> Passed: ( [ooo]2 Xo )2 with 0.5 load (50000000flops) took 0.1s as expected > Passed: ( [ooX]2 oo )2 with 0.3333 load (33333333flops) took 0.1s as expected -> Passed: ( [Xoo]2 oo )2 with 0.3333 load (33333333flops) took 0.1s as expected > Passed: ( [oXo]2 oo )2 with 0.3333 load (33333333flops) took 0.1s as expected +> Passed: ( [Xoo]2 oo )2 with 0.3333 load (33333333flops) took 0.1s as expected > # TEST ON FOUR-CORE PMs AND TWO-CORE VMs > ## Check impact of a single VM > ### Put a VM on a PM, and put a task to the VM @@ -117,8 +117,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > Passed: ( [Xo]2 )4 with 1 load (100000000flops) took 0.1s as expected > ### ( [ooo]2 )4: Put a VM on a PM, and put three tasks to the VM > Passed: ( [ooX]2 )4 with 0.6667 load (66666666flops) took 0.1s as expected -> Passed: ( [Xoo]2 )4 with 0.6667 load (66666666flops) took 0.1s as expected > Passed: ( [oXo]2 )4 with 0.6667 load (66666666flops) took 0.1s as expected +> Passed: ( [Xoo]2 )4 with 0.6667 load (66666666flops) took 0.1s as expected > ## Check impact of a single empty VM collocated with tasks > ### Put a VM on a PM, and put a task to the PM > Passed: ( [ ]2 X )4 with 1 load (100000000flops) took 0.1s as expected @@ -127,8 +127,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > Passed: ( [ ]2 Xo )4 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put three tasks to the PM > Passed: ( [ ]2 ooX )4 with 1 load (100000000flops) took 0.1s as expected -> Passed: ( [ ]2 Xoo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [ ]2 oXo )4 with 1 load (100000000flops) took 0.1s as expected +> Passed: ( [ ]2 Xoo )4 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put four tasks to the PM > Passed: ( [ ]2 oooX )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [ ]2 ooXo )4 with 1 load (100000000flops) took 0.1s as expected @@ -139,32 +139,32 @@ $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${srcdir: > Passed: ( [o]2 X )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [X]2 o )4 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put two tasks to the PM and one task to the VM -> Passed: ( [o]2 Xo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [o]2 oX )4 with 1 load (100000000flops) took 0.1s as expected +> Passed: ( [o]2 Xo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [X]2 oo )4 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put two tasks to the PM and two tasks to the VM -> Passed: ( [oo]2 Xo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [oo]2 oX )4 with 1 load (100000000flops) took 0.1s as expected +> Passed: ( [oo]2 Xo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [oX]2 oo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [Xo]2 oo )4 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put three tasks to the PM and one tasks to the VM > Passed: ( [o]2 ooX )4 with 1 load (100000000flops) took 0.1s as expected -> Passed: ( [o]2 Xoo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [o]2 oXo )4 with 1 load (100000000flops) took 0.1s as expected +> Passed: ( [o]2 Xoo )4 with 1 load (100000000flops) took 0.1s as expected > Passed: ( [X]2 ooo )4 with 1 load (100000000flops) took 0.1s as expected > ### Put a VM on a PM, and put three tasks to the PM and two tasks to the VM > Passed: ( [oo]2 ooX )4 with 0.8 load (80000000flops) took 0.1s as expected -> Passed: ( [oo]2 Xoo )4 with 0.8 load (80000000flops) took 0.1s as expected > Passed: ( [oo]2 oXo )4 with 0.8 load (80000000flops) took 0.1s as expected +> Passed: ( [oo]2 Xoo )4 with 0.8 load (80000000flops) took 0.1s as expected > Passed: ( [oX]2 ooo )4 with 0.8 load (80000000flops) took 0.1s as expected > Passed: ( [Xo]2 ooo )4 with 0.8 load (80000000flops) took 0.1s as expected > ### Put a VM on a PM, and put three tasks to the PM and three tasks to the VM > Passed: ( [ooo]2 ooX )4 with 0.8 load (80000000flops) took 0.1s as expected -> Passed: ( [ooo]2 Xoo )4 with 0.8 load (80000000flops) took 0.1s as expected > Passed: ( [ooo]2 oXo )4 with 0.8 load (80000000flops) took 0.1s as expected +> Passed: ( [ooo]2 Xoo )4 with 0.8 load (80000000flops) took 0.1s as expected > Passed: ( [ooX]2 ooo )4 with 0.5333 load (53333333flops) took 0.1s as expected -> Passed: ( [Xoo]2 ooo )4 with 0.5333 load (53333333flops) took 0.1s as expected > Passed: ( [oXo]2 ooo )4 with 0.5333 load (53333333flops) took 0.1s as expected +> Passed: ( [Xoo]2 ooo )4 with 0.5333 load (53333333flops) took 0.1s as expected > > > ## 0 test failed diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh index 8be078fe9c..6e2576aa2f 100644 --- a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh +++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh @@ -19,16 +19,16 @@ $ ./concurrent_rw$EXEEXT ${srcdir:=.}/../../../examples/platforms/storage/storag > [ 4.600000] (host@bob) process 4 goes to sleep for 2 seconds > [ 5.500000] (host@bob) process 5 is writing again! > [ 5.600000] (host@bob) process 5 goes to sleep for 1 seconds -> [ 6.600000] (host@bob) process 4 is reading! -> [ 6.600000] (host@bob) process 5 is reading! > [ 6.600000] (host@bob) process 1 is reading! > [ 6.600000] (host@bob) process 2 is reading! > [ 6.600000] (host@bob) process 3 is reading! -> [ 6.750000] (host@bob) process 4 goes to sleep for 4 seconds -> [ 6.750000] (host@bob) process 5 goes to sleep for 5 seconds +> [ 6.600000] (host@bob) process 4 is reading! +> [ 6.600000] (host@bob) process 5 is reading! > [ 6.750000] (host@bob) process 1 goes to sleep for 1 seconds > [ 6.750000] (host@bob) process 2 goes to sleep for 2 seconds > [ 6.750000] (host@bob) process 3 goes to sleep for 3 seconds +> [ 6.750000] (host@bob) process 4 goes to sleep for 4 seconds +> [ 6.750000] (host@bob) process 5 goes to sleep for 5 seconds > [ 7.750000] (host@bob) process 1 is reading again! > [ 7.780000] (host@bob) process 1 => Size of /home/doc/simgrid/examples/platforms/g5k.xml1: 6000000 > [ 8.750000] (host@bob) process 2 is reading again!