X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25:/src/xbt/mmalloc/mm_legacy.c

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index e92b122814..94aa3d1ac9 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,6 +7,7 @@
 /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
 
 #include "mmprivate.h"
+#include "xbt_modinter.h"
 #include "internal_config.h"
 #include <math.h>
 
@@ -39,9 +40,9 @@ void mmalloc_set_current_heap(xbt_mheap_t new_heap)
 #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");
@@ -54,11 +55,13 @@ static void mm_gnuld_legacy_init(void) { /* This function is called from mmalloc
  * 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[512];
+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 (3*4096/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
@@ -70,29 +73,30 @@ void *malloc(size_t n) {
     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) {
+  } 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 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>512) {
-        fprintf(stderr,
-            "Panic: real malloc symbol not resolved yet, and I need %zu bytes while my little private memory chunk is only 512 bytes wide. "
-            "Damn LD, we must fix our code to extend this area.\n",n);
+          "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");
@@ -101,15 +105,20 @@ void *malloc(size_t 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)
@@ -132,7 +141,7 @@ void free(void *p)
 {
   if (p==NULL)
     return;
-  if (p!=junkarea) {
+  if (p<=(void*)junkareas || p>(void*)(junkareas[MAX_JUNK_AREAS]) ) {
     xbt_mheap_t mdp = __mmalloc_current_heap;
 
     if (mdp) {
@@ -142,8 +151,10 @@ void free(void *p)
     } else {
       real_free(p);
     }
+  } else if(allocated_junk && p==junkareas[allocated_junk-1]) {
+    allocated_junk--;
   } else {
-    allocated_junk=0;
+    // Leaked memory.
   }
 }