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 msg_vm.c - adrien (please note that there is one line (destruction of the tx_pr...
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mm_module.c
diff --git
a/src/xbt/mmalloc/mm_module.c
b/src/xbt/mmalloc/mm_module.c
index
a2c36cd
..
affa209
100644
(file)
--- a/
src/xbt/mmalloc/mm_module.c
+++ b/
src/xbt/mmalloc/mm_module.c
@@
-330,6
+330,8
@@
void *mmalloc_preinit(void)
{
int res;
if (__mmalloc_default_mdp == NULL) {
+ if(!xbt_pagesize)
+ xbt_pagesize = getpagesize();
unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
__mmalloc_default_mdp = xbt_mheap_new_options(-1, addr, XBT_MHEAP_OPTION_MEMSET);
@@
-343,7
+345,7
@@
void *mmalloc_preinit(void)
}
xbt_assert(__mmalloc_default_mdp != NULL);
-#if defined(HAVE_GNU_LD) && defined(MMALLOC_WANT_OVERRIDE_LEGACY)
+#if
0 &&
defined(HAVE_GNU_LD) && defined(MMALLOC_WANT_OVERRIDE_LEGACY)
mm_gnuld_legacy_init();
#endif