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 'smpi-topo'
[simgrid.git]
/
src
/
mc
/
mc_memory.c
diff --git
a/src/mc/mc_memory.c
b/src/mc/mc_memory.c
index
110b848
..
f734ec7
100644
(file)
--- a/
src/mc/mc_memory.c
+++ b/
src/mc/mc_memory.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
3
. The SimGrid Team.
+/* Copyright (c) 2008-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-30,7
+30,7
@@
void MC_memory_init()
raw_heap = NULL;
#else
/* Create the second region a page after the first one ends + safety gap */
raw_heap = NULL;
#else
/* Create the second region a page after the first one ends + safety gap */
- raw_heap = xbt_mheap_new(-1, (char*)(std_heap) + STD_HEAP_SIZE +
getpagesize()
);
+ raw_heap = xbt_mheap_new(-1, (char*)(std_heap) + STD_HEAP_SIZE +
xbt_pagesize
);
xbt_assert(raw_heap != NULL);
#endif
}
xbt_assert(raw_heap != NULL);
#endif
}