X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25fd5bf34caebe9efb725c743c7c4e0319c46ad2..a00f94a0c4dab6793ebd7f61961ef04d15873c23:/src/smpi/colls/alltoall-pair.c

diff --git a/src/smpi/colls/alltoall-pair.c b/src/smpi/colls/alltoall-pair.c
index 8767708dba..24ef5f769c 100644
--- a/src/smpi/colls/alltoall-pair.c
+++ b/src/smpi/colls/alltoall-pair.c
@@ -1,4 +1,4 @@
-#include "colls.h"
+#include "colls_private.h"
 
 /*****************************************************************************
 
@@ -37,10 +37,10 @@ int alltoall_pair(void *send_buff, int send_count, MPI_Datatype send_type,
   char *send_ptr = (char *) send_buff;
   char *recv_ptr = (char *) recv_buff;
 
-  MPI_Comm_rank(comm, &rank);
-  MPI_Comm_size(comm, &num_procs);
-  MPI_Type_extent(send_type, &send_chunk);
-  MPI_Type_extent(recv_type, &recv_chunk);
+  rank = smpi_comm_rank(comm);
+  num_procs = smpi_comm_size(comm);
+  send_chunk = smpi_datatype_get_extent(send_type);
+  recv_chunk = smpi_datatype_get_extent(recv_type);
 
   MPI_Win_create(recv_buff, num_procs * recv_chunk * send_count, recv_chunk, 0,
                  comm, &win);
@@ -62,32 +62,30 @@ int alltoall_pair(void *send_buff, int send_count, MPI_Datatype send_type,
 int smpi_coll_tuned_alltoall_pair(void *send_buff, int send_count,
                                   MPI_Datatype send_type,
                                   void *recv_buff, int recv_count,
-                                  MPI_Datatype recv_type,
-                                  MPI_Comm comm)
+                                  MPI_Datatype recv_type, MPI_Comm comm)
 {
 
   MPI_Aint send_chunk, recv_chunk;
   MPI_Status s;
   int i, src, dst, rank, num_procs;
-  int tag = 1, success = 1;
-
+  int tag = 1;
   char *send_ptr = (char *) send_buff;
   char *recv_ptr = (char *) recv_buff;
 
-  MPI_Comm_rank(comm, &rank);
-  MPI_Comm_size(comm, &num_procs);
-  MPI_Type_extent(send_type, &send_chunk);
-  MPI_Type_extent(recv_type, &recv_chunk);
+  rank = smpi_comm_rank(comm);
+  num_procs = smpi_comm_size(comm);
+  send_chunk = smpi_datatype_get_extent(send_type);
+  recv_chunk = smpi_datatype_get_extent(recv_type);
 
   send_chunk *= send_count;
   recv_chunk *= recv_count;
 
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;
-    MPI_Sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst,
-                 tag, recv_ptr + src * recv_chunk, recv_count, recv_type,
-                 src, tag, comm, &s);
+    smpi_mpi_sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst, tag,
+		 recv_ptr + src * recv_chunk, recv_count, recv_type, src, tag,
+		 comm, &s);
   }
 
-  return success;
+  return MPI_SUCCESS;
 }