* under the terms of the license (GNU LGPL) which comes with this package. */
#include "mmprivate.h"
+#include "xbt/ex.h"
/* Return memory to the heap.
Like `mfree' but don't call a mfree_hook if there is one. */
abort();
}
+ check_fraghead(mdp);
type = mdp->heapinfo[block].type;
switch (type) {
case -1: /* Already free */
- fprintf(stderr,"Asked to free a fragment in a block that is already free. I'm puzzled\n");
- abort();
+ UNLOCK(mdp);
+ THROWF(system_error, 0, "Asked to free a fragment in a block that is already free. I'm puzzled\n");
break;
case 0:
mdp -> heapstats.bytes_free -= bytes;
} */
- /* Set the next search to begin at this block. */
+ /* Set the next search to begin at this block.
+ This is probably important to the trick where realloc returns the block to
+ the system before reasking for the same block with a bigger size. */
mdp->heapindex = block;
break;
((char *) ADDRESS(block) +
(mdp->heapinfo[block].busy_frag.first << type));
- /* Set size used in the fragment to 0 */
frag_nb = RESIDUAL(ptr, BLOCKSIZE) >> type;
- mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = 0;
+
+ if( mdp->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){
+ UNLOCK(mdp);
+ THROWF(system_error, 0, "Asked to free a fragment that is already free. I'm puzzled\n");
+ }
+
+ /* Set size used in the fragment to -1 */
+ mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1;
if (mdp->heapinfo[block].busy_frag.nfree ==
(BLOCKSIZE >> type) - 1) {
}
break;
}
+
+ check_fraghead(mdp);
}