From: degomme <degomme@debian.localdomain>
Date: Fri, 7 Jun 2013 12:42:28 +0000 (+0200)
Subject: rename old alltoall selector function, which will probably be removed soon
X-Git-Tag: v3_9_90~313
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9d7537a900d7a00156eda13f5fd6ec26b10eb242

rename old alltoall selector function, which will probably be removed soon
---

diff --git a/src/smpi/private.h b/src/smpi/private.h
index f67ad5e1f9..642ddee771 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -239,7 +239,7 @@ void nary_tree_bcast(void *buf, int count, MPI_Datatype datatype, int root,
                      MPI_Comm comm, int arity);
 void nary_tree_barrier(MPI_Comm comm, int arity);
 
-int smpi_coll_tuned_alltoall_ompi(void *sendbuf, int sendcount,
+int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount,
                                       MPI_Datatype sendtype, void *recvbuf,
                                       int recvcount, MPI_Datatype recvtype,
                                       MPI_Comm comm);
diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c
index 29e3aa94c5..503c060ece 100644
--- a/src/smpi/smpi_coll.c
+++ b/src/smpi/smpi_coll.c
@@ -39,9 +39,9 @@ COLL_ALLREDUCES(COLL_DESCRIPTION, COLL_COMMA),
 };
 
 s_mpi_coll_description_t mpi_coll_alltoall_description[] = {
-  {"ompi",
+  {"default",
    "Ompi alltoall default collective",
-   smpi_coll_tuned_alltoall_ompi},
+   smpi_coll_tuned_alltoall_ompi2},
 COLL_ALLTOALLS(COLL_DESCRIPTION, COLL_COMMA),
   {"bruck",
    "Alltoall Bruck (SG) collective",
@@ -311,7 +311,7 @@ void nary_tree_barrier(MPI_Comm comm, int arity)
   free_tree(tree);
 }
 
-int smpi_coll_tuned_alltoall_ompi(void *sendbuf, int sendcount,
+int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount,
                                    MPI_Datatype sendtype, void *recvbuf,
                                    int recvcount, MPI_Datatype recvtype,
                                    MPI_Comm comm)