Merge branch 'mc'

[simgrid.git] / teshsuite / msg / pid / pid.tesh

diff --git a/teshsuite/msg/pid/pid.tesh b/teshsuite/msg/pid/pid.tesh
index 0a55186..54c1a3d 100644 (file)
--- a/teshsuite/msg/pid/pid.tesh
+++ b/teshsuite/msg/pid/pid.tesh
@@ -1,27 +1,27 @@
-$ ./pid ${srcdir:=.}/pid_p.xml ${srcdir:=.}/pid_d.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (1:sendpid@toto) Sending pid of "1".
-> [  0.000000] (2:sendpid@toto) Sending pid of "2".
-> [  0.000000] (3:sendpid@toto) Sending pid of "3".
-> [  0.001082] (4:killall@toto) Killing process "1".
-> [  0.001082] (1:sendpid@toto) Send of pid "1" done.
-> [  0.001082] (1:sendpid@toto) Process "1" killed.
-> [  0.002165] (2:sendpid@toto) Send of pid "2" done.
-> [  0.002165] (4:killall@toto) Killing process "2".
-> [  0.002165] (2:sendpid@toto) Process "2" killed.
-> [  0.003247] (3:sendpid@toto) Send of pid "3" done.
-> [  0.003247] (4:killall@toto) Killing process "3".
-> [  0.003247] (3:sendpid@toto) Process "3" killed.
+$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/pid_d.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (1:sendpid@Tremblay) Sending pid of "1".
+> [  0.000000] (2:sendpid@Tremblay) Sending pid of "2".
+> [  0.000000] (3:sendpid@Tremblay) Sending pid of "3".
+> [  0.000402] (4:killall@Tremblay) Killing process "1".
+> [  0.000402] (1:sendpid@Tremblay) Send of pid "1" done.
+> [  0.000402] (1:sendpid@Tremblay) Process "1" killed.
+> [  0.000804] (2:sendpid@Tremblay) Send of pid "2" done.
+> [  0.000804] (4:killall@Tremblay) Killing process "2".
+> [  0.000804] (2:sendpid@Tremblay) Process "2" killed.
+> [  0.001206] (3:sendpid@Tremblay) Send of pid "3" done.
+> [  0.001206] (4:killall@Tremblay) Killing process "3".
+> [  0.001206] (3:sendpid@Tremblay) Process "3" killed.

 
 

-$ ./pid ${srcdir:=.}/pid_p.xml ${srcdir:=.}/pid_d.xml 2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (2:sendpid@toto) Sending pid of "2".
-> [  0.000000] (3:sendpid@toto) Sending pid of "3".
-> [  0.000000] (4:sendpid@toto) Sending pid of "4".
-> [  0.001082] (5:killall@toto) Killing process "2".
-> [  0.001082] (2:sendpid@toto) Send of pid "2" done.
-> [  0.001082] (2:sendpid@toto) Process "2" killed.
-> [  0.002165] (3:sendpid@toto) Send of pid "3" done.
-> [  0.002165] (5:killall@toto) Killing process "3".
-> [  0.002165] (3:sendpid@toto) Process "3" killed.
-> [  0.003247] (4:sendpid@toto) Send of pid "4" done.
-> [  0.003247] (5:killall@toto) Killing process "4".
-> [  0.003247] (4:sendpid@toto) Process "4" killed.
+$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/pid_d.xml 2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (2:sendpid@Tremblay) Sending pid of "2".
+> [  0.000000] (3:sendpid@Tremblay) Sending pid of "3".
+> [  0.000000] (4:sendpid@Tremblay) Sending pid of "4".
+> [  0.000402] (5:killall@Tremblay) Killing process "2".
+> [  0.000402] (2:sendpid@Tremblay) Send of pid "2" done.
+> [  0.000402] (2:sendpid@Tremblay) Process "2" killed.
+> [  0.000804] (3:sendpid@Tremblay) Send of pid "3" done.
+> [  0.000804] (5:killall@Tremblay) Killing process "3".
+> [  0.000804] (3:sendpid@Tremblay) Process "3" killed.
+> [  0.001206] (4:sendpid@Tremblay) Send of pid "4" done.
+> [  0.001206] (5:killall@Tremblay) Killing process "4".
+> [  0.001206] (4:sendpid@Tremblay) Process "4" killed.