Move Virtu functions into the gras_os_ namespace

[simgrid.git] / examples / ping / ping.c

diff --git a/examples/ping/ping.c b/examples/ping/ping.c
index 39ca8dd..aa7ad2f 100644 (file)
--- a/examples/ping/ping.c
+++ b/examples/ping/ping.c
@@ -30,10 +30,9 @@ gras_error_t register_messages(void);
 /* Code */
 gras_error_t register_messages(void) {
   gras_error_t errcode;
-  gras_msgtype_t *msg_t; /* FIXME: not needed */
 
-  TRY(gras_msgtype_declare("ping", gras_datadesc_by_name("int"), &msg_t));
-  TRY(gras_msgtype_declare("pong", gras_datadesc_by_name("int"), &msg_t));
+  TRY(gras_msgtype_declare("ping", gras_datadesc_by_name("int")));
+  TRY(gras_msgtype_declare("pong", gras_datadesc_by_name("int")));
 
   return no_error;
 }
@@ -116,16 +115,13 @@ int server (int argc,char *argv[]) {
        gras_socket_my_port(g->sock));
   g->endcondition=0;
 
-  while (1) {
-    errcode = gras_msg_handle(10.0);
-    if (errcode != no_error && errcode != timeout_error) 
-      return errcode;
-    if (g->endcondition)
-      break;
-  }
+  errcode = gras_msg_handle(600.0);
+  if (errcode != no_error)
+    return errcode;
+  if (g->endcondition)
   
   if (!gras_if_RL())
-    gras_sleep(5,0);
+    gras_os_sleep(5,0);
   gras_socket_close(g->sock);
   free(g);
   gras_exit();
@@ -165,8 +161,7 @@ int client(int argc,char *argv[]) {
   } 
 
   INFO2("Launch client (server on %s:%d)",host,port);
-  if (!gras_if_RL())
-    gras_sleep(5,0); /* Wait for the server to be setup */
+  gras_os_sleep(5,0); /* Wait for the server to be setup */
   if ((errcode=gras_socket_client(host,port,&(g->sock)))) {
     ERROR1("Client: Unable to connect to the server. Got %s",
           gras_error_name(errcode));