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
[mc] Bug: MC was reading from the wrong region
[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
8ee23eb
..
4839cfe
100644
(file)
--- a/
src/xbt/mmalloc/mm_module.c
+++ b/
src/xbt/mmalloc/mm_module.c
@@
-72,6
+72,11
@@
On failure returns NULL. */
xbt_mheap_t xbt_mheap_new(int fd, void *baseaddr)
On failure returns NULL. */
xbt_mheap_t xbt_mheap_new(int fd, void *baseaddr)
+{
+ return xbt_mheap_new_options(fd, baseaddr, 0);
+}
+
+xbt_mheap_t xbt_mheap_new_options(int fd, void *baseaddr, int options)
{
struct mdesc mtemp;
xbt_mheap_t mdp;
{
struct mdesc mtemp;
xbt_mheap_t mdp;
@@
-169,6
+174,7
@@
xbt_mheap_t xbt_mheap_new(int fd, void *baseaddr)
mdp->base = mdp->breakval = mdp->top = baseaddr;
mdp->next_mdesc = NULL;
mdp->refcount = 1;
mdp->base = mdp->breakval = mdp->top = baseaddr;
mdp->next_mdesc = NULL;
mdp->refcount = 1;
+ mdp->options = options;
/* If we have not been passed a valid open file descriptor for the file
to map to, then we go for an anonymous map */
/* If we have not been passed a valid open file descriptor for the file
to map to, then we go for an anonymous map */
@@
-326,7
+332,7
@@
void *mmalloc_preinit(void)
if (__mmalloc_default_mdp == NULL) {
unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
if (__mmalloc_default_mdp == NULL) {
unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
- __mmalloc_default_mdp = xbt_mheap_new
(-1, addr
);
+ __mmalloc_default_mdp = xbt_mheap_new
_options(-1, addr, XBT_MHEAP_OPTION_MEMSET
);
/* Fixme? only the default mdp in protected against forks */
// This is mandated to protect the mmalloced areas through forks. Think of tesh.
// Nah, removing the mutex isn't a good idea either for tesh
/* Fixme? only the default mdp in protected against forks */
// This is mandated to protect the mmalloced areas through forks. Think of tesh.
// Nah, removing the mutex isn't a good idea either for tesh