Update copyright lines with new year.

[simgrid.git] / src / smpi / colls / alltoall / alltoall-ring-mpi-barrier.cpp

diff --git a/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
index aefe70f..c477b3e 100644 (file)
--- a/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2020. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "../colls_private.h"
+#include "../colls_private.hpp"
 /*****************************************************************************
 
  * Function: alltoall_ring_mpi_barrier
@@ -23,14 +23,16 @@
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
            MPI barriers are added between each two phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
+namespace simgrid{
+namespace smpi{
 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)
+alltoall__ring_mpi_barrier(const 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;
@@ -52,7 +54,7 @@ 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_coll_barrier_fun(comm);
+    colls::barrier(comm);
     Request::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);
@@ -60,3 +62,5 @@ smpi_coll_tuned_alltoall_ring_mpi_barrier(void *send_buff, int send_count,
 
   return MPI_SUCCESS;
 }
+}
+}