X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1757b8e6b03369034f2d251bcffc37e61a3c20a..c1196ca10d1165bfaadfd66799bff4e0eec459b5:/examples/gras/pmm/pmm.c diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c index 820568951a..27b03d1daf 100644 --- a/examples/gras/pmm/pmm.c +++ b/examples/gras/pmm/pmm.c @@ -108,25 +108,25 @@ 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 "); + xbt_assert(argc > 1, "Usage: master "); gras_socket_server(atoi(argv[1])); peers = amok_pm_group_new("pmm"); /* friends, we're ready. Come and play */ - INFO0("Wait for peers for 2 sec"); + XBT_INFO("Wait for peers for 2 sec"); gras_msg_handleall(2); while (xbt_dynar_length(peers) < SLAVE_COUNT) { - INFO2("Got only %ld pals (of %d). Wait 2 more seconds", + XBT_INFO("Got only %ld pals (of %d). Wait 2 more seconds", xbt_dynar_length(peers),SLAVE_COUNT); gras_msg_handleall(2); } - INFO1("Good. Got %ld pals", xbt_dynar_length(peers)); + XBT_INFO("Good. Got %ld pals", xbt_dynar_length(peers)); for (i = 0; i < xbt_dynar_length(peers) && i < SLAVE_COUNT; i++) { 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); @@ -135,7 +135,7 @@ int master(int argc, char *argv[]) xbt_peer_t h; xbt_dynar_remove_at(peers, i, &h); - INFO2("Too much slaves. Killing %s:%d", h->name, h->port); + XBT_INFO("Too much slaves. Killing %s:%d", h->name, h->port); amok_pm_kill_hp(h->name, h->port); free(h); } @@ -143,7 +143,7 @@ int master(int argc, char *argv[]) /* Assign job to slaves */ int row = 0, line = 0; - INFO0("XXXXXXXXXXXXXXXXXXXXXX begin Multiplication"); + XBT_INFO("XXXXXXXXXXXXXXXXXXXXXX begin Multiplication"); for (i = 0; i < SLAVE_COUNT; i++) { s_pmm_assignment_t assignment; int j, k; @@ -196,7 +196,7 @@ int master(int argc, char *argv[]) /* Retrieve the results */ for (i = 0; i < SLAVE_COUNT; i++) { gras_msg_wait(6000, "result", &from, &result); - VERB2("%d slaves are done already. Waiting for %d", i + 1, + XBT_VERB("%d slaves are done already. Waiting for %d", i + 1, SLAVE_COUNT); xbt_matrix_copy_values(C, result.C, submatrix_size, submatrix_size, submatrix_size * result.linepos, @@ -206,14 +206,14 @@ int master(int argc, char *argv[]) /* end of gather */ if (xbt_matrix_double_is_seq(C)) - INFO0("XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations"); + XBT_INFO("XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations"); else { - WARN0("the result seems wrong"); + XBT_WARN("the result seems wrong"); if (DATA_MATRIX_SIZE < 30) { - INFO0("The Result of Multiplication is :"); + XBT_INFO("The Result of Multiplication is :"); xbt_matrix_dump(C, "C:res", 0, xbt_matrix_dump_display_double); } else { - INFO1("Matrix size too big (%d>30) to be displayed here", + XBT_INFO("Matrix size too big (%d>30) to be displayed here", DATA_MATRIX_SIZE); } } @@ -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); @@ -273,9 +271,9 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) mydataB = assignment.B; if (gras_if_RL()) - INFO0("Receive my pos and assignment"); + XBT_INFO("Receive my pos and assignment"); else - INFO2("Receive my pos (%d,%d) and assignment", myline, myrow); + XBT_INFO("Receive my pos (%d,%d) and assignment", myline, myrow); /* Get my neighborhood from the assignment message (skipping myself) */ for (i = 0; i < PROC_MATRIX_SIZE - 1; i++) { @@ -295,10 +293,10 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) /* a line brodcast */ if (myline == step) { - VERB2("LINE: step(%d) = Myline(%d). Broadcast my data.", step, + XBT_VERB("LINE: step(%d) = Myline(%d). Broadcast my data.", step, myline); for (l = 0; l < PROC_MATRIX_SIZE - 1; l++) { - VERB1("LINE: Send to %s", gras_socket_peer_name(socket_row[l])); + XBT_VERB("LINE: Send to %s", gras_socket_peer_name(socket_row[l])); gras_msg_send(socket_row[l], "dataB", &mydataB); } @@ -311,18 +309,18 @@ 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"); } - VERB3("LINE: step(%d) <> Myline(%d). Receive data from %s", step, + XBT_VERB("LINE: step(%d) <> Myline(%d). Receive data from %s", step, myline, gras_socket_peer_name(from)); } /* a row brodcast */ if (myrow == step) { - VERB2("ROW: step(%d)=myrow(%d). Broadcast my data.", step, myrow); + XBT_VERB("ROW: step(%d)=myrow(%d). Broadcast my data.", step, myrow); for (l = 1; l < PROC_MATRIX_SIZE; l++) { - VERB1("ROW: Send to %s", + XBT_VERB("ROW: Send to %s", gras_socket_peer_name(socket_line[l - 1])); gras_msg_send(socket_line[l - 1], "dataA", &mydataA); } @@ -334,10 +332,10 @@ 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"); } - VERB3("ROW: step(%d)<>myrow(%d). Receive data from %s", step, myrow, + 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); @@ -352,10 +350,10 @@ 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"); } - VERB2(">>>>>>>> Result sent to %s:%d <<<<<<<<", + XBT_VERB(">>>>>>>> Result sent to %s:%d <<<<<<<<", gras_socket_peer_name(master), gras_socket_peer_port(master)); /* Free the allocated resources, and shut GRAS down */ @@ -401,7 +399,7 @@ int slave(int argc, char *argv[]) /* Create the connexions */ mysock = gras_socket_server_range(3000, 9999, 0, 0); - INFO1("Sensor %d starting", rank); + XBT_INFO("Sensor %d starting", rank); while (!connected) { xbt_ex_t e; TRY {