X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bf8d8ce536dfc289ece377a77c709502c3281ad..8fa2ead37d9c64feb9ce3e00b3bcff5314896cea:/src/xbt/mmalloc/mm_legacy.c diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c index edff857ad7..2a1a5863ce 100644 --- a/src/xbt/mmalloc/mm_legacy.c +++ b/src/xbt/mmalloc/mm_legacy.c @@ -1,4 +1,4 @@ -/* 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 @@ -7,11 +7,10 @@ /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */ #include "mmprivate.h" -#include "gras_config.h" +#include "internal_config.h" #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mm_legacy, xbt, - "Logging specific to mm_legacy in mmalloc"); +//#define MM_LEGACY_VERBOSE 1 /* define this to see which version of malloc gets used */ /* The mmalloc() package can use a single implicit malloc descriptor for mmalloc/mrealloc/mfree operations which do not supply an explicit @@ -22,8 +21,6 @@ xbt_mheap_t __mmalloc_default_mdp = NULL; static xbt_mheap_t __mmalloc_current_heap = NULL; /* The heap we are currently using. */ -#include "xbt_modinter.h" - xbt_mheap_t mmalloc_get_current_heap(void) { return __mmalloc_current_heap; @@ -34,517 +31,171 @@ void mmalloc_set_current_heap(xbt_mheap_t new_heap) __mmalloc_current_heap = new_heap; } -#ifdef MMALLOC_WANT_OVERIDE_LEGACY -void *malloc(size_t n) -{ - xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); - LOCK(mdp); - void *ret = mmalloc(mdp, n); - UNLOCK(mdp); +#ifdef MMALLOC_WANT_OVERRIDE_LEGACY +#ifdef HAVE_GNU_LD + +#undef _GNU_SOURCE +#define _GNU_SOURCE 1 +#include + +static void * (*real_malloc) (size_t); +static void * (*real_realloc) (void*,size_t); +static void * (*real_free) (void*); + +static void mm_gnuld_legacy_init(void) { /* This function is called from mmalloc_preinit(); it works even if it's static because all mm is in mm.c */ + real_malloc = (void * (*) (size_t)) dlsym(RTLD_NEXT, "malloc"); + real_realloc = (void * (*) (void*,size_t)) dlsym(RTLD_NEXT, "realloc"); + real_free = (void * (*) (void*)) dlsym(RTLD_NEXT, "free"); + __mmalloc_current_heap = __mmalloc_default_mdp; +} + +/* Hello pimple! + * DL needs some memory while resolving the malloc symbol, that is somehow problematic + * To that extend, we have a little area here living in .BSS that we return if asked for memory before the malloc is resolved. + */ +int allocated_junk=0; /* keep track of whether our little area was already given to someone */ +char junkarea[4096]; + +/* This version use mmalloc if there is a current heap, or the legacy implem if not */ +void *malloc(size_t n) { + xbt_mheap_t mdp = __mmalloc_current_heap; + void *ret; +#ifdef MM_LEGACY_VERBOSE + static int warned_raw = 0; + static int warned_mmalloc = 0; +#endif + if (mdp) { + LOCK(mdp); + ret = mmalloc(mdp, n); + UNLOCK(mdp); +#ifdef MM_LEGACY_VERBOSE + if (!warned_mmalloc) { + fprintf(stderr,"Using mmalloc; enabling the model-checker in cmake may have a bad impact on your simulation performance\n"); + warned_mmalloc = 1; + } +#endif + } else { + if (!real_malloc) { + if (allocated_junk) { + fprintf(stderr, + "Panic: real malloc symbol not resolved yet, and I already gave my little private memory chunk away. " + "Damn LD, we must extend our code to have several such areas.\n"); + exit(1); + } else if (n > sizeof junkarea) { + fprintf(stderr, + "Panic: real malloc symbol not resolved yet, and I need %zu bytes while my little private memory chunk is only %zu bytes wide. " + "Damn LD, we must fix our code to extend this area.\n", n, sizeof junkarea); + exit(1); + } else { + allocated_junk = 1; + return junkarea; + } + } +#ifdef MM_LEGACY_VERBOSE + if (!warned_raw) { + fprintf(stderr,"Using system malloc after interception; you seem to be currently model-checking\n"); + warned_raw = 1; + } +#endif + ret = real_malloc(n); + } return ret; } + void *calloc(size_t nmemb, size_t size) { - xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); - - LOCK(mdp); - void *ret = mcalloc(mdp, nmemb,size); - UNLOCK(mdp); - + void *ret = malloc(nmemb*size); + memset(ret, 0, nmemb * size); return ret; } void *realloc(void *p, size_t s) { - void *ret = NULL; - xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); + xbt_mheap_t mdp = __mmalloc_current_heap; + void *ret; - LOCK(mdp); - ret = mrealloc(mdp, p, s); - UNLOCK(mdp); + if (mdp) { + LOCK(mdp); + ret = mrealloc(mdp, p, s); + UNLOCK(mdp); + } else { + ret = real_realloc(p,s); + } return ret; } void free(void *p) { - xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); - - LOCK(mdp); - mfree(mdp, p); - UNLOCK(mdp); -} -#endif - -/* Make sure it works with md==NULL */ + if (p==NULL) + return; + if (p!=junkarea) { + xbt_mheap_t mdp = __mmalloc_current_heap; -/* Safety gap from the heap's break address. - * Try to increase this first if you experience strange errors under - * valgrind. */ -#define HEAP_OFFSET (128UL<<20) - -xbt_mheap_t mmalloc_get_default_md(void) -{ - xbt_assert(__mmalloc_default_mdp); - return __mmalloc_default_mdp; -} - -static void mmalloc_fork_prepare(void) -{ - xbt_mheap_t mdp = NULL; - if ((mdp =__mmalloc_default_mdp)){ - while(mdp){ + if (mdp) { LOCK(mdp); - if(mdp->fd >= 0){ - mdp->refcount++; - } - mdp = mdp->next_mdesc; + mfree(mdp, p); + UNLOCK(mdp); + } else { + real_free(p); } + } else { + allocated_junk=0; } } -static void mmalloc_fork_parent(void) -{ - xbt_mheap_t mdp = NULL; - if ((mdp =__mmalloc_default_mdp)){ - while(mdp){ - if(mdp->fd < 0) - UNLOCK(mdp); - mdp = mdp->next_mdesc; - } - } -} -static void mmalloc_fork_child(void) +#else /* NO GNU_LD */ +void *malloc(size_t n) { - struct mdesc* mdp = NULL; - if ((mdp =__mmalloc_default_mdp)){ - while(mdp){ - UNLOCK(mdp); - mdp = mdp->next_mdesc; - } - } -} + xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); -/* Initialize the default malloc descriptor. */ -void *mmalloc_preinit(void) -{ - int res; - if (__mmalloc_default_mdp == NULL) { - unsigned long mask = ~((unsigned long)getpagesize() - 1); - void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask); - __mmalloc_default_mdp = mmalloc_attach(-1, addr); - /* Fixme? only the default mdp in protected against forks */ - res = xbt_os_thread_atfork(mmalloc_fork_prepare, - mmalloc_fork_parent, mmalloc_fork_child); - if (res != 0) - THROWF(system_error,0,"xbt_os_thread_atfork() failed: return value %d",res); - } - xbt_assert(__mmalloc_default_mdp != NULL); + LOCK(mdp); + void *ret = mmalloc(mdp, n); + UNLOCK(mdp); - return __mmalloc_default_mdp; + return ret; } -void mmalloc_postexit(void) +void *calloc(size_t nmemb, size_t size) { - /* Do not detach the default mdp or ldl won't be able to free the memory it allocated since we're in memory */ - // mmalloc_detach(__mmalloc_default_mdp); - mmalloc_detach_no_free(__mmalloc_default_mdp); -} - -int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){ - - if(mdp1 == NULL && mdp2 == NULL){ - XBT_DEBUG("Malloc descriptors null"); - return 0; - } - - /* Heapstats */ + xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); - int errors = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr); + LOCK(mdp); + void *ret = mmalloc(mdp, nmemb*size); + UNLOCK(mdp); + memset(ret, 0, nmemb * size); - return (errors > 0); + return ret; } -int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr){ - - int errors = 0; - - if(mdp1->headersize != mdp2->headersize){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of the file header for the mapped files"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->refcount != mdp2->refcount){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different number of processes that attached the heap"); - errors++; - }else{ - return 1; - } - } - - if(strcmp(mdp1->magic, mdp2->magic) != 0){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different magic number"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->flags != mdp2->flags){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different flags"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->heapsize != mdp2->heapsize){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different number of info entries"); - errors++; - }else{ - return 1; - } - } - - //XBT_DEBUG("Heap size : %zu", mdp1->heapsize); - - if(mdp1->heapbase != mdp2->heapbase){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different first block of the heap"); - errors++; - }else{ - return 1; - } - } - - - if(mdp1->heapindex != mdp2->heapindex){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different index for the heap table : %zu - %zu", mdp1->heapindex, mdp2->heapindex); - errors++; - }else{ - return 1; - } - } - - //XBT_DEBUG("Heap index : %zu", mdp1->heapindex); - - if(mdp1->base != mdp2->base){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different base address of the memory region"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->breakval != mdp2->breakval){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different current location in the memory region"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->top != mdp2->top){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different end of the current location in the memory region"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->heaplimit != mdp2->heaplimit){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different limit of valid info table indices"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->fd != mdp2->fd){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different file descriptor for the file to which this malloc heap is mapped"); - errors++; - }else{ - return 1; - } - } - - if(mdp1->version != mdp2->version){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different version of the mmalloc package"); - errors++; - }else{ - return 1; - } - } - - - size_t block_free1, block_free2 , next_block_free, first_block_free, block_free ; - size_t i, j; - void *addr_block1, *addr_block2; - size_t frag_size; - - - /* Search index of the first free block */ - - block_free1 = mdp1->heapindex; - block_free2 = mdp2->heapindex; - - while(mdp1->heapinfo[block_free1].free.prev != 0){ - block_free1 = mdp1->heapinfo[block_free1].free.prev; - } - - while(mdp2->heapinfo[block_free2].free.prev != 0){ - block_free2 = mdp1->heapinfo[block_free2].free.prev; - } - - if(block_free1 != block_free2){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different first free block"); - errors++; - }else{ - return 1; - } - } - - first_block_free = block_free1; - - if(mdp1->heapinfo[first_block_free].free.size != mdp2->heapinfo[first_block_free].free.size){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different size (in blocks) of the first free cluster"); - errors++; - }else{ - return 1; - } - } - - /* Check busy blocks (circular checking)*/ - - i = first_block_free + mdp1->heapinfo[first_block_free].free.size; - - if(mdp1->heapinfo[first_block_free].free.next != mdp2->heapinfo[first_block_free].free.next){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different next block free"); - errors++; - }else{ - return 1; - } - } - - block_free = first_block_free; - next_block_free = mdp1->heapinfo[first_block_free].free.next; - - if(next_block_free == 0) - next_block_free = mdp1->heaplimit; - - while(i != first_block_free){ - - while(iheapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different type of busy block"); - errors++; - }else{ - return 1; - } - }else{ - - addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); - addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); - - switch(mdp1->heapinfo[i].busy.type){ - case 0 : - if(mdp1->heapinfo[i].busy.info.block.size != mdp2->heapinfo[i].busy.info.block.size){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of a large cluster"); - errors++; - }else{ - return 1; - } - }else{ - if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.block.size * BLOCKSIZE)) != 0){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different data in block %zu (size = %zu) (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, mdp1->heapinfo[i].busy.info.block.size, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2); - errors++; - }else{ - return 1; - } - } - } - i = i+mdp1->heapinfo[i].busy.info.block.size; - - break; - default : - if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different free fragments in the fragmented block %zu", i); - errors++; - }else{ - return 1; - } - }else{ - if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different first free fragments in the block %zu", i); - errors++; - }else{ - return 1; - } - }else{ - frag_size = pow(2,mdp1->heapinfo[i].busy.type); - for(j=0 ; j< (BLOCKSIZE/frag_size); j++){ - if(memcmp((char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), frag_size) != 0){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different data in fragment %zu (addr_frag1 = %p - addr_frag2 = %p) of block %zu", j + 1, (char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), i); - errors++; - }else{ - return 1; - } - } - } - } - } - - i++; - - break; - } - - } - } - - if( i != first_block_free){ - - if(mdp1->heapinfo[block_free].free.next != mdp2->heapinfo[block_free].free.next){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different next block free"); - errors++; - }else{ - return 1; - } - } - - block_free = mdp1->heapinfo[block_free].free.next; - next_block_free = mdp1->heapinfo[block_free].free.next; - - i = block_free + mdp1->heapinfo[block_free].free.size; - - if((next_block_free == 0) && (i != mdp1->heaplimit)){ - - while(i < mdp1->heaplimit){ - - if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different type of busy block"); - errors++; - }else{ - return 1; - } - }else{ - - addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); - addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); - - switch(mdp1->heapinfo[i].busy.type){ - case 0 : - if(mdp1->heapinfo[i].busy.info.block.size != mdp2->heapinfo[i].busy.info.block.size){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of a large cluster"); - errors++; - }else{ - return 1; - } - }else{ - if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.block.size * BLOCKSIZE)) != 0){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different data in block %zu (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2); - errors++; - }else{ - return 1; - } - } - } - - i = i+mdp1->heapinfo[i].busy.info.block.size; - - break; - default : - if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different free fragments in the fragmented block %zu", i); - errors++; - }else{ - return 1; - } - }else{ - if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different first free fragments in the block %zu", i); - errors++; - }else{ - return 1; - } - }else{ - frag_size = pow(2,mdp1->heapinfo[i].busy.type); - for(j=0 ; j< (BLOCKSIZE/frag_size); j++){ - if(memcmp((char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), frag_size) != 0){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different data in fragment %zu (addr_frag1 = %p - addr_frag2 = %p) of block %zu", j + 1, (char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), i); - errors++; - }else{ - return 1; - } - } - } - } - } - - i++; - - break; - } - } - } +void *realloc(void *p, size_t s) +{ + void *ret = NULL; + xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); - } + LOCK(mdp); + ret = mrealloc(mdp, p, s); + UNLOCK(mdp); - } - } - - return (errors>0); + return ret; } - -void mmalloc_display_info_heap(xbt_mheap_t h){ - -} - -/* Useless prototype to make gcc happy */ -void *valloc(size_t size); +void free(void *p) +{ + if (p != NULL) { + xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); -void *valloc(size_t size) -{ //FIXME: won't work - return mvalloc(NULL, size); + LOCK(mdp); + mfree(mdp, p); + UNLOCK(mdp); + } } +#endif /* NO GNU_LD */ +#endif /* WANT_MALLOC_OVERRIDE */ -