Revert "make MSG_comm_waitany use dynar"

This reverts commit ae811896a4746542e8de1616e8bc95a3ee6320f2.

Conflicts:
	examples/msg/actions/actions.c

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index dab03cd..20d67e8 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -256,6 +256,7 @@ static void action_barrier(const char *const *action)
 
 static void action_reduce(const char *const *action)
 {
 
 static void action_reduce(const char *const *action)
 {

+  int i;       

   char *reduce_identifier;
   char mailbox[80];
   double comm_size = parse_double(action[2]);
   char *reduce_identifier;
   char mailbox[80];
   double comm_size = parse_double(action[2]);


@@ -276,32 +277,25 @@ static void action_reduce(const char *const *action)
 
   if (!strcmp(process_name, "p0")) {
     XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name);
 
   if (!strcmp(process_name, "p0")) {
     XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name);

-
-    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
-    msg_task_t *tasks = xbt_new0(msg_task_t, communicator_size - 1);
-    int i;
-
-    for (i = 1; i < communicator_size; i++) {
-      sprintf(mailbox, "%s_p%d_p0", reduce_identifier, i);
-      xbt_dynar_push_as(comms, msg_comm_t,
-                        MSG_task_irecv(&(tasks[i - 1]), mailbox));
-    }
-    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[cursor]);
-    }
-    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);
-    MSG_task_execute(comp_task);
-    MSG_task_destroy(comp_task);
-    XBT_DEBUG("%s: computed", reduce_identifier);
+    
+    msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
+      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);
+      }
+      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]);
+      }
+      free(tasks);
+
+      comp_task = MSG_task_create("reduce_comp", comp_size, 0, NULL);
+      XBT_DEBUG("%s: computing 'reduce_comp'", reduce_identifier);
+      MSG_task_execute(comp_task);
+      MSG_task_destroy(comp_task);
+      XBT_DEBUG("%s: computed", reduce_identifier);

 
   } else {
     XBT_DEBUG("%s: %s sends", reduce_identifier, process_name);
 
   } else {
     XBT_DEBUG("%s: %s sends", reduce_identifier, process_name);


@@ -338,27 +332,21 @@ static void action_bcast(const char *const *action)
   if (!strcmp(process_name, "p0")) {
     XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name);
 
   if (!strcmp(process_name, "p0")) {
     XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name);
 

-    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+      msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);

 
 

+      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);
+      }
+      MSG_comm_waitall(comms,communicator_size-1,-1);
+    for (i = 1; i < communicator_size; i++)
+         MSG_comm_destroy(comms[i-1]);
+      free(comms);

 
 

-    for (i = 1; i < communicator_size; i++) {
-      sprintf(mailbox, "%s_p0_p%d", bcast_identifier, i);
-      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);
-    }
-    xbt_dynar_free(&comms);
-
-
-    XBT_DEBUG("%s: all messages sent by %s have been received",
-              bcast_identifier, process_name);
+      XBT_DEBUG("%s: all messages sent by %s have been received",
+             bcast_identifier, process_name);

 
   } else {
     sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name);
 
   } else {
     sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name);


@@ -390,6 +378,7 @@ static void action_sleep(const char *const *action)
 
 static void action_allReduce(const char *const *action)
 {
 
 static void action_allReduce(const char *const *action)
 {

+  int i;

   char *allreduce_identifier;
   char mailbox[80];
   double comm_size = parse_double(action[2]);
   char *allreduce_identifier;
   char mailbox[80];
   double comm_size = parse_double(action[2]);


@@ -411,21 +400,16 @@ static void action_allReduce(const char *const *action)
   if (!strcmp(process_name, "p0")) {
     XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name);
 
   if (!strcmp(process_name, "p0")) {
     XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name);
 

-    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
-    msg_task_t *tasks = xbt_new0(msg_task_t, communicator_size - 1);
-    int i;
+    msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
+    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);
     for (i = 1; i < communicator_size; i++) {
       sprintf(mailbox, "%s_p%d_p0", allreduce_identifier, i);

-      xbt_dynar_push_as(comms, msg_comm_t,
-                        MSG_task_irecv(&(tasks[i - 1]), mailbox));
+      comms[i-1] = MSG_task_irecv(&(tasks[i-1]),mailbox);

     }
     }

-    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[cursor]);
+    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]);

     }
     free(tasks);
 
     }
     free(tasks);
 


@@ -435,18 +419,16 @@ static void action_allReduce(const char *const *action)
     MSG_task_destroy(comp_task);
     XBT_DEBUG("%s: computed", allreduce_identifier);
 
     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);
     for (i = 1; i < communicator_size; i++) {
       sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i);

-      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);
+      comms[i-1] =
+          MSG_task_isend(MSG_task_create(mailbox,0,comm_size,NULL),
+              mailbox);

     }
     }

-    xbt_dynar_free(&comms);
+    MSG_comm_waitall(comms,communicator_size-1,-1);
+    for (i = 1; i < communicator_size; i++)
+       MSG_comm_destroy(comms[i-1]);
+    free(comms);

 
     XBT_DEBUG("%s: all messages sent by %s have been received",
               allreduce_identifier, process_name);
 
     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 8de9a03..01d03c6 100644 (file)
--- 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]);
 
   double task_comm_size = atof(argv[3]);
   long receivers_count = atol(argv[4]);
 

-  xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+  msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count);

   int i;
   msg_task_t task = NULL;
   for (i = 0; i < number_of_tasks; i++) {
   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);
     task =
         MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
                         NULL);

-    xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, mailbox));
+    comm[i] = 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);
     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);

-    xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, mailbox));    
+    comm[i + number_of_tasks] = 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 */
     XBT_INFO("Send to receiver-%ld finalize", i % receivers_count);
 
   }
   /* Here we are waiting for the completion of all communications */

-  MSG_comm_waitall(comms, -1);
+  MSG_comm_waitall(comm, (number_of_tasks + receivers_count), -1);

 
   XBT_INFO("Goodbye now!");
 
   XBT_INFO("Goodbye now!");

-  xbt_dynar_free(&comms);
+  xbt_free(comm);

   return 0;
 }                               /* end_of_sender */
 
   return 0;
 }                               /* end_of_sender */
 

diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c
index 18743c1..ba8a65c 100644 (file)
--- a/examples/msg/pmm/msg_pmm.c
+++ b/examples/msg/pmm/msg_pmm.c
@@ -194,24 +194,18 @@ static void broadcast_jobs(node_job_t *jobs)
   int node;
   char node_mbox[MAILBOX_NAME_SIZE];
   msg_task_t task;
   int node;
   char node_mbox[MAILBOX_NAME_SIZE];
   msg_task_t task;

-  xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+  msg_comm_t comms[GRID_NUM_NODES - 1] = {0};

 
   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);
 
   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);

-     xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, node_mbox));
+    comms[node-1] = MSG_task_isend(task, node_mbox);

   }
 
   }
 

-  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);
+  MSG_comm_waitall(comms, GRID_NUM_NODES-1, -1);
+  for (node = 1; node < GRID_NUM_NODES; node++)
+    MSG_comm_destroy(comms[node - 1]);

 }
 
 static node_job_t wait_job(int selfid)
 }
 
 static node_job_t wait_job(int selfid)


@@ -351,24 +345,19 @@ 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;
 
 static void receive_results(result_t *results){
   int node;

-  xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+  msg_comm_t comms[GRID_NUM_NODES-1] = {0};

   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++){
   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++){

-   xbt_dynar_push_as(comms, msg_comm_t, MSG_task_irecv(&tasks[node-1], "0"));
+   comms[node-1] = MSG_task_irecv(&tasks[node-1], "0");

   }
 
   }
 

-  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);
+  MSG_comm_waitall(comms, GRID_NUM_NODES - 1, -1);
+  for (node = 1; node < GRID_NUM_NODES; node++)
+    MSG_comm_destroy(comms[node - 1]);

 
   /* Reconstruct the result matrix */
   for (node = 1; node < GRID_NUM_NODES; node++){
 
   /* 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 e28b4de..5d993b0 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -236,7 +236,8 @@ 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(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(xbt_dynar_t comms, double timeout);
+XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t * comm, int nb_elem,
+                                  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);
 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 f31cec1..38b579d 100644 (file)
--- 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
 *
 /** \ingroup msg_task_usage
 * \brief This function is called by a sender and permit to wait for each communication
 *

-* \param comm a vector of communications
+* \param comm a vector of communication
+* \param nb_elem is the size of the comm vector

 * \param timeout for each call of MSG_comm_wait
 */
 * \param timeout for each call of MSG_comm_wait
 */

-void MSG_comm_waitall(xbt_dynar_t comms, double timeout)
+void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout)

 {
 {

-  unsigned int cursor;
-  msg_comm_t comm;
-  xbt_dynar_foreach(comms, cursor, comm) {
-    MSG_comm_wait(comm, timeout);    
+  int i = 0;
+  for (i = 0; i < nb_elem; i++) {
+    MSG_comm_wait(comm[i], timeout);

   }
 }
 
   }
 }