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
model-checker : add stats in mmalloc
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmalloc.c
diff --git
a/src/xbt/mmalloc/mmalloc.c
b/src/xbt/mmalloc/mmalloc.c
index
bbdc937
..
37f8c6b
100644
(file)
--- a/
src/xbt/mmalloc/mmalloc.c
+++ b/
src/xbt/mmalloc/mmalloc.c
@@
-164,6
+164,12
@@
void *mmalloc(xbt_mheap_t mdp, size_t size)
RESIDUAL(next->next, BLOCKSIZE) >> log;
}
RESIDUAL(next->next, BLOCKSIZE) >> log;
}
+ /* Update the statistics. */
+ mdp -> heapstats.chunks_used++;
+ mdp -> heapstats.bytes_used += 1 << log;
+ mdp -> heapstats.chunks_free--;
+ mdp -> heapstats.bytes_free -= 1 << log;
+
} else {
/* No free fragments of the desired size, so get a new block
and break it into fragments, returning the first. */
} else {
/* No free fragments of the desired size, so get a new block
and break it into fragments, returning the first. */
@@
-190,6
+196,10
@@
void *mmalloc(xbt_mheap_t mdp, size_t size)
mdp->heapinfo[block].type = log;
mdp->heapinfo[block].busy_frag.nfree = i - 1;
mdp->heapinfo[block].busy_frag.first = i - 1;
mdp->heapinfo[block].type = log;
mdp->heapinfo[block].busy_frag.nfree = i - 1;
mdp->heapinfo[block].busy_frag.first = i - 1;
+
+ mdp -> heapstats.chunks_free += (BLOCKSIZE >> log) - 1;
+ mdp -> heapstats.bytes_free += BLOCKSIZE - (1 << log);
+ mdp -> heapstats.bytes_used -= BLOCKSIZE - (1 << log);
}
} else {
/* Large allocation to receive one or more blocks.
}
} else {
/* Large allocation to receive one or more blocks.
@@
-231,7
+241,8
@@
void *mmalloc(xbt_mheap_t mdp, size_t size)
mdp->heapinfo[block].busy_block.size = blocks;
mdp->heapinfo[block].busy_block.busy_size = requested_size;
mdp->heapinfo[block].busy_block.bt_size=xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_block.bt,XBT_BACKTRACE_SIZE);
mdp->heapinfo[block].busy_block.size = blocks;
mdp->heapinfo[block].busy_block.busy_size = requested_size;
mdp->heapinfo[block].busy_block.bt_size=xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_block.bt,XBT_BACKTRACE_SIZE);
-
+ mdp -> heapstats.chunks_used++;
+ mdp -> heapstats.bytes_used += blocks * BLOCKSIZE;
return result;
}
/* Need large block(s), but found some in the existing heap */
return result;
}
/* Need large block(s), but found some in the existing heap */
@@
-267,6
+278,10
@@
void *mmalloc(xbt_mheap_t mdp, size_t size)
mdp->heapinfo[block].busy_block.busy_size = requested_size;
//mdp->heapinfo[block].busy_block.bt_size = 0;
mdp->heapinfo[block].busy_block.bt_size = xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_block.bt,XBT_BACKTRACE_SIZE);
mdp->heapinfo[block].busy_block.busy_size = requested_size;
//mdp->heapinfo[block].busy_block.bt_size = 0;
mdp->heapinfo[block].busy_block.bt_size = xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_block.bt,XBT_BACKTRACE_SIZE);
+
+ mdp -> heapstats.chunks_used++;
+ mdp -> heapstats.bytes_used += blocks * BLOCKSIZE;
+ mdp -> heapstats.bytes_free -= blocks * BLOCKSIZE;
}
//printf("(%s) Done mallocing. Result is %p\n",xbt_thread_self_name(),result);fflush(stdout);
return (result);
}
//printf("(%s) Done mallocing. Result is %p\n",xbt_thread_self_name(),result);fflush(stdout);
return (result);