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' into mc
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmprivate.h
diff --git
a/src/xbt/mmalloc/mmprivate.h
b/src/xbt/mmalloc/mmprivate.h
index
37e4ea7
..
5e2a7ed
100644
(file)
--- a/
src/xbt/mmalloc/mmprivate.h
+++ b/
src/xbt/mmalloc/mmprivate.h
@@
-202,6
+202,8
@@
struct mdesc {
/* The version number of the mmalloc package that created this file. */
unsigned char version;
/* The version number of the mmalloc package that created this file. */
unsigned char version;
+ unsigned int options;
+
/* Some flag bits to keep track of various internal things. */
unsigned int flags;
/* Some flag bits to keep track of various internal things. */
unsigned int flags;
@@
-240,7
+242,9
@@
struct mdesc {
void *breakval;
/* The end of the current memory region for this malloc heap. This is
void *breakval;
/* The end of the current memory region for this malloc heap. This is
- the first location past the end of mapped memory. */
+ the first location past the end of mapped memory.
+ Compared to breakval, this value is rounded to the next memory page.
+ */
void *top;
void *top;