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
Fix mismatched alloc/free.
[simgrid.git]
/
src
/
smpi
/
colls
/
reduce
/
reduce-NTSL.cpp
diff --git
a/src/smpi/colls/reduce/reduce-NTSL.cpp
b/src/smpi/colls/reduce/reduce-NTSL.cpp
index
4032b3d
..
3f48c44
100644
(file)
--- a/
src/smpi/colls/reduce/reduce-NTSL.cpp
+++ b/
src/smpi/colls/reduce/reduce-NTSL.cpp
@@
-1,15
+1,15
@@
-/* Copyright (c) 2013-201
7
. 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
* under the terms of the license (GNU LGPL) which comes with this package. */
* 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.h
pp
"
//#include <star-reduction.c>
int reduce_NTSL_segment_size_in_byte = 8192;
//#include <star-reduction.c>
int reduce_NTSL_segment_size_in_byte = 8192;
-/* Non-topology-specific pipelined linear-bcast function
+/* Non-topology-specific pipelined linear-bcast function
0->1, 1->2 ,2->3, ....., ->last node : in a pipeline fashion
*/
namespace simgrid{
0->1, 1->2 ,2->3, ....., ->last node : in a pipeline fashion
*/
namespace simgrid{
@@
-45,7
+45,7
@@
int Coll_reduce_NTSL::reduce(void *buf, void *rbuf, int count,
/* use for buffer offset for sending and receiving data = segment size in byte */
int increment = segment * extent;
/* use for buffer offset for sending and receiving data = segment size in byte */
int increment = segment * extent;
- /* if the input size is not divisible by segment size =>
+ /* if the input size is not divisible by segment size =>
the small remainder will be done with native implementation */
int remainder = count % segment;
the small remainder will be done with native implementation */
int remainder = count % segment;
@@
-59,7
+59,7
@@
int Coll_reduce_NTSL::reduce(void *buf, void *rbuf, int count,
Request::send(buf,count,datatype,0,tag,comm);
}
else if (rank == 0) {
Request::send(buf,count,datatype,0,tag,comm);
}
else if (rank == 0) {
- Request::recv(buf,count,datatype,root,tag,comm,&status);
+ Request::recv(buf,count,datatype,root,tag,comm,&status);
}
}
*/
}
}
*/
@@
-149,7
+149,7
@@
int Coll_reduce_NTSL::reduce(void *buf, void *rbuf, int count,
comm);
}
comm);
}
-
free
(tmp_buf);
+
smpi_free_tmp_buffer
(tmp_buf);
return MPI_SUCCESS;
}
}
return MPI_SUCCESS;
}
}