Make a tesh file for ns3.

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

diff --git a/examples/gras/mmrpc/mmrpc.c b/examples/gras/mmrpc/mmrpc.c
index bfad502..5ab834d 100644 (file)
--- a/examples/gras/mmrpc/mmrpc.c
+++ b/examples/gras/mmrpc/mmrpc.c
@@ -55,7 +55,6 @@ static int server_cb_request_handler(gras_msg_cb_ctx_t ctx,
 
 int server(int argc, char *argv[])
 {
-  xbt_ex_t e;
   gras_socket_t sock = NULL;
   int port = 4000;
 
@@ -68,12 +67,12 @@ int server(int argc, char *argv[])
   }
 
   /* 3. Create my master socket */
-  INFO1("Launch server (port=%d)", port);
+  XBT_INFO("Launch server (port=%d)", port);
   TRY {
     sock = gras_socket_server(port);
   }
-  CATCH(e) {
-    RETHROW0("Unable to establish a server socket: %s");
+  CATCH_ANONYMOUS {
+    RETHROWF("Unable to establish a server socket: %s");
   }
 
   /* 4. Register the known messages and payloads. */
@@ -89,14 +88,13 @@ int server(int argc, char *argv[])
   gras_socket_close(sock);
   gras_exit();
 
-  INFO0("Done.");
+  XBT_INFO("Done.");
   return 0;
 }                               /* end_of_server */
 
 
 int client(int argc, char *argv[])
 {
-  xbt_ex_t e;
   gras_socket_t toserver = NULL;        /* peer */
 
   gras_socket_t from;
@@ -116,7 +114,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. Wait for the server startup */
   gras_os_sleep(1);
@@ -125,17 +123,17 @@ int client(int argc, char *argv[])
   TRY {
     toserver = gras_socket_client(host, port);
   }
-  CATCH(e) {
-    RETHROW0("Unable to connect to the server: %s");
+  CATCH_ANONYMOUS {
+    RETHROWF("Unable to connect to the server: %s");
   }
-  INFO2("Connected to %s:%d.", host, port);
+  XBT_INFO("Connected to %s:%d.", host, port);
 
 
   /* 5. Register the messages (before use) */
   mmrpc_register_messages();
 
   /* 6. 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));
 
   /* 7. Prepare and send the request to the server */
@@ -152,7 +150,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));
 
   /* 8. Wait for the answer from the server, and deal with issues */
@@ -163,14 +161,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));
 
   /* 9. 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));
 
   /* 10. Free the allocated resources, and shut GRAS down */
@@ -178,6 +176,6 @@ int client(int argc, char *argv[])
   xbt_matrix_free(answer);
   gras_socket_close(toserver);
   gras_exit();
-  INFO0("Done.");
+  XBT_INFO("Done.");
   return 0;
 }                               /* end_of_client */