A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not store any metadata where the user (was) legitimate to write
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mm_legacy.c
diff --git
a/src/xbt/mmalloc/mm_legacy.c
b/src/xbt/mmalloc/mm_legacy.c
index
a9928e0
..
96610ee
100644
(file)
--- a/
src/xbt/mmalloc/mm_legacy.c
+++ b/
src/xbt/mmalloc/mm_legacy.c
@@
-7,44
+7,50
@@
/* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
#include "mmprivate.h"
/* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
#include "mmprivate.h"
+#include "gras_config.h"
+#include <math.h>
-static void *__mmalloc_current_heap = NULL; /* The heap we are currently using. */
-#include "xbt_modinter.h"
+/* 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;
-void *mmalloc_get_current_heap(void)
+
+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;
}
{
return __mmalloc_current_heap;
}
-void mmalloc_set_current_heap(
void *
new_heap)
+void mmalloc_set_current_heap(
xbt_mheap_t
new_heap)
{
__mmalloc_current_heap = new_heap;
}
{
__mmalloc_current_heap = new_heap;
}
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVER
R
IDE_LEGACY
void *malloc(size_t n)
{
void *malloc(size_t n)
{
-#ifdef HAVE_MMAP
- if (!__mmalloc_current_heap)
-
mmalloc_preinit(
);
-#endif
-
void *ret = mmalloc(__mmalloc_current_heap, n
);
+ xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+
LOCK(mdp
);
+ void *ret = mmalloc(mdp, n);
+
UNLOCK(mdp
);
return ret;
}
void *calloc(size_t nmemb, size_t size)
{
return ret;
}
void *calloc(size_t nmemb, size_t size)
{
-
size_t total_size = nmemb * size
;
-#ifdef HAVE_MMAP
- if (!__mmalloc_current_heap)
-
mmalloc_preinit(
);
-#endif
-
void *ret = mmalloc(__mmalloc_current_heap, total_
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);
- /* Fill the allocated memory with zeroes to mimic calloc behaviour */
- memset(ret, '\0', total_size);
return ret;
}
return ret;
}
@@
-52,50
+58,25
@@
void *calloc(size_t nmemb, size_t size)
void *realloc(void *p, size_t s)
{
void *ret = NULL;
void *realloc(void *p, size_t s)
{
void *ret = NULL;
-#ifdef HAVE_MMAP
- if (!__mmalloc_current_heap)
- mmalloc_preinit();
-#endif
- if (s) {
- if (p)
- ret = mrealloc(__mmalloc_current_heap, p, s);
- else
- ret = mmalloc(__mmalloc_current_heap, s);
- } else {
- if (p)
- mfree(__mmalloc_current_heap, p);
- }
+ 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)
{
return ret;
}
void free(void *p)
{
- return mfree(__mmalloc_current_heap, p);
-}
-#endif
-
-/* Make sure it works with md==NULL */
-
-#define HEAP_OFFSET 40960000 /* Safety gap from the heap's break address */
+ if (p != NULL) {
+ xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
-void *mmalloc_get_default_md(void)
-{
-
xbt_assert(__mmalloc_default_
mdp);
- return __mmalloc_default_mdp;
+ LOCK(mdp);
+ mfree(mdp, p);
+
UNLOCK(
mdp);
+ }
}
}
+#endif
-/* Initialize the default malloc descriptor. */
-void mmalloc_preinit(void)
-{
- if (!__mmalloc_default_mdp)
- __mmalloc_default_mdp =
- mmalloc_attach(-1, (char *) sbrk(0) + HEAP_OFFSET);
- xbt_assert(__mmalloc_default_mdp != NULL);
-}
-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);
-}