From b535dc5f8e8d9402e481b0186ddb81f11b486d01 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 26 Jan 2021 20:11:12 +0100 Subject: [PATCH] logs: Allow %a instead of %P to display the actor name %P still works, but I don't think that saving a case in a switch really saves anything. So let's not break existing scripts for nothing. --- docs/manpages/tesh.pod | 2 +- docs/source/Configuring_SimGrid.rst | 4 +-- docs/source/outcomes.rst | 2 +- examples/c/actor-daemon/actor-daemon.tesh | 2 +- examples/c/actor-exiting/actor-exiting.tesh | 2 +- examples/c/actor-kill/actor-kill.tesh | 2 +- examples/c/actor-lifetime/actor-lifetime.tesh | 2 +- examples/c/actor-migrate/actor-migrate.tesh | 2 +- examples/c/actor-suspend/actor-suspend.tesh | 2 +- examples/c/actor-yield/actor-yield.tesh | 2 +- examples/c/app-bittorrent/app-bittorrent.tesh | 2 +- examples/c/app-chainsend/app-chainsend.tesh | 2 +- .../app-masterworker-multicore.tesh | 2 +- .../app-masterworker-vivaldi.tesh | 2 +- .../c/app-masterworker/app-masterworker.tesh | 4 +-- examples/c/app-token-ring/app-token-ring.tesh | 6 ++-- examples/c/cloud-capping/cloud-capping.tesh | 2 +- .../c/cloud-migration/cloud-migration.tesh | 2 +- examples/c/comm-pingpong/comm-pingpong.tesh | 8 +++--- examples/c/comm-wait/comm-wait.tesh | 8 +++--- examples/c/comm-waitall/comm-waitall.tesh | 2 +- examples/c/comm-waitany/comm-waitany.tesh | 2 +- examples/c/dht-kademlia/dht-kademlia.tesh | 2 +- examples/c/dht-pastry/dht-pastry.tesh | 2 +- .../energy-exec-ptask/energy-exec-ptask.tesh | 2 +- examples/c/energy-exec/energy-exec.tesh | 4 +-- examples/c/energy-vm/energy-vm.tesh | 2 +- examples/c/exec-async/exec-async.tesh | 2 +- examples/c/exec-dvfs/exec-dvfs.tesh | 4 +-- examples/c/exec-remote/exec-remote.tesh | 2 +- examples/c/io-disk-raw/io-disk-raw.tesh | 2 +- .../platform-failures/platform-failures.tesh | 6 ++-- .../platform-properties.tesh | 2 +- .../c/plugin-host-load/plugin-host-load.tesh | 2 +- .../synchro-semaphore/synchro-semaphore.tesh | 2 +- .../app/masterworker/app-masterworker.tesh | 2 +- .../java/app/tokenring/app-tokenring.tesh | 6 ++-- .../java/async/dsend/async-dsend.tesh | 2 +- .../java/async/waitall/async-waitall.tesh | 2 +- .../java/async/yield/async-yield.tesh | 2 +- .../masterworker/cloud-masterworker.tesh | 2 +- .../process/migration/process-migration.tesh | 2 +- .../java/process/suspend/process-suspend.tesh | 2 +- .../java/task/priority/task-priority.tesh | 2 +- .../deprecated/msg/mc/bugged2-liveness.tesh | 2 +- .../python/actor-daemon/actor-daemon.tesh | 2 +- examples/python/actor-kill/actor-kill.tesh | 2 +- .../python/actor-lifetime/actor-lifetime.tesh | 2 +- .../python/actor-migrate/actor-migrate.tesh | 2 +- .../python/actor-suspend/actor-suspend.tesh | 2 +- examples/python/actor-yield/actor-yield.tesh | 2 +- examples/python/comm-wait/comm-wait.tesh | 2 +- .../python/comm-waitall/comm-waitall.tesh | 2 +- .../python/comm-waitany/comm-waitany.tesh | 2 +- examples/python/exec-async/exec-async.tesh | 2 +- examples/python/exec-dvfs/exec-dvfs.tesh | 4 +-- examples/python/exec-remote/exec-remote.tesh | 2 +- .../s4u/actor-daemon/s4u-actor-daemon.tesh | 2 +- .../s4u/actor-exiting/s4u-actor-exiting.tesh | 2 +- examples/s4u/actor-kill/s4u-actor-kill.tesh | 2 +- .../actor-lifetime/s4u-actor-lifetime.tesh | 2 +- .../s4u/actor-migrate/s4u-actor-migrate.tesh | 2 +- .../s4u/actor-suspend/s4u-actor-suspend.tesh | 2 +- examples/s4u/actor-yield/s4u-actor-yield.tesh | 2 +- .../app-bittorrent/s4u-app-bittorrent.tesh | 2 +- .../s4u/app-chainsend/s4u-app-chainsend.tesh | 2 +- .../s4u-app-masterworkers.tesh | 4 +-- .../app-token-ring/s4u-app-token-ring.tesh | 6 ++-- .../s4u/cloud-capping/s4u-cloud-capping.tesh | 2 +- .../cloud-migration/s4u-cloud-migration.tesh | 2 +- .../comm-dependent/s4u-comm-dependent.tesh | 2 +- .../comm-host2host/s4u-comm-host2host.tesh | 2 +- .../s4u/comm-pingpong/s4u-comm-pingpong.tesh | 8 +++--- .../s4u/comm-pingpong/simix-breakpoint.tesh | 2 +- examples/s4u/comm-ready/s4u-comm-ready.tesh | 2 +- .../s4u/comm-suspend/s4u-comm-suspend.tesh | 2 +- examples/s4u/comm-wait/s4u-comm-wait.tesh | 2 +- .../s4u/comm-waitall/s4u-comm-waitall.tesh | 2 +- .../s4u/comm-waitany/s4u-comm-waitany.tesh | 2 +- .../comm-waituntil/s4u-comm-waituntil.tesh | 2 +- examples/s4u/dht-chord/s4u-dht-chord.tesh | 2 +- .../s4u/dht-kademlia/s4u-dht-kademlia.tesh | 2 +- examples/s4u/energy-boot/s4u-energy-boot.tesh | 4 +-- .../s4u-energy-exec-ptask.tesh | 4 +-- examples/s4u/energy-exec/s4u-energy-exec.tesh | 4 +-- examples/s4u/energy-link/s4u-energy-link.tesh | 4 +-- examples/s4u/energy-vm/s4u-energy-vm.tesh | 2 +- examples/s4u/energy-wifi/s4u-energy-wifi.tesh | 2 +- .../s4u-engine-filtering.tesh | 2 +- examples/s4u/exec-async/s4u-exec-async.tesh | 2 +- .../exec-dependent/s4u-exec-dependent.tesh | 2 +- examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh | 4 +-- examples/s4u/exec-ptask/s4u-exec-ptask.tesh | 2 +- examples/s4u/exec-remote/s4u-exec-remote.tesh | 2 +- examples/s4u/io-async/s4u-io-async.tesh | 2 +- .../s4u/io-dependent/s4u-io-dependent.tesh | 2 +- examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh | 2 +- examples/s4u/maestro-set/s4u-maestro-set.tesh | 2 +- .../s4u-mc-bugged1-liveness-stack-cleaner | 2 +- .../s4u-mc-bugged1-liveness-visited.tesh | 2 +- .../s4u-mc-bugged1-liveness.tesh | 2 +- examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh | 2 +- examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh | 2 +- .../s4u-mc-failing-assert.tesh | 2 +- .../s4u-network-ns3-wifi.tesh | 2 +- examples/s4u/network-ns3/s4u-network-ns3.tesh | 12 ++++---- .../s4u/network-wifi/s4u-network-wifi.tesh | 2 +- .../s4u-platform-failures.tesh | 4 +-- .../s4u-platform-profile.tesh | 2 +- .../s4u-platform-properties.tesh | 2 +- .../s4u-plugin-host-load.tesh | 2 +- .../s4u-plugin-link-load.tesh | 2 +- examples/s4u/replay-comm/s4u-replay-comm.tesh | 4 +-- examples/s4u/replay-io/s4u-replay-io.tesh | 2 +- .../s4u-routing-get-clusters.tesh | 4 +-- ...-synchro-condition-variable-waituntil.tesh | 2 +- .../replay_multiple_manual_coll1.tesh | 4 +-- ...lay_multiple_manual_coll2_st_sr_noise.tesh | 2 +- .../replay_multiple_manual_empty1.tesh | 4 +-- .../replay_multiple_manual_empty2.tesh | 16 +++++------ .../replay_multiple_manual_mixed1.tesh | 4 +-- .../replay_multiple_manual_mixed2.tesh | 8 +++--- .../replay_multiple_manual_mixed2_st.tesh | 2 +- ...eplay_multiple_manual_mixed2_st_noise.tesh | 2 +- .../replay_multiple_manual_mixed2_st_sr.tesh | 2 +- ...ay_multiple_manual_mixed2_st_sr_noise.tesh | 2 +- .../replay_multiple_manual_nojob.tesh | 4 +-- src/mc/api.cpp | 6 ++-- src/mc/checker/SimcallInspector.hpp | 2 ++ src/xbt/log.cpp | 2 +- src/xbt/xbt_log_layout_format.cpp | 7 +++-- teshsuite/java/semaphoregc/semaphoregc.tesh | 2 +- teshsuite/java/sleephostoff/sleephostoff.tesh | 2 +- teshsuite/lua/lua_platforms.tesh | 2 +- .../mc/random-bug/random-bug-nocrash.tesh | 4 +-- .../mc/random-bug/random-bug-replay.tesh | 4 +-- teshsuite/mc/random-bug/random-bug.tesh | 6 ++-- .../python/borken-context/borken-context.tesh | 2 +- .../python/corrupt-stack/corrupt-stack.tesh | 2 +- .../s4u/basic-link-test/basic-link-test.tesh | 4 +-- .../cloud-interrupt-migration.tesh | 2 +- .../s4u/comm-get-sender/comm-get-sender.tesh | 2 +- .../s4u/concurrent_rw/concurrent_rw.tesh | 2 +- teshsuite/s4u/is-router/is-router.tesh | 2 +- teshsuite/s4u/listen_async/listen_async.tesh | 2 +- .../ns3-from-src-to-itself.tesh | 2 +- .../ns3-simultaneous-send-rcv.tesh | 2 +- teshsuite/s4u/pid/pid.tesh | 2 +- .../storage_client_server.tesh | 2 +- .../trace-integration/trace-integration.tesh | 28 +++++++++---------- teshsuite/s4u/wait-any-for/wait-any-for.tesh | 2 +- .../basic-parsing-test-sym-full.tesh | 10 +++---- .../basic-parsing-test.tesh | 14 +++++----- teshsuite/simdag/basic1/basic1.tesh | 4 +-- .../comm-mxn-all2all/comm-mxn-all2all.tesh | 2 +- .../comm-mxn-independent.tesh | 2 +- .../comm-mxn-scatter/comm-mxn-scatter.tesh | 2 +- .../comm-p2p-latency-1.tesh | 6 ++-- .../comm-p2p-latency-2.tesh | 6 ++-- .../comm-p2p-latency-3.tesh | 6 ++-- .../comm-p2p-latency-bound.tesh | 2 +- .../simdag/comp-only-par/comp-only-par.tesh | 4 +-- .../simdag/comp-only-seq/comp-only-seq.tesh | 2 +- .../flatifier/bogus_disk_attachment.tesh | 2 +- .../flatifier/bogus_missing_gateway.tesh | 4 +-- .../flatifier/bogus_two_hosts_asymetric.tesh | 2 +- teshsuite/simdag/flatifier/flatifier.tesh | 20 ++++++------- .../coll-allreduce-automatic.tesh | 2 +- teshsuite/smpi/io-all-at/io-all-at.tesh | 2 +- teshsuite/smpi/io-all/io-all.tesh | 2 +- teshsuite/smpi/io-ordered/io-ordered.tesh | 2 +- teshsuite/smpi/io-shared/io-shared.tesh | 2 +- teshsuite/smpi/io-simple-at/io-simple-at.tesh | 2 +- teshsuite/smpi/io-simple/io-simple.tesh | 2 +- teshsuite/smpi/macro-shared/macro-shared.tesh | 2 +- teshsuite/xbt/log_usage/log_usage.tesh | 8 +++--- teshsuite/xbt/log_usage/log_usage_ndebug.tesh | 2 +- 177 files changed, 282 insertions(+), 279 deletions(-) diff --git a/docs/manpages/tesh.pod b/docs/manpages/tesh.pod index da7ef424f0..23dfbeb351 100755 --- a/docs/manpages/tesh.pod +++ b/docs/manpages/tesh.pod @@ -187,7 +187,7 @@ same timestamp. Here is a SimGrid example: # Sort only lines depending on the first 19 chars ! output sort 19 - $ ./some_simgrid_simulator --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n + $ ./some_simgrid_simulator --log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n This approach may seem surprising at the first glance but it does its job: diff --git a/docs/source/Configuring_SimGrid.rst b/docs/source/Configuring_SimGrid.rst index 6f8a2e5a2c..d7f4ae9170 100644 --- a/docs/source/Configuring_SimGrid.rst +++ b/docs/source/Configuring_SimGrid.rst @@ -1596,7 +1596,7 @@ as the date, or the actor ID, everything. Existing format directives: - %p: Priority name (LOG4J compatible) - %h: Hostname (SimGrid extension) - - %P: Actor name (SimGrid extension -- note that with SMPI this is the integer value of the process rank) + - %a: Actor name (SimGrid extension -- note that with SMPI this is the integer value of the process rank) - %i: Actor PID (SimGrid extension -- this is a 'i' as in 'i'dea) - %t: Thread "name" (LOG4J compatible -- actually the address of the thread in memory) @@ -1609,7 +1609,7 @@ as the date, or the actor ID, everything. Existing format directives: - %r: application age (time elapsed since the beginning of the application) -``--log=root.fmt:'[%h:%P:(%i) %r] %l: %m%n'`` gives you the default layout used for info messages while ``--log=root.fmt:'[%h:%P:(%i) %r] %l: [%c/%p] %m%n'`` gives you the default +``--log=root.fmt:'[%h:%a:(%i) %r] %l: %m%n'`` gives you the default layout used for info messages while ``--log=root.fmt:'[%h:%a:(%i) %r] %l: [%c/%p] %m%n'`` gives you the default layout for the other priorities (it adds the source code location). Also, the actor identification is omitted by the default layout for the messages coming directly from the SimGrid kernel, so info messages are formatted with ``[%r] [%c/%p] %m%n`` in this case. When specifying the layout manually, such distinctions are currently impossible, and the provided layout is used for every messages. diff --git a/docs/source/outcomes.rst b/docs/source/outcomes.rst index a27ebca15f..441ec3d8a2 100644 --- a/docs/source/outcomes.rst +++ b/docs/source/outcomes.rst @@ -22,7 +22,7 @@ handling, while filtering out every other messages that are of a lesser priority ``--log=root.thresh:error --log=s4u_host.thresh:debug`` You can also change the **layout** used to format the messages, using format directives that are similar to the *printf* ones: ``%r`` prints the time elapsed since the beginning of -the simulation; ``%P`` gives the actor name, etc. Many such directives :ref:`are available `. You can have a specific layout per category, and it will be inherited by all +the simulation; ``%a`` gives the actor name, etc. Many such directives :ref:`are available `. You can have a specific layout per category, and it will be inherited by all its sub-categories. Finally, the **appender** actually displays the produced messages. SimGrid provides four appenders so far: the default one prints on *stderr*. ``file`` writes to a given file, diff --git a/examples/c/actor-daemon/actor-daemon.tesh b/examples/c/actor-daemon/actor-daemon.tesh index f2253fa728..9860cc9c93 100644 --- a/examples/c/actor-daemon/actor-daemon.tesh +++ b/examples/c/actor-daemon/actor-daemon.tesh @@ -2,7 +2,7 @@ p Testing the actor daemonization feature -$ ${bindir:=.}/c-actor-daemon ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-daemon ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:worker@Boivin) Let's do some work (for 10 sec on Boivin). > [ 0.000000] (2:daemon@Tremblay) Hello from the infinite loop > [ 3.000000] (2:daemon@Tremblay) Hello from the infinite loop diff --git a/examples/c/actor-exiting/actor-exiting.tesh b/examples/c/actor-exiting/actor-exiting.tesh index 613db5ba40..c2c950f055 100644 --- a/examples/c/actor-exiting/actor-exiting.tesh +++ b/examples/c/actor-exiting/actor-exiting.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" --log=no_loc +$ ${bindir:=.}/c-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" --log=no_loc > [ 1.000000] (A@Tremblay) I stop now > [ 3.000000] (C@Ginette) And now, induce a deadlock by waiting for a message that will never come > diff --git a/examples/c/actor-kill/actor-kill.tesh b/examples/c/actor-kill/actor-kill.tesh index 7f8ef0369c..b3a2ef73fb 100644 --- a/examples/c/actor-kill/actor-kill.tesh +++ b/examples/c/actor-kill/actor-kill.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (killer@Tremblay) Hello! > [ 0.000000] (victim A@Fafard) Hello! > [ 0.000000] (victim A@Fafard) Suspending myself diff --git a/examples/c/actor-lifetime/actor-lifetime.tesh b/examples/c/actor-lifetime/actor-lifetime.tesh index 93215fd94b..a0ad0e0070 100644 --- a/examples/c/actor-lifetime/actor-lifetime.tesh +++ b/examples/c/actor-lifetime/actor-lifetime.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-actor-lifetime ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-lifetime ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep. diff --git a/examples/c/actor-migrate/actor-migrate.tesh b/examples/c/actor-migrate/actor-migrate.tesh index 7cb1ee4161..8282599eeb 100644 --- a/examples/c/actor-migrate/actor-migrate.tesh +++ b/examples/c/actor-migrate/actor-migrate.tesh @@ -2,7 +2,7 @@ p Testing the actor migration feature -$ ${bindir:=.}/c-actor-migrate ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-migrate ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin) > [ 5.000000] (monitor@Boivin) After 5 seconds, move the actor to Jacquelin > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit diff --git a/examples/c/actor-suspend/actor-suspend.tesh b/examples/c/actor-suspend/actor-suspend.tesh index 09275eb0af..47a1ea7104 100644 --- a/examples/c/actor-suspend/actor-suspend.tesh +++ b/examples/c/actor-suspend/actor-suspend.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/c-actor-suspend ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-suspend ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (dream_master@Boivin) Let's create a lazy guy. > [ 0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep. > [ 0.000000] (dream_master@Boivin) Let's wait a little bit... diff --git a/examples/c/actor-yield/actor-yield.tesh b/examples/c/actor-yield/actor-yield.tesh index 34d1d82890..f499bbc9a2 100644 --- a/examples/c/actor-yield/actor-yield.tesh +++ b/examples/c/actor-yield/actor-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-actor-yield ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-actor-yield ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now! > [ 0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now! diff --git a/examples/c/app-bittorrent/app-bittorrent.tesh b/examples/c/app-bittorrent/app-bittorrent.tesh index 1e27526060..cb3feb0579 100644 --- a/examples/c/app-bittorrent/app-bittorrent.tesh +++ b/examples/c/app-bittorrent/app-bittorrent.tesh @@ -4,7 +4,7 @@ p Bittorrent implementation ! timeout 10 ! output sort 19 -$ ${bindir:=.}/c-app-bittorrent ${platfdir}/cluster_backbone.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-bittorrent ${platfdir}/cluster_backbone.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:tracker@node-0.simgrid.org) Tracker launched. > [ 0.000000] (2:peer@node-1.simgrid.org) Hi, I'm joining the network with id 2 > [ 0.000000] (3:peer@node-2.simgrid.org) Hi, I'm joining the network with id 3 diff --git a/examples/c/app-chainsend/app-chainsend.tesh b/examples/c/app-chainsend/app-chainsend.tesh index 4a878fa9e6..898720240b 100644 --- a/examples/c/app-chainsend/app-chainsend.tesh +++ b/examples/c/app-chainsend/app-chainsend.tesh @@ -2,7 +2,7 @@ ! timeout 60 ! output sort 19 -$ ${bindir:=.}/c-app-chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%a@%h)%e%m%n" > [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated). > [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). > [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated). diff --git a/examples/c/app-masterworker/app-masterworker-multicore.tesh b/examples/c/app-masterworker/app-masterworker-multicore.tesh index 9e818880b9..86dea6144e 100644 --- a/examples/c/app-masterworker/app-masterworker-multicore.tesh +++ b/examples/c/app-masterworker/app-masterworker-multicore.tesh @@ -2,7 +2,7 @@ p Testing a simple master/worker example application -$ ./app-masterworker/c-app-masterworker ${platfdir}/multicore_machine.xml ${srcdir:=.}/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ./app-masterworker/c-app-masterworker ${platfdir}/multicore_machine.xml ${srcdir:=.}/app-masterworker-multicore_d.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'Full' > [ 0.000000] (1:master@Tremblay) Got 6 workers and 20 tasks to process diff --git a/examples/c/app-masterworker/app-masterworker-vivaldi.tesh b/examples/c/app-masterworker/app-masterworker-vivaldi.tesh index 7ae97d40c2..1effe9c30e 100644 --- a/examples/c/app-masterworker/app-masterworker-vivaldi.tesh +++ b/examples/c/app-masterworker/app-masterworker-vivaldi.tesh @@ -2,7 +2,7 @@ p Testing a simple master/worker example application -$ ${bindir}/c-app-masterworker ${platfdir}/vivaldi.xml ${srcdir:=.}/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/c-app-masterworker ${platfdir}/vivaldi.xml ${srcdir:=.}/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/latency-factor' to '1.0' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth-factor' to '1.0' > [ 0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process diff --git a/examples/c/app-masterworker/app-masterworker.tesh b/examples/c/app-masterworker/app-masterworker.tesh index 30047d8124..db5801c91b 100644 --- a/examples/c/app-masterworker/app-masterworker.tesh +++ b/examples/c/app-masterworker/app-masterworker.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application (mailbox version) ! output sort 19 -$ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --cfg=network/crosstraffic:0 --trace "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" @@ -34,7 +34,7 @@ $ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${ > [ 5.094868] (0:maestro@) Simulation time 5.09487 > [ 5.094868] (6:worker@Bourassa) I'm done. See you! -$ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-masterworker ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/app-masterworker_d.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "worker-0" > [ 0.002265] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "worker-1" diff --git a/examples/c/app-token-ring/app-token-ring.tesh b/examples/c/app-token-ring/app-token-ring.tesh index 5650fb2688..8f68d1ddb1 100644 --- a/examples/c/app-token-ring/app-token-ring.tesh +++ b/examples/c/app-token-ring/app-token-ring.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '6' > [ 0.000000] (0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (1@host2) Host "1" received "Token" @@ -16,7 +16,7 @@ $ ${bindir:=.}/c-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt: > [ 0.131796] (0@host1) Host "0" received "Token" > [ 0.131796] (maestro@) Simulation time 0.131796 -$ ${bindir:=.}/c-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '2' > [ 0.000000] (0@100030591) Host "0" send 'Token' to Host "1" > [ 0.624423] (1@100036570) Host "1" received "Token" @@ -24,7 +24,7 @@ $ ${bindir:=.}/c-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6 > [ 1.248846] (0@100030591) Host "0" received "Token" > [ 1.248846] (maestro@) Simulation time 1.24885 -$ ${bindir:=.}/c-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/c-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '60' > [ 0.000000] (0@host-1.cluster1) Host "0" send 'Token' to Host "1" > [ 0.030364] (1@host-1.cluster2) Host "1" received "Token" diff --git a/examples/c/cloud-capping/cloud-capping.tesh b/examples/c/cloud-capping/cloud-capping.tesh index d4eff54351..72871aa79f 100644 --- a/examples/c/cloud-capping/cloud-capping.tesh +++ b/examples/c/cloud-capping/cloud-capping.tesh @@ -1,5 +1,5 @@ ! output sort -$ ${bindir:=.}/c-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) # 1. Put a single task on a PM. > [ 0.000000] (1:master_@Fafard) ### Test: with/without sg_exec_set_bound > [ 0.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard diff --git a/examples/c/cloud-migration/cloud-migration.tesh b/examples/c/cloud-migration/cloud-migration.tesh index b69b90e323..e096f65fbe 100644 --- a/examples/c/cloud-migration/cloud-migration.tesh +++ b/examples/c/cloud-migration/cloud-migration.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/c-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Test: Migrate a VM with 1000 Mbytes RAM > [132.765801] (1:master_@Fafard) VM0 migrated: Fafard->Tremblay in 132.766 s > [132.765801] (1:master_@Fafard) Test: Migrate a VM with 100 Mbytes RAM diff --git a/examples/c/comm-pingpong/comm-pingpong.tesh b/examples/c/comm-pingpong/comm-pingpong.tesh index 26178d91da..cc129fdbca 100644 --- a/examples/c/comm-pingpong/comm-pingpong.tesh +++ b/examples/c/comm-pingpong/comm-pingpong.tesh @@ -2,7 +2,7 @@ p Testing with default compound -$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 > [ 0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound) @@ -14,7 +14,7 @@ $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xm p Testing with default compound and Full network optimization -$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/optim' to 'Full' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 @@ -27,7 +27,7 @@ $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xm p Testing the deprecated CM02 network model -$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 @@ -41,7 +41,7 @@ $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xm p Testing the surf network constant model -$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_constant.xml comm-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_constant.xml comm-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 'Constant' diff --git a/examples/c/comm-wait/comm-wait.tesh b/examples/c/comm-wait/comm-wait.tesh index 9307cd9dd9..64ca5d4517 100644 --- a/examples/c/comm-wait/comm-wait.tesh +++ b/examples/c/comm-wait/comm-wait.tesh @@ -2,7 +2,7 @@ p Test1 sg_comm_test() with Sleep_sender > Sleep_receiver -$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 1.000000] (2:receiver@Ruby) Wait for my first message @@ -17,7 +17,7 @@ $ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=. p Test2 sg_comm_test() with Sleep_sender < Sleep_receiver -$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 1.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver' @@ -32,7 +32,7 @@ $ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=. p Test1 sg_comm_wait() with Sleep_sender > Sleep_receiver -$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 1.000000] (2:receiver@Ruby) Wait for my first message @@ -47,7 +47,7 @@ $ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=. p Test2 sg_comm_wait() with Sleep_sender < Sleep_receiver -$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-wait ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 1.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver' diff --git a/examples/c/comm-waitall/comm-waitall.tesh b/examples/c/comm-waitall/comm-waitall.tesh index 326f543542..1c3cfe6bea 100644 --- a/examples/c/comm-waitall/comm-waitall.tesh +++ b/examples/c/comm-waitall/comm-waitall.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/c-comm-waitall ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-waitall ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (3:receiver@Perl) Wait for my first message diff --git a/examples/c/comm-waitany/comm-waitany.tesh b/examples/c/comm-waitany/comm-waitany.tesh index 3d19ecd623..b9e4a98bf4 100644 --- a/examples/c/comm-waitany/comm-waitany.tesh +++ b/examples/c/comm-waitany/comm-waitany.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/c-comm-waitany ${platfdir:=.}/small_platform.xml ${srcdir:=.}/comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-comm-waitany ${platfdir:=.}/small_platform.xml ${srcdir:=.}/comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver-1' > [ 0.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver-0' diff --git a/examples/c/dht-kademlia/dht-kademlia.tesh b/examples/c/dht-kademlia/dht-kademlia.tesh index 3ca6ceb5ff..036e0bb6e1 100644 --- a/examples/c/dht-kademlia/dht-kademlia.tesh +++ b/examples/c/dht-kademlia/dht-kademlia.tesh @@ -3,7 +3,7 @@ p Testing the Kademlia implementation ! output sort 19 -$ ${bindir:=.}/c-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%a@%h)%e%m%n" > [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 > [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 > [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 diff --git a/examples/c/dht-pastry/dht-pastry.tesh b/examples/c/dht-pastry/dht-pastry.tesh index 118fa21627..241efaf684 100644 --- a/examples/c/dht-pastry/dht-pastry.tesh +++ b/examples/c/dht-pastry/dht-pastry.tesh @@ -2,7 +2,7 @@ p Testing the Pastry implementation -$ ${bindir:=.}/c-dht-pastry -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-pastry_d.xml --log=pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-dht-pastry -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dht-pastry_d.xml --log=pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 20.007806] (1:node@node-0.simgrid.org) Task update from 366680 !!! > [ 20.007806] (1:node@node-0.simgrid.org) Node: > [ 20.007806] (1:node@node-0.simgrid.org) Id: 42 '0000002a' diff --git a/examples/c/energy-exec-ptask/energy-exec-ptask.tesh b/examples/c/energy-exec-ptask/energy-exec-ptask.tesh index 8947d721f1..da437392ed 100644 --- a/examples/c/energy-exec-ptask/energy-exec-ptask.tesh +++ b/examples/c/energy-exec-ptask/energy-exec-ptask.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-energy-exec-ptask ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-energy-exec-ptask ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:test@MyHost1) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair > [300.000000] (1:test@MyHost1) We can do the same with a timeout of one second enabled. diff --git a/examples/c/energy-exec/energy-exec.tesh b/examples/c/energy-exec/energy-exec.tesh index 0e12842637..fbaabf89f5 100644 --- a/examples/c/energy-exec/energy-exec.tesh +++ b/examples/c/energy-exec/energy-exec.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption -$ ${bindir:=.}/c-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds @@ -22,7 +22,7 @@ $ ${bindir:=.}/c-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%1 > [ 30.000000] (0:maestro@) Energy consumption of host MyHost2: 2100.000000 Joules > [ 30.000000] (0:maestro@) Energy consumption of host MyHost3: 3000.000000 Joules -$ ${bindir:=.}/c-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/c-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 diff --git a/examples/c/energy-vm/energy-vm.tesh b/examples/c/energy-vm/energy-vm.tesh index 82a1dcf202..b0e1ce7c92 100644 --- a/examples/c/energy-vm/energy-vm.tesh +++ b/examples/c/energy-vm/energy-vm.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption in case of VMs -$ ${bindir:=.}/c-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs@MyHost1) Creating and starting two VMs > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: one inside a VM, the other directly on the host diff --git a/examples/c/exec-async/exec-async.tesh b/examples/c/exec-async/exec-async.tesh index ca6efffb02..28b82de3e0 100644 --- a/examples/c/exec-async/exec-async.tesh +++ b/examples/c/exec-async/exec-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-exec-async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-exec-async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:wait@Fafard) Execute 7.6296e+07 flops, should take 1 second. > [ 0.000000] (2:monitor@Ginette) Execute 4.8492e+07 flops, should take 1 second. > [ 0.000000] (3:cancel@Boivin) Execute 9.8095e+07 flops, should take 1 second. diff --git a/examples/c/exec-dvfs/exec-dvfs.tesh b/examples/c/exec-dvfs/exec-dvfs.tesh index 9ac0ed4558..882c433589 100644 --- a/examples/c/exec-dvfs/exec-dvfs.tesh +++ b/examples/c/exec-dvfs/exec-dvfs.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -19,7 +19,7 @@ $ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10. > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 -$ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/c-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 diff --git a/examples/c/exec-remote/exec-remote.tesh b/examples/c/exec-remote/exec-remote.tesh index f970184aba..f0dda02ce2 100644 --- a/examples/c/exec-remote/exec-remote.tesh +++ b/examples/c/exec-remote/exec-remote.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/c-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) I'm a wizard! I can run a task on the Ginette host from the Fafard one! Look! > [ 0.000000] (1:test@Fafard) It started. Running 48.492Mf takes exactly one second on Ginette (but not on Fafard). > [ 0.100000] (1:test@Fafard) Loads in flops/s: Boivin=0; Fafard=0; Ginette=48492000 diff --git a/examples/c/io-disk-raw/io-disk-raw.tesh b/examples/c/io-disk-raw/io-disk-raw.tesh index 927cd4f98c..e2e428fd7c 100644 --- a/examples/c/io-disk-raw/io-disk-raw.tesh +++ b/examples/c/io-disk-raw/io-disk-raw.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir}/c-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/c-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) *** alice properties **** > [ 0.000000] (0:maestro@) ram -> 100B > [ 0.000000] (0:maestro@) *** bob properties **** diff --git a/examples/c/platform-failures/platform-failures.tesh b/examples/c/platform-failures/platform-failures.tesh index bbcc1b81dc..7c1f941eec 100644 --- a/examples/c/platform-failures/platform-failures.tesh +++ b/examples/c/platform-failures/platform-failures.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED ! output sort 19 -$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=cpu.t:verbose +$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -108,7 +108,7 @@ $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${p p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED ! output sort 19 -$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=cpu.t:verbose +$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -217,4 +217,4 @@ p complex with such an integration test. One day, we will setup a set of p unit tests for the surf solver, and such issues will be addressable again. p For the time being, I just give up, sorry. -p $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=cpu.t:verbose +p $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=cpu.t:verbose diff --git a/examples/c/platform-properties/platform-properties.tesh b/examples/c/platform-properties/platform-properties.tesh index 80e910de41..df0c2453a8 100644 --- a/examples/c/platform-properties/platform-properties.tesh +++ b/examples/c/platform-properties/platform-properties.tesh @@ -3,7 +3,7 @@ p Testing an application with properties in the XML for Hosts, Links and Processes ! output sort 19 -$ ${bindir:=.}/c-platform-properties ${platfdir}/prop.xml platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-platform-properties ${platfdir}/prop.xml platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s diff --git a/examples/c/plugin-host-load/plugin-host-load.tesh b/examples/c/plugin-host-load/plugin-host-load.tesh index 82036e8815..57dc45fef0 100644 --- a/examples/c/plugin-host-load/plugin-host-load.tesh +++ b/examples/c/plugin-host-load/plugin-host-load.tesh @@ -2,7 +2,7 @@ p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops) -$ ${bindir:=.}/c-plugin-host-load ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-plugin-host-load ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0) and current average load: 0.00000 (should be 0) > [ 0.000000] (1:load_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed) diff --git a/examples/c/synchro-semaphore/synchro-semaphore.tesh b/examples/c/synchro-semaphore/synchro-semaphore.tesh index e800832b3c..f6beba53d5 100644 --- a/examples/c/synchro-semaphore/synchro-semaphore.tesh +++ b/examples/c/synchro-semaphore/synchro-semaphore.tesh @@ -3,7 +3,7 @@ p Testing synchronization with semaphores ! output sort 19 -$ ${bindir:=.}/c-synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/c-synchro-semaphore ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:Alice@Fafard) Trying to acquire 1 > [ 0.000000] (1:Alice@Fafard) Acquired 1 > [ 0.900000] (2:Bob@Fafard) Trying to acquire 1 diff --git a/examples/deprecated/java/app/masterworker/app-masterworker.tesh b/examples/deprecated/java/app/masterworker/app-masterworker.tesh index f8cca45836..9d451db043 100644 --- a/examples/deprecated/java/app/masterworker/app-masterworker.tesh +++ b/examples/deprecated/java/app/masterworker/app-masterworker.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${javacmd:=java} -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:app.masterworker.Master@Jacquelin) Hello! My PID is 1. Got 7 workers and 5 tasks to process > [ 0.860026] (2:app.masterworker.Worker@Tremblay) Received "Task_0". Processing it (my pid is 2). diff --git a/examples/deprecated/java/app/tokenring/app-tokenring.tesh b/examples/deprecated/java/app/tokenring/app-tokenring.tesh index f7b5076eec..1b0626d0ba 100644 --- a/examples/deprecated/java/app/tokenring/app-tokenring.tesh +++ b/examples/deprecated/java/app/tokenring/app-tokenring.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n' +$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n' > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (0:maestro@) Number of hosts '6' > [ 0.000000] (1:0@host1) Host '0' send 'Token' to Host '1' @@ -18,7 +18,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/.. > [ 0.131796] (0:maestro@) Terminating the simulation... > [ 0.131796] (0:maestro@) Simulation time 0.13179602061855672 -$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n' +$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%a@%h)%e%m%n' > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (0:maestro@) Number of hosts '2' > [ 0.000000] (1:0@100030591) Host '0' send 'Token' to Host '1' @@ -28,7 +28,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/.. > [ 1.248846] (0:maestro@) Terminating the simulation... > [ 1.248846] (0:maestro@) Simulation time 1.2488464578972847 -$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n' +$ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n' > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (0:maestro@) Number of hosts '60' > [ 0.000000] (1:0@host-1.cluster1) Host '0' send 'Token' to Host '1' diff --git a/examples/deprecated/java/async/dsend/async-dsend.tesh b/examples/deprecated/java/async/dsend/async-dsend.tesh index 99e2112954..fa926a1a51 100644 --- a/examples/deprecated/java/async/dsend/async-dsend.tesh +++ b/examples/deprecated/java/async/dsend/async-dsend.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! timeout 30 -$ ${javacmd:=java} -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:Sender@Boivin) Hello! Got 6 receivers to contact > [ 0.000000] (1:Sender@Boivin) Sending "Task_1" to "Bourassa" diff --git a/examples/deprecated/java/async/waitall/async-waitall.tesh b/examples/deprecated/java/async/waitall/async-waitall.tesh index 35eedc02c7..8aeab7bdc3 100644 --- a/examples/deprecated/java/async/waitall/async-waitall.tesh +++ b/examples/deprecated/java/async/waitall/async-waitall.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${javacmd:=java} -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:Sender@Boivin) I have 6 receivers to contact > [ 0.000000] (1:Sender@Boivin) Start the Sending 'Task_1' to 'Bourassa' diff --git a/examples/deprecated/java/async/yield/async-yield.tesh b/examples/deprecated/java/async/yield/async-yield.tesh index e83e606d88..3d1df97f08 100644 --- a/examples/deprecated/java/async/yield/async-yield.tesh +++ b/examples/deprecated/java/async/yield/async-yield.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! timeout 30 -$ ${javacmd:=java} -classpath ${classpath:=.} async/yield/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} async/yield/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:Yielder@Boivin) Yielded 10. Good bye now! > [ 0.000000] (2:Yielder@Bourassa) Yielded 15. Good bye now! diff --git a/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh index 66e1e042d3..2aef8c8003 100644 --- a/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh +++ b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${javacmd:=java} -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:Master@Boivin) Launched 6 VMs > [ 0.000000] (1:Master@Boivin) Send some work to everyone diff --git a/examples/deprecated/java/process/migration/process-migration.tesh b/examples/deprecated/java/process/migration/process-migration.tesh index 242b21621e..849ea97f95 100644 --- a/examples/deprecated/java/process/migration/process-migration.tesh +++ b/examples/deprecated/java/process/migration/process-migration.tesh @@ -2,7 +2,7 @@ ! output sort 19 -$ ${javacmd:=java} -classpath ${classpath:=.} process/migration/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} process/migration/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (2:emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener. > [ 0.000000] (2:emigrant@Boivin) Yeah, found something to do diff --git a/examples/deprecated/java/process/suspend/process-suspend.tesh b/examples/deprecated/java/process/suspend/process-suspend.tesh index 8ed5050ad3..e24890a007 100644 --- a/examples/deprecated/java/process/suspend/process-suspend.tesh +++ b/examples/deprecated/java/process/suspend/process-suspend.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${javacmd:=java} -classpath ${classpath:=.} process/suspend/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} process/suspend/Main ${srcdir:=.}/../../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:DreamMaster@Jacquelin) Let's create a lazy guy. > [ 0.000000] (1:DreamMaster@Jacquelin) Let's wait a little bit... diff --git a/examples/deprecated/java/task/priority/task-priority.tesh b/examples/deprecated/java/task/priority/task-priority.tesh index 1ba6ad7a36..a457ff753e 100644 --- a/examples/deprecated/java/task/priority/task-priority.tesh +++ b/examples/deprecated/java/task/priority/task-priority.tesh @@ -2,7 +2,7 @@ ! output sort 19 -$ ${javacmd:=java} -classpath ${classpath:=.} task/priority/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/task/priority/priority.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} task/priority/Main ${srcdir:=.}/../../platforms/small_platform.xml ${srcdir:=.}/task/priority/priority.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:task.priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0 > [ 0.000000] (2:task.priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0 diff --git a/examples/deprecated/msg/mc/bugged2-liveness.tesh b/examples/deprecated/msg/mc/bugged2-liveness.tesh index 16d8b151ab..395b3a3209 100644 --- a/examples/deprecated/msg/mc/bugged2-liveness.tesh +++ b/examples/deprecated/msg/mc/bugged2-liveness.tesh @@ -3,4 +3,4 @@ ! expect return 2 ! timeout 20 ! output ignore -$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged2_liveness ${platfdir:=.}/small_platform.xml ${srcdir:=.}/deploy_bugged2_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_bugged2_liveness +$ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged2_liveness ${platfdir:=.}/small_platform.xml ${srcdir:=.}/deploy_bugged2_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack-size:256 --cfg=model-check/property:promela_bugged2_liveness diff --git a/examples/python/actor-daemon/actor-daemon.tesh b/examples/python/actor-daemon/actor-daemon.tesh index a687d3c6f9..523c126922 100644 --- a/examples/python/actor-daemon/actor-daemon.tesh +++ b/examples/python/actor-daemon/actor-daemon.tesh @@ -2,7 +2,7 @@ p Testing the process daemonization feature -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-daemon.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-daemon.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin). > [ 0.000000] (daemon@Tremblay) Hello from the infinite loop > [ 3.000000] (daemon@Tremblay) Hello from the infinite loop diff --git a/examples/python/actor-kill/actor-kill.tesh b/examples/python/actor-kill/actor-kill.tesh index 71779130b4..10f61a7362 100644 --- a/examples/python/actor-kill/actor-kill.tesh +++ b/examples/python/actor-kill/actor-kill.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-kill.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-kill.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (killer@Tremblay) Hello! > [ 0.000000] (victim A@Fafard) Hello! > [ 0.000000] (victim A@Fafard) Suspending myself diff --git a/examples/python/actor-lifetime/actor-lifetime.tesh b/examples/python/actor-lifetime/actor-lifetime.tesh index 906d466268..bf67b9de50 100644 --- a/examples/python/actor-lifetime/actor-lifetime.tesh +++ b/examples/python/actor-lifetime/actor-lifetime.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-lifetime.py ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-lifetime.py ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep. diff --git a/examples/python/actor-migrate/actor-migrate.tesh b/examples/python/actor-migrate/actor-migrate.tesh index d77331326d..6896e53cf5 100644 --- a/examples/python/actor-migrate/actor-migrate.tesh +++ b/examples/python/actor-migrate/actor-migrate.tesh @@ -2,7 +2,7 @@ p Testing the actor migration feature -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-migrate.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-migrate.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin) > [ 5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit diff --git a/examples/python/actor-suspend/actor-suspend.tesh b/examples/python/actor-suspend/actor-suspend.tesh index fee3d527db..9608ce30d3 100644 --- a/examples/python/actor-suspend/actor-suspend.tesh +++ b/examples/python/actor-suspend/actor-suspend.tesh @@ -3,7 +3,7 @@ p Testing the suspend/resume feature of SimGrid ! output sort 19 -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-suspend.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-suspend.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (dream_master@Boivin) Let's create a lazy guy. > [ 0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep. > [ 0.000000] (dream_master@Boivin) Let's wait a little bit... diff --git a/examples/python/actor-yield/actor-yield.tesh b/examples/python/actor-yield/actor-yield.tesh index 209b2eb299..68f020f2d4 100644 --- a/examples/python/actor-yield/actor-yield.tesh +++ b/examples/python/actor-yield/actor-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-yield.py ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/../../s4u/actor-yield/s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-yield.py ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/../../s4u/actor-yield/s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now! > [ 0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now! diff --git a/examples/python/comm-wait/comm-wait.tesh b/examples/python/comm-wait/comm-wait.tesh index 7d7670fbbb..77c789a3e3 100644 --- a/examples/python/comm-wait/comm-wait.tesh +++ b/examples/python/comm-wait/comm-wait.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/comm-wait.py ${platfdir}/small_platform_fatpipe.xml comm-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/comm-wait.py ${platfdir}/small_platform_fatpipe.xml comm-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'Mailbox(receiver-0)' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (1:sender@Tremblay) Send 'Message 1' to 'Mailbox(receiver-0)' diff --git a/examples/python/comm-waitall/comm-waitall.tesh b/examples/python/comm-waitall/comm-waitall.tesh index 208f807c79..e30f19f2a1 100644 --- a/examples/python/comm-waitall/comm-waitall.tesh +++ b/examples/python/comm-waitall/comm-waitall.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/comm-waitall.py ${platfdir}/small_platform_fatpipe.xml comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/comm-waitall.py ${platfdir}/small_platform_fatpipe.xml comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'Mailbox(receiver-0)' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (3:receiver@Perl) Wait for my first message diff --git a/examples/python/comm-waitany/comm-waitany.tesh b/examples/python/comm-waitany/comm-waitany.tesh index cd6ebad5df..3acb8f3931 100644 --- a/examples/python/comm-waitany/comm-waitany.tesh +++ b/examples/python/comm-waitany/comm-waitany.tesh @@ -3,7 +3,7 @@ p Testing Comm.wait_any() ! output sort 19 -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/comm-waitany.py ${platfdir}/small_platform.xml comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/comm-waitany.py ${platfdir}/small_platform.xml comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'Mailbox(receiver-0)' > [ 0.000000] (2:receiver@Fafard) Wait for my first message > [ 0.000000] (3:receiver@Jupiter) Wait for my first message diff --git a/examples/python/exec-async/exec-async.tesh b/examples/python/exec-async/exec-async.tesh index 4df63cbe99..f294eac610 100644 --- a/examples/python/exec-async/exec-async.tesh +++ b/examples/python/exec-async/exec-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-async.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-async.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:wait@Fafard) Waiter executes 76296000 flops, should take 1 second. > [ 0.000000] (2:monitor@Ginette) Monitor executes 48492000 flops, should take 1 second. > [ 0.000000] (3:cancel@Boivin) Canceller executes 98095000 flops, should take 1 second. diff --git a/examples/python/exec-dvfs/exec-dvfs.tesh b/examples/python/exec-dvfs/exec-dvfs.tesh index b3b5e2ebb1..06bd1904af 100644 --- a/examples/python/exec-dvfs/exec-dvfs.tesh +++ b/examples/python/exec-dvfs/exec-dvfs.tesh @@ -2,7 +2,7 @@ p Testing the DVFS-related functions -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-dvfs.py ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-dvfs.py ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -20,7 +20,7 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-dvfs.py ${pla > [ 6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 > [ 6.000000] (2:dvfs_test@MyHost2) Final power peak=20000000.000000 -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-dvfs.py ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/exec-dvfs.py ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 diff --git a/examples/python/exec-remote/exec-remote.tesh b/examples/python/exec-remote/exec-remote.tesh index 400b4ddaa3..a6a61c5953 100644 --- a/examples/python/exec-remote/exec-remote.tesh +++ b/examples/python/exec-remote/exec-remote.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/exec-remote.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/exec-remote.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) I'm a wizard! I can run a task on the Ginette host from the Fafard one! Look! > [ 0.000000] (1:test@Fafard) It started. Running 48.492Mf takes exactly one second on Ginette (but not on Fafard). > [ 0.100000] (1:test@Fafard) Loads in flops/s: Boivin=0; Fafard=0; Ginette=48492000 diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh index a4679efd48..f9623120d0 100644 --- a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh +++ b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh @@ -2,7 +2,7 @@ p Testing the actor daemonization feature -$ ${bindir:=.}/s4u-actor-daemon ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-daemon ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin). > [ 0.000000] (daemon@Tremblay) Hello from the infinite loop > [ 3.000000] (daemon@Tremblay) Hello from the infinite loop diff --git a/examples/s4u/actor-exiting/s4u-actor-exiting.tesh b/examples/s4u/actor-exiting/s4u-actor-exiting.tesh index dbbf4db1c0..651cf68914 100644 --- a/examples/s4u/actor-exiting/s4u-actor-exiting.tesh +++ b/examples/s4u/actor-exiting/s4u-actor-exiting.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" --log=no_loc +$ ${bindir:=.}/s4u-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" --log=no_loc > [ 1.000000] (A@Tremblay) I stop now > [ 1.000000] (maestro@) Actor A terminates now > [ 2.000000] (maestro@) Actor A gets destroyed now diff --git a/examples/s4u/actor-kill/s4u-actor-kill.tesh b/examples/s4u/actor-kill/s4u-actor-kill.tesh index 603cd8d23e..ddbb367706 100644 --- a/examples/s4u/actor-kill/s4u-actor-kill.tesh +++ b/examples/s4u/actor-kill/s4u-actor-kill.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (killer@Tremblay) Hello! > [ 0.000000] (victim A@Fafard) Hello! > [ 0.000000] (victim A@Fafard) Suspending myself diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh index 082c1121d8..1a194ab686 100644 --- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh +++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster_backbone.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster_backbone.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. > [ 0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. > [ 2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep. diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh index 27ab0b7645..dd6f4309c6 100644 --- a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh +++ b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh @@ -2,7 +2,7 @@ p Testing the actor migration feature -$ ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin) > [ 5.000000] (monitor@Boivin) After 5 seconds, move the actor to Jacquelin > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh index a443c7fc4f..b506771fd6 100644 --- a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh +++ b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh @@ -3,7 +3,7 @@ p Testing the suspend/resume feature of S4U ! output sort 19 -$ ${bindir:=.}/s4u-actor-suspend ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-suspend ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (dream_master@Boivin) Let's create a lazy guy. > [ 0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep. > [ 0.000000] (dream_master@Boivin) Let's wait a little bit... diff --git a/examples/s4u/actor-yield/s4u-actor-yield.tesh b/examples/s4u/actor-yield/s4u-actor-yield.tesh index 69503ff507..a8838a672c 100644 --- a/examples/s4u/actor-yield/s4u-actor-yield.tesh +++ b/examples/s4u/actor-yield/s4u-actor-yield.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-actor-yield ${platfdir}/small_platform_fatpipe.xml s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-actor-yield ${platfdir}/small_platform_fatpipe.xml s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now! > [ 0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now! diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh index 6142d79b66..83cc088c95 100644 --- a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh +++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh @@ -4,7 +4,7 @@ p Testing the Bittorrent implementation with S4U ! timeout 10 ! output sort 19 -$ ${bindir:=.}/s4u-app-bittorrent ${platfdir}/cluster_backbone.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-bittorrent ${platfdir}/cluster_backbone.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:tracker@node-0.simgrid.org) Tracker launched. > [ 0.000000] (2:peer@node-1.simgrid.org) Hi, I'm joining the network with id 2 > [ 0.000000] (3:peer@node-2.simgrid.org) Hi, I'm joining the network with id 3 diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh index c025625828..ef903dfd53 100644 --- a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh +++ b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh @@ -4,7 +4,7 @@ p Testing the chainsend S4U implementation ! timeout 60 ! output sort 19 -$ ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%12.6r]%e(%i:%a@%h)%e%m%n" > [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated). > [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). > [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated). diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh b/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh index a1e38caba5..ff087db9b2 100644 --- a/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh +++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers.tesh @@ -3,7 +3,7 @@ p Testing a simple master/workers example application ! output sort 19 -$ ${bindir:=.}/s4u-app-masterworkers-class ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-masterworkers-class ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (master@Tremblay) Sending task 0 of 20 to mailbox 'Tremblay' > [ 0.002265] (master@Tremblay) Sending task 1 of 20 to mailbox 'Jupiter' @@ -34,7 +34,7 @@ $ ${bindir:=.}/s4u-app-masterworkers-class ${platfdir}/small_platform.xml s4u-ap > [ 5.133855] (worker@Bourassa) Exiting now. ! output sort 19 -$ ${bindir:=.}/s4u-app-masterworkers-fun ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-masterworkers-fun ${platfdir}/small_platform.xml s4u-app-masterworkers_d.xml --trace "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (master@Tremblay) Got 5 workers and 20 tasks to process > [ 0.000000] (master@Tremblay) Sending task 0 of 20 to mailbox 'Tremblay' > [ 0.002265] (master@Tremblay) Sending task 1 of 20 to mailbox 'Jupiter' diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh index 6429883065..76fb5f8e46 100644 --- a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh +++ b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '6' > [ 0.000000] (0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (1@host2) Host "1" received "Token" @@ -16,7 +16,7 @@ $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fm > [ 0.131796] (0@host1) Host "0" received "Token" > [ 0.131796] (maestro@) Simulation time 0.131796 -$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '2' > [ 0.000000] (0@100030591) Host "0" send 'Token' to Host "1" > [ 0.624423] (1@100036570) Host "1" received "Token" @@ -24,7 +24,7 @@ $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12 > [ 1.248846] (0@100030591) Host "0" received "Token" > [ 1.248846] (maestro@) Simulation time 1.24885 -$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) Number of hosts '60' > [ 0.000000] (0@host-1.cluster1) Host "0" send 'Token' to Host "1" > [ 0.030364] (1@host-1.cluster2) Host "1" received "Token" diff --git a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh b/examples/s4u/cloud-capping/s4u-cloud-capping.tesh index 09a7a9eef5..7d98b020d1 100644 --- a/examples/s4u/cloud-capping/s4u-cloud-capping.tesh +++ b/examples/s4u/cloud-capping/s4u-cloud-capping.tesh @@ -1,5 +1,5 @@ ! output sort -$ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-cloud-capping ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) # 1. Put a single activity on a PM. > [ 0.000000] (1:master_@Fafard) ### Test: with/without activity set_bound > [ 0.000000] (1:master_@Fafard) ### Test: no bound for Task1@Fafard diff --git a/examples/s4u/cloud-migration/s4u-cloud-migration.tesh b/examples/s4u/cloud-migration/s4u-cloud-migration.tesh index 02628ea332..13db264e8a 100644 --- a/examples/s4u/cloud-migration/s4u-cloud-migration.tesh +++ b/examples/s4u/cloud-migration/s4u-cloud-migration.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/s4u-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-cloud-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Test: Migrate a VM with 1000 Mbytes RAM > [132.765801] (1:master_@Fafard) VM0 migrated: Fafard->Tremblay in 132.766 s > [132.765801] (1:master_@Fafard) Test: Migrate a VM with 100 Mbytes RAM diff --git a/examples/s4u/comm-dependent/s4u-comm-dependent.tesh b/examples/s4u/comm-dependent/s4u-comm-dependent.tesh index 94a4001c21..3d39738522 100644 --- a/examples/s4u/comm-dependent/s4u-comm-dependent.tesh +++ b/examples/s4u/comm-dependent/s4u-comm-dependent.tesh @@ -2,7 +2,7 @@ p Testing with default compound -$ ${bindir:=.}/s4u-comm-dependent ${platfdir}/small_platform.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%6.2r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-dependent ${platfdir}/small_platform.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%6.2r]%e(%i:%a@%h)%e%m%n" > [ 2.00] (1:sender@Tremblay) Remove a dependency from 'exec on sender' on 'comm to receiver' > [ 2.00] (1:sender@Tremblay) All dependencies are solved, let's start 'comm to receiver' > [ 3.07] (2:receiver@Jupiter) Remove a dependency from 'comm from sender' on 'exec on receiver' diff --git a/examples/s4u/comm-host2host/s4u-comm-host2host.tesh b/examples/s4u/comm-host2host/s4u-comm-host2host.tesh index 9dcda41718..1335cb8889 100644 --- a/examples/s4u/comm-host2host/s4u-comm-host2host.tesh +++ b/examples/s4u/comm-host2host/s4u-comm-host2host.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-comm-host2host ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-host2host ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Boivin) Send c12 with sendto_async(Tremblay -> Jupiter), and c34 with sendto_init(Fafard -> Ginette) > [ 0.000000] (1:sender@Boivin) After creation, c12 is STARTED (remaining: 1.50e+07 bytes); c34 is INITED (remaining: 1.00e+07 bytes) > [ 1.000000] (1:sender@Boivin) One sec later, c12 is STARTED (remaining: 8.48e+06 bytes); c34 is INITED (remaining: 1.00e+07 bytes) diff --git a/examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh b/examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh index ea8a5e8503..233348e263 100644 --- a/examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh +++ b/examples/s4u/comm-pingpong/s4u-comm-pingpong.tesh @@ -2,7 +2,7 @@ p Testing with default compound -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 > [ 0.019014] (2:ponger@Jupiter) Payload received : small communication (latency bound) @@ -14,7 +14,7 @@ $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--log=root.fmt: p Testing with default compound Full network optimization -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--cfg=network/optim:Full" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/optim' to 'Full' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 @@ -27,7 +27,7 @@ $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--cfg=network/o p Testing the deprecated CM02 network model -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 @@ -41,7 +41,7 @@ $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model: p Testing the surf network constant model -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_constant.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_constant.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 'Constant' diff --git a/examples/s4u/comm-pingpong/simix-breakpoint.tesh b/examples/s4u/comm-pingpong/simix-breakpoint.tesh index ccd57696bd..7788a80532 100644 --- a/examples/s4u/comm-pingpong/simix-breakpoint.tesh +++ b/examples/s4u/comm-pingpong/simix-breakpoint.tesh @@ -3,7 +3,7 @@ p Testing option --cfg=debug/breakpoint ! expect signal SIGTRAP -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=debug/breakpoint:3.1416 +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=debug/breakpoint:3.1416 > [ 0.000000] (0:maestro@) Configuration change: Set 'debug/breakpoint' to '3.1416' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 > [ 0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1 diff --git a/examples/s4u/comm-ready/s4u-comm-ready.tesh b/examples/s4u/comm-ready/s4u-comm-ready.tesh index 96902d9b02..17e76f55ad 100644 --- a/examples/s4u/comm-ready/s4u-comm-ready.tesh +++ b/examples/s4u/comm-ready/s4u-comm-ready.tesh @@ -2,7 +2,7 @@ p Test1 Peer sending and receiving -$ ${bindir:=.}/s4u-comm-ready ${platfdir}/small_platform_fatpipe.xml s4u-comm-ready_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-ready ${platfdir}/small_platform_fatpipe.xml s4u-comm-ready_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:peer@Tremblay) Send 'Message 0 from peer 0' to 'peer-1' > [ 0.000000] (2:peer@Ruby) Send 'Message 0 from peer 1' to 'peer-0' > [ 0.000000] (1:peer@Tremblay) Send 'Message 0 from peer 0' to 'peer-2' diff --git a/examples/s4u/comm-suspend/s4u-comm-suspend.tesh b/examples/s4u/comm-suspend/s4u-comm-suspend.tesh index 8d05012e06..f572b6c860 100644 --- a/examples/s4u/comm-suspend/s4u-comm-suspend.tesh +++ b/examples/s4u/comm-suspend/s4u-comm-suspend.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-comm-suspend ${platfdir}/small_platform.xml s4u-comm-suspend_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-suspend ${platfdir}/small_platform.xml s4u-comm-suspend_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Suspend the communication before it starts (remaining: 13194230 bytes) and wait a second. > [ 0.000000] (2:receiver@Jupiter) Wait for the message. > [ 1.000000] (1:sender@Tremblay) Now, start the communication (remaining: 13194230 bytes) and wait another second. diff --git a/examples/s4u/comm-wait/s4u-comm-wait.tesh b/examples/s4u/comm-wait/s4u-comm-wait.tesh index d78bf4936c..547bfc4c7f 100644 --- a/examples/s4u/comm-wait/s4u-comm-wait.tesh +++ b/examples/s4u/comm-wait/s4u-comm-wait.tesh @@ -2,7 +2,7 @@ p Test1 Sleep_sender > Sleep_receiver -$ ${bindir:=.}/s4u-comm-wait ${platfdir}/small_platform_fatpipe.xml s4u-comm-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-wait ${platfdir}/small_platform_fatpipe.xml s4u-comm-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 1.000000] (2:receiver@Ruby) Wait for my first message diff --git a/examples/s4u/comm-waitall/s4u-comm-waitall.tesh b/examples/s4u/comm-waitall/s4u-comm-waitall.tesh index 5844e84ada..2f662a7c8b 100644 --- a/examples/s4u/comm-waitall/s4u-comm-waitall.tesh +++ b/examples/s4u/comm-waitall/s4u-comm-waitall.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-comm-waitall ${platfdir}/small_platform_fatpipe.xml s4u-comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-waitall ${platfdir}/small_platform_fatpipe.xml s4u-comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (3:receiver@Perl) Wait for my first message diff --git a/examples/s4u/comm-waitany/s4u-comm-waitany.tesh b/examples/s4u/comm-waitany/s4u-comm-waitany.tesh index 0d56306d80..9e5944aa9a 100644 --- a/examples/s4u/comm-waitany/s4u-comm-waitany.tesh +++ b/examples/s4u/comm-waitany/s4u-comm-waitany.tesh @@ -3,7 +3,7 @@ p Testing this_actor->wait_any() ! output sort 19 -$ ${bindir:=.}/s4u-comm-waitany ${platfdir}/small_platform.xml s4u-comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-waitany ${platfdir}/small_platform.xml s4u-comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Fafard) Wait for my first message > [ 0.000000] (3:receiver@Jupiter) Wait for my first message diff --git a/examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh b/examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh index e5c43f7b44..87d8794170 100644 --- a/examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh +++ b/examples/s4u/comm-waituntil/s4u-comm-waituntil.tesh @@ -2,7 +2,7 @@ p Test1 Sleep_sender > Sleep_receiver -$ ${bindir:=.}/s4u-comm-waituntil ${platfdir}/small_platform_fatpipe.xml s4u-comm-waituntil_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-waituntil ${platfdir}/small_platform_fatpipe.xml s4u-comm-waituntil_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver-0' diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh index f4fb8acde7..5272f733f1 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord.tesh +++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh @@ -3,7 +3,7 @@ p Testing the Chord implementation with S4U ! output sort 19 -$ ${bindir:=.}/s4u-dht-chord -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-dht-chord -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%a@%h)%e%m%n" > [ 0.00000] (node@node-0.simgrid.org) My finger table: > [ 0.00000] (node@node-0.simgrid.org) Start | Succ > [ 0.00000] (node@node-0.simgrid.org) 3 | 42 diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh index b92c7a6924..09586c26e1 100644 --- a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh +++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh @@ -3,7 +3,7 @@ p Testing the Kademlia implementation with S4U ! output sort 19 -$ ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%a@%h)%e%m%n" > [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 > [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 > [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 diff --git a/examples/s4u/energy-boot/s4u-energy-boot.tesh b/examples/s4u/energy-boot/s4u-energy-boot.tesh index 7a1c3016a6..43b18b8bbb 100644 --- a/examples/s4u/energy-boot/s4u-energy-boot.tesh +++ b/examples/s4u/energy-boot/s4u-energy-boot.tesh @@ -2,7 +2,7 @@ p Modeling the host energy consumption during boot and shutdown -$ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:Boot Monitor@MyHost2) Initial pstate: 0; Energy dissipated so far:0E+00 J > [ 0.000000] (1:Boot Monitor@MyHost2) Sleep for 10 seconds > [ 10.000000] (1:Boot Monitor@MyHost2) Done sleeping. Current pstate: 0; Energy dissipated so far: 950.00 J @@ -23,7 +23,7 @@ $ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[% > [177.000000] (0:maestro@) Energy consumption of host MyHost1: 19820.000000 Joules > [177.000000] (0:maestro@) Energy consumption of host MyHost2: 17700.000000 Joules -$ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/s4u-energy-boot ${srcdir:=.}/platform_boot.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:Boot Monitor@MyHost2) Initial pstate: 0; Energy dissipated so far:0E+00 J diff --git a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh index 376b3e8c91..80a18568cf 100644 --- a/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh +++ b/examples/s4u/energy-exec-ptask/s4u-energy-exec-ptask.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption -$ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost1] Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 @@ -43,7 +43,7 @@ $ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_platform.xml "--log=root > [470.000000] (0:maestro@) Energy consumption of host MyHost3: 47000.000000 Joules -$ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-exec-ptask ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:energy_ptask_test@MyHost1) [MyHost1] Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 diff --git a/examples/s4u/energy-exec/s4u-energy-exec.tesh b/examples/s4u/energy-exec/s4u-energy-exec.tesh index 22acb05dae..025cbf90cc 100644 --- a/examples/s4u/energy-exec/s4u-energy-exec.tesh +++ b/examples/s4u/energy-exec/s4u-energy-exec.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption -$ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 > [ 0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds @@ -22,7 +22,7 @@ $ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_platform.xml "--log=root.fmt:[ > [ 30.000000] (0:maestro@) Energy consumption of host MyHost2: 2100.000000 Joules > [ 30.000000] (0:maestro@) Energy consumption of host MyHost3: 3000.000000 Joules -$ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=host/model:ptask_L07 +$ ${bindir:=.}/s4u-energy-exec ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=host/model:ptask_L07 > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:93.33333333333333:200.0, 93.0:90.0:170.0, 90.0:90.0:150.0 diff --git a/examples/s4u/energy-link/s4u-energy-link.tesh b/examples/s4u/energy-link/s4u-energy-link.tesh index c3b63c95e9..1060899383 100644 --- a/examples/s4u/energy-link/s4u-energy-link.tesh +++ b/examples/s4u/energy-link/s4u-energy-link.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing link energy consumption (using CM02 as a network model) -$ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Activating the SimGrid link energy plugin @@ -15,7 +15,7 @@ $ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml "--log=root.fmt: p And now test with 500000 bytes -$ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml 1 50000000 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-energy-link ${platfdir}/energy_platform.xml 1 50000000 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Activating the SimGrid link energy plugin diff --git a/examples/s4u/energy-vm/s4u-energy-vm.tesh b/examples/s4u/energy-vm/s4u-energy-vm.tesh index e04ecab598..06ca5ed1c9 100644 --- a/examples/s4u/energy-vm/s4u-energy-vm.tesh +++ b/examples/s4u/energy-vm/s4u-energy-vm.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing host energy consumption in case of VMs -$ ${bindir:=.}/s4u-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-energy-vm ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs@MyHost1) Creating and starting two VMs > [ 0.000000] (1:dvfs@MyHost1) Create two activities on Host1: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Create two activities on Host2: one inside a VM, the other directly on the host diff --git a/examples/s4u/energy-wifi/s4u-energy-wifi.tesh b/examples/s4u/energy-wifi/s4u-energy-wifi.tesh index 3df3c434bc..8492413696 100644 --- a/examples/s4u/energy-wifi/s4u-energy-wifi.tesh +++ b/examples/s4u/energy-wifi/s4u-energy-wifi.tesh @@ -2,7 +2,7 @@ p Testing the mechanism for computing link energy consumption (using CM02 as a network model) -$ ${bindir:=.}/s4u-energy-wifi ${platfdir}/wifi_energy.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-energy-wifi ${platfdir}/wifi_energy.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Activating the wifi_energy plugin. diff --git a/examples/s4u/engine-filtering/s4u-engine-filtering.tesh b/examples/s4u/engine-filtering/s4u-engine-filtering.tesh index 157a40d43c..7ef0b1c71c 100644 --- a/examples/s4u/engine-filtering/s4u-engine-filtering.tesh +++ b/examples/s4u/engine-filtering/s4u-engine-filtering.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Let's filter some hosts... -$ ${bindir:=.}/s4u-engine-filtering ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no +$ ${bindir:=.}/s4u-engine-filtering ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no' > [ 0.000000] (0:maestro@) Hosts currently registered with this engine: 3 diff --git a/examples/s4u/exec-async/s4u-exec-async.tesh b/examples/s4u/exec-async/s4u-exec-async.tesh index 989c78690e..9f3ab52955 100644 --- a/examples/s4u/exec-async/s4u-exec-async.tesh +++ b/examples/s4u/exec-async/s4u-exec-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-exec-async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:wait@Fafard) Execute 7.6296e+07 flops, should take 1 second. > [ 0.000000] (2:monitor@Ginette) Execute 4.8492e+07 flops, should take 1 second. > [ 0.000000] (3:cancel@Boivin) Execute 9.8095e+07 flops, should take 1 second. diff --git a/examples/s4u/exec-dependent/s4u-exec-dependent.tesh b/examples/s4u/exec-dependent/s4u-exec-dependent.tesh index f915f71456..75e916de76 100644 --- a/examples/s4u/exec-dependent/s4u-exec-dependent.tesh +++ b/examples/s4u/exec-dependent/s4u-exec-dependent.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort -$ ${bindir:=.}/s4u-exec-dependent ${platfdir}/small_platform.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-dependent ${platfdir}/small_platform.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 2.000000] (1:worker@Fafard) Remove a dependency from 'parent 1' on 'child' > [ 2.000000] (1:worker@Fafard) Exec 'parent 1' is complete > [ 3.000000] (1:worker@Fafard) Remove a dependency from 'parent 2' on 'child' diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh index f5bb91021c..8ad80a9493 100644 --- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh +++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh @@ -2,7 +2,7 @@ p Testing the DVFS-related functions -$ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 @@ -21,7 +21,7 @@ $ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_platform.xml "--log=root.fmt:[%1 > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 -$ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-dvfs ${platfdir}/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 > [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 > [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh index 15ceaef84e..b03213dfe9 100644 --- a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh +++ b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:ptask_L07 --cfg=tracing:yes --cfg=tracing/uncategorized:yes --log=instr_resource.t:verbose --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-ptask ${platfdir}/energy_platform.xml --cfg=host/model:ptask_L07 --cfg=tracing:yes --cfg=tracing/uncategorized:yes --log=instr_resource.t:verbose --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07' > [ 0.000000] (0:maestro@) Configuration change: Set 'tracing' to 'yes' > [ 0.000000] (0:maestro@) Configuration change: Set 'tracing/uncategorized' to 'yes' diff --git a/examples/s4u/exec-remote/s4u-exec-remote.tesh b/examples/s4u/exec-remote/s4u-exec-remote.tesh index 37d52b0f8b..9b2c9933e0 100644 --- a/examples/s4u/exec-remote/s4u-exec-remote.tesh +++ b/examples/s4u/exec-remote/s4u-exec-remote.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort 19 -$ ${bindir:=.}/s4u-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-exec-remote ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) I'm a wizard! I can run an activity on the Ginette host from the Fafard one! Look! > [ 0.000000] (1:test@Fafard) It started. Running 48.492Mf takes exactly one second on Ginette (but not on Fafard). > [ 0.100000] (1:test@Fafard) Loads in flops/s: Boivin=0; Fafard=0; Ginette=48492000 diff --git a/examples/s4u/io-async/s4u-io-async.tesh b/examples/s4u/io-async/s4u-io-async.tesh index a1ca8d7618..0fd5d78377 100644 --- a/examples/s4u/io-async/s4u-io-async.tesh +++ b/examples/s4u/io-async/s4u-io-async.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-io-async ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-io-async ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:test@bob) Hello! read 20000000 bytes from Disk1 > [ 0.000000] (2:test_waitfor@alice) Hello! write 50000000 bytes from Disk1 > [ 0.200000] (1:test@bob) Goodbye now! diff --git a/examples/s4u/io-dependent/s4u-io-dependent.tesh b/examples/s4u/io-dependent/s4u-io-dependent.tesh index 7a7e537d40..3a3d2f995d 100644 --- a/examples/s4u/io-dependent/s4u-io-dependent.tesh +++ b/examples/s4u/io-dependent/s4u-io-dependent.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort -$ ${bindir:=.}/s4u-io-dependent ${platfdir}/hosts_with_disks.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-io-dependent ${platfdir}/hosts_with_disks.xml --log=s4u_activity.t:verbose "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 1.000000] (1:bob@bob) All dependencies are solved, let's start 'bob write' > [ 1.000000] (1:bob@bob) Remove a dependency from 'bob compute' on 'bob write' > [ 1.100000] (1:bob@bob) All dependencies are solved, let's start 'carl read' diff --git a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh b/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh index f2eadab4d3..024aba7a00 100644 --- a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh +++ b/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir}/s4u-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/s4u-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) *** alice properties **** > [ 0.000000] (0:maestro@) ram -> 100B > [ 0.000000] (0:maestro@) *** bob properties **** diff --git a/examples/s4u/maestro-set/s4u-maestro-set.tesh b/examples/s4u/maestro-set/s4u-maestro-set.tesh index fb1fc8844e..ea532a127d 100644 --- a/examples/s4u/maestro-set/s4u-maestro-set.tesh +++ b/examples/s4u/maestro-set/s4u-maestro-set.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-maestro-set ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-maestro-set ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) I am not the main thread, as expected > [ 0.000000] (2:receiver@Jupiter) I am not the main thread, as expected > [ 0.000000] (1:sender@Tremblay) I am the main thread, as expected diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner index ce56584b54..0552ca2898 100755 --- a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner +++ b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner @@ -32,7 +32,7 @@ run() { timeout 30s ${bindir:=.}/bugged1_liveness_cleaner_$state \ ${srcdir:=.}/../../platforms/platform.xml \ ${srcdir:=.}/deploy_bugged1_liveness.xml \ - "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" \ + "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" \ --cfg=contexts/factory:ucontext \ --cfg=contexts/stack-size:256 assert 'test $? = 134' diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh index f8541d0d69..ccf11d9026 100644 --- a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh +++ b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 30 ! output ignore -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged1-liveness ${platfdir:=.}/small_platform.xml 1 --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 +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged1-liveness ${platfdir:=.}/small_platform.xml 1 --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%a@%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:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh index 6ac22b1aec..71e9226fa3 100644 --- a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh +++ b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 20 ! output ignore -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged1-liveness ${platfdir:=.}/small_platform.xml 0 --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 +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged1-liveness ${platfdir:=.}/small_platform.xml 0 --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack-size:256 --cfg=model-check/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 diff --git a/examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh b/examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh index d004d06e26..5e96cdef3b 100644 --- a/examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh +++ b/examples/s4u/mc-bugged1/s4u-mc-bugged1.tesh @@ -2,7 +2,7 @@ ! expect return 1 ! timeout 20 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged1 ${platfdir:=.}/model_checker_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256 +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged1 ${platfdir:=.}/model_checker_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256 > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (2:client@HostB) Sent! > [ 0.000000] (3:client@HostC) Sent! diff --git a/examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh b/examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh index c6b3708211..e20f2b95eb 100644 --- a/examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh +++ b/examples/s4u/mc-bugged2/s4u-mc-bugged2.tesh @@ -2,7 +2,7 @@ ! expect return 1 ! timeout 20 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged2 ${platfdir:=.}/model_checker_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256 +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-bugged2 ${platfdir:=.}/model_checker_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=contexts/stack-size:256 > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (2:client@HostB) Send 1 > [ 0.000000] (3:client@HostC) Send 2 diff --git a/examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh b/examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh index 24e59278de..7c459b1566 100644 --- a/examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh +++ b/examples/s4u/mc-failing-assert/s4u-mc-failing-assert.tesh @@ -2,7 +2,7 @@ ! expect return 1 ! timeout 20 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-failing-assert ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/s4u-mc-failing-assert ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (2:client1@Bourassa) Sent! > [ 0.000000] (1:server@Boivin) OK diff --git a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh b/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh index df2170dda8..2f85e78326 100644 --- a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh +++ b/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/network-ns3-wifi/s4u-network-ns3-wifi ${platfdir}/wifi_ns3.xml "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3-wifi/s4u-network-ns3-wifi ${platfdir}/wifi_ns3.xml "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [STA0-1:receiver(2)] [ns3_wifi_example/INFO] [1] STA0-1 received 100000 bytes from STA0-0 > [STA0-0:receiver(4)] [ns3_wifi_example/INFO] [2] STA0-0 received 100000 bytes from STA0-1 diff --git a/examples/s4u/network-ns3/s4u-network-ns3.tesh b/examples/s4u/network-ns3/s4u-network-ns3.tesh index 2d38df43d9..195129f964 100644 --- a/examples/s4u/network-ns3/s4u-network-ns3.tesh +++ b/examples/s4u/network-ns3/s4u-network-ns3.tesh @@ -5,19 +5,19 @@ p We just want to check that the ns-3 bindings of SimGrid are working correctly, p 3hosts 2links -$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3hosts_2links_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3hosts_2links_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [Jupiter:worker(2)] [s4u_test/INFO] FLOW[1] : Receive 100 bytes from Tremblay to Jupiter p 6hosts 3links -$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3links_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3links_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [Jupiter:worker(2)] [s4u_test/INFO] FLOW[1] : Receive 10000 bytes from Tremblay to Jupiter > [Ginette:worker(4)] [s4u_test/INFO] FLOW[2] : Receive 10000 bytes from Fafard to Ginette > [Lovelace:worker(6)] [s4u_test/INFO] FLOW[3] : Receive 10000 bytes from Bourassa to Lovelace -$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3links-timer_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3links-timer_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [Jupiter:worker(2)] [s4u_test/INFO] FLOW[1] : Receive 10000 bytes from Tremblay to Jupiter > [Ginette:worker(4)] [s4u_test/INFO] FLOW[2] : Receive 10000 bytes from Fafard to Ginette @@ -26,14 +26,14 @@ $ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/small_platform_one_link_r p One cluster -$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/cluster_backbone.xml ${srcdir}/network-ns3/one_cluster_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/cluster_backbone.xml ${srcdir}/network-ns3/one_cluster_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [node-6.simgrid.org:worker(2)] [s4u_test/INFO] FLOW[1] : Receive 100 bytes from node-2.simgrid.org to node-6.simgrid.org p Dogbone ! timeout 10 -$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/dogbone.xml ${srcdir}/network-ns3/dogbone_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/dogbone.xml ${srcdir}/network-ns3/dogbone_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [:maestro(0)] [ns3/WARNING] Ignoring a route between S1 and C1 of length 3: Only routes of length 1 are considered with ns-3. > WARNING: You can ignore this warning if your hosts can still communicate when only considering routes of length 1. @@ -43,7 +43,7 @@ $ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/dogbone.xml ${srcdir}/net p 2hosts 1link -$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/onelink.xml ${srcdir}/network-ns3/onelink_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ${bindir:=.}/network-ns3/s4u-network-ns3 ${platfdir}/onelink.xml ${srcdir}/network-ns3/onelink_d.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [C1:worker(2)] [s4u_test/INFO] FLOW[1] : Receive 10000 bytes from S1 to C1 diff --git a/examples/s4u/network-wifi/s4u-network-wifi.tesh b/examples/s4u/network-wifi/s4u-network-wifi.tesh index b4e49d11f5..0cb06ba95f 100644 --- a/examples/s4u/network-wifi/s4u-network-wifi.tesh +++ b/examples/s4u/network-wifi/s4u-network-wifi.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-network-wifi ${platfdir}/wifi.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-network-wifi ${platfdir}/wifi.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Station 1) Send a message to the other station. > [ 0.000000] (2:receiver@Station 2) Wait for a message. > [ 3.888889] (1:sender@Station 1) Done. diff --git a/examples/s4u/platform-failures/s4u-platform-failures.tesh b/examples/s4u/platform-failures/s4u-platform-failures.tesh index 6de4ef060e..3f8d0cf0f9 100644 --- a/examples/s4u/platform-failures/s4u-platform-failures.tesh +++ b/examples/s4u/platform-failures/s4u-platform-failures.tesh @@ -3,7 +3,7 @@ p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED ! output sort 19 -$ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=cpu.t:verbose +$ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process @@ -108,7 +108,7 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $ p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED ! output sort 19 -$ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=cpu.t:verbose +$ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=cpu.t:verbose > [ 0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard' > [ 0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind. > [ 0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process diff --git a/examples/s4u/platform-profile/s4u-platform-profile.tesh b/examples/s4u/platform-profile/s4u-platform-profile.tesh index 1d27cf584a..a1570c0a87 100644 --- a/examples/s4u/platform-profile/s4u-platform-profile.tesh +++ b/examples/s4u/platform-profile/s4u-platform-profile.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-platform-profile ${platfdir}/small_platform_profile.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-platform-profile ${platfdir}/small_platform_profile.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:watcher@Tremblay) Fafard: 25Gflops, Jupiter: 12Gflops, Link1: (1000.00MB/s 10ms), Link2: (1000.00MB/s 10ms) > [ 1.000000] (1:watcher@Tremblay) Fafard: 25Gflops, Jupiter: 12Gflops, Link1: (1000.00MB/s 3ms), Link2: (1000.00MB/s 10ms) > [ 2.000000] (1:watcher@Tremblay) Fafard: 25Gflops, Jupiter: 25Gflops, Link1: (2000.00MB/s 3ms), Link2: (1000.00MB/s 10ms) diff --git a/examples/s4u/platform-properties/s4u-platform-properties.tesh b/examples/s4u/platform-properties/s4u-platform-properties.tesh index f9a14b8093..71e4fecb4c 100644 --- a/examples/s4u/platform-properties/s4u-platform-properties.tesh +++ b/examples/s4u/platform-properties/s4u-platform-properties.tesh @@ -3,7 +3,7 @@ p Testing a S4U application with properties in the XML for Hosts, Links and Actors ! output sort 19 -$ ${bindir:=.}/s4u-platform-properties ${platfdir}/prop.xml s4u-platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-platform-properties ${platfdir}/prop.xml s4u-platform-properties_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s diff --git a/examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh b/examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh index 276ef37d69..f91cbfc6cb 100644 --- a/examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh +++ b/examples/s4u/plugin-host-load/s4u-plugin-host-load.tesh @@ -2,7 +2,7 @@ p This tests the Host Load plugin (that allows the user to get the current load of a host and the computed flops) -$ ${bindir:=.}/s4u-plugin-host-load ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-plugin-host-load ${platfdir}/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:load_test@MyHost1) Initial peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (should be 0) and current average load: 0.00000 (should be 0) > [ 0.000000] (1:load_test@MyHost1) Sleep for 10 seconds > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed) diff --git a/examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh b/examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh index cc078cd081..a98dd0fe12 100644 --- a/examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh +++ b/examples/s4u/plugin-link-load/s4u-plugin-link-load.tesh @@ -2,7 +2,7 @@ p This tests the LinkLoad plugin (that allows the user to get the load of a link) -$ ${bindir:=.}/s4u-plugin-link-load ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-plugin-link-load ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (2:monitor@node-51.simgrid.org) Tracking desired links > [ 0.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (0, 0, 0, 0) > [ 1.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (0, 0, 0, 0) diff --git a/examples/s4u/replay-comm/s4u-replay-comm.tesh b/examples/s4u/replay-comm/s4u-replay-comm.tesh index 00006b27fc..3b73683cb6 100644 --- a/examples/s4u/replay-comm/s4u-replay-comm.tesh +++ b/examples/s4u/replay-comm/s4u-replay-comm.tesh @@ -1,12 +1,12 @@ ! output sort 19 -$ ${bindir:=.}/s4u-replay-comm --log=replay_comm.thres=verbose ${platfdir}/small_platform_fatpipe.xml s4u-replay-comm-split_d.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-replay-comm --log=replay_comm.thres=verbose ${platfdir}/small_platform_fatpipe.xml s4u-replay-comm-split_d.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 20.703314] (p0@Tremblay) p0 recv p1 20.703314 > [ 20.703314] (p1@Ruby) p1 send p0 1e10 20.703314 > [ 30.897513] (p0@Tremblay) p0 compute 1e9 10.194200 > [ 30.897513] (p1@Ruby) p1 compute 1e9 10.194200 > [ 30.897513] (maestro@) Simulation time 30.8975 -$ ${bindir:=.}/s4u-replay-comm --log=replay_comm.thres=verbose ${platfdir}/small_platform_fatpipe.xml s4u-replay-comm_d.xml s4u-replay-comm.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-replay-comm --log=replay_comm.thres=verbose ${platfdir}/small_platform_fatpipe.xml s4u-replay-comm_d.xml s4u-replay-comm.txt "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 20.703314] (p0@Tremblay) p0 recv p1 20.703314 > [ 20.703314] (p1@Ruby) p1 send p0 1e10 20.703314 > [ 30.897513] (p0@Tremblay) p0 compute 1e9 10.194200 diff --git a/examples/s4u/replay-io/s4u-replay-io.tesh b/examples/s4u/replay-io/s4u-replay-io.tesh index 31b4f0ef86..f31bb6493f 100644 --- a/examples/s4u/replay-io/s4u-replay-io.tesh +++ b/examples/s4u/replay-io/s4u-replay-io.tesh @@ -1,5 +1,5 @@ ! output sort 19 -$ ${bindir:=.}/s4u-replay-io --log=replay_io.thres=verbose ${platfdir}/hosts_with_disks.xml s4u-replay-io_d.xml s4u-replay-io.txt "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-replay-io --log=replay_io.thres=verbose ${platfdir}/hosts_with_disks.xml s4u-replay-io_d.xml s4u-replay-io.txt "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (p0@alice) p0 open /lib/libsimgrid.so.3.6.2 0.000000 > [ 0.063552] (p0@alice) p0 read /lib/libsimgrid.so.3.6.2 12710497 0.063552 > [ 0.063552] (p0@alice) p0 close /lib/libsimgrid.so.3.6.2 0.000000 diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh index 8dc83c88e4..f03b7453fd 100644 --- a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh +++ b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_multi.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_multi.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) simple > [ 0.000000] (maestro@) node-0.1core.org > [ 0.000000] (maestro@) node-1.1core.org @@ -27,7 +27,7 @@ $ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_multi.xml "--log=roo > [ 0.000000] (maestro@) node-6.4cores.org > [ 0.000000] (maestro@) node-7.4cores.org -$ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_dragonfly.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-routing-get-clusters ${platfdir}/cluster_dragonfly.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (maestro@) bob_cluster > [ 0.000000] (maestro@) node-0.simgrid.org > [ 0.000000] (maestro@) node-1.simgrid.org diff --git a/examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh b/examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh index 1053222de6..eadab556d0 100644 --- a/examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh +++ b/examples/s4u/synchro-condition-variable-waituntil/s4u-synchro-condition-variable-waituntil.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-synchro-condition-variable-waituntil "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/s4u-synchro-condition-variable-waituntil "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (2:competitor@Tremblay) Entering the race... > [ 0.000000] (3:competitor@Tremblay) Entering the race... > [ 0.000000] (4:competitor@Tremblay) Entering the race... diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll1.tesh index 9452b3e3ab..8590813d37 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll1.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll1.tesh @@ -6,7 +6,7 @@ $ mkfile ${srcdir:=.}/workload_coll1 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_coll1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_coll1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='coll.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') @@ -22,7 +22,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with one coll job (with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_coll1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_coll1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='coll.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh index 81c99ffa0f..d39f90d1a5 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh @@ -7,7 +7,7 @@ $ mkfile ${srcdir:=.}/workload_coll2_same_time_and_resources ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_coll2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_coll2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='coll.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='coll.txt', size=2, start=0, alloc='0,1' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh index deb4038700..97349fe0ea 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh @@ -6,7 +6,7 @@ $ mkfile ${srcdir:=.}/workload_empty1 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') @@ -23,7 +23,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with one empty job (with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh index 171cbee54f..f7b3685af2 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh @@ -7,7 +7,7 @@ $ mkfile ${srcdir:=.}/workload_empty2 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='2,3' @@ -35,7 +35,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two empty jobs (not at the same time, not on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='2,3' @@ -71,7 +71,7 @@ $ mkfile ${srcdir:=.}/workload_empty2_same_resources ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1' @@ -99,7 +99,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two empty jobs (not at the same time, but on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1' @@ -135,7 +135,7 @@ $ mkfile ${srcdir:=.}/workload_empty2_same_time ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3' @@ -162,7 +162,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two empty jobs (at the same time but not on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3' @@ -198,7 +198,7 @@ $ mkfile ${srcdir:=.}/workload_empty2_same_time_and_resources ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1' @@ -226,7 +226,7 @@ p Workload with two empty jobs (at the same time and on the same resources, with ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh index b27648cd9c..0d68c8db2b 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh @@ -6,7 +6,7 @@ $ mkfile ${srcdir:=.}/workload_mixed1 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') @@ -22,7 +22,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir p Workload with one mixed job (with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh index 5c3b546290..22ba4d5da4 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh @@ -6,7 +6,7 @@ $ mkfile ${srcdir:=.}/workload_mixed2 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' @@ -32,7 +32,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two mixed jobs (not at the same time, not on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' @@ -66,7 +66,7 @@ $ mkfile ${srcdir:=.}/workload_mixed2_same_resources ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' @@ -92,7 +92,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two mixed jobs (not at the same time, but on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh index 379b6eaf2c..b8af968bca 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh @@ -1,7 +1,7 @@ p Workload with two mixed jobs (at the same time but not on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='2,3' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh index 9b32acdbd0..ca715de7f4 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh @@ -1,7 +1,7 @@ p Workload with two mixed jobs (at the same time but not on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='2,3' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh index 9efc0099d4..1ddbbf6921 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh @@ -1,7 +1,7 @@ p Workload with two mixed jobs (at the same time and on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='0,1' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh index 4d9b15c778..b2973139a6 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh @@ -1,7 +1,7 @@ p Workload with two mixed jobs (at the same time and on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='0,1' diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh index 62827fd4ec..b0dbb16797 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh @@ -5,13 +5,13 @@ $ mkfile ${srcdir:=.}/workload_nojob ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 0 0 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Simulation finished! Final time: 0 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" 7 13 > [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 7.000000] (maestro@) Simulation finished! Final time: 7 diff --git a/src/mc/api.cpp b/src/mc/api.cpp index 8b8b77b181..83e367625c 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -87,7 +87,7 @@ inline bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const kernel::activity::CommImpl* synchro2 = get_comm(r2); if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) { - const kernel::activity::MailboxImpl* mbox = get_mbox(r1); + const kernel::activity::MailboxImpl* mbox = get_mbox(r1); // r1->get_mboxx') if (mbox != synchro2->mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0) @@ -328,10 +328,10 @@ bool Api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, return remote(comm_addr1) == remote(comm_addr2); } -kernel::activity::CommImpl* Api::get_comm_isend_raw_addr(smx_simcall_t request) const +RemotePtr Api::get_comm_isend_raw_addr(smx_simcall_t request) const { auto comm_addr = simcall_comm_isend__getraw__result(request); - return static_cast(comm_addr); + return RemotePtr(static_cast(comm_addr)); } kernel::activity::CommImpl* Api::get_comm_wait_raw_addr(smx_simcall_t request) const diff --git a/src/mc/checker/SimcallInspector.hpp b/src/mc/checker/SimcallInspector.hpp index 3759a7fa2d..e4766a620f 100644 --- a/src/mc/checker/SimcallInspector.hpp +++ b/src/mc/checker/SimcallInspector.hpp @@ -27,6 +27,8 @@ public: * If it's a random(), choose the next value to explore. */ virtual void arm() {} + virtual void fire() {} + virtual bool is_dependend(SimcallInspector& other); /** Some simcalls may only be observable under some circumstances. * Most simcalls are not visible from the MC because they don't have an inspector at all. */ diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp index 4819878dfb..8113f3691d 100644 --- a/src/xbt/log.cpp +++ b/src/xbt/log.cpp @@ -572,7 +572,7 @@ static void xbt_log_help() " -> %%p: Priority name (LOG4J compatible)\n" "\n" " -> %%h: Hostname (SimGrid extension)\n" - " -> %%P: Process name (SimGrid extension)\n" + " -> %%a: Actor name (SimGrid extension)\n" " -> %%t: Thread \"name\" (LOG4J compatible -- actually the address of the thread in memory)\n" " -> %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)\n" "\n" diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp index 55408937fc..49c9ba26c7 100644 --- a/src/xbt/xbt_log_layout_format.cpp +++ b/src/xbt/xbt_log_layout_format.cpp @@ -18,7 +18,7 @@ static constexpr const char* ERRMSG = " what: %%m: user message %%c: log category %%p: log priority\n" " where:\n" " source: %%F: file %%L: line %%M: function %%l: location (%%F:%%L)\n" - " runtime: %%h: hostname %%t: thread %%P: process %%i: PID\n" + " runtime: %%h: hostname %%a: actor %%i: PID\n" " when: %%d: date %%r: app. age\n" " other: %%%%: %% %%n: new line %%e: plain space\n"; @@ -129,10 +129,11 @@ static bool xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_even show_string(sg_host_self_get_name()); break; case 't': /* thread/process name; LOG4J compliant */ - case 'P': /* process name; SimGrid extension */ + case 'P': /* Used before SimGrid 3.26 and kept for compatiblity. Should not hurt. */ + case 'a': /* actor name; SimGrid extension */ show_string(xbt_procname()); break; - case 'i': /* process PID name; SimGrid extension */ + case 'i': /* actor ID; SimGrid extension */ show_int(xbt_getpid()); break; case 'F': /* file name; LOG4J compliant */ diff --git a/teshsuite/java/semaphoregc/semaphoregc.tesh b/teshsuite/java/semaphoregc/semaphoregc.tesh index 4abd4f5d1e..19adc301d9 100644 --- a/teshsuite/java/semaphoregc/semaphoregc.tesh +++ b/teshsuite/java/semaphoregc/semaphoregc.tesh @@ -1,6 +1,6 @@ ! timeout 15 -$ ${javacmd:=java} -classpath ${classpath:=.} semaphoregc.SemaphoreGC ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.4r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} semaphoregc.SemaphoreGC ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.4r]%e(%i:%a@%h)%e%m%n" > [ 0.0000] (0:maestro@) Using regular java threads. > [ 0.0000] (1:SemCreator@Fafard) Creating 50 new Semaphores, yielding and triggering a GC after each > [ 500.0000] (1:SemCreator@Fafard) It worked, we survived. The test is passed. diff --git a/teshsuite/java/sleephostoff/sleephostoff.tesh b/teshsuite/java/sleephostoff/sleephostoff.tesh index 9a2ea81802..5467ab0fac 100644 --- a/teshsuite/java/sleephostoff/sleephostoff.tesh +++ b/teshsuite/java/sleephostoff/sleephostoff.tesh @@ -1,4 +1,4 @@ -$ ${javacmd:=java} -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${javacmd:=java} -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:TestRunner@Fafard) **** **** **** ***** ***** Test Sleep ***** ***** **** **** **** > [ 0.000000] (1:TestRunner@Fafard) Test sleep: Create a process on Tremblay that simply make periodic sleep, turn off Tremblay diff --git a/teshsuite/lua/lua_platforms.tesh b/teshsuite/lua/lua_platforms.tesh index be0fab2869..94fa230343 100644 --- a/teshsuite/lua/lua_platforms.tesh +++ b/teshsuite/lua/lua_platforms.tesh @@ -28,7 +28,7 @@ $ ${bindir:=.}/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun ${srcdir > [Bourassa:worker:(6) 5.133855] [s4u_app_masterworker/INFO] Exiting now. > [5.133855] [s4u_app_masterworker/INFO] Simulation is over -$ ${bindir:=.}/examples/s4u/app-token-ring/s4u-app-token-ring ${srcdir:=.}/examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/examples/s4u/app-token-ring/s4u-app-token-ring ${srcdir:=.}/examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of hosts '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" diff --git a/teshsuite/mc/random-bug/random-bug-nocrash.tesh b/teshsuite/mc/random-bug/random-bug-nocrash.tesh index 00fdd65fe1..975946e483 100644 --- a/teshsuite/mc/random-bug/random-bug-nocrash.tesh +++ b/teshsuite/mc/random-bug/random-bug-nocrash.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh ! expect return 1 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug assert ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug assert ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (0:maestro@) Behavior: assert > [ 0.000000] (0:maestro@) ************************** @@ -14,7 +14,7 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug assert ${platfdir > [ 0.000000] (0:maestro@) Visited states = 68 > [ 0.000000] (0:maestro@) Executed transitions = 46 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug printf ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug printf ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (0:maestro@) Behavior: printf > [ 0.000000] (1:app@Fafard) Error reached diff --git a/teshsuite/mc/random-bug/random-bug-replay.tesh b/teshsuite/mc/random-bug/random-bug-replay.tesh index ed83684e88..df085576c1 100644 --- a/teshsuite/mc/random-bug/random-bug-replay.tesh +++ b/teshsuite/mc/random-bug/random-bug-replay.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/random-bug printf ${platfdir}/small_platform.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" +$ ${bindir:=.}/random-bug printf ${platfdir}/small_platform.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4" > [ 0.000000] (0:maestro@) Behavior: printf > [ 0.000000] (0:maestro@) path=1/3;1/4 > [ 0.000000] (1:app@Fafard) Error reached @@ -7,6 +7,6 @@ $ ${bindir:=.}/random-bug printf ${platfdir}/small_platform.xml --log=xbt_cfg.t # Behavior: assert does not have the same output within and without MC, so don't test it here. That's already covered with the other ones ! expect signal SIGIOT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/random-bug abort ${platfdir}/small_platform.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" +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/random-bug abort ${platfdir}/small_platform.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4" > [ 0.000000] (0:maestro@) Behavior: abort > [ 0.000000] (0:maestro@) path=1/3;1/4 diff --git a/teshsuite/mc/random-bug/random-bug.tesh b/teshsuite/mc/random-bug/random-bug.tesh index c41c45b317..fa0d3747d6 100644 --- a/teshsuite/mc/random-bug/random-bug.tesh +++ b/teshsuite/mc/random-bug/random-bug.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh ! expect return 1 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug assert ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug assert ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (0:maestro@) Behavior: assert > [ 0.000000] (0:maestro@) ************************** @@ -16,7 +16,7 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug assert ${platfdir ! expect return 6 # because SIMGRID_MC_EXIT_PROGRAM_CRASH = 6 -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug abort ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --log=no_loc +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug abort ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning --log=no_loc > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (0:maestro@) Behavior: abort > [ 0.000000] (0:maestro@) ************************** @@ -32,7 +32,7 @@ $ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug abort ${platfdir} > [ 0.000000] (0:maestro@) Executed transitions = 2 > [ 0.000000] (0:maestro@) Stack trace not displayed because you passed --log=no_loc -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug printf ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug printf ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=xbt_cfg.thresh:warning > [ 0.000000] (0:maestro@) Check a safety property. Reduction is: dpor. > [ 0.000000] (0:maestro@) Behavior: printf > [ 0.000000] (1:app@Fafard) Error reached diff --git a/teshsuite/python/borken-context/borken-context.tesh b/teshsuite/python/borken-context/borken-context.tesh index cb6e84e945..e422bbb408 100644 --- a/teshsuite/python/borken-context/borken-context.tesh +++ b/teshsuite/python/borken-context/borken-context.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/borken-context.py ${platfdir}/small_platform_fatpipe.xml borken-context_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/borken-context.py ${platfdir}/small_platform_fatpipe.xml borken-context_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 3.000000] (1:sender@Tremblay) Goodbye now! > [ 5.000000] (2:receiver@Ruby) Five seconds elapsed > [ 5.000000] (0:maestro@) Dummy import... diff --git a/teshsuite/python/corrupt-stack/corrupt-stack.tesh b/teshsuite/python/corrupt-stack/corrupt-stack.tesh index ea860717eb..310c9660ee 100644 --- a/teshsuite/python/corrupt-stack/corrupt-stack.tesh +++ b/teshsuite/python/corrupt-stack/corrupt-stack.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/corrupt-stack.py ${platfdir}/small_platform_fatpipe.xml corrupt-stack_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/corrupt-stack.py ${platfdir}/small_platform_fatpipe.xml corrupt-stack_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sleeper3@Ruby) 3-Iter 6 > [ 0.000000] (1:sleeper3@Ruby) 5-Iter 5 > [ 0.000000] (1:sleeper3@Ruby) 1-Iter 4 diff --git a/teshsuite/s4u/basic-link-test/basic-link-test.tesh b/teshsuite/s4u/basic-link-test/basic-link-test.tesh index d2b8048ecb..e733a78a2e 100644 --- a/teshsuite/s4u/basic-link-test/basic-link-test.tesh +++ b/teshsuite/s4u/basic-link-test/basic-link-test.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Link count: 12 > [ 0.000000] (0:maestro@) __loopback__: latency = 0.00000, bandwidth = 10000000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000 @@ -15,7 +15,7 @@ $ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=r > [ 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 -$ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Link count: 5 > [ 0.000000] (0:maestro@) __loopback__: latency = 0.00000, bandwidth = 10000000000.000000 > [ 0.000000] (0:maestro@) link1: latency = 0.00005, bandwidth = 125000000.000000 diff --git a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh index 235dfcf2cb..f0c3138a03 100644 --- a/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh +++ b/teshsuite/s4u/cloud-interrupt-migration/cloud-interrupt-migration.tesh @@ -1,4 +1,4 @@ -$ ${bindir:=.}/cloud-interrupt-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/cloud-interrupt-migration ${platfdir}/small_platform.xml --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:master_@Fafard) Start the migration of VM0 from Fafard to Tremblay > [ 2.000000] (1:master_@Fafard) Wait! change my mind, shutdown VM0. This ends the migration > [ 10.000000] (1:master_@Fafard) Start again the migration of VM0 from Fafard to Tremblay diff --git a/teshsuite/s4u/comm-get-sender/comm-get-sender.tesh b/teshsuite/s4u/comm-get-sender/comm-get-sender.tesh index 6130c033f4..e54f5c12c4 100644 --- a/teshsuite/s4u/comm-get-sender/comm-get-sender.tesh +++ b/teshsuite/s4u/comm-get-sender/comm-get-sender.tesh @@ -1,5 +1,5 @@ ! output sort -$ ${bindir}/comm-get-sender ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/comm-get-sender ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:send@Tremblay) Sending > [ 0.000000] (2:receive@Tremblay) Receiving > [ 0.000195] (2:receive@Tremblay) Got a message sent by 'send' diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh index 89e43ce300..13503418f5 100644 --- a/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh +++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.tesh @@ -1,4 +1,4 @@ -$ ./concurrent_rw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ./concurrent_rw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (host@bob) process 1 is writing! > [ 0.000000] (host@bob) process 2 is writing! > [ 0.000000] (host@bob) process 3 is writing! diff --git a/teshsuite/s4u/is-router/is-router.tesh b/teshsuite/s4u/is-router/is-router.tesh index 3a39722df5..7192988e62 100644 --- a/teshsuite/s4u/is-router/is-router.tesh +++ b/teshsuite/s4u/is-router/is-router.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/is-router ${srcdir:=.}/../../simdag/platforms/test_of_is_router.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/is-router ${srcdir:=.}/../../simdag/platforms/test_of_is_router.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > Host count: 10, link number: 1 > - Seen: "host01". Type: host > - Seen: "host02". Type: host diff --git a/teshsuite/s4u/listen_async/listen_async.tesh b/teshsuite/s4u/listen_async/listen_async.tesh index 9d3157c18f..7731de3956 100644 --- a/teshsuite/s4u/listen_async/listen_async.tesh +++ b/teshsuite/s4u/listen_async/listen_async.tesh @@ -1,4 +1,4 @@ -$ ./listen_async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ./listen_async ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (test@Tremblay) Task listen works on regular mailboxes > [ 0.000000] (test@Tremblay) Mailbox::listen_from() returns 1 (should return my pid, which is 1) > [ 0.000195] (test@Tremblay) Data successfully received from regular mailbox diff --git a/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh b/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh index 74c6da62c3..16cb9cbd8b 100644 --- a/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh +++ b/teshsuite/s4u/ns3-from-src-to-itself/ns3-from-src-to-itself.tesh @@ -1,7 +1,7 @@ p In the ns-3 tests, the timings are not shown because the exact values may vary with your ns-3 version. p We just want to check that the ns-3 bindings of SimGrid are working correctly, we don't want to thoroughly test ns-3. -$ ./ns3-from-src-to-itself ${platfdir}/ns3-big-cluster.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ./ns3-from-src-to-itself ${platfdir}/ns3-big-cluster.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [:maestro(0)] [ns3/WARNING] Sending from a host c-01.rennes to itself is not supported by ns-3. Every such communication finishes immediately upon startup. > [c-01.rennes:receiver(1)] [s4u_test/INFO] Done receiving from 2 senders, each of them sending 5 messages diff --git a/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.tesh b/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.tesh index 61b0e9c4ad..c5d0feb75a 100644 --- a/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.tesh +++ b/teshsuite/s4u/ns3-simultaneous-send-rcv/ns3-simultaneous-send-rcv.tesh @@ -1,6 +1,6 @@ p In the ns-3 tests, the timings are not shown because the exact values may vary with your ns-3 version. p We just want to check that the ns-3 bindings of SimGrid are working correctly, we don't want to thoroughly test ns-3. -$ ./ns3-simultaneous-send-rcv ${platfdir}/ns3-big-cluster.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" +$ ./ns3-simultaneous-send-rcv ${platfdir}/ns3-big-cluster.xml --cfg=network/model:ns-3 "--log=root.fmt:[%h:%a(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'ns-3' > [c-01.rennes:receiver(1)] [s4u_test/INFO] Done receiving from 100 senders, each of them sending 5 messages diff --git a/teshsuite/s4u/pid/pid.tesh b/teshsuite/s4u/pid/pid.tesh index 86011dbb42..5ad07c9ba2 100644 --- a/teshsuite/s4u/pid/pid.tesh +++ b/teshsuite/s4u/pid/pid.tesh @@ -1,4 +1,4 @@ -$ ./pid ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ./pid ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (sendpid@Tremblay) Sending pid of "1". > [ 0.000000] (sendpid@Tremblay) Sending pid of "2". > [ 0.000000] (sendpid@Tremblay) Sending pid of "3". diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.tesh b/teshsuite/s4u/storage_client_server/storage_client_server.tesh index b4d284175d..a103fbba93 100644 --- a/teshsuite/s4u/storage_client_server/storage_client_server.tesh +++ b/teshsuite/s4u/storage_client_server/storage_client_server.tesh @@ -1,4 +1,4 @@ -$ ./storage_client_server ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" +$ ./storage_client_server ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n" > [ 0.000000] (server@alice) *** Disk info on alice *** > [ 0.000000] (server@alice) Disk name: Disk1, mount name: / > [ 0.000000] (server@alice) Free size: 536857690006 bytes diff --git a/teshsuite/s4u/trace-integration/trace-integration.tesh b/teshsuite/s4u/trace-integration/trace-integration.tesh index fcecc76b63..0db4220061 100644 --- a/teshsuite/s4u/trace-integration/trace-integration.tesh +++ b/teshsuite/s4u/trace-integration/trace-integration.tesh @@ -4,7 +4,7 @@ p c=cycle s=step p=priority h=host p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c0s1.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_0_step_1 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -16,7 +16,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c0s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_0_step_2 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -28,7 +28,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s0.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_0 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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,7 +40,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c1s0.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_1_step_0 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -52,7 +52,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s1.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_1 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -64,7 +64,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c2s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_2_step_2 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -76,7 +76,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c1s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_1_step_2 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -88,7 +88,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c3s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_3_step_2 ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -100,7 +100,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two process with same priority ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -116,7 +116,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -132,7 +132,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp2 p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority (included) ! output sort -$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -148,7 +148,7 @@ $ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included. p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -168,7 +168,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority ! output sort -$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' @@ -188,7 +188,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority (included) ! output sort -$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/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" +$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/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:%a@%h)%e%m%n" > [ 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' diff --git a/teshsuite/s4u/wait-any-for/wait-any-for.tesh b/teshsuite/s4u/wait-any-for/wait-any-for.tesh index a28b79002b..87ae347dce 100644 --- a/teshsuite/s4u/wait-any-for/wait-any-for.tesh +++ b/teshsuite/s4u/wait-any-for/wait-any-for.tesh @@ -3,7 +3,7 @@ p Testing the wait_any_for feature of S4U ! output sort 19 -$ ${bindir:=.}/wait-any-for ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/wait-any-for ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:worker@Tremblay) Sending and receiving 42 and 51 asynchronously > [ 0.000000] (1:worker@Tremblay) All comms have started > [ 0.500000] (1:worker@Tremblay) wait_any_for: Timeout reached diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh index 593f596dcc..5206812ff1 100644 --- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh +++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 @@ -156,7 +156,7 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_splitduplex.xml FULL_ > Route latency = 0.000600, route bandwidth = 125000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 @@ -273,7 +273,7 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml FULL_LINK "--log > Route latency = 0.000600, route bandwidth = 125000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 2 > Route between alice and alice @@ -294,7 +294,7 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK > Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 3 > Route between alice and alice @@ -315,7 +315,7 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xm > Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 6 > Route between NODO01 and NODO01 diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh index 4519613d7f..566cf352ea 100644 --- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh +++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.tesh @@ -1,36 +1,36 @@ ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 12 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 5, link number: 1 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 1, link number: 5 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 3, link number: 4 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 4, link number: 12 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 4 ! output sort -$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > Workstation number: 2, link number: 2 diff --git a/teshsuite/simdag/basic1/basic1.tesh b/teshsuite/simdag/basic1/basic1.tesh index 72369bb5f8..dde9e4a97a 100644 --- a/teshsuite/simdag/basic1/basic1.tesh +++ b/teshsuite/simdag/basic1/basic1.tesh @@ -1,7 +1,7 @@ -$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml 1e9 1e9 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml 1e9 1e9 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 16.000100] (0:maestro@) Simulation time: 16.000100 -$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml 1e9 1e8 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/basic1 ../../../examples/platforms/two_hosts_platform_shared.xml 1e9 1e8 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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/comm-mxn-all2all/comm-mxn-all2all.tesh b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh index f4edb07b59..2fc2682d58 100644 --- a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh +++ b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.tesh @@ -1,6 +1,6 @@ p all 2 all test, only fat pipe switch is used concurrently ! output sort -$ ${bindir:=.}/comm-mxn-all2all ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-mxn-all2all ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 8.000000] (0:maestro@) 8 diff --git a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh index fde722fb20..ac52c7f36f 100644 --- a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh +++ b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.tesh @@ -1,6 +1,6 @@ p sending on different paths test ! output sort -$ ${bindir:=.}/comm-mxn-independent ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-mxn-independent ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 3.000000] (0:maestro@) 3 diff --git a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh index 4eaeddfe6d..bbe9f04bcf 100644 --- a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh +++ b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.tesh @@ -1,6 +1,6 @@ p scatter test ! output sort -$ ${bindir:=.}/comm-mxn-scatter ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-mxn-scatter ../platforms/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > [ 8.000000] (0:maestro@) 8 diff --git a/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh index 2c8538b723..654230ba04 100644 --- a/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh +++ b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.tesh @@ -1,20 +1,20 @@ p latency check, 1 byte, shared link ! output sort -$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1.5 p latency check, 1 byte, fat pipe ! output sort -$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 -$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-1 ../platforms/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 3 diff --git a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh index dca689f88c..6416d54575 100644 --- a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh +++ b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.tesh @@ -1,20 +1,20 @@ p latency check, 2 x 1 byte, same direction, shared link ! output sort -$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1sl.xml --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1sl.xml --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 -$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1fl.xml --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1fl.xml --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 -$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1switch.xml --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-2 ../platforms/platform_2p_1switch.xml --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 4 diff --git a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh index 0e889b22d7..c4935b43cc 100644 --- a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh +++ b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.tesh @@ -2,20 +2,20 @@ p latency check, 2 x 1 byte, opposite direction, shared link ! output sort -$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 -$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 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 -$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-3 ../platforms/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 4 diff --git a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh index daffc5b30a..546d560da2 100644 --- a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh +++ b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh @@ -1,6 +1,6 @@ p latency bounded by large latency link ! output sort -$ ${bindir:=.}/comm-p2p-latency-bound ../platforms/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comm-p2p-latency-bound ../platforms/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 10001.5 diff --git a/teshsuite/simdag/comp-only-par/comp-only-par.tesh b/teshsuite/simdag/comp-only-par/comp-only-par.tesh index 21adaf9428..19c2a3639a 100644 --- a/teshsuite/simdag/comp-only-par/comp-only-par.tesh +++ b/teshsuite/simdag/comp-only-par/comp-only-par.tesh @@ -1,11 +1,11 @@ p par task comp only, no comm, homogeneous ! output sort -$ ${bindir:=.}/comp-only-par ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comp-only-par ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1 p par task comp only, no comm, heterogeneous ! output sort -$ ${bindir:=.}/comp-only-par ../platforms/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" +$ ${bindir:=.}/comp-only-par ../platforms/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1 diff --git a/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh b/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh index 9b88759c07..1aeec46e8c 100644 --- a/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh +++ b/teshsuite/simdag/comp-only-seq/comp-only-seq.tesh @@ -1,6 +1,6 @@ p seq task comp only, no comm ! output sort -$ ${bindir:=.}/comp-only-seq ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/comp-only-seq ../platforms/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks. > 1 diff --git a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh index c3ad26c29f..ee01d405a1 100644 --- a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh +++ b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh @@ -1,5 +1,5 @@ ! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_disk_attachment.xml:19: Unable to attach storage cdisk: host plouf does not exist. > [ 0.000000] [0:maestro@] Exiting now. diff --git a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh index f9e194da37..cc2b34bbb8 100644 --- a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh +++ b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh @@ -1,12 +1,12 @@ ! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: zoneRoute gw_src='nod-cluster_router.cluster.us' does name a node. Existing netpoints: > 'node-1.cluster.us','node-2.cluster.us','node-3.cluster.us','node-4.cluster.us','node-cluster_router.cluster.us','noeud-1.grappe.fr','noeud-2.grappe.fr','noeud-3.grappe.fr','noeud-4.grappe.fr','noeud-grappe_router.grappe.fr' > [ 0.000000] [0:maestro@] Exiting now. ! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: zoneRoute gw_dst='neud-grappe_router.grappe.fr' does name a node. Existing netpoints: > 'node-1.cluster.us','node-2.cluster.us','node-3.cluster.us','node-4.cluster.us','node-cluster_router.cluster.us','noeud-1.grappe.fr','noeud-2.grappe.fr','noeud-3.grappe.fr','noeud-4.grappe.fr','noeud-grappe_router.grappe.fr' diff --git a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh index 27535d7d74..f18b7e3afb 100644 --- a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh +++ b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh @@ -1,4 +1,4 @@ ! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=no_loc +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --log=no_loc > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > [ 0.000000] [0:maestro@] The route between alice and bob already exists (Rq: routes are symmetrical by default). diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh index d027cfbaa3..1b3acda8c1 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -134,7 +134,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e > > -$ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -268,7 +268,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt: > > -$ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -302,7 +302,7 @@ $ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6 > > -$ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -320,7 +320,7 @@ $ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6 > > -$ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -363,7 +363,7 @@ $ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log > > -$ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -498,7 +498,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -525,7 +525,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[% > > -$ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -550,7 +550,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%1 > > -$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > @@ -684,7 +684,7 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "-- > > -$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > > diff --git a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh index db9f767655..230368cd36 100644 --- a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh +++ b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh @@ -2,7 +2,7 @@ p Test allreduce ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-allreduce --log=smpi_config.thres:warning --log=smpi_coll.thres:error --cfg=smpi/allreduce:automatic --cfg=smpi/async-small-thresh:65536 --cfg=smpi/send-is-detached-thresh:128000 --cfg=smpi/simulate-computation:no "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=smpi_mpi.thres:error --log=smpi_pmpi.thres:error +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-allreduce --log=smpi_config.thres:warning --log=smpi_coll.thres:error --cfg=smpi/allreduce:automatic --cfg=smpi/async-small-thresh:65536 --cfg=smpi/send-is-detached-thresh:128000 --cfg=smpi/simulate-computation:no "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=smpi_mpi.thres:error --log=smpi_pmpi.thres:error > [rank 0] -> Tremblay > [rank 1] -> Tremblay > [rank 2] -> Tremblay diff --git a/teshsuite/smpi/io-all-at/io-all-at.tesh b/teshsuite/smpi/io-all-at/io-all-at.tesh index 12bb588120..f781e07ae4 100644 --- a/teshsuite/smpi/io-all-at/io-all-at.tesh +++ b/teshsuite/smpi/io-all-at/io-all-at.tesh @@ -1,6 +1,6 @@ # Test for MPI_File_read and MPI_File_write ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-all-at +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-all-at > [rank 0] -> bob > [rank 1] -> carl > [rank 2] -> bob diff --git a/teshsuite/smpi/io-all/io-all.tesh b/teshsuite/smpi/io-all/io-all.tesh index ffc8aebd05..353df36a0f 100644 --- a/teshsuite/smpi/io-all/io-all.tesh +++ b/teshsuite/smpi/io-all/io-all.tesh @@ -1,6 +1,6 @@ # Test for MPI_File_read and MPI_File_write ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-all +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-all > [rank 0] -> bob > [rank 1] -> carl > [rank 2] -> bob diff --git a/teshsuite/smpi/io-ordered/io-ordered.tesh b/teshsuite/smpi/io-ordered/io-ordered.tesh index 6a7082d1e2..fb9c98da62 100644 --- a/teshsuite/smpi/io-ordered/io-ordered.tesh +++ b/teshsuite/smpi/io-ordered/io-ordered.tesh @@ -1,6 +1,6 @@ # Test for MPI_File_read and MPI_File_write ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-ordered +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-ordered > [rank 0] -> bob > [rank 1] -> carl > [rank 2] -> bob diff --git a/teshsuite/smpi/io-shared/io-shared.tesh b/teshsuite/smpi/io-shared/io-shared.tesh index 69f4894fb0..277fc71ff0 100644 --- a/teshsuite/smpi/io-shared/io-shared.tesh +++ b/teshsuite/smpi/io-shared/io-shared.tesh @@ -1,6 +1,6 @@ # Test for MPI_File_read and MPI_File_write ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-shared +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-shared > [rank 0] -> bob > [rank 1] -> carl > [rank 2] -> bob diff --git a/teshsuite/smpi/io-simple-at/io-simple-at.tesh b/teshsuite/smpi/io-simple-at/io-simple-at.tesh index 8bb5d72e41..36ac51c38f 100644 --- a/teshsuite/smpi/io-simple-at/io-simple-at.tesh +++ b/teshsuite/smpi/io-simple-at/io-simple-at.tesh @@ -1,6 +1,6 @@ # Test for MPI_File_read and MPI_File_write ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-simple-at +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-simple-at > [rank 0] -> bob > [rank 1] -> carl > [rank 2] -> bob diff --git a/teshsuite/smpi/io-simple/io-simple.tesh b/teshsuite/smpi/io-simple/io-simple.tesh index 59c3f51fe5..c2a3c1c679 100644 --- a/teshsuite/smpi/io-simple/io-simple.tesh +++ b/teshsuite/smpi/io-simple/io-simple.tesh @@ -1,6 +1,6 @@ # Test for MPI_File_read and MPI_File_write ! output sort -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-simple +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_io -platform ../../../examples/platforms/hosts_with_disks.xml -np 4 --log=xbt_cfg.thres:critical --log=smpi_config.thres:warning --log=smpi_mpi.thres:error --log=s4u_file.thres:error --log=smpi_io.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" --cfg=smpi/simulate-computation:0 ${bindir:=.}/io-simple > [rank 0] -> bob > [rank 1] -> carl > [rank 2] -> bob diff --git a/teshsuite/smpi/macro-shared/macro-shared.tesh b/teshsuite/smpi/macro-shared/macro-shared.tesh index 3d31e9a6ea..039d3789ec 100644 --- a/teshsuite/smpi/macro-shared/macro-shared.tesh +++ b/teshsuite/smpi/macro-shared/macro-shared.tesh @@ -1,7 +1,7 @@ p Test compute ! output sort ! timeout 5 -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-shared --log=xbt_cfg.thres:warning --log=smpi_kernel.thres:verbose "--log=root.fmt:(%P@%h)%e%m%n" +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-shared --log=xbt_cfg.thres:warning --log=smpi_kernel.thres:verbose "--log=root.fmt:(%a@%h)%e%m%n" > (maestro@) You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/host-speed:" to set its value. Check https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more information. > (maestro@) Receiver is shared. Let's ignore it. > (maestro@) Receiver is shared. Let's ignore it. diff --git a/teshsuite/xbt/log_usage/log_usage.tesh b/teshsuite/xbt/log_usage/log_usage.tesh index 4db584b41e..67385830e5 100644 --- a/teshsuite/xbt/log_usage/log_usage.tesh +++ b/teshsuite/xbt/log_usage/log_usage.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh p Check different log thresholds -$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 > [ 0.000000] [0:maestro@] false alarm! @@ -22,7 +22,7 @@ $ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] false alarm! p Check the "file" log appender -$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:file:${bindir:=.}/log_usage.log +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --log=root.app:file:${bindir:=.}/log_usage.log $ cat ${bindir:=.}/log_usage.log > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 @@ -44,7 +44,7 @@ $ cat ${bindir:=.}/log_usage.log > [ 0.000000] [0:maestro@] false alarm! p Check the "rollfile" log appender -$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:rollfile:500:${bindir:=.}/log_usage.log +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --log=root.app:rollfile:500:${bindir:=.}/log_usage.log $ cat ${bindir:=.}/log_usage.log > [ 0.000000] [0:maestro@] val=2 > [ 0.000000] [0:maestro@] false alarm! @@ -63,7 +63,7 @@ $ cat ${bindir:=.}/log_usage.log > p Check the "splitfile" log appender -$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=root.app:splitfile:500:${bindir:=.}/log_usage_%.log +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --log=root.app:splitfile:500:${bindir:=.}/log_usage_%.log $ cat ${bindir:=.}/log_usage_0.log > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 diff --git a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh index 113c106e98..5fc588f78e 100644 --- a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh +++ b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Test with the settings '' > [ 0.000000] [0:maestro@] val=2 > [ 0.000000] [0:maestro@] false alarm! -- 2.20.1