X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..8c6bbb14f44b8daed5ea43d80880c6bf2155118b:/src/xbt/mmalloc/mfree.c diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c index 47efab762f..8572826534 100644 --- a/src/xbt/mmalloc/mfree.c +++ b/src/xbt/mmalloc/mfree.c @@ -1,6 +1,6 @@ /* Free a block of memory allocated by `mmalloc'. */ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2023. 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. */ @@ -11,8 +11,7 @@ Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */ #include "mmprivate.h" -#include "xbt/ex.h" -#include "mc/mc.h" +#include "src/mc/mc.h" /* Return memory to the heap. Like `mfree' but don't call a mfree_hook if there is one. */ @@ -22,9 +21,7 @@ void mfree(struct mdesc *mdp, void *ptr) { size_t frag_nb; size_t i; - int it; - -// fprintf(stderr,"free(%p)\n",ptr); + size_t it; if (ptr == NULL) return; @@ -32,6 +29,11 @@ void mfree(struct mdesc *mdp, void *ptr) size_t block = BLOCK(ptr); if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) { + if ((char*)ptr <= (char*)mmalloc_preinit_buffer + mmalloc_preinit_buffer_size && + (char*)ptr >= (char*)mmalloc_preinit_buffer) + /* This points to the static buffer for fake mallocs done by dlsym before mmalloc initialization, ignore it */ + return; + fprintf(stderr,"Ouch, this pointer is not mine, I refuse to free it. Give me valid pointers, or give me death!!\n"); abort(); } @@ -40,13 +42,13 @@ void mfree(struct mdesc *mdp, void *ptr) 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"); + fprintf(stderr, "Asked to free a fragment in a heapinfo block. I'm confused.\n"); + abort(); 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"); + fprintf(stderr, "Asked to free a fragment in a block that is already free. I'm puzzled.\n"); + abort(); break; case MMALLOC_TYPE_UNFRAGMENTED: @@ -84,8 +86,10 @@ void mfree(struct mdesc *mdp, void *ptr) /* Mark all my ex-blocks as free */ for (it=0; itheapinfo[block].busy_block.size; it++) { if (mdp->heapinfo[block+it].type < 0) { - fprintf(stderr,"Internal Error: Asked to free a block already marked as free (block=%lu it=%d type=%lu). Please report this bug.\n", - (unsigned long)block,it,(unsigned long)mdp->heapinfo[block].type); + fprintf(stderr, + "Internal Error: Asked to free a block already marked as free (block=%zu it=%zu type=%d). " + "Please report this bug.\n", + block, it, mdp->heapinfo[block].type); abort(); } mdp->heapinfo[block+it].type = MMALLOC_TYPE_FREE; @@ -93,7 +97,6 @@ void mfree(struct mdesc *mdp, void *ptr) 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; @@ -104,8 +107,10 @@ void mfree(struct mdesc *mdp, void *ptr) /* Mark all my ex-blocks as free */ for (it=0; itheapinfo[block].free_block.size; it++) { if (mdp->heapinfo[block+it].type <0) { - fprintf(stderr,"Internal error: Asked to free a block already marked as free (block=%lu it=%d/%lu type=%lu). Please report this bug.\n", - (unsigned long)block,it,(unsigned long)mdp->heapinfo[block].free_block.size,(unsigned long)mdp->heapinfo[block].type); + fprintf(stderr, + "Internal error: Asked to free a block already marked as free (block=%zu it=%zu/%zu type=%d). " + "Please report this bug.\n", + block, it, mdp->heapinfo[block].free_block.size, mdp->heapinfo[block].type); abort(); } mdp->heapinfo[block+it].type = MMALLOC_TYPE_FREE; @@ -126,7 +131,8 @@ void mfree(struct mdesc *mdp, void *ptr) } /* 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)) { @@ -140,7 +146,8 @@ void mfree(struct mdesc *mdp, void *ptr) 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 @@ -150,7 +157,7 @@ void mfree(struct mdesc *mdp, void *ptr) default: if (type < 0) { - fprintf(stderr, "Unkown mmalloc block type.\n"); + fprintf(stderr, "Unknown mmalloc block type.\n"); abort(); } @@ -163,8 +170,8 @@ void mfree(struct mdesc *mdp, void *ptr) frag_nb = RESIDUAL(ptr, BLOCKSIZE) >> type; 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"); + fprintf(stderr, "Asked to free a fragment that is already free. I'm puzzled\n"); + abort(); } if (MC_is_active() && mdp->heapinfo[block].busy_frag.ignore[frag_nb] > 0) @@ -174,7 +181,6 @@ void mfree(struct mdesc *mdp, void *ptr) 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. */ @@ -191,7 +197,7 @@ void mfree(struct mdesc *mdp, void *ptr) mdp -> heapstats.chunks_free -= BLOCKSIZE >> type; mdp -> heapstats.bytes_free -= BLOCKSIZE; - mfree((void *) mdp, (void *) ADDRESS(block)); + mfree(mdp, ADDRESS(block)); } else if (mdp->heapinfo[block].busy_frag.nfree != 0) { /* If some fragments of this block are free, you know what? I'm already happy. */ ++mdp->heapinfo[block].busy_frag.nfree;