Give up on timestamps in this test. Check the comment on top of the file to see why

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3855 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/gras/rpc/rpc.c b/examples/gras/rpc/rpc.c
index 240c27d..f40a4cf 100644 (file)
--- a/examples/gras/rpc/rpc.c
+++ b/examples/gras/rpc/rpc.c
@@ -27,9 +27,9 @@ int server (int argc,char *argv[]);
 int forwarder (int argc,char *argv[]);
 int client (int argc,char *argv[]);
 
 int forwarder (int argc,char *argv[]);
 int client (int argc,char *argv[]);
 

-static void exception_raising(void) {
-  THROW0(unknown_error,42,"Some error we will catch on client side");
-}
+#define exception_raising() \
+  THROW0(unknown_error,42,"Some error we will catch on client side")
+

 static void exception_catching(void) {
   int gotit = 0,i;
   xbt_ex_t e;
 static void exception_catching(void) {
   int gotit = 0,i;
   xbt_ex_t e;

diff --git a/examples/gras/rpc/test_sg_32 b/examples/gras/rpc/test_sg_32
index 707b326..d5c52d6 100755 (executable)
--- a/examples/gras/rpc/test_sg_32
+++ b/examples/gras/rpc/test_sg_32
@@ -1,43 +1,49 @@
-$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/rpc.xml
-> [Tremblay:server:(1) 0.000000] [Rpc/INFO] Launch server (port=4000)
-> [Tremblay:server:(1) 0.000000] [Rpc/INFO] Listening on port 4000
-> [Ginette:forwarder:(2) 0.000000] [Rpc/INFO] Launch forwarder (port=4000)
-> [Fafard:client:(3) 0.000000] [Rpc/INFO] Launch client (server on Tremblay:4000)
-> [Fafard:client:(3) 2.000000] [Rpc/INFO] Connected to Tremblay:4000.
-> [Fafard:client:(3) 2.000000] [Rpc/INFO] Connected to server which is on Tremblay:4000
-> [Tremblay:server:(1) 2.001977] [Rpc/INFO] Got message PING(1234) from Fafard:0
-> [Fafard:client:(3) 2.003954] [Rpc/INFO] The answer to PING(1234) on Tremblay:4000 is PONG(4321)
-> [Fafard:client:(3) 2.003954] [Rpc/INFO] Call the exception raising RPC
-> [Tremblay:server:(1) 2.003954] [Rpc/INFO] Answered with PONG(4321)
-> [Fafard:client:(3) 2.008019] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.008019] [Rpc/INFO] Called the exception raising RPC
-> [Fafard:client:(3) 2.008019] [Rpc/INFO] Call the exception raising RPC (i=0)
-> [Fafard:client:(3) 2.012085] [Rpc/INFO] Call the exception raising RPC (i=1)
-> [Fafard:client:(3) 2.016150] [Rpc/INFO] Call the exception raising RPC (i=2)
-> [Fafard:client:(3) 2.020216] [Rpc/INFO] Call the exception raising RPC (i=3)
-> [Fafard:client:(3) 2.024281] [Rpc/INFO] Call the exception raising RPC (i=4)
-> [Fafard:client:(3) 2.028346] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=0)
-> [Ginette:forwarder:(2) 2.029606] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.033556] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.033556] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=1)
-> [Ginette:forwarder:(2) 2.034816] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.038766] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.038766] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=2)
-> [Ginette:forwarder:(2) 2.040026] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.043975] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.043975] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=3)
-> [Ginette:forwarder:(2) 2.045235] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.049185] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.049185] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=4)
-> [Ginette:forwarder:(2) 2.050445] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.054395] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.054395] [Rpc/INFO] Ask Ginette:4000 to die
-> [Ginette:forwarder:(2) 2.055655] [Rpc/INFO] Asked to die by Fafard:0
-> [Ginette:forwarder:(2) 2.055655] [Rpc/INFO] Done.
-> [Ginette:forwarder:(2) 2.055655] [gras/INFO] Exiting GRAS
-> [Fafard:client:(3) 2.055655] [Rpc/INFO] Ask Tremblay:4000 to die
-> [Tremblay:server:(1) 2.057631] [Rpc/INFO] Asked to die by Fafard:0
-> [Tremblay:server:(1) 2.057631] [Rpc/INFO] Done.
-> [Tremblay:server:(1) 2.057631] [gras/INFO] Exiting GRAS
-> [Fafard:client:(3) 2.057631] [Rpc/INFO] Done.
-> [Fafard:client:(3) 2.057631] [gras/INFO] Exiting GRAS
+# There is no timestamp in this test, because we exchange exceptions,
+# which contain not only the filename (which could change in case of
+# VPATH builds), but also the function name (which changes with the
+# optimization level: if inlining, gcc changes it).
+# Trying to get it right would prevent me to ever submit that damn paper.
+
+$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/rpc.xml --log=root.fmt:"'[%h:%t:(%i)] [%c/%p] %m%n'"
+> [Tremblay:server:(1)] [Rpc/INFO] Launch server (port=4000)
+> [Tremblay:server:(1)] [Rpc/INFO] Listening on port 4000
+> [Ginette:forwarder:(2)] [Rpc/INFO] Launch forwarder (port=4000)
+> [Fafard:client:(3)] [Rpc/INFO] Launch client (server on Tremblay:4000)
+> [Fafard:client:(3)] [Rpc/INFO] Connected to Tremblay:4000.
+> [Fafard:client:(3)] [Rpc/INFO] Connected to server which is on Tremblay:4000
+> [Tremblay:server:(1)] [Rpc/INFO] Got message PING(1234) from Fafard:0
+> [Fafard:client:(3)] [Rpc/INFO] The answer to PING(1234) on Tremblay:4000 is PONG(4321)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC
+> [Tremblay:server:(1)] [Rpc/INFO] Answered with PONG(4321)
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Called the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=0)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=1)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=2)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=3)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=4)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=0)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=1)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=2)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=3)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=4)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Ask Ginette:4000 to die
+> [Ginette:forwarder:(2)] [Rpc/INFO] Asked to die by Fafard:0
+> [Ginette:forwarder:(2)] [Rpc/INFO] Done.
+> [Ginette:forwarder:(2)] [gras/INFO] Exiting GRAS
+> [Fafard:client:(3)] [Rpc/INFO] Ask Tremblay:4000 to die
+> [Tremblay:server:(1)] [Rpc/INFO] Asked to die by Fafard:0
+> [Tremblay:server:(1)] [Rpc/INFO] Done.
+> [Tremblay:server:(1)] [gras/INFO] Exiting GRAS
+> [Fafard:client:(3)] [Rpc/INFO] Done.
+> [Fafard:client:(3)] [gras/INFO] Exiting GRAS

diff --git a/examples/gras/rpc/test_sg_64 b/examples/gras/rpc/test_sg_64
index 89ecca5..d5c52d6 100755 (executable)
--- a/examples/gras/rpc/test_sg_64
+++ b/examples/gras/rpc/test_sg_64
@@ -1,43 +1,49 @@
-$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/rpc.xml
-> [Tremblay:server:(1) 0.000000] [Rpc/INFO] Launch server (port=4000)
-> [Tremblay:server:(1) 0.000000] [Rpc/INFO] Listening on port 4000
-> [Ginette:forwarder:(2) 0.000000] [Rpc/INFO] Launch forwarder (port=4000)
-> [Fafard:client:(3) 0.000000] [Rpc/INFO] Launch client (server on Tremblay:4000)
-> [Fafard:client:(3) 2.000000] [Rpc/INFO] Connected to Tremblay:4000.
-> [Fafard:client:(3) 2.000000] [Rpc/INFO] Connected to server which is on Tremblay:4000
-> [Tremblay:server:(1) 2.001977] [Rpc/INFO] Got message PING(1234) from Fafard:0
-> [Fafard:client:(3) 2.003954] [Rpc/INFO] The answer to PING(1234) on Tremblay:4000 is PONG(4321)
-> [Fafard:client:(3) 2.003954] [Rpc/INFO] Call the exception raising RPC
-> [Tremblay:server:(1) 2.003954] [Rpc/INFO] Answered with PONG(4321)
-> [Fafard:client:(3) 2.007986] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.007986] [Rpc/INFO] Called the exception raising RPC
-> [Fafard:client:(3) 2.007986] [Rpc/INFO] Call the exception raising RPC (i=0)
-> [Fafard:client:(3) 2.012018] [Rpc/INFO] Call the exception raising RPC (i=1)
-> [Fafard:client:(3) 2.016050] [Rpc/INFO] Call the exception raising RPC (i=2)
-> [Fafard:client:(3) 2.020083] [Rpc/INFO] Call the exception raising RPC (i=3)
-> [Fafard:client:(3) 2.024115] [Rpc/INFO] Call the exception raising RPC (i=4)
-> [Fafard:client:(3) 2.028147] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=0)
-> [Ginette:forwarder:(2) 2.029407] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.033314] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.033314] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=1)
-> [Ginette:forwarder:(2) 2.034574] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.038482] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.038482] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=2)
-> [Ginette:forwarder:(2) 2.039741] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.043649] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.043649] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=3)
-> [Ginette:forwarder:(2) 2.044909] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.048816] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.048816] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=4)
-> [Ginette:forwarder:(2) 2.050076] [Rpc/INFO] Forward a request
-> [Fafard:client:(3) 2.053983] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
-> [Fafard:client:(3) 2.053983] [Rpc/INFO] Ask Ginette:4000 to die
-> [Ginette:forwarder:(2) 2.055243] [Rpc/INFO] Asked to die by Fafard:0
-> [Ginette:forwarder:(2) 2.055243] [Rpc/INFO] Done.
-> [Ginette:forwarder:(2) 2.055243] [gras/INFO] Exiting GRAS
-> [Fafard:client:(3) 2.055243] [Rpc/INFO] Ask Tremblay:4000 to die
-> [Tremblay:server:(1) 2.057219] [Rpc/INFO] Asked to die by Fafard:0
-> [Tremblay:server:(1) 2.057219] [Rpc/INFO] Done.
-> [Tremblay:server:(1) 2.057219] [gras/INFO] Exiting GRAS
-> [Fafard:client:(3) 2.057219] [Rpc/INFO] Done.
-> [Fafard:client:(3) 2.057219] [gras/INFO] Exiting GRAS
+# There is no timestamp in this test, because we exchange exceptions,
+# which contain not only the filename (which could change in case of
+# VPATH builds), but also the function name (which changes with the
+# optimization level: if inlining, gcc changes it).
+# Trying to get it right would prevent me to ever submit that damn paper.
+
+$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/rpc.xml --log=root.fmt:"'[%h:%t:(%i)] [%c/%p] %m%n'"
+> [Tremblay:server:(1)] [Rpc/INFO] Launch server (port=4000)
+> [Tremblay:server:(1)] [Rpc/INFO] Listening on port 4000
+> [Ginette:forwarder:(2)] [Rpc/INFO] Launch forwarder (port=4000)
+> [Fafard:client:(3)] [Rpc/INFO] Launch client (server on Tremblay:4000)
+> [Fafard:client:(3)] [Rpc/INFO] Connected to Tremblay:4000.
+> [Fafard:client:(3)] [Rpc/INFO] Connected to server which is on Tremblay:4000
+> [Tremblay:server:(1)] [Rpc/INFO] Got message PING(1234) from Fafard:0
+> [Fafard:client:(3)] [Rpc/INFO] The answer to PING(1234) on Tremblay:4000 is PONG(4321)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC
+> [Tremblay:server:(1)] [Rpc/INFO] Answered with PONG(4321)
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Called the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=0)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=1)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=2)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=3)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC (i=4)
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=0)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=1)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=2)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=3)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Call the exception raising RPC on the forwarder (i=4)
+> [Ginette:forwarder:(2)] [Rpc/INFO] Forward a request
+> [Fafard:client:(3)] [Rpc/INFO] Got the expected exception when calling the exception raising RPC
+> [Fafard:client:(3)] [Rpc/INFO] Ask Ginette:4000 to die
+> [Ginette:forwarder:(2)] [Rpc/INFO] Asked to die by Fafard:0
+> [Ginette:forwarder:(2)] [Rpc/INFO] Done.
+> [Ginette:forwarder:(2)] [gras/INFO] Exiting GRAS
+> [Fafard:client:(3)] [Rpc/INFO] Ask Tremblay:4000 to die
+> [Tremblay:server:(1)] [Rpc/INFO] Asked to die by Fafard:0
+> [Tremblay:server:(1)] [Rpc/INFO] Done.
+> [Tremblay:server:(1)] [gras/INFO] Exiting GRAS
+> [Fafard:client:(3)] [Rpc/INFO] Done.
+> [Fafard:client:(3)] [gras/INFO] Exiting GRAS