X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..cf57fb58889894670e2594d2e3b6a213d8fd6089:/examples/gras/mmrpc/mmrpc_client.c

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index 897959b3ea..ec62e3690e 100644
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* GridRPC - Fake Grid RPC thingy doing matrix multiplications (as expected)*/
 
-/* Copyright (c) 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. */
@@ -36,7 +35,7 @@ int client(int argc, char *argv[])
     port = atoi(argv[2]);
   }
 
-  INFO2("Launch client (server on %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) {
@@ -46,19 +45,19 @@ int client(int argc, char *argv[])
     }
     CATCH(e) {
       if (e.category != system_error)
-        RETHROW0("Unable to connect to the server: %s");
+        RETHROWF("Unable to connect to the server: %s");
       xbt_ex_free(e);
       gras_os_sleep(0.05);
     }
   }
-  INFO2("Connected to %s:%d.", host, port);
+  XBT_INFO("Connected to %s:%d.", host, port);
 
 
   /* 4. Register the messages (before use) */
   mmrpc_register_messages();
 
   /* 5. Keep the user informed of what's going on */
-  INFO2(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<",
+  XBT_INFO(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<",
         gras_socket_peer_name(toserver), gras_socket_peer_port(toserver));
 
   /* 6. Prepare and send the request to the server */
@@ -75,7 +74,7 @@ int client(int argc, char *argv[])
 
   xbt_matrix_free(request[0]);
 
-  INFO2(">>>>>>>> Request sent to %s:%d <<<<<<<<",
+  XBT_INFO(">>>>>>>> Request sent to %s:%d <<<<<<<<",
         gras_socket_peer_name(toserver), gras_socket_peer_port(toserver));
 
   /* 7. Wait for the answer from the server, and deal with issues */
@@ -86,14 +85,14 @@ int client(int argc, char *argv[])
    */
   for (i = 0; i < MATSIZE; i++)
     for (j = 0; i < MATSIZE; i++)
-      xbt_assert4(xbt_matrix_get_as(answer, i, j, double) ==
+      xbt_assert(xbt_matrix_get_as(answer, i, j, double) ==
                   xbt_matrix_get_as(request[1], i, j, double),
                   "Answer does not match expectations. Found %f at cell %d,%d instead of %f",
                   xbt_matrix_get_as(answer, i, j, double), i, j,
                   xbt_matrix_get_as(request[1], i, j, double));
 
   /* 8. Keep the user informed of what's going on, again */
-  INFO2(">>>>>>>> Got answer from %s:%d (values are right) <<<<<<<<",
+  XBT_INFO(">>>>>>>> Got answer from %s:%d (values are right) <<<<<<<<",
         gras_socket_peer_name(from), gras_socket_peer_port(from));
 
   /* 9. Free the allocated resources, and shut GRAS down */