From: Paul Bédaride Date: Thu, 20 Dec 2012 16:29:45 +0000 (+0100) Subject: make MSG_comm_waitany use dynar X-Git-Tag: v3_9_rc1~86^2~77 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ae811896a4746542e8de1616e8bc95a3ee6320f2 make MSG_comm_waitany use dynar --- diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index a591bd33c0..0cbc2eba1e 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -271,18 +271,22 @@ static void action_reduce(const char *const *action) if (!strcmp(process_name, "p0")) { XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name); - msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); msg_task_t *tasks = xbt_new0(msg_task_t,communicator_size-1); for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p%d_p0", reduce_identifier, i); - comms[i-1] = MSG_task_irecv(&(tasks[i-1]),mailbox); + xbt_dynar_push_as(comms, msg_comm_t, MSG_task_irecv(&(tasks[i-1]),mailbox)); } - MSG_comm_waitall(comms,communicator_size-1,-1); - for (i = 1; i < communicator_size; i++) { - MSG_comm_destroy(comms[i-1]); - MSG_task_destroy(tasks[i-1]); + MSG_comm_waitall(comms, -1); + + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); + MSG_task_destroy(tasks[i]); } free(tasks); + xbt_dynar_free(&comms); comp_task = MSG_task_create("reduce_comp", comp_size, 0, NULL); XBT_DEBUG("%s: computing 'reduce_comp'", reduce_identifier); @@ -324,18 +328,24 @@ static void action_bcast(const char *const *action) if (!strcmp(process_name, "p0")) { XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name); - msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p0_p%d", bcast_identifier, i); - comms[i-1] = - MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL), - mailbox); + xbt_dynar_push_as(comms, msg_comm_t, + MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL), + mailbox)); + } + MSG_comm_waitall(comms, -1); + + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); } - MSG_comm_waitall(comms,communicator_size-1,-1); - for (i = 1; i < communicator_size; i++) - MSG_comm_destroy(comms[i-1]); - free(comms); + xbt_dynar_free(&comms); + XBT_DEBUG("%s: all messages sent by %s have been received", bcast_identifier, process_name); @@ -390,18 +400,21 @@ static void action_allReduce(const char *const *action) { if (!strcmp(process_name, "p0")) { XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name); - msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1); + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); msg_task_t *tasks = xbt_new0(msg_task_t,communicator_size-1); for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p%d_p0", allreduce_identifier, i); - comms[i-1] = MSG_task_irecv(&(tasks[i-1]),mailbox); + xbt_dynar_push_as(comms, msg_comm_t, MSG_task_irecv(&(tasks[i-1]),mailbox)); } - MSG_comm_waitall(comms,communicator_size-1,-1); - for (i = 1; i < communicator_size; i++) { - MSG_comm_destroy(comms[i-1]); - MSG_task_destroy(tasks[i-1]); + MSG_comm_waitall(comms, -1); + + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); + MSG_task_destroy(tasks[i]); } - free(tasks); + free(tasks); comp_task = MSG_task_create("allReduce_comp", comp_size, 0, NULL); XBT_DEBUG("%s: computing 'reduce_comp'", allreduce_identifier); @@ -409,16 +422,18 @@ static void action_allReduce(const char *const *action) { MSG_task_destroy(comp_task); XBT_DEBUG("%s: computed", allreduce_identifier); + xbt_dynar_reset(comms); for (i = 1; i < communicator_size; i++) { sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i); - comms[i-1] = - MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL), - mailbox); + xbt_dynar_push_as(comms, msg_comm_t, + MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL), + mailbox)); + } + MSG_comm_waitall(comms, -1); + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); } - MSG_comm_waitall(comms,communicator_size-1,-1); - for (i = 1; i < communicator_size; i++) - MSG_comm_destroy(comms[i-1]); - free(comms); + xbt_dynar_free(&comms); XBT_DEBUG("%s: all messages sent by %s have been received", allreduce_identifier, process_name); diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c index 01d03c6bf0..8de9a03fcf 100644 --- a/examples/msg/icomms/peer2.c +++ b/examples/msg/icomms/peer2.c @@ -33,7 +33,7 @@ int sender(int argc, char *argv[]) double task_comm_size = atof(argv[3]); long receivers_count = atol(argv[4]); - msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count); + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); int i; msg_task_t task = NULL; for (i = 0; i < number_of_tasks; i++) { @@ -44,22 +44,22 @@ int sender(int argc, char *argv[]) task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL); - comm[i] = MSG_task_isend(task, mailbox); + xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, mailbox)); XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i); } for (i = 0; i < receivers_count; i++) { char mailbox[80]; sprintf(mailbox, "receiver-%ld", i % receivers_count); task = MSG_task_create("finalize", 0, 0, 0); - comm[i + number_of_tasks] = MSG_task_isend(task, mailbox); + xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, mailbox)); XBT_INFO("Send to receiver-%ld finalize", i % receivers_count); } /* Here we are waiting for the completion of all communications */ - MSG_comm_waitall(comm, (number_of_tasks + receivers_count), -1); + MSG_comm_waitall(comms, -1); XBT_INFO("Goodbye now!"); - xbt_free(comm); + xbt_dynar_free(&comms); return 0; } /* end_of_sender */ diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c index ba8a65c1c4..18743c134d 100644 --- a/examples/msg/pmm/msg_pmm.c +++ b/examples/msg/pmm/msg_pmm.c @@ -194,18 +194,24 @@ static void broadcast_jobs(node_job_t *jobs) int node; char node_mbox[MAILBOX_NAME_SIZE]; msg_task_t task; - msg_comm_t comms[GRID_NUM_NODES - 1] = {0}; + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); XBT_VERB("Broadcast Jobs"); for (node = 1; node < GRID_NUM_NODES; node++){ task = MSG_task_create("Job", 100, 100, jobs[node-1]); snprintf(node_mbox, MAILBOX_NAME_SIZE - 1, "%d", node); - comms[node-1] = MSG_task_isend(task, node_mbox); + xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, node_mbox)); } - MSG_comm_waitall(comms, GRID_NUM_NODES-1, -1); - for (node = 1; node < GRID_NUM_NODES; node++) - MSG_comm_destroy(comms[node - 1]); + MSG_comm_waitall(comms, -1); + + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); + } + + xbt_dynar_free(&comms); } static node_job_t wait_job(int selfid) @@ -345,19 +351,24 @@ static void create_jobs(xbt_matrix_t A, xbt_matrix_t B, node_job_t *jobs) static void receive_results(result_t *results){ int node; - msg_comm_t comms[GRID_NUM_NODES-1] = {0}; + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); msg_task_t tasks[GRID_NUM_NODES-1] = {0}; XBT_VERB("Receive Results."); /* Get the result from the nodes in the GRID */ for (node = 1; node < GRID_NUM_NODES; node++){ - comms[node-1] = MSG_task_irecv(&tasks[node-1], "0"); + xbt_dynar_push_as(comms, msg_comm_t, MSG_task_irecv(&tasks[node-1], "0")); } - MSG_comm_waitall(comms, GRID_NUM_NODES - 1, -1); - for (node = 1; node < GRID_NUM_NODES; node++) - MSG_comm_destroy(comms[node - 1]); + MSG_comm_waitall(comms, -1); + + msg_comm_t comm; + unsigned int cursor; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_destroy(comm); + } + xbt_dynar_free(&comms); /* Reconstruct the result matrix */ for (node = 1; node < GRID_NUM_NODES; node++){ diff --git a/include/msg/msg.h b/include/msg/msg.h index 5d993b0f40..e28b4de0b4 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -236,8 +236,7 @@ XBT_PUBLIC(int) MSG_comm_test(msg_comm_t comm); XBT_PUBLIC(int) MSG_comm_testany(xbt_dynar_t comms); XBT_PUBLIC(void) MSG_comm_destroy(msg_comm_t comm); XBT_PUBLIC(msg_error_t) MSG_comm_wait(msg_comm_t comm, double timeout); -XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t * comm, int nb_elem, - double timeout); +XBT_PUBLIC(void) MSG_comm_waitall(xbt_dynar_t comms, double timeout); XBT_PUBLIC(int) MSG_comm_waitany(xbt_dynar_t comms); XBT_PUBLIC(msg_task_t) MSG_comm_get_task(msg_comm_t comm); XBT_PUBLIC(msg_error_t) MSG_comm_get_status(msg_comm_t comm); diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index 38b579d283..f31cec178c 100644 --- a/src/msg/msg_gos.c +++ b/src/msg/msg_gos.c @@ -571,15 +571,15 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) /** \ingroup msg_task_usage * \brief This function is called by a sender and permit to wait for each communication * -* \param comm a vector of communication -* \param nb_elem is the size of the comm vector +* \param comm a vector of communications * \param timeout for each call of MSG_comm_wait */ -void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout) +void MSG_comm_waitall(xbt_dynar_t comms, double timeout) { - int i = 0; - for (i = 0; i < nb_elem; i++) { - MSG_comm_wait(comm[i], timeout); + unsigned int cursor; + msg_comm_t comm; + xbt_dynar_foreach(comms, cursor, comm) { + MSG_comm_wait(comm, timeout); } }