Merge branches 'master' and 'master' of github.com:simgrid/simgrid

[simgrid.git] / src / smpi / colls / barrier / barrier-ompi.cpp

diff --git a/src/smpi/colls/barrier/barrier-ompi.cpp b/src/smpi/colls/barrier/barrier-ompi.cpp
index 2b08bdf..94131da 100644 (file)
--- a/src/smpi/colls/barrier/barrier-ompi.cpp
+++ b/src/smpi/colls/barrier/barrier-ompi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
  * synchronous gurantee made by last ring of sends are synchronous
  *
  */
-int smpi_coll_tuned_barrier_ompi_doublering(MPI_Comm comm
-                                            )
+namespace simgrid{
+namespace smpi{
+int Coll_barrier_ompi_doublering::barrier(MPI_Comm comm)
 {
     int rank, size;
     int left, right;
@@ -104,8 +105,7 @@ int smpi_coll_tuned_barrier_ompi_doublering(MPI_Comm comm
  * To make synchronous, uses sync sends and sync sendrecvs
  */
 
-int smpi_coll_tuned_barrier_ompi_recursivedoubling(MPI_Comm comm
-                                                   )
+int Coll_barrier_ompi_recursivedoubling::barrier(MPI_Comm comm)
 {
     int rank, size, adjsize;
     int mask, remote;
@@ -179,8 +179,7 @@ int smpi_coll_tuned_barrier_ompi_recursivedoubling(MPI_Comm comm
  * To make synchronous, uses sync sends and sync sendrecvs
  */
 
-int smpi_coll_tuned_barrier_ompi_bruck(MPI_Comm comm
-                                       )
+int Coll_barrier_ompi_bruck::barrier(MPI_Comm comm)
 {
     int rank, size;
     int distance, to, from;
@@ -212,8 +211,7 @@ int smpi_coll_tuned_barrier_ompi_bruck(MPI_Comm comm
  * To make synchronous, uses sync sends and sync sendrecvs
  */
 /* special case for two processes */
-int smpi_coll_tuned_barrier_ompi_two_procs(MPI_Comm comm
-                                           )
+int Coll_barrier_ompi_two_procs::barrier(MPI_Comm comm)
 {
     int remote;
 
@@ -245,7 +243,7 @@ int smpi_coll_tuned_barrier_ompi_two_procs(MPI_Comm comm
 
 /* copied function (with appropriate renaming) starts here */
 
-int smpi_coll_tuned_barrier_ompi_basic_linear(MPI_Comm comm)
+int Coll_barrier_ompi_basic_linear::barrier(MPI_Comm comm)
 {
     int i;
     int size = comm->size();
@@ -297,7 +295,7 @@ int smpi_coll_tuned_barrier_ompi_basic_linear(MPI_Comm comm)
  * Another recursive doubling type algorithm, but in this case
  * we go up the tree and back down the tree.  
  */
-int smpi_coll_tuned_barrier_ompi_tree(MPI_Comm comm)
+int Coll_barrier_ompi_tree::barrier(MPI_Comm comm)
 {
     int rank, size, depth;
     int jump, partner;
@@ -344,3 +342,6 @@ int smpi_coll_tuned_barrier_ompi_tree(MPI_Comm comm)
 
     return MPI_SUCCESS;
 }
+
+}
+}