rename sup-mmap.c into mmorecore.c and simplify the code since we want no more than...

[simgrid.git] / src / xbt / mmalloc / detach.c

diff --git a/src/xbt/mmalloc/detach.c b/src/xbt/mmalloc/detach.c
index 43e1ab3..5dfaf42 100644 (file)
--- a/src/xbt/mmalloc/detach.c
+++ b/src/xbt/mmalloc/detach.c
@@ -31,16 +31,25 @@
 void mmalloc_pre_detach(void *md)
 {
   struct mdesc *mdp = md;
-  xbt_os_mutex_t mutex = mdp->mutex;
-  mdp->mutex = NULL;
-  xbt_os_mutex_destroy(mutex);
+
+  if(--mdp->refcount == 0){
+    LOCK(mdp) ;
+    sem_destroy(&mdp->sem);
+  }
 }
 
 void *mmalloc_detach(void *md)
 {
-  struct mdesc mtemp;
+  struct mdesc *mdp = (struct mdesc *)md;
+  struct mdesc mtemp, *mdptemp;
+
+  if (mdp != NULL) {
+    /* Remove the heap from the linked list of heaps attached by mmalloc */
+    mdptemp = __mmalloc_default_mdp;
+    while(mdptemp->next_mdesc != mdp )
+      mdptemp = mdptemp->next_mdesc;
 
-  if (md != NULL) {
+    mdptemp->next_mdesc = mdp->next_mdesc;
 
     mmalloc_pre_detach(md);
     mtemp = *(struct mdesc *) md;
@@ -48,7 +57,7 @@ void *mmalloc_detach(void *md)
     /* Now unmap all the pages associated with this region by asking for a
        negative increment equal to the current size of the region. */
 
-    if ((mtemp.morecore(&mtemp,
+    if ((mmorecore(&mtemp,
                         (char *) mtemp.base - (char *) mtemp.breakval)) ==
         NULL) {
       /* Deallocating failed.  Update the original malloc descriptor