Remove spurious semicolon.

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

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
index bb48e39..a4a3a00 100644 (file)
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -108,7 +108,7 @@ int master(int argc, char *argv[])
   C = xbt_matrix_double_new_zeros(DATA_MATRIX_SIZE, DATA_MATRIX_SIZE);
 
   /* Create the connexions */
-  xbt_assert0(argc > 1, "Usage: master <port>");
+  xbt_assert(argc > 1, "Usage: master <port>");
   gras_socket_server(atoi(argv[1]));
   peers = amok_pm_group_new("pmm");
 
@@ -126,7 +126,7 @@ int master(int argc, char *argv[])
     xbt_dynar_get_cpy(peers, i, &grid[i]);
     socket[i] = gras_socket_client(grid[i]->name, grid[i]->port);
   }
-  xbt_assert2(i == SLAVE_COUNT,
+  xbt_assert(i == SLAVE_COUNT,
               "Not enough slaves for this setting (got %d of %d). Change the deployment file",
               i, SLAVE_COUNT);
 
@@ -240,8 +240,6 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
   s_pmm_assignment_t assignment = *(s_pmm_assignment_t *) payload;
   gras_socket_t master = gras_msg_cb_ctx_from(ctx);
 
-  xbt_ex_t e;
-
   int step, l;
   xbt_matrix_t bA = xbt_matrix_new(submatrix_size, submatrix_size,
                                    sizeof(double), NULL);
@@ -311,8 +309,8 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
         xbt_matrix_free(bB);
         gras_msg_wait(600, "dataB", &from, &bB);
       }
-      CATCH(e) {
-        RETHROW0("Can't get a data message from line : %s");
+      CATCH_ANONYMOUS {
+        RETHROWF("Can't get a data message from line : %s");
       }
       XBT_VERB("LINE: step(%d) <> Myline(%d). Receive data from %s", step,
             myline, gras_socket_peer_name(from));
@@ -334,15 +332,15 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
         xbt_matrix_free(bA);
         gras_msg_wait(1200, "dataA", &from, &bA);
       }
-      CATCH(e) {
-        RETHROW0("Can't get a data message from row : %s");
+      CATCH_ANONYMOUS {
+        RETHROWF("Can't get a data message from row : %s");
       }
       XBT_VERB("ROW: step(%d)<>myrow(%d). Receive data from %s", step, myrow,
             gras_socket_peer_name(from));
     }
     xbt_matrix_double_addmult(bA, bB, bC);
 
-  };
+  }
 
   /* send Result to master */
   result.C = bC;
@@ -352,8 +350,8 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload)
   TRY {
     gras_msg_send(master, "result", &result);
   }
-  CATCH(e) {
-    RETHROW0("Failed to send answer to server: %s");
+  CATCH_ANONYMOUS {
+    RETHROWF("Failed to send answer to server: %s");
   }
   XBT_VERB(">>>>>>>> Result sent to %s:%d <<<<<<<<",
         gras_socket_peer_name(master), gras_socket_peer_port(master));