/* Free a block of memory allocated by `mmalloc'. */
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* Return memory to the heap. */
void mfree(struct mdesc *mdp, void *ptr)
{
- int type;
- size_t block, frag_nb;
+ size_t frag_nb;
size_t i;
int it;
- mmalloc_paranoia(mdp);
-// fprintf(stderr,"free(%p)\n",ptr);
-
if (ptr == NULL)
return;
- block = BLOCK(ptr);
+ size_t block = BLOCK(ptr);
if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) {
fprintf(stderr,"Ouch, this pointer is not mine, I refuse to free it. Give me valid pointers, or give me death!!\n");
abort();
}
- type = mdp->heapinfo[block].type;
+ int type = mdp->heapinfo[block].type;
switch (type) {
case MMALLOC_TYPE_HEAPINFO:
UNLOCK(mdp);
- THROWF(system_error, 0, "Asked to free a fragment in a heapinfo block. I'm confused.\n");
+ THROWF(0, "Asked to free a fragment in a heapinfo block. I'm confused.\n");
break;
case MMALLOC_TYPE_FREE: /* Already free */
UNLOCK(mdp);
- THROWF(system_error, 0, "Asked to free a fragment in a block that is already free. I'm puzzled.\n");
+ THROWF(0, "Asked to free a fragment in a block that is already free. I'm puzzled.\n");
break;
case MMALLOC_TYPE_UNFRAGMENTED:
mdp -> heapstats.bytes_free +=
mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
- if(MC_is_active()){
- if(mdp->heapinfo[block].busy_block.ignore > 0)
- MC_remove_ignore_heap(ptr, mdp -> heapinfo[block].busy_block.busy_size);
- }
+ if (MC_is_active() && mdp->heapinfo[block].busy_block.ignore > 0)
+ MC_unignore_heap(ptr, mdp->heapinfo[block].busy_block.busy_size);
/* Find the free cluster previous to this one in the free list.
Start searching at the last block referenced; this may benefit
block = i;
} else {
- //fprintf(stderr,"Free block %d to %d (as a new chunck)\n",block,block+mdp->heapinfo[block].busy_block.size);
/* Really link this block back into the free list. */
mdp->heapinfo[block].free_block.size = mdp->heapinfo[block].busy_block.size;
mdp->heapinfo[block].free_block.next = mdp->heapinfo[i].free_block.next;
}
/* Now see if we can return stuff to the system. */
- /* blocks = mdp -> heapinfo[block].free.size;
+#if 0
+ blocks = mdp -> heapinfo[block].free.size;
if (blocks >= FINAL_FREE_BLOCKS && block + blocks == mdp -> heaplimit
&& mdp -> morecore (mdp, 0) == ADDRESS (block + blocks))
{
block = mdp -> heapinfo[block].free.prev;
mdp -> heapstats.chunks_free--;
mdp -> heapstats.bytes_free -= bytes;
- } */
+ }
+#endif
/* Set the next search to begin at this block.
This is probably important to the trick where realloc returns the block to
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");
+ THROWF(0, "Asked to free a fragment that is already free. I'm puzzled\n");
}
- if(MC_is_active()){
- if(mdp->heapinfo[block].busy_frag.ignore[frag_nb] > 0)
- MC_remove_ignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
- }
+ if (MC_is_active() && mdp->heapinfo[block].busy_frag.ignore[frag_nb] > 0)
+ MC_unignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
/* 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 ==
(BLOCKSIZE >> type) - 1) {
/* If all fragments of this block are free, remove this block from its swag and free the whole block. */