X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c04d8355923f8323a1a3195fe3b73ac08b984ea..ad5ee977c604c3348f24ef6f27e2ba160c87ae7b:/src/xbt/mmalloc/mm_legacy.c diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c index d126d185f8..7984ad0bfe 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-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,71 +7,195 @@ /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */ #include "mmprivate.h" +#include "internal_config.h" +#include -static void *__mmalloc_current_heap=NULL; /* The heap we are currently using. */ +//#define MM_LEGACY_VERBOSE 1 /* define this to see which version of malloc gets used */ -void* mmalloc_get_current_heap(void) { +/* The mmalloc() package can use a single implicit malloc descriptor + for mmalloc/mrealloc/mfree operations which do not supply an explicit + descriptor. This allows mmalloc() to provide + backwards compatibility with the non-mmap'd version. */ +xbt_mheap_t __mmalloc_default_mdp = NULL; + + +static xbt_mheap_t __mmalloc_current_heap = NULL; /* The heap we are currently using. */ + +xbt_mheap_t mmalloc_get_current_heap(void) +{ return __mmalloc_current_heap; } -void mmalloc_set_current_heap(void *new_heap) { - __mmalloc_current_heap=new_heap; + +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) { - void *ret = mmalloc(__mmalloc_current_heap, n); - return ret; +#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; } -void *calloc(size_t nmemb, size_t size) { - size_t total_size = nmemb * size; +/* 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 - void *ret = mmalloc(__mmalloc_current_heap, total_size); + 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; +} - /* Fill the allocated memory with zeroes to mimic calloc behaviour */ - memset(ret,'\0', total_size); +void *calloc(size_t nmemb, size_t size) +{ + void *ret = malloc(nmemb*size); + memset(ret, 0, nmemb * size); return ret; } -void *realloc(void *p, size_t s) { - void *ret = NULL; +void *realloc(void *p, size_t s) +{ + xbt_mheap_t mdp = __mmalloc_current_heap; + void *ret; - if (s) { - if (p) - ret = mrealloc(__mmalloc_current_heap, p,s); - else - ret = mmalloc(__mmalloc_current_heap,s); + if (mdp) { + LOCK(mdp); + ret = mrealloc(mdp, p, s); + UNLOCK(mdp); } else { - if (p) - mfree(__mmalloc_current_heap,p); + ret = real_realloc(p,s); } return ret; } -void free(void *p) { - return mfree(__mmalloc_current_heap, p); +void free(void *p) +{ + if (p==NULL) + return; + if (p!=junkarea) { + xbt_mheap_t mdp = __mmalloc_current_heap; + + if (mdp) { + LOCK(mdp); + mfree(mdp, p); + UNLOCK(mdp); + } else { + real_free(p); + } + } else { + allocated_junk=0; + } } -#endif -/* Make sure it works with md==NULL */ -#define HEAP_OFFSET 40960000 /* Safety gap from the heap's break address */ +#else /* NO GNU_LD */ +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); -void *mmalloc_get_default_md(void) { - xbt_assert(__mmalloc_default_mdp); - return __mmalloc_default_mdp; + return ret; } -/* Initialize the default malloc descriptor. */ -#include "xbt_modinter.h" -void mmalloc_preinit(void) { - __mmalloc_default_mdp = mmalloc_attach(-1, (char *)sbrk(0) + HEAP_OFFSET); - xbt_assert(__mmalloc_default_mdp != NULL); +void *calloc(size_t nmemb, size_t size) +{ + xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); + + LOCK(mdp); + void *ret = mmalloc(mdp, nmemb*size); + UNLOCK(mdp); + memset(ret, 0, nmemb * size); + + + return ret; } -void mmalloc_postexit(void) { - /* 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); + +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 ret; } + +void free(void *p) +{ + if (p != NULL) { + xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); + + LOCK(mdp); + mfree(mdp, p); + UNLOCK(mdp); + } +} +#endif /* NO GNU_LD */ +#endif /* WANT_MALLOC_OVERRIDE */ + +