[SMPI] Reverted removal of 'extern C' as this broke things.

[simgrid.git] / src / smpi / smpi_coll.cpp

diff --git a/src/smpi/smpi_coll.cpp b/src/smpi/smpi_coll.cpp
index fc01931..3d50a57 100644 (file)
--- a/src/smpi/smpi_coll.cpp
+++ b/src/smpi/smpi_coll.cpp
@@ -124,8 +124,9 @@ int find_coll_description(s_mpi_coll_description_t * table,
 {
   char *name_list = NULL;
   int selector_on=0;
-  if(name==NULL){//no argument provided, use active selector's algorithm
-    name=(char*)sg_cfg_get_string("smpi/coll_selector");
+  if (name==NULL || name[0] == '\0') {
+    //no argument provided, use active selector's algorithm
+    name=(char*)xbt_cfg_get_string("smpi/coll-selector");
     selector_on=1;
   }
   for (int i = 0; table[i].name; i++)
@@ -167,6 +168,7 @@ int (*mpi_coll_reduce_fun)(void *buf, void *rbuf, int count, MPI_Datatype dataty
 int (*mpi_coll_reduce_scatter_fun)(void *sbuf, void *rbuf, int *rcounts,MPI_Datatype dtype,MPI_Op  op,MPI_Comm  comm);
 int (*mpi_coll_scatter_fun)(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype,int root, MPI_Comm comm);
 int (*mpi_coll_barrier_fun)(MPI_Comm comm);
+void (*smpi_coll_cleanup_callback)(void);
 
 
 int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount,