apply last API modification

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

diff --git a/examples/ping/ping.c b/examples/ping/ping.c
index 5724135..9305602 100644 (file)
--- a/examples/ping/ping.c
+++ b/examples/ping/ping.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <signal.h>
 
-#include <gras.h>
+#include "gras.h"
 
 GRAS_LOG_NEW_DEFAULT_CATEGORY(Ping);
 
@@ -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;
 }
@@ -70,8 +69,7 @@ int server_cb_ping_handler(gras_socket_t        *expeditor,
        gras_socket_peer_port(expeditor));
   
   msg = 4321;
-  TRY(gras_msgtype_by_name("pong",&pong_t));
-  errcode = gras_msg_send(expeditor, pong_t, &msg);
+  errcode = gras_msg_send(expeditor, gras_msgtype_by_name("pong"), &msg);
 
   if (errcode != no_error) {
     ERROR1("SERVER: Unable answer with PONG: %s\n", gras_error_name(errcode));
@@ -109,8 +107,7 @@ int server (int argc,char *argv[]) {
 
   TRYFAIL(register_messages());
   TRYFAIL(register_messages());
-  TRYFAIL(gras_msgtype_by_name("ping",&ping_msg));
-  TRYFAIL(gras_cb_register(ping_msg,&server_cb_ping_handler));
+  TRYFAIL(gras_cb_register(gras_msgtype_by_name("ping"),&server_cb_ping_handler));
 
   INFO1("SERVER: >>>>>>>> Listening on port %d <<<<<<<<",
        gras_socket_my_port(g->sock));
@@ -122,7 +119,7 @@ int server (int argc,char *argv[]) {
   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();
@@ -148,7 +145,6 @@ int client(int argc,char *argv[]) {
 
   gras_socket_t  *from;
   int ping, pong;
-  gras_msgtype_t *msg_ping_type=NULL, *msg_pong_type=NULL;
 
   const char *host = "127.0.0.1";
         int   port = 4000;
@@ -162,8 +158,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));
@@ -173,14 +168,12 @@ int client(int argc,char *argv[]) {
 
 
   TRY(register_messages());
-  TRY(gras_msgtype_by_name("ping",&msg_ping_type));
-  TRY(gras_msgtype_by_name("pong",&msg_pong_type));
 
   INFO2("Client: >>>>>>>> Connected to server which is on %s:%d <<<<<<<<", 
        gras_socket_peer_name(g->sock),gras_socket_peer_port(g->sock));
 
   ping = 1234;
-  errcode = gras_msg_send(g->sock, msg_ping_type, &ping);
+  errcode = gras_msg_send(g->sock, gras_msgtype_by_name("ping"), &ping);
   if (errcode != no_error) {
     fprintf(stderr, "Client: Unable send PING to server (%s)\n",
            gras_error_name(errcode));
@@ -191,8 +184,8 @@ int client(int argc,char *argv[]) {
        ping,
        gras_socket_peer_name(g->sock),gras_socket_peer_port(g->sock));
 
-  if ((errcode=gras_msg_wait(6000,
-                            msg_pong_type,&from,&pong))) {
+  if ((errcode=gras_msg_wait(6000,gras_msgtype_by_name("pong"),
+                            &from,&pong))) {
     ERROR1("Client: Why can't I get my PONG message like everyone else (%s)?",
           gras_error_name(errcode));
     gras_socket_close(g->sock);