First works on the datatypes. Still missing a lot.

[simgrid.git] / src / smpi / colls / alltoall-mvapich-scatter-dest.cpp

diff --git a/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp b/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
index 41946973ba867e4bcf8a7ffdd903598df24d593a..3cc984fc141cda74d62ba822672990baaaf12041 100644 (file)
--- a/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
+++ b/src/smpi/colls/alltoall-mvapich-scatter-dest.cpp
@@ -61,8 +61,8 @@ int smpi_coll_tuned_alltoall_mvapich2_scatter_dest(
     
     if (recvcount == 0) return MPI_SUCCESS;
     
-    comm_size =  smpi_comm_size(comm);
-    rank = smpi_comm_rank(comm);
+    comm_size =  comm->size();
+    rank = comm->rank();
     
     /* Get extent of send and recv types */
     recvtype_extent = smpi_datatype_get_extent(recvtype);
@@ -101,7 +101,7 @@ int smpi_coll_tuned_alltoall_mvapich2_scatter_dest(
         /* do the communication -- post ss sends and receives: */
         for ( i=0; i<ss; i++ ) {
             dst = (rank+i+ii) % comm_size;
-            reqarray[i]=smpi_mpi_irecv((char *)recvbuf +
+            reqarray[i]=Request::irecv((char *)recvbuf +
                                       dst*recvcount*recvtype_extent,
                                       recvcount, recvtype, dst,
                                       COLL_TAG_ALLTOALL, comm);
@@ -109,7 +109,7 @@ int smpi_coll_tuned_alltoall_mvapich2_scatter_dest(
         }
         for ( i=0; i<ss; i++ ) {
             dst = (rank-i-ii+comm_size) % comm_size;
-            reqarray[i+ss]=smpi_mpi_isend((char *)sendbuf +
+            reqarray[i+ss]=Request::isend((char *)sendbuf +
                                           dst*sendcount*sendtype_extent,
                                           sendcount, sendtype, dst,
                                           COLL_TAG_ALLTOALL, comm);
@@ -117,7 +117,7 @@ int smpi_coll_tuned_alltoall_mvapich2_scatter_dest(
         }
         
         /* ... then wait for them to finish: */
-        smpi_mpi_waitall(2*ss,reqarray,starray);
+        Request::waitall(2*ss,reqarray,starray);
         
        
         /* --BEGIN ERROR HANDLING-- */