From 630ec674ef1d824672647bd7b1b64e91d6d88eaa Mon Sep 17 00:00:00 2001 From: Marion Guthmuller Date: Mon, 11 Feb 2013 09:19:22 +0100 Subject: [PATCH 1/1] model-checker : init ignore information for each block/fragment only in mmalloc --- src/xbt/mmalloc/mfree.c | 4 ---- src/xbt/mmalloc/mmalloc.c | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c index f3d9baa275..a6735e019f 100644 --- a/src/xbt/mmalloc/mfree.c +++ b/src/xbt/mmalloc/mfree.c @@ -88,8 +88,6 @@ void mfree(struct mdesc *mdp, void *ptr) abort(); } mdp->heapinfo[block+it].type = -1; - mdp->heapinfo[block+it].busy_block.ignore = 0; - } block = i; @@ -170,7 +168,6 @@ void mfree(struct mdesc *mdp, void *ptr) /* Set size used in the fragment to -1 */ mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1; - mdp->heapinfo[block].busy_frag.ignore[frag_nb] = 0; // fprintf(stderr,"nfree:%zu capa:%d\n", mdp->heapinfo[block].busy_frag.nfree,(BLOCKSIZE >> type)); if (mdp->heapinfo[block].busy_frag.nfree == @@ -182,7 +179,6 @@ void mfree(struct mdesc *mdp, void *ptr) mdp->heapinfo[block].type = 0; mdp->heapinfo[block].busy_block.size = 1; mdp->heapinfo[block].busy_block.busy_size = 0; - mdp->heapinfo[block].busy_block.ignore = 0; /* Keep the statistics accurate. */ mdp -> heapstats.chunks_used++; diff --git a/src/xbt/mmalloc/mmalloc.c b/src/xbt/mmalloc/mmalloc.c index 726842fa32..f0ddc2d489 100644 --- a/src/xbt/mmalloc/mmalloc.c +++ b/src/xbt/mmalloc/mmalloc.c @@ -277,11 +277,12 @@ void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size) block = BLOCK(result); for (it=0;itheapinfo[block+it].type = 0; + mdp->heapinfo[block+it].busy_block.busy_size = 0; + mdp->heapinfo[block+it].busy_block.ignore = 0; } 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.ignore = 0; mdp -> heapstats.chunks_used++; mdp -> heapstats.bytes_used += blocks * BLOCKSIZE; @@ -316,10 +317,11 @@ void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size) for (it=0;itheapinfo[block+it].type = 0; + mdp->heapinfo[block+it].busy_block.busy_size = 0; + mdp->heapinfo[block+it].busy_block.ignore = 0; } mdp->heapinfo[block].busy_block.size = blocks; - mdp->heapinfo[block].busy_block.busy_size = requested_size; - mdp->heapinfo[block].busy_block.ignore = 0; + 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); -- 2.20.1