From 56c3026268986d7e710f5186c9a726fb96f4aef0 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 13 Jul 2007 09:00:25 +0000
Subject: [PATCH] Speed up make check in RL a bit

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3759 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/gras/mmrpc/mmrpc_client.c | 32 +++++++++++++++++-------------
 examples/gras/mmrpc/test_rl        |  2 --
 examples/gras/mmrpc/test_sg_32     | 13 ++++++------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index 4f52086002..7a0e1fcee7 100644
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -16,6 +16,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(MatMult);
 int client(int argc,char *argv[]) {
   xbt_ex_t e; 
   gras_socket_t toserver=NULL; /* peer */
+  int connected = 0;
 
   gras_socket_t from;
   xbt_matrix_t request[2], answer;
@@ -36,26 +37,29 @@ int client(int argc,char *argv[]) {
 
   INFO2("Launch client (server on %s:%d)",host,port);
    
-  /* 3. Wait for the server startup */
-  gras_os_sleep(1);
-   
-  /* 4. Create a socket to speak to the server */
-  TRY {
-    toserver=gras_socket_client(host,port);
-  } CATCH(e) {
-    RETHROW0("Unable to connect to the server: %s");
+  /* 3. Create a socket to speak to the server */
+  while (!connected) {
+     TRY {
+	toserver=gras_socket_client(host,port);
+	connected=1;
+     } CATCH(e) {
+	if (e.category != system_error)
+	  RETHROW0("Unable to connect to the server: %s");
+	xbt_ex_free(e);
+	gras_os_sleep(0.05);
+     }
   }
   INFO2("Connected to %s:%d.",host,port);    
 
 
-  /* 5. Register the messages (before use) */
+  /* 4. Register the messages (before use) */
   mmrpc_register_messages();
 
-  /* 6. Keep the user informed of what's going on */
+  /* 5. Keep the user informed of what's going on */
   INFO2(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<", 
 	gras_socket_peer_name(toserver),gras_socket_peer_port(toserver));
 
-  /* 7. Prepare and send the request to the server */
+  /* 6. Prepare and send the request to the server */
 
   request[0] = xbt_matrix_double_new_id(MATSIZE,MATSIZE);
   request[1] = xbt_matrix_double_new_rand(MATSIZE,MATSIZE);
@@ -72,7 +76,7 @@ int client(int argc,char *argv[]) {
   INFO2(">>>>>>>> Request sent to %s:%d <<<<<<<<",
 	gras_socket_peer_name(toserver),gras_socket_peer_port(toserver));
 
-  /* 8. Wait for the answer from the server, and deal with issues */
+  /* 7. Wait for the answer from the server, and deal with issues */
   gras_msg_wait(6000,"answer",&from,&answer);
 
   /*
@@ -85,11 +89,11 @@ int client(int argc,char *argv[]) {
 		  xbt_matrix_get_as(answer,i,j,double),i,j,
 		  xbt_matrix_get_as(request[1],i,j,double));
 
-  /* 9. Keep the user informed of what's going on, again */
+  /* 8. Keep the user informed of what's going on, again */
   INFO2(">>>>>>>> Got answer from %s:%d (values are right) <<<<<<<<", 
 	gras_socket_peer_name(from),gras_socket_peer_port(from));
 
-  /* 10. Free the allocated resources, and shut GRAS down */
+  /* 9. Free the allocated resources, and shut GRAS down */
   xbt_matrix_free(request[1]);
   xbt_matrix_free(answer);
   gras_socket_close(toserver);
diff --git a/examples/gras/mmrpc/test_rl b/examples/gras/mmrpc/test_rl
index 08473164ad..1b857f0983 100755
--- a/examples/gras/mmrpc/test_rl
+++ b/examples/gras/mmrpc/test_rl
@@ -2,8 +2,6 @@
 > Launch server (port=4002)
 > Exiting GRAS
 
-$ sleep 1
-
 $ $SG_TEST_EXENV ./mmrpc_client$EXEEXT 127.0.0.1 4002 --log=root.fmt:%m%n 
 > Launch client (server on 127.0.0.1:4002)
 > Connected to 127.0.0.1:4002.
diff --git a/examples/gras/mmrpc/test_sg_32 b/examples/gras/mmrpc/test_sg_32
index 97347a8a1c..215cd2e69a 100755
--- a/examples/gras/mmrpc/test_sg_32
+++ b/examples/gras/mmrpc/test_sg_32
@@ -1,9 +1,10 @@
 $ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/mmrpc.xml
 > [Tremblay:server:(1) 0.000000] [MatMult/INFO] Launch server (port=4000)
 > [Fafard:client:(2) 0.000000] [MatMult/INFO] Launch client (server on Tremblay:4000)
-> [Fafard:client:(2) 1.000000] [MatMult/INFO] Connected to Tremblay:4000.
-> [Fafard:client:(2) 1.000000] [MatMult/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<<
-> [Fafard:client:(2) 1.053783] [MatMult/INFO] >>>>>>>> Request sent to Tremblay:4000 <<<<<<<<
-> [Fafard:client:(2) 1.081662] [MatMult/INFO] >>>>>>>> Got answer from Tremblay:4000 (values are right) <<<<<<<<
-> [Fafard:client:(2) 1.081662] [gras/INFO] Exiting GRAS
-> [Tremblay:server:(1) 1.081662] [gras/INFO] Exiting GRAS
+> [Fafard:client:(2) 0.000000] [MatMult/INFO] Connected to Tremblay:4000.
+> [Fafard:client:(2) 0.000000] [MatMult/INFO] >>>>>>>> Connected to server which is on Tremblay:4000 <<<<<<<<
+> [Fafard:client:(2) 0.053783] [MatMult/INFO] >>>>>>>> Request sent to Tremblay:4000 <<<<<<<<
+> [Fafard:client:(2) 0.081662] [MatMult/INFO] >>>>>>>> Got answer from Tremblay:4000 (values are right) <<<<<<<<
+> [Fafard:client:(2) 0.081662] [gras/INFO] Exiting GRAS
+> [Tremblay:server:(1) 0.081662] [gras/INFO] Exiting GRAS
+
-- 
2.20.1