X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee52f84fe512219acf534c4d4654c3df56659e91..0e9c0448c6566825b170b98ecff716b098bda10e:/src/xbt/mmalloc/mrealloc.c diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c index dc31fa19e2..3569c14d5c 100644 --- a/src/xbt/mmalloc/mrealloc.c +++ b/src/xbt/mmalloc/mrealloc.c @@ -2,7 +2,7 @@ Copyright 1990, 1991 Free Software Foundation Written May 1989 by Mike Haertel. */ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -82,8 +82,10 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) int it; /* The new size is smaller; return excess memory to the free list. */ //printf("(%s) return excess memory...",xbt_thread_self_name()); - for (it= block+blocks; it< mdp->heapinfo[block].busy_block.size ; it++) + for (it= block+blocks; it< mdp->heapinfo[block].busy_block.size ; it++){ mdp->heapinfo[it].type = 0; // FIXME that should be useless, type should already be 0 here + mdp->heapinfo[it].busy_block.ignore = 0; + } mdp->heapinfo[block + blocks].busy_block.size = mdp->heapinfo[block].busy_block.size - blocks; @@ -92,7 +94,6 @@ 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) { @@ -101,7 +102,6 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t 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. @@ -134,7 +134,6 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) 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,