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
SMPI cleanups: rename a symbol and remove unused parameters
[simgrid.git]
/
src
/
smpi
/
smpi_shared.cpp
diff --git
a/src/smpi/smpi_shared.cpp
b/src/smpi/smpi_shared.cpp
index
8a113c3
..
08fb31b
100644
(file)
--- a/
src/smpi/smpi_shared.cpp
+++ b/
src/smpi/smpi_shared.cpp
@@
-208,7
+208,8
@@
static void *smpi_shared_malloc_local(size_t size, const char *file, int line)
#define ALIGN_UP(n, align) (((n) + (align)-1) & -(align))
#define ALIGN_DOWN(n, align) ((n) & -(align))
#define ALIGN_UP(n, align) (((n) + (align)-1) & -(align))
#define ALIGN_DOWN(n, align) ((n) & -(align))
-void *smpi_shared_malloc_global__(size_t size, const char *file, int line, size_t *shared_block_offsets, int nb_shared_blocks) {
+void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int nb_shared_blocks)
+{
void *mem;
xbt_assert(smpi_shared_malloc_blocksize % PAGE_SIZE == 0, "The block size of shared malloc should be a multiple of the page size.");
/* First reserve memory area */
void *mem;
xbt_assert(smpi_shared_malloc_blocksize % PAGE_SIZE == 0, "The block size of shared malloc should be a multiple of the page size.");
/* First reserve memory area */
@@
-318,7
+319,7
@@
static void *smpi_shared_malloc_global(size_t size, const char *file, int line,
shared_block_offsets[0] = 0;
shared_block_offsets[1] = size;
}
shared_block_offsets[0] = 0;
shared_block_offsets[1] = size;
}
- return smpi_shared_malloc_
global__(size, file, lin
e, shared_block_offsets, nb_shared_blocks);
+ return smpi_shared_malloc_
partial(siz
e, shared_block_offsets, nb_shared_blocks);
}
void *smpi_shared_malloc(size_t size, const char *file, int line) {
}
void *smpi_shared_malloc(size_t size, const char *file, int line) {