X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..c5cfdf988dc28c64bae948c5a749d0b44e881426:/src/smpi/smpi_coll.c

diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c
index d1984b0a26..7798de86ea 100644
--- a/src/smpi/smpi_coll.c
+++ b/src/smpi/smpi_coll.c
@@ -11,7 +11,6 @@
 #include <assert.h>
 
 #include "private.h"
-#include "smpi_coll_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi,
                                 "Logging specific to SMPI (coll)");
@@ -19,18 +18,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi,
 struct s_proc_tree {
   int PROCTREE_A;
   int numChildren;
-  int * child;
+  int *child;
   int parent;
   int me;
   int root;
   int isRoot;
 };
-typedef struct s_proc_tree * proc_tree_t;
+typedef struct s_proc_tree *proc_tree_t;
 
 /**
  * alloc and init
  **/
-static proc_tree_t alloc_tree(int arity) {
+static proc_tree_t alloc_tree(int arity)
+{
   proc_tree_t tree;
   int i;
 
@@ -39,7 +39,7 @@ static proc_tree_t alloc_tree(int arity) {
   tree->isRoot = 0;
   tree->numChildren = 0;
   tree->child = xbt_new(int, arity);
-  for(i = 0; i < arity; i++) {
+  for (i = 0; i < arity; i++) {
     tree->child[i] = -1;
   }
   tree->root = -1;
@@ -50,64 +50,70 @@ static proc_tree_t alloc_tree(int arity) {
 /**
  * free
  **/
-static void free_tree(proc_tree_t tree) {
-  xbt_free(tree->child );
+static void free_tree(proc_tree_t tree)
+{
+  xbt_free(tree->child);
   xbt_free(tree);
 }
 
 /**
  * Build the tree depending on a process rank (index) and the group size (extent)
- * @param index the rank of the calling process
- * @param extent the total number of processes
+ * @param root the rank of the tree root
+ * @param rank the rank of the calling process
+ * @param size the total number of processes
  **/
-static void build_tree(int index, int extent, proc_tree_t* tree) {
-  int places = (*tree)->PROCTREE_A * index;
-  int i, ch, pr;
+static void build_tree(int root, int rank, int size, proc_tree_t * tree)
+{
+  int index = (rank - root + size) % size;
+  int firstChildIdx = index * (*tree)->PROCTREE_A + 1;
+  int i;
 
-  (*tree)->me = index;
-  (*tree)->root = 0 ;
-  for(i = 1; i <= (*tree)->PROCTREE_A; i++) {
-    ++places;
-    ch = (*tree)->PROCTREE_A * index + i + (*tree)->root;
-    ch %= extent;
-    if(places < extent) {
-      (*tree)->child[i - 1] = ch;
-      (*tree)->numChildren++;
-    }
+  (*tree)->me = rank;
+  (*tree)->root = root;
+
+  for (i = 0; i < (*tree)->PROCTREE_A && firstChildIdx + i < size; i++) {
+    (*tree)->child[i] = (firstChildIdx + i + root) % size;
+    (*tree)->numChildren++;
   }
-  if(index == (*tree)->root) {
+  if (rank == root) {
     (*tree)->isRoot = 1;
   } else {
     (*tree)->isRoot = 0;
-    pr = (index - 1) / (*tree)->PROCTREE_A;
-    (*tree)->parent = pr;
+    (*tree)->parent = (((index - 1) / (*tree)->PROCTREE_A) + root) % size;
   }
 }
 
 /**
  * bcast
  **/
-static void tree_bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, proc_tree_t tree) {
-  int system_tag = 999;  // used negative int but smpi_create_request() declares this illegal (to be checked)
+static void tree_bcast(void *buf, int count, MPI_Datatype datatype,
+                       MPI_Comm comm, proc_tree_t tree)
+{
+  int system_tag = 999;         // used negative int but smpi_create_request() declares this illegal (to be checked)
   int rank, i;
-  MPI_Request* requests;
+  MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
   /* wait for data from my parent in the tree */
-  if(!tree->isRoot) {
-    DEBUG3("<%d> tree_bcast(): i am not root: recv from %d, tag=%d)",
+  if (!tree->isRoot) {
+    XBT_DEBUG("<%d> tree_bcast(): i am not root: recv from %d, tag=%d)",
            rank, tree->parent, system_tag + rank);
-    smpi_mpi_recv(buf, count, datatype, tree->parent, system_tag + rank, comm, MPI_STATUS_IGNORE);
+    smpi_mpi_recv(buf, count, datatype, tree->parent, system_tag + rank,
+                  comm, MPI_STATUS_IGNORE);
   }
   requests = xbt_new(MPI_Request, tree->numChildren);
-  DEBUG2("<%d> creates %d requests (1 per child)", rank, tree->numChildren);
+  XBT_DEBUG("<%d> creates %d requests (1 per child)", rank,
+         tree->numChildren);
   /* iniates sends to ranks lower in the tree */
-  for(i = 0; i < tree->numChildren; i++) {
-    if(tree->child[i] == -1) {
+  for (i = 0; i < tree->numChildren; i++) {
+    if (tree->child[i] == -1) {
       requests[i] = MPI_REQUEST_NULL;
     } else {
-      DEBUG3("<%d> send to <%d>, tag=%d", rank, tree->child[i], system_tag + tree->child[i]);
-      requests[i] = smpi_isend_init(buf, count, datatype, tree->child[i], system_tag + tree->child[i], comm);
+      XBT_DEBUG("<%d> send to <%d>, tag=%d", rank, tree->child[i],
+             system_tag + tree->child[i]);
+      requests[i] =
+          smpi_isend_init(buf, count, datatype, tree->child[i],
+                          system_tag + tree->child[i], comm);
     }
   }
   smpi_mpi_startall(tree->numChildren, requests);
@@ -118,27 +124,34 @@ static void tree_bcast(void* buf, int count, MPI_Datatype datatype, int root, MP
 /**
  * anti-bcast
  **/
-static void tree_antibcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, proc_tree_t tree) {
-  int system_tag = 999;  // used negative int but smpi_create_request() declares this illegal (to be checked)
+static void tree_antibcast(void *buf, int count, MPI_Datatype datatype,
+                           MPI_Comm comm, proc_tree_t tree)
+{
+  int system_tag = 999;         // used negative int but smpi_create_request() declares this illegal (to be checked)
   int rank, i;
-  MPI_Request* requests;
+  MPI_Request *requests;
 
   rank = smpi_comm_rank(comm);
   // everyone sends to its parent, except root.
-  if(!tree->isRoot) {
-    DEBUG3("<%d> tree_antibcast(): i am not root: send to %d, tag=%d)",
+  if (!tree->isRoot) {
+    XBT_DEBUG("<%d> tree_antibcast(): i am not root: send to %d, tag=%d)",
            rank, tree->parent, system_tag + rank);
-    smpi_mpi_send(buf, count, datatype, tree->parent, system_tag + rank, comm);
+    smpi_mpi_send(buf, count, datatype, tree->parent, system_tag + rank,
+                  comm);
   }
   //every one receives as many messages as it has children
   requests = xbt_new(MPI_Request, tree->numChildren);
-  DEBUG2("<%d> creates %d requests (1 per child)", rank, tree->numChildren);
-  for(i = 0; i < tree->numChildren; i++) {
-    if(tree->child[i] == -1) {
+  XBT_DEBUG("<%d> creates %d requests (1 per child)", rank,
+         tree->numChildren);
+  for (i = 0; i < tree->numChildren; i++) {
+    if (tree->child[i] == -1) {
       requests[i] = MPI_REQUEST_NULL;
     } else {
-      DEBUG3("<%d> recv from <%d>, tag=%d", rank, tree->child[i], system_tag + tree->child[i]);
-      requests[i] = smpi_irecv_init(buf, count, datatype, tree->child[i], system_tag + tree->child[i], comm);
+      XBT_DEBUG("<%d> recv from <%d>, tag=%d", rank, tree->child[i],
+             system_tag + tree->child[i]);
+      requests[i] =
+          smpi_irecv_init(buf, count, datatype, tree->child[i],
+                          system_tag + tree->child[i], comm);
     }
   }
   smpi_mpi_startall(tree->numChildren, requests);
@@ -149,30 +162,33 @@ static void tree_antibcast(void* buf, int count, MPI_Datatype datatype, int root
 /**
  * bcast with a binary, ternary, or whatever tree ..
  **/
-void nary_tree_bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, int arity) {
+void nary_tree_bcast(void *buf, int count, MPI_Datatype datatype, int root,
+                     MPI_Comm comm, int arity)
+{
   proc_tree_t tree = alloc_tree(arity);
   int rank, size;
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  build_tree(rank, size, &tree);
-  tree_bcast(buf, count, datatype, root, comm, tree);
+  build_tree(root, rank, size, &tree);
+  tree_bcast(buf, count, datatype, comm, tree);
   free_tree(tree);
 }
 
 /**
  * barrier with a binary, ternary, or whatever tree ..
  **/
-void nary_tree_barrier(MPI_Comm comm, int arity) {
-  proc_tree_t tree = alloc_tree( arity );
+void nary_tree_barrier(MPI_Comm comm, int arity)
+{
+  proc_tree_t tree = alloc_tree(arity);
   int rank, size;
-  char dummy='$';
+  char dummy = '$';
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  build_tree(rank, size, &tree);
-  tree_antibcast(&dummy, 1, MPI_CHAR, 0, comm, tree);
-  tree_bcast(&dummy, 1, MPI_CHAR, 0, comm, tree);
+  build_tree(0, rank, size, &tree);
+  tree_antibcast(&dummy, 1, MPI_CHAR, comm, tree);
+  tree_bcast(&dummy, 1, MPI_CHAR, comm, tree);
   free_tree(tree);
 }
 
@@ -180,46 +196,64 @@ void nary_tree_barrier(MPI_Comm comm, int arity) {
  * Alltoall Bruck
  *
  * Openmpi calls this routine when the message size sent to each rank < 2000 bytes and size < 12
+ * FIXME: uh, check smpi_pmpi again, but this routine is called for > 12, not
+ * less...
  **/
-int smpi_coll_tuned_alltoall_bruck(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
+int smpi_coll_tuned_alltoall_bruck(void *sendbuf, int sendcount,
+                                   MPI_Datatype sendtype, void *recvbuf,
+                                   int recvcount, MPI_Datatype recvtype,
+                                   MPI_Comm comm)
+{
   int system_tag = 777;
   int i, rank, size, err, count;
-  MPI_Aint lb, sendextent, recvextent;
-  MPI_Request* requests;
+  MPI_Aint lb;
+  MPI_Aint sendext = 0;
+  MPI_Aint recvext = 0;
+  MPI_Request *requests;
 
   // FIXME: check implementation
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  DEBUG1("<%d> algorithm alltoall_bruck() called.", rank);
-  err = smpi_datatype_extent(sendtype, &lb, &sendextent);
-  err = smpi_datatype_extent(recvtype, &lb, &recvextent);
+  XBT_DEBUG("<%d> algorithm alltoall_bruck() called.", rank);
+  err = smpi_datatype_extent(sendtype, &lb, &sendext);
+  err = smpi_datatype_extent(recvtype, &lb, &recvext);
   /* Local copy from self */
-  err = smpi_datatype_copy(&((char*)sendbuf)[rank * sendextent], sendcount, sendtype, &((char*)recvbuf)[rank * recvextent], recvcount, recvtype);
-  if(err == MPI_SUCCESS && size > 1) {
+  err =
+      smpi_datatype_copy((char *)sendbuf + rank * sendcount * sendext, 
+                         sendcount, sendtype, 
+                         (char *)recvbuf + rank * recvcount * recvext,
+                         recvcount, recvtype);
+  if (err == MPI_SUCCESS && size > 1) {
     /* Initiate all send/recv to/from others. */
     requests = xbt_new(MPI_Request, 2 * (size - 1));
     count = 0;
     /* Create all receives that will be posted first */
-    for(i = 0; i < size; ++i) {
-      if(i == rank) {
-        DEBUG3("<%d> skip request creation [src = %d, recvcount = %d]", rank, i, recvcount);
+    for (i = 0; i < size; ++i) {
+      if (i == rank) {
+        XBT_DEBUG("<%d> skip request creation [src = %d, recvcount = %d]",
+               rank, i, recvcount);
         continue;
       }
-      requests[count] = smpi_irecv_init(&((char*)recvbuf)[i * recvextent], recvcount, recvtype, i, system_tag, comm);
+      requests[count] =
+          smpi_irecv_init((char *)recvbuf + i * recvcount * recvext, recvcount,
+                          recvtype, i, system_tag, comm);
       count++;
     }
     /* Now create all sends  */
-    for(i = 0; i < size; ++i) {
-      if(i == rank) {
-        DEBUG3("<%d> skip request creation [dst = %d, sendcount = %d]", rank, i, sendcount);
+    for (i = 0; i < size; ++i) {
+      if (i == rank) {
+        XBT_DEBUG("<%d> skip request creation [dst = %d, sendcount = %d]",
+               rank, i, sendcount);
         continue;
       }
-      requests[count] = smpi_isend_init(&((char*)sendbuf)[i * sendextent], sendcount, sendtype, i, system_tag, comm);
+      requests[count] =
+          smpi_isend_init((char *)sendbuf + i * sendcount * sendext, sendcount,
+                          sendtype, i, system_tag, comm);
       count++;
     }
-    /* Wait for them all.*/
+    /* Wait for them all. */
     smpi_mpi_startall(count, requests);
-    DEBUG2("<%d> wait for %d requests", rank, count);
+    XBT_DEBUG("<%d> wait for %d requests", rank, count);
     smpi_mpi_waitall(count, requests, MPI_STATUS_IGNORE);
     xbt_free(requests);
   }
@@ -229,29 +263,37 @@ int smpi_coll_tuned_alltoall_bruck(void* sendbuf, int sendcount, MPI_Datatype se
 /**
  * Alltoall basic_linear
  **/
-int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
+int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount,
+                                          MPI_Datatype sendtype,
+                                          void *recvbuf, int recvcount,
+                                          MPI_Datatype recvtype,
+                                          MPI_Comm comm)
+{
   int system_tag = 888;
   int i, rank, size, err, count;
-  MPI_Aint lb, sendinc, recvinc;
+  MPI_Aint lb = 0, sendext = 0, recvext = 0;
   MPI_Request *requests;
 
   /* Initialize. */
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  DEBUG1("<%d> algorithm alltoall_basic_linear() called.", rank);
-  err = smpi_datatype_extent(sendtype, &lb, &sendinc);
-  err = smpi_datatype_extent(recvtype, &lb, &recvinc);
-  sendinc *= sendcount;
-  recvinc *= recvcount;
+  XBT_DEBUG("<%d> algorithm alltoall_basic_linear() called.", rank);
+  err = smpi_datatype_extent(sendtype, &lb, &sendext);
+  err = smpi_datatype_extent(recvtype, &lb, &recvext);
   /* simple optimization */
-  err = smpi_datatype_copy(&((char*)sendbuf)[rank * sendinc], sendcount, sendtype, &((char*)recvbuf)[rank * recvinc], recvcount, recvtype);
-  if(err == MPI_SUCCESS && size > 1) {
+  err = smpi_datatype_copy((char *)sendbuf + rank * sendcount * sendext, 
+                           sendcount, sendtype, 
+                           (char *)recvbuf + rank * recvcount * recvext, 
+                           recvcount, recvtype);
+  if (err == MPI_SUCCESS && size > 1) {
     /* Initiate all send/recv to/from others. */
     requests = xbt_new(MPI_Request, 2 * (size - 1));
     /* Post all receives first -- a simple optimization */
     count = 0;
-    for(i = (rank + 1) % size; i != rank; i = (i + 1) % size) {
-      requests[count] = smpi_irecv_init(&((char*)recvbuf)[i * recvinc], recvcount, recvtype, i, system_tag, comm);
+    for (i = (rank + 1) % size; i != rank; i = (i + 1) % size) {
+      requests[count] =
+          smpi_irecv_init((char *)recvbuf + i * recvcount * recvext, recvcount, 
+                          recvtype, i, system_tag, comm);
       count++;
     }
     /* Now post all sends in reverse order
@@ -259,13 +301,15 @@ int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount, MPI_Data
      *     when messages actually arrive in the order in which they were posted.
      * TODO: check the previous assertion
      */
-    for(i = (rank + size - 1) % size; i != rank; i = (i + size - 1) % size ) {
-      requests[count] = smpi_isend_init(&((char*)sendbuf)[i * sendinc], sendcount, sendtype, i, system_tag, comm);
+    for (i = (rank + size - 1) % size; i != rank; i = (i + size - 1) % size) {
+      requests[count] =
+          smpi_isend_init((char *)sendbuf + i * sendcount * sendext, sendcount,
+                          sendtype, i, system_tag, comm);
       count++;
     }
-    /* Wait for them all.*/
+    /* Wait for them all. */
     smpi_mpi_startall(count, requests);
-    DEBUG2("<%d> wait for %d requests", rank, count);
+    XBT_DEBUG("<%d> wait for %d requests", rank, count);
     smpi_mpi_waitall(count, requests, MPI_STATUS_IGNORE);
     xbt_free(requests);
   }
@@ -282,65 +326,90 @@ int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount, MPI_Data
  *          ....
  * Openmpi calls this routine when the message size sent to each rank is greater than 3000 bytes
  **/
-int smpi_coll_tuned_alltoall_pairwise(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
+int smpi_coll_tuned_alltoall_pairwise(void *sendbuf, int sendcount,
+                                      MPI_Datatype sendtype, void *recvbuf,
+                                      int recvcount, MPI_Datatype recvtype,
+                                      MPI_Comm comm)
+{
   int system_tag = 999;
   int rank, size, step, sendto, recvfrom, sendsize, recvsize;
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  DEBUG1("<%d> algorithm alltoall_pairwise() called.", rank);
+  XBT_DEBUG("<%d> algorithm alltoall_pairwise() called.", rank);
   sendsize = smpi_datatype_size(sendtype);
   recvsize = smpi_datatype_size(recvtype);
   /* Perform pairwise exchange - starting from 1 so the local copy is last */
-  for(step = 1; step < size + 1; step++) {
+  for (step = 1; step < size + 1; step++) {
     /* who do we talk to in this step? */
-    sendto  = (rank+step)%size;
-    recvfrom = (rank+size-step)%size;
+    sendto = (rank + step) % size;
+    recvfrom = (rank + size - step) % size;
     /* send and receive */
-    smpi_mpi_sendrecv(&((char*)sendbuf)[sendto * sendsize * sendcount], sendcount, sendtype, sendto, system_tag, &((char*)recvbuf)[recvfrom * recvsize * recvcount], recvcount, recvtype, recvfrom, system_tag, comm, MPI_STATUS_IGNORE);
+    smpi_mpi_sendrecv(&((char *) sendbuf)[sendto * sendsize * sendcount],
+                      sendcount, sendtype, sendto, system_tag,
+                      &((char *) recvbuf)[recvfrom * recvsize * recvcount],
+                      recvcount, recvtype, recvfrom, system_tag, comm,
+                      MPI_STATUS_IGNORE);
   }
   return MPI_SUCCESS;
 }
 
-int smpi_coll_basic_alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int *recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm) {
+int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
+                              int *senddisps, MPI_Datatype sendtype,
+                              void *recvbuf, int *recvcounts,
+                              int *recvdisps, MPI_Datatype recvtype,
+                              MPI_Comm comm)
+{
   int system_tag = 889;
   int i, rank, size, err, count;
-  MPI_Aint lb, sendextent, recvextent;
-  MPI_Request* requests;
+  MPI_Aint lb = 0, sendext = 0, recvext = 0;
+  MPI_Request *requests;
 
   /* Initialize. */
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  DEBUG1("<%d> algorithm basic_alltoallv() called.", rank);
-  err = smpi_datatype_extent(sendtype, &lb, &sendextent);
-  err = smpi_datatype_extent(recvtype, &lb, &recvextent);
+  XBT_DEBUG("<%d> algorithm basic_alltoallv() called.", rank);
+  err = smpi_datatype_extent(sendtype, &lb, &sendext);
+  err = smpi_datatype_extent(recvtype, &lb, &recvext);
   /* Local copy from self */
-  err = smpi_datatype_copy(&((char*)sendbuf)[senddisps[rank] * sendextent], sendcounts[rank], sendtype, &((char*)recvbuf)[recvdisps[rank] * recvextent], recvcounts[rank], recvtype);
-  if(err == MPI_SUCCESS && size > 1) {
+  err =
+      smpi_datatype_copy((char *)sendbuf + senddisps[rank] * sendext, 
+                         sendcounts[rank], sendtype,
+                         (char *)recvbuf + recvdisps[rank] * recvext, 
+                         recvcounts[rank], recvtype);
+  if (err == MPI_SUCCESS && size > 1) {
     /* Initiate all send/recv to/from others. */
     requests = xbt_new(MPI_Request, 2 * (size - 1));
     count = 0;
     /* Create all receives that will be posted first */
-    for(i = 0; i < size; ++i) {
-      if(i == rank || recvcounts[i] == 0) {
-        DEBUG3("<%d> skip request creation [src = %d, recvcounts[src] = %d]", rank, i, recvcounts[i]);
+    for (i = 0; i < size; ++i) {
+      if (i == rank || recvcounts[i] == 0) {
+        XBT_DEBUG
+            ("<%d> skip request creation [src = %d, recvcounts[src] = %d]",
+             rank, i, recvcounts[i]);
         continue;
       }
-      requests[count] = smpi_irecv_init(&((char*)recvbuf)[recvdisps[i] * recvextent], recvcounts[i], recvtype, i, system_tag, comm);
+      requests[count] =
+          smpi_irecv_init((char *)recvbuf + recvdisps[i] * recvext, 
+                          recvcounts[i], recvtype, i, system_tag, comm);
       count++;
     }
     /* Now create all sends  */
-    for(i = 0; i < size; ++i) {
-      if(i == rank || sendcounts[i] == 0) {
-        DEBUG3("<%d> skip request creation [dst = %d, sendcounts[dst] = %d]", rank, i, sendcounts[i]);
+    for (i = 0; i < size; ++i) {
+      if (i == rank || sendcounts[i] == 0) {
+        XBT_DEBUG
+            ("<%d> skip request creation [dst = %d, sendcounts[dst] = %d]",
+             rank, i, sendcounts[i]);
         continue;
       }
-      requests[count] = smpi_isend_init(&((char*)sendbuf)[senddisps[i] * sendextent], sendcounts[i], sendtype, i, system_tag, comm);
+      requests[count] =
+          smpi_isend_init((char *)sendbuf + senddisps[i] * sendext, 
+                          sendcounts[i], sendtype, i, system_tag, comm);
       count++;
     }
-    /* Wait for them all.*/
+    /* Wait for them all. */
     smpi_mpi_startall(count, requests);
-    DEBUG2("<%d> wait for %d requests", rank, count);
+    XBT_DEBUG("<%d> wait for %d requests", rank, count);
     smpi_mpi_waitall(count, requests, MPI_STATUS_IGNORE);
     xbt_free(requests);
   }