#include "xbt/matrix.h"
#include "amok/peermanagement.h"
-#define PROC_MATRIX_SIZE 2
+#define PROC_MATRIX_SIZE 3
#define NEIGHBOR_COUNT PROC_MATRIX_SIZE - 1
#define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
gras_msgtype_declare("pmm_sync", 0);
}
+static gras_socket_t try_gras_socket_client_from_string(const char *host)
+{
+ volatile gras_socket_t sock = NULL;
+ xbt_ex_t e;
+ TRY {
+ sock = gras_socket_client_from_string(host);
+ }
+ CATCH(e) {
+ if (e.category != system_error)
+ /* dunno what happened, let the exception go through */
+ RETHROWF("Unable to connect to the server: %s");
+ xbt_ex_free(e);
+ }
+ return sock;
+}
+
+static void my_gras_msg_wait(double timeout, const char* msgt_want,
+ gras_socket_t* expeditor, void *payload,
+ const char *error_msg)
+{
+ TRY {
+ gras_msg_wait(timeout, msgt_want, expeditor, payload);
+ }
+ CATCH_ANONYMOUS {
+ RETHROWF("%s: %s", error_msg);
+ }
+}
+
/* Function prototypes */
int slave(int argc, char *argv[]);
int master(int argc, char *argv[]);
C = xbt_matrix_double_new_zeros(DATA_MATRIX_SIZE, DATA_MATRIX_SIZE);
/* Create the connexions */
- xbt_assert
0(argc > 1, "Usage: master <port>");
+ xbt_assert(argc > 1, "Usage: master <port>");
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) < 9) {
- INFO1("Got only %ld pals. Wait 2 more seconds",
- xbt_dynar_length(peers));
+ while (xbt_dynar_length(peers) < SLAVE_COUNT) {
+ 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);
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);
}
/* 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;
/* 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,
/* 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);
}
}
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);
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++) {
/* 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);
}
bB = xbt_matrix_new_sub(mydataB,
submatrix_size, submatrix_size, 0, 0, NULL);
} else {
- TRY {
- xbt_matrix_free(bB);
- gras_msg_wait(600, "dataB", &from, &bB);
- }
- CATCH(e) {
- RETHROW0("Can't get a data message from line : %s");
- }
- VERB3("LINE: step(%d) <> Myline(%d). Receive data from %s", step,
+ xbt_matrix_free(bB);
+ my_gras_msg_wait(600, "dataB", &from, &bB,
+ "Can't get a data message from line");
+ 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);
}
bA = xbt_matrix_new_sub(mydataA,
submatrix_size, submatrix_size, 0, 0, NULL);
} else {
- TRY {
- xbt_matrix_free(bA);
- gras_msg_wait(1200, "dataA", &from, &bA);
- }
- CATCH(e) {
- RETHROW0("Can't get a data message from row : %s");
- }
- VERB3("ROW: step(%d)<>myrow(%d). Receive data from %s", step, myrow,
+ xbt_matrix_free(bA);
+ my_gras_msg_wait(1200, "dataA", &from, &bA,
+ "Can't get a data message from row");
+ 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;
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 */
{
gras_socket_t mysock;
gras_socket_t master = NULL;
- int connected = 0;
int rank;
/* Init the GRAS's infrastructure */
/* Create the connexions */
mysock = gras_socket_server_range(3000, 9999, 0, 0);
- INFO1("Sensor %d starting", rank);
- while (!connected) {
- xbt_ex_t e;
- TRY {
- master = gras_socket_client_from_string(argv[1]);
- connected = 1;
- }
- CATCH(e) {
- if (e.category != system_error)
- RETHROW;
- xbt_ex_free(e);
- gras_os_sleep(0.5);
- }
- }
- INFO2("Connected to master: %s:%d",gras_socket_peer_name(master),gras_socket_peer_port(master));
+ XBT_INFO("Sensor %d starting", rank);
+ while (!(master = try_gras_socket_client_from_string(argv[1])))
+ gras_os_sleep(0.5);
/* Join and run the group */
rank = amok_pm_group_join(master, "pmm");
