X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/befbbbe1fbb31663a8f91e24ce12df271cf4ae79..5089a0a98b27f5eeee62321dff4f025f1648f025:/src/smpi/colls/allgather/allgather-3dmesh.cpp

diff --git a/src/smpi/colls/allgather/allgather-3dmesh.cpp b/src/smpi/colls/allgather/allgather-3dmesh.cpp
index 58927c9dbb..02e5d12f76 100644
--- a/src/smpi/colls/allgather/allgather-3dmesh.cpp
+++ b/src/smpi/colls/allgather/allgather-3dmesh.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2019. 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"
 
 /*****************************************************************************
 
@@ -90,18 +90,17 @@ static int is_3dmesh(int num, int *i, int *j, int *k)
  * algorithm. Allgather ommunication occurs first in the x dimension, y
  * dimension, and then in the z dimension. Communication in each dimension
  * follows "simple"
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 ****************************************************************************/
 namespace simgrid{
 namespace smpi{
 
 
-int Coll_allgather_3dmesh::allgather(void *send_buff, int send_count,
-                                     MPI_Datatype send_type, void *recv_buff,
-                                     int recv_count, MPI_Datatype recv_type,
-                                     MPI_Comm comm)
+int allgather__3dmesh(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_Request *req, *req_ptr;
   MPI_Aint extent;
 
   int i, src, dst, rank, num_procs, block_size, my_z_base;
@@ -114,8 +113,7 @@ int Coll_allgather_3dmesh::allgather(void *send_buff, int send_count,
   extent = send_type->get_extent();
 
   if (not is_3dmesh(num_procs, &X, &Y, &Z))
-    THROWF(arg_error,0, "allgather_3dmesh algorithm can't be used with this number of processes! ");
-
+    throw std::invalid_argument("allgather_3dmesh algorithm can't be used with this number of processes!");
 
   num_reqs = X;
 
@@ -133,9 +131,8 @@ int Coll_allgather_3dmesh::allgather(void *send_buff, int send_count,
 
   block_size = extent * send_count;
 
-  req = (MPI_Request *) xbt_malloc(num_reqs * sizeof(MPI_Request));
-
-  req_ptr = req;
+  MPI_Request* req     = new MPI_Request[num_reqs];
+  MPI_Request* req_ptr = req;
 
   // do local allgather/local copy
   recv_offset = rank * block_size;
@@ -206,7 +203,7 @@ int Coll_allgather_3dmesh::allgather(void *send_buff, int send_count,
   }
   Request::waitall(Z - 1, req, MPI_STATUSES_IGNORE);
 
-  free(req);
+  delete[] req;
 
   return MPI_SUCCESS;
 }