-#include "colls.h"
+#include "colls_private.h"
/*****************************************************************************
* Function: alltoall_ring_mpi_barrier
****************************************************************************/
int
-smpi_coll_tuned_alltoall_ring_mpi_barrier(void * send_buff, int send_count,
- MPI_Datatype send_type, void * recv_buff,
- int recv_count, MPI_Datatype recv_type,
- MPI_Comm comm)
+smpi_coll_tuned_alltoall_ring_mpi_barrier(void *send_buff, int send_count,
+ MPI_Datatype send_type,
+ void *recv_buff, int recv_count,
+ MPI_Datatype recv_type, MPI_Comm comm)
{
MPI_Status s;
MPI_Aint send_chunk, recv_chunk;
int i, src, dst, rank, num_procs;
- int tag = 1, success = 1; /*, failure = 0, pof2 = 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);
+ char *send_ptr = (char *) send_buff;
+ char *recv_ptr = (char *) recv_buff;
+
+ 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 = (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,
- tag, recv_ptr + src * recv_chunk, recv_count, recv_type,
- src, tag, comm, &s);
- }
-
- return success;
+ recv_chunk *= recv_count;
+
+ for (i = 0; i < num_procs; i++) {
+ src = (rank - i + num_procs) % num_procs;
+ dst = (rank + i) % num_procs;
+
+ 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);
+ }
+
+ return MPI_SUCCESS;
}