#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
-#ifdef HAVE_GNU_LD
+#if 0 && defined(HAVE_GNU_LD)
#undef _GNU_SOURCE
#define _GNU_SOURCE 1
#include <dlfcn.h>
-static void * (*real_malloc) (size_t);
-static void * (*real_realloc) (void*,size_t);
-static void * (*real_free) (void*);
+static void * (*real_malloc) (size_t) = NULL;
+static void * (*real_realloc) (void*,size_t) = NULL;
+static void * (*real_free) (void*) = NULL;
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];
+static int allocated_junk = 0; /* keep track of many blocks of our little area was already given to someone */
+#define JUNK_SIZE 8
+#define MAX_JUNK_AREAS (64 * 1024 / JUNK_SIZE)
+static char junkareas[MAX_JUNK_AREAS][JUNK_SIZE];
/* This version use mmalloc if there is a current heap, or the legacy implem if not */
-void *malloc(size_t n) {
+static void *malloc_or_calloc(size_t n, int setzero) {
xbt_mheap_t mdp = __mmalloc_current_heap;
void *ret;
#ifdef MM_LEGACY_VERBOSE
LOCK(mdp);
ret = mmalloc(mdp, n);
UNLOCK(mdp);
+ // This was already done by mmalloc:
+ if (mdp->options & XBT_MHEAP_OPTION_MEMSET) {
+ setzero = 0;
+ }
#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) {
+ } else if (!real_malloc) {
+ size_t needed_areas = n / JUNK_SIZE;
+ if(needed_areas * JUNK_SIZE != n) needed_areas++;
+ if (allocated_junk+needed_areas>=MAX_JUNK_AREAS) {
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);
+ "Panic: real malloc symbol not resolved yet, and I already gave my little private memory chunk away.\n");
exit(1);
} else {
- allocated_junk = 1;
- return junkarea;
+ size_t i = allocated_junk;
+ allocated_junk += needed_areas;
+ ret = junkareas[i];
}
}
+ else {
#ifdef MM_LEGACY_VERBOSE
if (!warned_raw) {
fprintf(stderr,"Using system malloc after interception; you seem to be currently model-checking\n");
#endif
ret = real_malloc(n);
}
+ if (ret && setzero) {
+ memset(ret, 0, n);
+ }
return ret;
}
+void *malloc(size_t n)
+{
+ return malloc_or_calloc(n, 0);
+}
void *calloc(size_t nmemb, size_t size)
{
- void *ret = malloc(nmemb*size);
- memset(ret, 0, nmemb * size);
- return ret;
+ return malloc_or_calloc(nmemb*size, 1);
}
void *realloc(void *p, size_t s)
{
if (p==NULL)
return;
- if (p!=junkarea) {
+ if (p<(void*)junkareas || p>=(void*)(junkareas[MAX_JUNK_AREAS]) ) {
+ // main use case
+
xbt_mheap_t mdp = __mmalloc_current_heap;
if (mdp) {
real_free(p);
}
} else {
- allocated_junk=0;
+ // We are in the junkarea.
+ // This area is used to allocate memory at initilization time.
+
+ if(allocated_junk && p==junkareas[allocated_junk-1]) {
+ // Last junkarea. We can reuse it.
+ allocated_junk--;
+ } else {
+ // We currently cannot reuse freed junkareas in the general case.
+ }
}
}
void *ret = mmalloc(mdp, n);
UNLOCK(mdp);
+
return ret;
}
LOCK(mdp);
void *ret = mmalloc(mdp, nmemb*size);
UNLOCK(mdp);
- memset(ret, 0, nmemb * size);
+ // This was already done in the callee:
+ if(!(mdp->options & XBT_MHEAP_OPTION_MEMSET)) {
+ memset(ret, 0, nmemb * size);
+ }
return ret;
}
}
#endif /* NO GNU_LD */
#endif /* WANT_MALLOC_OVERRIDE */
-
-
