[mm] Disable HAVE_GNU_LD code in order to get rid of the junkarea

The HAVE_GNU_LD mode of mmalloc delegates in some cases to standard
malloc()/free() which are resolved with dlsym(). This cause some
bootstrap problems which are only resolved with the junkarea: the
junkarea is regularly broken when adding dependencies because the
junkarea is then too small.

By disabling the HAVE_GNU_LD path, we get rid of the junkarea hack.

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 77d9284..655418d 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -25,7 +25,7 @@ void MC_memory_init()
   std_heap = mmalloc_get_default_md();
   xbt_assert(std_heap != NULL);
 
   std_heap = mmalloc_get_default_md();
   xbt_assert(std_heap != NULL);
 

-#if defined HAVE_GNU_LD && !defined MMALLOC_WANT_OVERRIDE_LEGACY
+#if 0 && defined HAVE_GNU_LD && !defined MMALLOC_WANT_OVERRIDE_LEGACY

   /* use the system malloc for the model-checker data */
   mc_heap = NULL;
 #else
   /* use the system malloc for the model-checker data */
   mc_heap = NULL;
 #else

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 20a609a..3d58ba5 100644 (file)
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -34,7 +34,7 @@ void mmalloc_set_current_heap(xbt_mheap_t new_heap)
 
 
 #ifdef MMALLOC_WANT_OVERRIDE_LEGACY
 
 
 #ifdef MMALLOC_WANT_OVERRIDE_LEGACY

-#ifdef HAVE_GNU_LD
+#if 0 && defined(HAVE_GNU_LD)

 
 #undef _GNU_SOURCE
 #define _GNU_SOURCE 1
 
 #undef _GNU_SOURCE
 #define _GNU_SOURCE 1


@@ -49,7 +49,7 @@ static void mm_gnuld_legacy_init(void) { /* This function is called from mmalloc
   real_realloc = (void * (*) (void*,size_t)) dlsym(RTLD_NEXT, "realloc");
   real_free = (void * (*) (void*)) dlsym(RTLD_NEXT, "free");
   __mmalloc_current_heap = __mmalloc_default_mdp;
   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
 
 /* Hello pimple!
  * DL needs some memory while resolving the malloc symbol, that is somehow problematic


@@ -176,6 +176,7 @@ void *malloc(size_t n)
   void *ret = mmalloc(mdp, n);
   UNLOCK(mdp);
 
   void *ret = mmalloc(mdp, n);
   UNLOCK(mdp);
 

+

   return ret;
 }
 
   return ret;
 }
 


@@ -186,8 +187,11 @@ void *calloc(size_t nmemb, size_t size)
   LOCK(mdp);
   void *ret = mmalloc(mdp, nmemb*size);
   UNLOCK(mdp);
   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;
 }
 
   return ret;
 }


@@ -216,5 +220,3 @@ void free(void *p)
 }
 #endif /* NO GNU_LD */
 #endif /* WANT_MALLOC_OVERRIDE */
 }
 #endif /* NO GNU_LD */
 #endif /* WANT_MALLOC_OVERRIDE */

-
-

diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c
index a2c36cd..affa209 100644 (file)
--- a/src/xbt/mmalloc/mm_module.c
+++ b/src/xbt/mmalloc/mm_module.c
@@ -330,6 +330,8 @@ void *mmalloc_preinit(void)
 {
   int res;
   if (__mmalloc_default_mdp == NULL) {
 {
   int res;
   if (__mmalloc_default_mdp == NULL) {

+    if(!xbt_pagesize)
+      xbt_pagesize = getpagesize();

     unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
     void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
     __mmalloc_default_mdp = xbt_mheap_new_options(-1, addr, XBT_MHEAP_OPTION_MEMSET);
     unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
     void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
     __mmalloc_default_mdp = xbt_mheap_new_options(-1, addr, XBT_MHEAP_OPTION_MEMSET);


@@ -343,7 +345,7 @@ void *mmalloc_preinit(void)
   }
   xbt_assert(__mmalloc_default_mdp != NULL);
 
   }
   xbt_assert(__mmalloc_default_mdp != NULL);
 

-#if defined(HAVE_GNU_LD) && defined(MMALLOC_WANT_OVERRIDE_LEGACY)
+#if 0 && defined(HAVE_GNU_LD) && defined(MMALLOC_WANT_OVERRIDE_LEGACY)

   mm_gnuld_legacy_init();
 #endif
 
   mm_gnuld_legacy_init();
 #endif