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' of git://scm.gforge.inria.fr/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mm_diff.c
diff --git
a/src/xbt/mmalloc/mm_diff.c
b/src/xbt/mmalloc/mm_diff.c
index
49c5968
..
39cd21c
100644
(file)
--- a/
src/xbt/mmalloc/mm_diff.c
+++ b/
src/xbt/mmalloc/mm_diff.c
@@
-1,6
+1,6
@@
/* mm_diff - Memory snapshooting and comparison */
/* mm_diff - Memory snapshooting and comparison */
-/* 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
@@
-316,7
+316,7
@@
int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1,
heaplimit = ((struct mdesc *)heap1)->heaplimit;
heaplimit = ((struct mdesc *)heap1)->heaplimit;
- s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE -
getpagesize()
;
+ s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE -
xbt_pagesize
;
heapbase1 = (char *)heap1 + BLOCKSIZE;
heapbase2 = (char *)heap2 + BLOCKSIZE;
heapbase1 = (char *)heap1 + BLOCKSIZE;
heapbase2 = (char *)heap2 + BLOCKSIZE;
@@
-1372,7
+1372,7
@@
int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
/* Heap information */
heaplimit = ((struct mdesc *)heap1)->heaplimit;
/* Heap information */
heaplimit = ((struct mdesc *)heap1)->heaplimit;
- s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE -
getpagesize()
;
+ s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE -
xbt_pagesize
;
heapbase1 = (char *)heap1 + BLOCKSIZE;
heapbase2 = (char *)heap2 + BLOCKSIZE;
heapbase1 = (char *)heap1 + BLOCKSIZE;
heapbase2 = (char *)heap2 + BLOCKSIZE;