A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright lines with new year.
[simgrid.git]
/
src
/
smpi
/
colls
/
alltoall
/
alltoall-mvapich-scatter-dest.cpp
diff --git
a/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
b/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
index
6032eda
..
15dd553
100644
(file)
--- a/
src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
+++ b/
src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
18
. The SimGrid Team.
+/* Copyright (c) 2013-20
20
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-44,21
+44,18
@@
#include "../colls_private.hpp"
namespace simgrid{
namespace smpi{
#include "../colls_private.hpp"
namespace simgrid{
namespace smpi{
-int Coll_alltoall_mvapich2_scatter_dest::alltoall(
- void *sendbuf,
- int sendcount,
- MPI_Datatype sendtype,
- void *recvbuf,
- int recvcount,
- MPI_Datatype recvtype,
- MPI_Comm comm)
+int alltoall__mvapich2_scatter_dest(const void *sendbuf,
+ int sendcount,
+ MPI_Datatype sendtype,
+ void *recvbuf,
+ int recvcount,
+ MPI_Datatype recvtype,
+ MPI_Comm comm)
{
int comm_size, i, j;
MPI_Aint sendtype_extent = 0, recvtype_extent = 0;
int mpi_errno=MPI_SUCCESS;
int dst, rank;
{
int comm_size, i, j;
MPI_Aint sendtype_extent = 0, recvtype_extent = 0;
int mpi_errno=MPI_SUCCESS;
int dst, rank;
- MPI_Request *reqarray;
- MPI_Status *starray;
if (recvcount == 0) return MPI_SUCCESS;
if (recvcount == 0) return MPI_SUCCESS;
@@
-93,9
+90,9
@@
int Coll_alltoall_mvapich2_scatter_dest::alltoall(
/* FIXME: This should use the memory macros (there are storage
leaks here if there is an error, for example) */
/* FIXME: This should use the memory macros (there are storage
leaks here if there is an error, for example) */
-
reqarray= (MPI_Request*)xbt_malloc(2*bblock*sizeof(MPI_Request))
;
+
MPI_Request* reqarray = new MPI_Request[2 * bblock]
;
-
starray=(MPI_Status *)xbt_malloc(2*bblock*sizeof(MPI_Status))
;
+
MPI_Status* starray = new MPI_Status[2 * bblock]
;
for (ii=0; ii<comm_size; ii+=bblock) {
ss = comm_size-ii < bblock ? comm_size-ii : bblock;
for (ii=0; ii<comm_size; ii+=bblock) {
ss = comm_size-ii < bblock ? comm_size-ii : bblock;
@@
-131,8
+128,8
@@
int Coll_alltoall_mvapich2_scatter_dest::alltoall(
}
}
/* --END ERROR HANDLING-- */
}
}
/* --END ERROR HANDLING-- */
-
xbt_free(starray)
;
-
xbt_free(reqarray)
;
+
delete[] starray
;
+
delete[] reqarray
;
return (mpi_errno);
}
return (mpi_errno);
}