From 55218bd35ab6da7cbfd41bf5bff9fe6eaeec0750 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 6 Jul 2017 00:45:40 +0200 Subject: [PATCH] revalidate the tesh files after fixing #195 --- .../s4u/actor-create/s4u_actor-create.tesh | 14 +++--- examples/s4u/io/s4u_io.tesh | 28 +++++------ examples/s4u/mutex/s4u_mutex.tesh | 50 +++++++++---------- teshsuite/s4u/actor/actor.tesh | 28 +++++------ .../host_on_off_wait/host_on_off_wait.tesh | 8 +-- .../generic_simcalls/generic_simcalls.tesh | 18 +++---- .../simix/stack_overflow/stack_overflow.tesh | 2 +- 7 files changed, 74 insertions(+), 74 deletions(-) diff --git a/examples/s4u/actor-create/s4u_actor-create.tesh b/examples/s4u/actor-create/s4u_actor-create.tesh index f436e01192..e056a48d12 100644 --- a/examples/s4u/actor-create/s4u_actor-create.tesh +++ b/examples/s4u/actor-create/s4u_actor-create.tesh @@ -1,10 +1,10 @@ #! ./tesh $ $SG_TEST_EXENV ${bindir:=.}/s4u_actor-create -> [Tremblay:sender1:(0) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send -> [Jupiter:sender2:(0) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send -> [Fafard:receiver:(0) 0.000000] [s4u_actor_create/INFO] Hello s4u, I'm ready to get any message you'd want on mb42 -> [Tremblay:sender1:(0) 0.025709] [s4u_actor_create/INFO] I'm done. See you. -> [Jupiter:sender2:(0) 0.070434] [s4u_actor_create/INFO] I'm done. See you. -> [Fafard:receiver:(0) 0.070434] [s4u_actor_create/INFO] I received 'GaBuZoMeu' and 'GloubiBoulga' -> [Fafard:receiver:(0) 0.070434] [s4u_actor_create/INFO] I'm done. See you. +> [Tremblay:sender1:(1) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send +> [Jupiter:sender2:(2) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send +> [Fafard:receiver:(3) 0.000000] [s4u_actor_create/INFO] Hello s4u, I'm ready to get any message you'd want on mb42 +> [Tremblay:sender1:(1) 0.025709] [s4u_actor_create/INFO] I'm done. See you. +> [Jupiter:sender2:(2) 0.070434] [s4u_actor_create/INFO] I'm done. See you. +> [Fafard:receiver:(3) 0.070434] [s4u_actor_create/INFO] I received 'GaBuZoMeu' and 'GloubiBoulga' +> [Fafard:receiver:(3) 0.070434] [s4u_actor_create/INFO] I'm done. See you. diff --git a/examples/s4u/io/s4u_io.tesh b/examples/s4u/io/s4u_io.tesh index 84a8d27291..4e21628f77 100644 --- a/examples/s4u/io/s4u_io.tesh +++ b/examples/s4u/io/s4u_io.tesh @@ -1,17 +1,17 @@ #! ./tesh $ $SG_TEST_EXENV ${bindir:=.}/s4u_io -> [denise:host:(0) 0.000000] [s4u_test/INFO] Storage info on denise: -> [denise:host:(0) 0.000000] [s4u_test/INFO] Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000. -> [denise:host:(0) 0.000000] [s4u_test/INFO] Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000. -> [denise:host:(0) 0.003333] [s4u_test/INFO] Create a 200000 bytes file named '/home/tmp/data.txt' on /sd1 -> [denise:host:(0) 0.003333] [s4u_test/INFO] Storage info on denise: -> [denise:host:(0) 0.003333] [s4u_test/INFO] Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000. -> [denise:host:(0) 0.003333] [s4u_test/INFO] Disk4 (/home) Used: 13421994; Free: 536857490006; Total: 536870912000. -> [denise:host:(0) 0.004333] [s4u_test/INFO] Read 200000 bytes on /home/tmp/data.txt -> [denise:host:(0) 0.006000] [s4u_test/INFO] Write 100000 bytes on /home/tmp/data.txt -> [denise:host:(0) 0.006000] [s4u_test/INFO] Move '/home/tmp/data.txt' to '/home/tmp/simgrid.readme' -> [denise:host:(0) 0.006000] [s4u_test/INFO] User data attached to the file: 777 -> [denise:host:(0) 0.006000] [s4u_test/INFO] Get/set data for storage element: Disk4 -> [denise:host:(0) 0.006000] [s4u_test/INFO] Uninitialized storage data: '(null)' -> [denise:host:(0) 0.006000] [s4u_test/INFO] Set and get data: 'Some user data' +> [denise:host:(1) 0.000000] [s4u_test/INFO] Storage info on denise: +> [denise:host:(1) 0.000000] [s4u_test/INFO] Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000. +> [denise:host:(1) 0.000000] [s4u_test/INFO] Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000. +> [denise:host:(1) 0.003333] [s4u_test/INFO] Create a 200000 bytes file named '/home/tmp/data.txt' on /sd1 +> [denise:host:(1) 0.003333] [s4u_test/INFO] Storage info on denise: +> [denise:host:(1) 0.003333] [s4u_test/INFO] Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000. +> [denise:host:(1) 0.003333] [s4u_test/INFO] Disk4 (/home) Used: 13421994; Free: 536857490006; Total: 536870912000. +> [denise:host:(1) 0.004333] [s4u_test/INFO] Read 200000 bytes on /home/tmp/data.txt +> [denise:host:(1) 0.006000] [s4u_test/INFO] Write 100000 bytes on /home/tmp/data.txt +> [denise:host:(1) 0.006000] [s4u_test/INFO] Move '/home/tmp/data.txt' to '/home/tmp/simgrid.readme' +> [denise:host:(1) 0.006000] [s4u_test/INFO] User data attached to the file: 777 +> [denise:host:(1) 0.006000] [s4u_test/INFO] Get/set data for storage element: Disk4 +> [denise:host:(1) 0.006000] [s4u_test/INFO] Uninitialized storage data: '(null)' +> [denise:host:(1) 0.006000] [s4u_test/INFO] Set and get data: 'Some user data' diff --git a/examples/s4u/mutex/s4u_mutex.tesh b/examples/s4u/mutex/s4u_mutex.tesh index a28dffe01a..8d64d17e23 100644 --- a/examples/s4u/mutex/s4u_mutex.tesh +++ b/examples/s4u/mutex/s4u_mutex.tesh @@ -1,28 +1,28 @@ #! ./tesh $ $SG_TEST_EXENV ${bindir:=.}/s4u_mutex -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock -> [Tremblay:worker:(0) 0.000000] [s4u_test/INFO] I'm done, good bye -> [Tremblay:main:(0) 10.000000] [s4u_test/INFO] Results is -> 12 +> [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard +> [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:worker:(3) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock +> [Tremblay:worker:(3) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Jupiter:worker:(4) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard +> [Jupiter:worker:(4) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:worker:(5) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock +> [Tremblay:worker:(5) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Jupiter:worker:(6) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard +> [Jupiter:worker:(6) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:worker:(7) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock +> [Tremblay:worker:(7) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Jupiter:worker:(8) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard +> [Jupiter:worker:(8) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:worker:(9) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock +> [Tremblay:worker:(9) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Jupiter:worker:(10) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard +> [Jupiter:worker:(10) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:worker:(11) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock +> [Tremblay:worker:(11) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Jupiter:worker:(12) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard +> [Jupiter:worker:(12) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:worker:(13) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a regular lock +> [Tremblay:worker:(13) 0.000000] [s4u_test/INFO] I'm done, good bye +> [Tremblay:main:(1) 10.000000] [s4u_test/INFO] Results is -> 12 diff --git a/teshsuite/s4u/actor/actor.tesh b/teshsuite/s4u/actor/actor.tesh index 86a6dbccda..35fec0bef7 100644 --- a/teshsuite/s4u/actor/actor.tesh +++ b/teshsuite/s4u/actor/actor.tesh @@ -1,16 +1,16 @@ $ ./actor ${srcdir:=.}/../../../examples/platforms/small_platform.xml -> [Tremblay:worker:(0) 0.500000] [s4u_test/INFO] Worker started (PID:2, PPID:0) -> [Tremblay:worker:(0) 0.500000] [s4u_test/INFO] Plop i am not suspended -> [Tremblay:master:(0) 1.000000] [s4u_test/INFO] Actor (pid=1, ppid=0, name=master) -> [Tremblay:master:(0) 1.000000] [s4u_test/INFO] Actor (pid=2, ppid=0, name=worker) -> [Tremblay:worker from master:(0) 1.500000] [s4u_test/INFO] Worker started (PID:3, PPID:1) -> [Tremblay:worker from master:(0) 1.500000] [s4u_test/INFO] Plop i am not suspended -> [Tremblay:worker from master:(0) 2.500000] [s4u_test/INFO] Plop i am not suspended -> [Tremblay:master:(0) 3.000000] [s4u_test/INFO] Suspend Actor (pid=3) -> [Tremblay:master:(0) 3.000000] [s4u_test/INFO] Actor (pid=3) is suspended -> [Tremblay:master:(0) 5.000000] [s4u_test/INFO] Resume Actor (pid=3) -> [Tremblay:master:(0) 5.000000] [s4u_test/INFO] Actor (pid=3) is not suspended -> [Tremblay:worker from master:(0) 5.000000] [s4u_test/INFO] Plop i am not suspended -> [Tremblay:worker from master:(0) 6.000000] [s4u_test/INFO] Plop i am not suspended -> [Tremblay:master:(0) 7.000000] [s4u_test/INFO] Goodbye now! +> [Tremblay:worker:(2) 0.500000] [s4u_test/INFO] Worker started (PID:2, PPID:0) +> [Tremblay:worker:(2) 0.500000] [s4u_test/INFO] Plop i am not suspended +> [Tremblay:master:(1) 1.000000] [s4u_test/INFO] Actor (pid=1, ppid=0, name=master) +> [Tremblay:master:(1) 1.000000] [s4u_test/INFO] Actor (pid=2, ppid=0, name=worker) +> [Tremblay:worker from master:(3) 1.500000] [s4u_test/INFO] Worker started (PID:3, PPID:1) +> [Tremblay:worker from master:(3) 1.500000] [s4u_test/INFO] Plop i am not suspended +> [Tremblay:worker from master:(3) 2.500000] [s4u_test/INFO] Plop i am not suspended +> [Tremblay:master:(1) 3.000000] [s4u_test/INFO] Suspend Actor (pid=3) +> [Tremblay:master:(1) 3.000000] [s4u_test/INFO] Actor (pid=3) is suspended +> [Tremblay:master:(1) 5.000000] [s4u_test/INFO] Resume Actor (pid=3) +> [Tremblay:master:(1) 5.000000] [s4u_test/INFO] Actor (pid=3) is not suspended +> [Tremblay:worker from master:(3) 5.000000] [s4u_test/INFO] Plop i am not suspended +> [Tremblay:worker from master:(3) 6.000000] [s4u_test/INFO] Plop i am not suspended +> [Tremblay:master:(1) 7.000000] [s4u_test/INFO] Goodbye now! > [7.000000] [s4u_test/INFO] Simulation time 7 diff --git a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh b/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh index 98e272af6c..039b942e00 100644 --- a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh +++ b/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh @@ -1,6 +1,6 @@ $ ./host_on_off_wait ${srcdir:=.}/../../../examples/platforms/small_platform.xml -> [Tremblay:master:(0) 0.000000] [s4u_test/INFO] Master waiting -> [Jupiter:worker:(0) 0.000000] [s4u_test/INFO] Worker waiting -> [Tremblay:master:(0) 1.000000] [s4u_test/INFO] Turning off the worker host -> [Tremblay:master:(0) 1.000000] [s4u_test/INFO] Master has finished +> [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Master waiting +> [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Worker waiting +> [Tremblay:master:(1) 1.000000] [s4u_test/INFO] Turning off the worker host +> [Tremblay:master:(1) 1.000000] [s4u_test/INFO] Master has finished > [1.000000] [s4u_test/INFO] Simulation time 1 diff --git a/teshsuite/simix/generic_simcalls/generic_simcalls.tesh b/teshsuite/simix/generic_simcalls/generic_simcalls.tesh index 0bb08af698..da4b16e9f8 100644 --- a/teshsuite/simix/generic_simcalls/generic_simcalls.tesh +++ b/teshsuite/simix/generic_simcalls/generic_simcalls.tesh @@ -1,15 +1,15 @@ $ ${bindir:=.}/generic_simcalls --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml -> [Tremblay:master:(0) 0.000000] [test/INFO] Start +> [Tremblay:master:(1) 0.000000] [test/INFO] Start > [0.000000] [test/INFO] kernel -> [Tremblay:master:(0) 0.000000] [test/INFO] kernel, returned +> [Tremblay:master:(1) 0.000000] [test/INFO] kernel, returned > [10.000000] [test/INFO] kernelSync with void -> [Tremblay:master:(0) 10.000000] [test/INFO] kernelSync with void, returned -> [Tremblay:master:(0) 20.000000] [test/INFO] Exception caught: Exception throwed from kernel_defer +> [Tremblay:master:(1) 10.000000] [test/INFO] kernelSync with void, returned +> [Tremblay:master:(1) 20.000000] [test/INFO] Exception caught: Exception throwed from kernel_defer > [30.000000] [test/INFO] kernelSync with value -> [Tremblay:master:(0) 30.000000] [test/INFO] kernelSync with value returned with 42 +> [Tremblay:master:(1) 30.000000] [test/INFO] kernelSync with value returned with 42 > [50.000000] [test/INFO] kernelAsync with value -> [Tremblay:master:(0) 50.000000] [test/INFO] kernelAsync with value returned with 43 -> [Tremblay:master:(0) 50.000000] [test/INFO] The future is not ready +> [Tremblay:master:(1) 50.000000] [test/INFO] kernelAsync with value returned with 43 +> [Tremblay:master:(1) 50.000000] [test/INFO] The future is not ready > [60.000000] [test/INFO] kernelAsync with value -> [Tremblay:master:(0) 60.000000] [test/INFO] The future is ready -> [Tremblay:master:(0) 60.000000] [test/INFO] kernelAsync with value returned with 43 \ No newline at end of file +> [Tremblay:master:(1) 60.000000] [test/INFO] The future is ready +> [Tremblay:master:(1) 60.000000] [test/INFO] kernelAsync with value returned with 43 \ No newline at end of file diff --git a/teshsuite/simix/stack_overflow/stack_overflow.tesh b/teshsuite/simix/stack_overflow/stack_overflow.tesh index 083531bfd8..bd3cab2716 100644 --- a/teshsuite/simix/stack_overflow/stack_overflow.tesh +++ b/teshsuite/simix/stack_overflow/stack_overflow.tesh @@ -1,6 +1,6 @@ ! expect signal SIGSEGV $ ${bindir:=.}/stack_overflow --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml -> [Tremblay:master:(0) 0.000000] [test/INFO] Launching our nice bugged recursive function... +> [Tremblay:master:(1) 0.000000] [test/INFO] Launching our nice bugged recursive function... > Access violation detected. > This probably comes from a programming error in your code, or from a stack > overflow. If you are certain of your code, try increasing the stack size -- 2.20.1