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
Change malloc/free to new/delete.
[simgrid.git]
/
src
/
smpi
/
colls
/
reduce_scatter
/
reduce_scatter-mpich.cpp
diff --git
a/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
b/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
index
18a2ca9
..
74bc225
100644
(file)
--- a/
src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
+++ b/
src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team.
+/* Copyright (c) 2013-201
9
. 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
@@
-24,12
+24,11
@@
static inline int MPIU_Mirror_permutation(unsigned int x, int bits)
namespace simgrid{
namespace smpi{
namespace simgrid{
namespace smpi{
-int Coll_reduce_scatter_mpich_pair::reduce_scatter(
void *sendbuf, void *recvbuf,
int recvcounts[],
+int Coll_reduce_scatter_mpich_pair::reduce_scatter(
const void *sendbuf, void *recvbuf, const
int recvcounts[],
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int rank, comm_size, i;
MPI_Aint extent, true_extent, true_lb;
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int rank, comm_size, i;
MPI_Aint extent, true_extent, true_lb;
- int *disps;
void *tmp_recvbuf;
int mpi_errno = MPI_SUCCESS;
int total_count, dst, src;
void *tmp_recvbuf;
int mpi_errno = MPI_SUCCESS;
int total_count, dst, src;
@@
-44,7
+43,7
@@
int Coll_reduce_scatter_mpich_pair::reduce_scatter(void *sendbuf, void *recvbuf,
is_commutative = 1;
}
is_commutative = 1;
}
-
disps = (int*)xbt_malloc( comm_size * sizeof(int))
;
+
int* disps = new int[comm_size]
;
total_count = 0;
for (i=0; i<comm_size; i++) {
total_count = 0;
for (i=0; i<comm_size; i++) {
@@
-53,8
+52,8
@@
int Coll_reduce_scatter_mpich_pair::reduce_scatter(void *sendbuf, void *recvbuf,
}
if (total_count == 0) {
}
if (total_count == 0) {
-
xbt_free(disps)
;
-
return MPI_ERR_COUNT;
+
delete[] disps
;
+ return MPI_ERR_COUNT;
}
if (sendbuf != MPI_IN_PLACE) {
}
if (sendbuf != MPI_IN_PLACE) {
@@
-138,14
+137,14
@@
int Coll_reduce_scatter_mpich_pair::reduce_scatter(void *sendbuf, void *recvbuf,
if (mpi_errno) return(mpi_errno);
}
if (mpi_errno) return(mpi_errno);
}
-
xbt_free(disps)
;
+
delete[] disps
;
smpi_free_tmp_buffer(tmp_recvbuf);
return MPI_SUCCESS;
}
smpi_free_tmp_buffer(tmp_recvbuf);
return MPI_SUCCESS;
}
-int Coll_reduce_scatter_mpich_noncomm::reduce_scatter(
void *sendbuf, void *recvbuf,
int recvcounts[],
+int Coll_reduce_scatter_mpich_noncomm::reduce_scatter(
const void *sendbuf, void *recvbuf, const
int recvcounts[],
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int mpi_errno = MPI_SUCCESS;
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int mpi_errno = MPI_SUCCESS;
@@
-262,12
+261,11
@@
int Coll_reduce_scatter_mpich_noncomm::reduce_scatter(void *sendbuf, void *recvb
-int Coll_reduce_scatter_mpich_rdb::reduce_scatter(
void *sendbuf, void *recvbuf,
int recvcounts[],
+int Coll_reduce_scatter_mpich_rdb::reduce_scatter(
const void *sendbuf, void *recvbuf, const
int recvcounts[],
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int rank, comm_size, i;
MPI_Aint extent, true_extent, true_lb;
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int rank, comm_size, i;
MPI_Aint extent, true_extent, true_lb;
- int *disps;
void *tmp_recvbuf, *tmp_results;
int mpi_errno = MPI_SUCCESS;
int dis[2], blklens[2], total_count, dst;
void *tmp_recvbuf, *tmp_results;
int mpi_errno = MPI_SUCCESS;
int dis[2], blklens[2], total_count, dst;
@@
-285,7
+283,7
@@
int Coll_reduce_scatter_mpich_rdb::reduce_scatter(void *sendbuf, void *recvbuf,
is_commutative = 1;
}
is_commutative = 1;
}
-
disps = (int*)xbt_malloc( comm_size * sizeof(int))
;
+
int* disps = new int[comm_size]
;
total_count = 0;
for (i=0; i<comm_size; i++) {
total_count = 0;
for (i=0; i<comm_size; i++) {
@@
-485,7
+483,7
@@
int Coll_reduce_scatter_mpich_rdb::reduce_scatter(void *sendbuf, void *recvbuf,
recvcounts[rank], datatype);
if (mpi_errno) return(mpi_errno);
recvcounts[rank], datatype);
if (mpi_errno) return(mpi_errno);
-
xbt_free(disps)
;
+
delete[] disps
;
smpi_free_tmp_buffer(tmp_recvbuf);
smpi_free_tmp_buffer(tmp_results);
return MPI_SUCCESS;
smpi_free_tmp_buffer(tmp_recvbuf);
smpi_free_tmp_buffer(tmp_results);
return MPI_SUCCESS;