Fix race condition with gras-mmrpc test.

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

diff --git a/examples/gras/mmrpc/mmrpc_server.c b/examples/gras/mmrpc/mmrpc_server.c
index 5072264..bcaf5f1 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_server.c
+++ b/examples/gras/mmrpc/mmrpc_server.c
@@ -40,7 +40,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 = 4002;
 
@@ -52,21 +51,21 @@ int server(int argc, char *argv[])
     port = atoi(argv[1]);
   }
 
-  /* 3. Create my master socket */
+  /* 3. Register the known messages and payloads. */
+  mmrpc_register_messages();
+
+  /* 4. Register my callback */
+  gras_cb_register("request", &server_cb_request_handler);
+
+  /* 5. Create my master socket */
   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. */
-  mmrpc_register_messages();
-
-  /* 5. Register my callback */
-  gras_cb_register("request", &server_cb_request_handler);
-
   /* 6. Wait up to 10 minutes for an incomming message to handle */
   gras_msg_handle(600.0);