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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
colls
/
reduce-arrival-pattern-aware.c
diff --git
a/src/smpi/colls/reduce-arrival-pattern-aware.c
b/src/smpi/colls/reduce-arrival-pattern-aware.c
index
6fe89cc
..
e528e9a
100644
(file)
--- a/
src/smpi/colls/reduce-arrival-pattern-aware.c
+++ b/
src/smpi/colls/reduce-arrival-pattern-aware.c
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. 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 <star-reduction.c>
#include "colls_private.h"
//#include <star-reduction.c>
@@
-66,7
+72,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
}
char *tmp_buf;
}
char *tmp_buf;
- tmp_buf = (char *)
xbt_malloc
(count * extent);
+ tmp_buf = (char *)
smpi_get_tmp_sendbuffer
(count * extent);
smpi_mpi_sendrecv(buf, count, datatype, rank, tag, rbuf, count, datatype, rank,
tag, comm, &status);
smpi_mpi_sendrecv(buf, count, datatype, rank, tag, rbuf, count, datatype, rank,
tag, comm, &status);
@@
-173,8
+179,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
to = header_buf[myordering + 1];
}
from = header_buf[myordering - 1];
to = header_buf[myordering + 1];
}
from = header_buf[myordering - 1];
- smpi_mpi_recv(tmp_buf, count, datatype, header_buf[myordering - 1], tag,
- comm, &status);
+ smpi_mpi_recv(tmp_buf, count, datatype, from, tag, comm, &status);
smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype);
smpi_mpi_send(rbuf, count, datatype, to, tag, comm);
}
smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype);
smpi_mpi_send(rbuf, count, datatype, to, tag, comm);
}
@@
-344,7
+349,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
comm);
}
comm);
}
-
free
(tmp_buf);
+
smpi_free_tmp_buffer
(tmp_buf);
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}