X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f04fa5306f52960db709bb520c49e9f4ecec000..0dc6f803fc980dade7792b7dfb4fa699073604d4:/src/smpi/colls/alltoall-ring-mpi-barrier.c diff --git a/src/smpi/colls/alltoall-ring-mpi-barrier.c b/src/smpi/colls/alltoall-ring-mpi-barrier.c index 94a5fb950d..469127abd8 100644 --- a/src/smpi/colls/alltoall-ring-mpi-barrier.c +++ b/src/smpi/colls/alltoall-ring-mpi-barrier.c @@ -1,4 +1,4 @@ -#include "colls.h" +#include "colls_private.h" /***************************************************************************** * Function: alltoall_ring_mpi_barrier @@ -29,15 +29,15 @@ smpi_coll_tuned_alltoall_ring_mpi_barrier(void *send_buff, int send_count, MPI_Status s; MPI_Aint send_chunk, recv_chunk; int i, src, dst, rank, num_procs; - int tag = 1; + int tag = COLL_TAG_ALLTOALL; 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; @@ -46,8 +46,8 @@ smpi_coll_tuned_alltoall_ring_mpi_barrier(void *send_buff, int send_count, src = (rank - i + num_procs) % num_procs; dst = (rank + i) % num_procs; - MPI_Barrier(comm); - MPI_Sendrecv(send_ptr + dst * send_chunk, send_count, send_type, dst, + mpi_coll_barrier_fun(comm); + 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); }