Fix race condition with gras-mmrpc test.

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

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index e139989..4719e1d 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -37,7 +37,10 @@ int client(int argc, char *argv[])
 
   XBT_INFO("Launch client (server on %s:%d)", host, port);
 
-  /* 3. Create a socket to speak to the server */
+  /* 3. Register the messages (before use) */
+  mmrpc_register_messages();
+
+  /* 4. Create a socket to speak to the server */
   while (!connected) {
     TRY {
       toserver = gras_socket_client(host, port);
@@ -52,10 +55,6 @@ int client(int argc, char *argv[])
   }
   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 */
   XBT_INFO(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<",
         gras_socket_peer_name(toserver), gras_socket_peer_port(toserver));
@@ -85,7 +84,7 @@ 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,