do not talk about tasks anymore

[simgrid.git] / examples / s4u / app-pingpong / s4u-app-pingpong.tesh

diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
index 8a4042a..7c01272 100644 (file)
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
@@ -5,10 +5,10 @@ p Testing with default compound
 $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%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)
-> [  0.019014] (2:ponger@Jupiter)  Ping time (latency bound) 0.019014
-> [  0.019014] (2:ponger@Jupiter) task_bw->data = 0.019
-> [150.178356] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [  0.019014] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [  0.019014] (2:ponger@Jupiter) Ping time (latency bound) 0.019014
+> [  0.019014] (2:ponger@Jupiter) payload = 0.019
+> [150.178356] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [150.178356] (1:pinger@Tremblay) Pong time (bandwidth bound): 150.159
 > [150.178356] (0:maestro@) Total simulation time: 150.178
 
@@ -18,10 +18,10 @@ $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml "--cfg=network/op
 > [  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
-> [  0.019014] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [  0.019014] (2:ponger@Jupiter)  Ping time (latency bound) 0.019014
-> [  0.019014] (2:ponger@Jupiter) task_bw->data = 0.019
-> [150.178356] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [  0.019014] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [  0.019014] (2:ponger@Jupiter) Ping time (latency bound) 0.019014
+> [  0.019014] (2:ponger@Jupiter) payload = 0.019
+> [150.178356] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [150.178356] (1:pinger@Tremblay) Pong time (bandwidth bound): 150.159
 > [150.178356] (0:maestro@) Total simulation time: 150.178
 
@@ -32,10 +32,10 @@ $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model:C
 > [  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
 > [  0.000000] (2:ponger@Jupiter) Pong from mailbox Mailbox 2 to mailbox Mailbox 1
-> [  0.001462] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [  0.001462] (2:ponger@Jupiter)  Ping time (latency bound) 0.001462
-> [  0.001462] (2:ponger@Jupiter) task_bw->data = 0.001
-> [145.639041] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [  0.001462] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [  0.001462] (2:ponger@Jupiter) Ping time (latency bound) 0.001462
+> [  0.001462] (2:ponger@Jupiter) payload = 0.001
+> [145.639041] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [145.639041] (1:pinger@Tremblay) Pong time (bandwidth bound): 145.638
 > [145.639041] (0:maestro@) Total simulation time: 145.639
 
@@ -47,9 +47,9 @@ $ ${bindir:=.}/s4u-app-pingpong ${platfdir}/small_platform_constant.xml "--cfg=h
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant'
 > [  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
-> [ 13.010000] (2:ponger@Jupiter) Task received : small communication (latency bound)
-> [ 13.010000] (2:ponger@Jupiter)  Ping time (latency bound) 13.010000
-> [ 13.010000] (2:ponger@Jupiter) task_bw->data = 13.010
-> [ 26.020000] (1:pinger@Tremblay) Task received : large communication (bandwidth bound)
+> [ 13.010000] (2:ponger@Jupiter) Payload received : small communication (latency bound)
+> [ 13.010000] (2:ponger@Jupiter) Ping time (latency bound) 13.010000
+> [ 13.010000] (2:ponger@Jupiter) payload = 13.010
+> [ 26.020000] (1:pinger@Tremblay) Payload received : large communication (bandwidth bound)
 > [ 26.020000] (1:pinger@Tremblay) Pong time (bandwidth bound): 13.010
 > [ 26.020000] (0:maestro@) Total simulation time: 26.020