integrate george modifications. Still use old-fashioned spawn instead

[simgrid.git] / examples / gras / rpc / rpc.c

diff --git a/examples/gras/rpc/rpc.c b/examples/gras/rpc/rpc.c
index c6ffc36..4c8e4fd 100644 (file)
--- a/examples/gras/rpc/rpc.c
+++ b/examples/gras/rpc/rpc.c
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* rpc - demo of the RPC features in GRAS                                   */
 
-/* Copyright (c) 2006 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. */
@@ -73,7 +72,7 @@ int client(int argc, char *argv[])
 
 
   const char *host = "127.0.0.1";
-  int port = 4000;
+  int port = 4001;
 
   memset(&e, 0, sizeof(xbt_ex_t));
 
@@ -146,7 +145,7 @@ int client(int argc, char *argv[])
     xbt_assert1(!strncmp(e.msg, exception_msg, strlen(exception_msg)),
                 "Got wrong message: %s", e.msg);
     INFO0
-      ("Got the expected exception when calling the exception raising RPC");
+        ("Got the expected exception when calling the exception raising RPC");
     xbt_ex_free(e);
   }
 
@@ -177,7 +176,8 @@ int client(int argc, char *argv[])
   for (i = 0; i < 5; i++) {
     INFO1("Call the exception raising RPC on the forwarder (i=%d)", i);
     TRY {
-      gras_msg_rpccall(toforwarder, 6000.0, "forward exception", NULL, NULL);
+      gras_msg_rpccall(toforwarder, 6000.0, "forward exception", NULL,
+                       NULL);
     }
     CATCH(e) {
       gotit = 1;
@@ -192,7 +192,7 @@ int client(int argc, char *argv[])
                 "Got wrong category: %d (instead of %d)",
                 e.category, unknown_error);
     INFO0
-      ("Got the expected exception when calling the exception raising RPC");
+        ("Got the expected exception when calling the exception raising RPC");
     xbt_ex_free(e);
     exception_catching();
   }
@@ -232,7 +232,8 @@ static int forwarder_cb_kill(gras_msg_cb_ctx_t ctx, void *payload_data)
   return 0;
 }
 
-static int forwarder_cb_forward_ex(gras_msg_cb_ctx_t ctx, void *payload_data)
+static int forwarder_cb_forward_ex(gras_msg_cb_ctx_t ctx,
+                                   void *payload_data)
 {
   forward_data_t fdata = gras_userdata_get();
 
@@ -314,7 +315,8 @@ static int server_cb_ping(gras_msg_cb_ctx_t ctx, void *payload_data)
   /* 2. Log which client connected */
   INFO3("Got message PING(%d) from %s:%d",
         msg,
-        gras_socket_peer_name(expeditor), gras_socket_peer_port(expeditor));
+        gras_socket_peer_name(expeditor),
+        gras_socket_peer_port(expeditor));
 
   /* 4. Change the value of the msg variable */
   msg = 4321;
@@ -335,7 +337,7 @@ int server(int argc, char *argv[])
   gras_socket_t mysock;
   server_data_t sdata;
 
-  int port = 4000;
+  int port = 4001;
 
   /* 1. Init the GRAS infrastructure */
   gras_init(&argc, argv);