Leak-- (seen in maestro-set).

[simgrid.git] / src / smpi / colls / allgather / allgather-rhv.cpp

diff --git a/src/smpi/colls/allgather/allgather-rhv.cpp b/src/smpi/colls/allgather/allgather-rhv.cpp
index 8e7f44b..1c50923 100644 (file)
--- a/src/smpi/colls/allgather/allgather-rhv.cpp
+++ b/src/smpi/colls/allgather/allgather-rhv.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
@@ -6,10 +6,14 @@
 
 #include "../colls_private.h"
 
+namespace simgrid{
+namespace smpi{
+
+
 // now only work with power of two processes
 
 int
-smpi_coll_tuned_allgather_rhv(void *sbuf, int send_count,
+Coll_allgather_rhv::allgather(void *sbuf, int send_count,
                               MPI_Datatype send_type, void *rbuf,
                               int recv_count, MPI_Datatype recv_type,
                               MPI_Comm comm)
@@ -24,7 +28,7 @@ smpi_coll_tuned_allgather_rhv(void *sbuf, int send_count,
   unsigned int mask;
   int curr_count;
 
-  // get size of the communicator, followed by rank 
+  // get size of the communicator, followed by rank
   unsigned int num_procs = comm->size();
 
   if((num_procs&(num_procs-1)))
@@ -41,10 +45,10 @@ smpi_coll_tuned_allgather_rhv(void *sbuf, int send_count,
   recv_chunk = r_extent * recv_count;
 
   if (send_chunk != recv_chunk) {
-    XBT_WARN("MPI_allgather_rhv use default MPI_allgather.");  
-    smpi_mpi_allgather(sbuf, send_count, send_type, rbuf, recv_count,
+    XBT_WARN("MPI_allgather_rhv use default MPI_allgather.");
+    Coll_allgather_default::allgather(sbuf, send_count, send_type, rbuf, recv_count,
                               recv_type, comm);
-    return MPI_SUCCESS;        
+    return MPI_SUCCESS;
   }
 
   // compute starting offset location to perform local copy
@@ -90,10 +94,8 @@ smpi_coll_tuned_allgather_rhv(void *sbuf, int send_count,
 
     //  printf("node %d send to %d in phase %d s_offset = %d r_offset = %d count = %d\n",rank,dst,phase, send_base_offset, recv_base_offset, curr_count);
 
-    Request::sendrecv((char *)rbuf + send_offset, curr_count, recv_type, dst, tag,
-                (char *)rbuf + recv_offset, curr_count, recv_type, dst, tag,
-                 comm, &status);
-
+    Request::sendrecv((char*)rbuf + send_offset, curr_count, recv_type, dst, tag, (char*)rbuf + recv_offset, curr_count,
+                      recv_type, dst, tag, comm, &status);
 
     curr_count *= 2;
     i *= 2;
@@ -103,3 +105,7 @@ smpi_coll_tuned_allgather_rhv(void *sbuf, int send_count,
 
   return MPI_SUCCESS;
 }
+
+
+}
+}