X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9335baa2b23f940577448a84168eb0b50d3dd966..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/src/smpi/colls/alltoallv/alltoallv-pair.cpp

diff --git a/src/smpi/colls/alltoallv/alltoallv-pair.cpp b/src/smpi/colls/alltoallv/alltoallv-pair.cpp
index 474078c973..67ff58be0e 100644
--- a/src/smpi/colls/alltoallv/alltoallv-pair.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2020. 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"
 
 /*****************************************************************************
 
@@ -24,15 +24,15 @@
  * Descrp: Function works when P is power of two. In each phase of P - 1
            phases, nodes in pair communicate their data.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
-namespace simgrid{
-namespace smpi{
-int Coll_alltoallv_pair::alltoallv(void *send_buff, int *send_counts, int *send_disps,
-                                  MPI_Datatype send_type,
-                                  void *recv_buff, int *recv_counts, int *recv_disps,
-                                  MPI_Datatype recv_type, MPI_Comm comm)
+namespace simgrid {
+namespace smpi {
+int alltoallv__pair(const void *send_buff, const int *send_counts, const int *send_disps,
+                    MPI_Datatype send_type,
+                    void *recv_buff, const int *recv_counts, const int *recv_disps,
+                    MPI_Datatype recv_type, MPI_Comm comm)
 {
 
   MPI_Aint send_chunk, recv_chunk;
@@ -46,7 +46,7 @@ int Coll_alltoallv_pair::alltoallv(void *send_buff, int *send_counts, int *send_
   num_procs = comm->size();
 
   if((num_procs&(num_procs-1)))
-    THROWF(arg_error,0, "alltoallv pair algorithm can't be used with non power of two number of processes ! ");
+    throw std::invalid_argument("alltoallv pair algorithm can't be used with non power of two number of processes!");
 
   send_chunk = send_type->get_extent();
   recv_chunk = recv_type->get_extent();
@@ -54,8 +54,7 @@ int Coll_alltoallv_pair::alltoallv(void *send_buff, int *send_counts, int *send_
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;
     Request::sendrecv(send_ptr + send_disps[dst] * send_chunk, send_counts[dst], send_type, dst, tag,
-		 recv_ptr + recv_disps[src] * recv_chunk, recv_counts[src], recv_type, src, tag,
-		 comm, &s);
+                      recv_ptr + recv_disps[src] * recv_chunk, recv_counts[src], recv_type, src, tag, comm, &s);
   }
   return MPI_SUCCESS;
 }