X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92bf4ba8e22e64dd7bb21dda3a5a113361073848..cf57fb58889894670e2594d2e3b6a213d8fd6089:/examples/gras/ping/ping_client.c

diff --git a/examples/gras/ping/ping_client.c b/examples/gras/ping/ping_client.c
index c49642463c..1b74e7035c 100644
--- a/examples/gras/ping/ping_client.c
+++ b/examples/gras/ping/ping_client.c
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* ping - ping/pong demo of GRAS features                                   */
 
-/* Copyright (c) 2003, 2004, 2005 Martin Quinson. All rights reserved.      */
+/* Copyright (c) 2006, 2007, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,75 +9,82 @@
 #include "ping.h"
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(Ping);
 
-int client(int argc,char *argv[]) {
-  xbt_ex_t e; 
-  gras_socket_t toserver=NULL; /* peer */
+int client(int argc, char *argv[])
+{
+  xbt_ex_t e;
+  gras_socket_t toserver = NULL;        /* peer */
+  int connected = 0;
 
   gras_socket_t from;
   int ping, pong;
 
   const char *host = "127.0.0.1";
-        int   port = 4000;
+  int port = 4000;
 
   /* 1. Init the GRAS's infrastructure */
   gras_init(&argc, argv);
-   
+
   /* 2. Get the server's address. The command line override defaults when specified */
   if (argc == 3) {
-    host=argv[1];
-    port=atoi(argv[2]);
-  } 
-
-  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");
+    host = argv[1];
+    port = atoi(argv[2]);
   }
-  INFO2("Connected to %s:%d.",host,port);    
 
+  XBT_INFO("Launch client (server on %s:%d)", host, port);
+
+  /* 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)
+        /* dunno what happened, let the exception go through */
+        RETHROWF("Unable to connect to the server: %s");
+      xbt_ex_free(e);
+      gras_os_sleep(0.05);
+    }
+  }
 
-  /* 5. Register the messages. 
-        See, it doesn't have to be done completely at the beginning, only before use */
+  XBT_INFO("Connected to %s:%d.", host, port);
+
+  /* 4. Register the messages.
+     See, it doesn't have to be done completely at the beginning, only before use */
   ping_register_messages();
 
-  /* 6. 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));
+  /* 5. Keep the user informed of what's going on */
+  XBT_INFO(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<",
+        gras_socket_peer_name(toserver), gras_socket_peer_port(toserver));
 
-  /* 7. Prepare and send the ping message to the server */
+  /* 6. Prepare and send the ping message to the server */
   ping = 1234;
   TRY {
     gras_msg_send(toserver, "ping", &ping);
-  } CATCH(e) {
+  }
+  CATCH(e) {
     gras_socket_close(toserver);
-    RETHROW0("Failed to send PING to server: %s");
+    RETHROWF("Failed to send PING to server: %s");
   }
-  INFO3(">>>>>>>> Message PING(%d) sent to %s:%d <<<<<<<<",
-	ping,
-	gras_socket_peer_name(toserver),gras_socket_peer_port(toserver));
+  XBT_INFO(">>>>>>>> Message PING(%d) sent to %s:%d <<<<<<<<",
+        ping, 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 */
   TRY {
-    gras_msg_wait(6000,"pong", &from,&pong);
-  } CATCH(e) {
+    gras_msg_wait(6000, "pong", &from, &pong);
+  }
+  CATCH(e) {
     gras_socket_close(toserver);
-    RETHROW0("Why can't I get my PONG message like everyone else: %s");
+    RETHROWF("Why can't I get my PONG message like everyone else: %s");
   }
 
-  /* 9. Keep the user informed of what's going on, again */
-  INFO3(">>>>>>>> Got PONG(%d) from %s:%d <<<<<<<<", 
-	pong,
-	gras_socket_peer_name(from),gras_socket_peer_port(from));
+  /* 8. Keep the user informed of what's going on, again */
+  XBT_INFO(">>>>>>>> Got PONG(%d) from %s:%d <<<<<<<<",
+        pong, 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 */
   gras_socket_close(toserver);
-  INFO0("Done.");
+  XBT_INFO("Done.");
   gras_exit();
   return 0;
-} /* end_of_client */
+}                               /* end_of_client */