X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..7d1dc2ebb532ebc2ce507519cae63cd6b213e881:/examples/gras/pmm/pmm.c diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c index bb48e39a8d..38c834c4a9 100644 --- a/examples/gras/pmm/pmm.c +++ b/examples/gras/pmm/pmm.c @@ -20,21 +20,21 @@ const int submatrix_size = DATA_MATRIX_SIZE / PROC_MATRIX_SIZE; XBT_LOG_NEW_DEFAULT_CATEGORY(pmm, "Parallel Matrix Multiplication"); /* struct for recovering results */ -GRAS_DEFINE_TYPE(s_result, struct s_result { +XBT_DEFINE_TYPE(s_result, struct s_result { int linepos; int rowpos; - xbt_matrix_t C GRAS_ANNOTE(subtype, double); + xbt_matrix_t C XBT_ANNOTE(subtype, double); }); typedef struct s_result result_t; /* struct to send initial data to slave */ -GRAS_DEFINE_TYPE(s_pmm_assignment, struct s_pmm_assignment { +XBT_DEFINE_TYPE(s_pmm_assignment, struct s_pmm_assignment { int linepos; int rowpos; xbt_peer_t line[NEIGHBOR_COUNT]; xbt_peer_t row[NEIGHBOR_COUNT]; - xbt_matrix_t A GRAS_ANNOTE(subtype, double); - xbt_matrix_t B GRAS_ANNOTE(subtype, double); + xbt_matrix_t A XBT_ANNOTE(subtype, double); + xbt_matrix_t B XBT_ANNOTE(subtype, double); }); typedef struct s_pmm_assignment s_pmm_assignment_t; @@ -42,12 +42,12 @@ typedef struct s_pmm_assignment s_pmm_assignment_t; /* register messages which may be sent (common to client and server) */ static void register_messages(void) { - gras_datadesc_type_t result_type; - gras_datadesc_type_t pmm_assignment_type; + xbt_datadesc_type_t result_type; + xbt_datadesc_type_t pmm_assignment_type; - gras_datadesc_set_const("NEIGHBOR_COUNT", NEIGHBOR_COUNT); - result_type = gras_datadesc_by_symbol(s_result); - pmm_assignment_type = gras_datadesc_by_symbol(s_pmm_assignment); + xbt_datadesc_set_const("NEIGHBOR_COUNT", NEIGHBOR_COUNT); + result_type = xbt_datadesc_by_symbol(s_result); + pmm_assignment_type = xbt_datadesc_by_symbol(s_pmm_assignment); /* receive a final result from slave */ gras_msgtype_declare("result", result_type); @@ -57,16 +57,44 @@ static void register_messages(void) /* send data between slaves */ gras_msgtype_declare("dataA", - gras_datadesc_matrix(gras_datadesc_by_name + xbt_datadesc_matrix(xbt_datadesc_by_name ("double"), NULL)); gras_msgtype_declare("dataB", - gras_datadesc_matrix(gras_datadesc_by_name + xbt_datadesc_matrix(xbt_datadesc_by_name ("double"), NULL)); /* synchronization message */ gras_msgtype_declare("pmm_sync", 0); } +static xbt_socket_t try_gras_socket_client_from_string(const char *host) +{ + volatile xbt_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, + xbt_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[]); @@ -91,11 +119,11 @@ int master(int argc, char *argv[]) xbt_matrix_t A, B, C; result_t result; - gras_socket_t from; + xbt_socket_t from; xbt_dynar_t peers; /* group of slaves */ xbt_peer_t grid[SLAVE_COUNT]; /* The slaves as an array */ - gras_socket_t socket[SLAVE_COUNT]; /* sockets for brodcast to slaves */ + xbt_socket_t socket[SLAVE_COUNT]; /* sockets for brodcast to slaves */ /* Init the GRAS's infrastructure */ gras_init(&argc, argv); @@ -108,7 +136,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 "); + xbt_assert(argc > 1, "Usage: master "); gras_socket_server(atoi(argv[1])); peers = amok_pm_group_new("pmm"); @@ -126,7 +154,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); @@ -238,9 +266,7 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) { /* Recover my initialized Data and My Position */ s_pmm_assignment_t assignment = *(s_pmm_assignment_t *) payload; - gras_socket_t master = gras_msg_cb_ctx_from(ctx); - - xbt_ex_t e; + xbt_socket_t master = gras_msg_cb_ctx_from(ctx); int step, l; xbt_matrix_t bA = xbt_matrix_new(submatrix_size, submatrix_size, @@ -255,11 +281,11 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) result_t result; - gras_socket_t from; /* to exchange data with my neighbor */ + xbt_socket_t from; /* to exchange data with my neighbor */ /* sockets for brodcast to other slave */ - gras_socket_t socket_line[PROC_MATRIX_SIZE - 1]; - gras_socket_t socket_row[PROC_MATRIX_SIZE - 1]; + xbt_socket_t socket_line[PROC_MATRIX_SIZE - 1]; + xbt_socket_t socket_row[PROC_MATRIX_SIZE - 1]; memset(socket_line, 0, sizeof(socket_line)); memset(socket_row, 0, sizeof(socket_row)); @@ -298,7 +324,7 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) XBT_VERB("LINE: step(%d) = Myline(%d). Broadcast my data.", step, myline); for (l = 0; l < PROC_MATRIX_SIZE - 1; l++) { - XBT_VERB("LINE: Send to %s", gras_socket_peer_name(socket_row[l])); + XBT_VERB("LINE: Send to %s", xbt_socket_peer_name(socket_row[l])); gras_msg_send(socket_row[l], "dataB", &mydataB); } @@ -307,15 +333,11 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) 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"); - } + 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)); + myline, xbt_socket_peer_name(from)); } /* a row brodcast */ @@ -323,26 +345,22 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) XBT_VERB("ROW: step(%d)=myrow(%d). Broadcast my data.", step, myrow); for (l = 1; l < PROC_MATRIX_SIZE; l++) { XBT_VERB("ROW: Send to %s", - gras_socket_peer_name(socket_line[l - 1])); + xbt_socket_peer_name(socket_line[l - 1])); gras_msg_send(socket_line[l - 1], "dataA", &mydataA); } xbt_matrix_free(bA); 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"); - } + 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_socket_peer_name(from)); } xbt_matrix_double_addmult(bA, bB, bC); - }; + } /* send Result to master */ result.C = bC; @@ -352,11 +370,11 @@ 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)); + xbt_socket_peer_name(master), xbt_socket_peer_port(master)); /* Free the allocated resources, and shut GRAS down */ xbt_matrix_free(bA); @@ -380,9 +398,8 @@ static int pmm_worker_cb(gras_msg_cb_ctx_t ctx, void *payload) int slave(int argc, char *argv[]) { - gras_socket_t mysock; - gras_socket_t master = NULL; - int connected = 0; + xbt_socket_t mysock; + xbt_socket_t master = NULL; int rank; /* Init the GRAS's infrastructure */ @@ -402,19 +419,8 @@ int slave(int argc, char *argv[]) /* Create the connexions */ mysock = gras_socket_server_range(3000, 9999, 0, 0); XBT_INFO("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); - } - } + 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");