X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f54458a7bb43175fc8e22322bf8b36dd5af06969..9a5bef704c2690a8fc084dd6765fcb347d55ecc8:/src/xbt/mmalloc/mrealloc.c diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c index c1078bdeaf..dc31fa19e2 100644 --- a/src/xbt/mmalloc/mrealloc.c +++ b/src/xbt/mmalloc/mrealloc.c @@ -91,6 +91,8 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) 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.equal_to = NULL; result = ptr; } else if (blocks == mdp->heapinfo[block].busy_block.size) { @@ -98,6 +100,8 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) /* No block size change necessary; only update the requested size */ result = ptr; mdp->heapinfo[block].busy_block.busy_size = requested_size; + mdp->heapinfo[block].busy_block.ignore = 0; + mdp->heapinfo[block].busy_block.equal_to = NULL; } else { /* Won't fit, so allocate a new region that will. @@ -112,6 +116,8 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) mdp->heaplimit = oldlimit; result = mmalloc_no_memset(mdp, requested_size); + //fprintf(stderr,"remalloc(%zu)~>%p\n",requested_size,result); + if (ptr != result) memmove(result, ptr, blocks * BLOCKSIZE); /* FIXME: we should memset the end of the recently area */ @@ -127,6 +133,8 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) result = ptr; int frag_nb = RESIDUAL(result, BLOCKSIZE) >> type; mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = requested_size; + mdp->heapinfo[block].busy_frag.ignore[frag_nb] = 0; + mdp->heapinfo[block].busy_frag.equal_to[frag_nb] = NULL; } else { /* fragment -> Either other fragment, or block */ /* The new size is different; allocate a new space,