static xbt_mheap_t __mmalloc_current_heap = NULL; /* The heap we are currently using. */
-#include "xbt_modinter.h"
-
xbt_mheap_t mmalloc_get_current_heap(void)
{
return __mmalloc_current_heap;
void *calloc(size_t nmemb, size_t size)
{
- size_t total_size = nmemb * size;
xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
LOCK(mdp);
- void *ret = mmalloc(mdp, total_size);
+ void *ret = mcalloc(mdp, nmemb,size);
UNLOCK(mdp);
- /* Fill the allocated memory with zeroes to mimic calloc behaviour */
- memset(ret, '\0', total_size);
-
return ret;
}
xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
LOCK(mdp);
- if (s) {
- if (p)
- ret = mrealloc(mdp, p, s);
- else
- ret = mmalloc(mdp, s);
- } else {
- mfree(mdp, p);
- }
+ ret = mrealloc(mdp, p, s);
UNLOCK(mdp);
return ret;
}
#endif
-/* Make sure it works with md==NULL */
-
-/* Safety gap from the heap's break address.
- * Try to increase this first if you experience strange errors under
- * valgrind. */
-#define HEAP_OFFSET (128UL<<20)
-
-xbt_mheap_t mmalloc_get_default_md(void)
-{
- xbt_assert(__mmalloc_default_mdp);
- return __mmalloc_default_mdp;
-}
-
-static void mmalloc_fork_prepare(void)
-{
- xbt_mheap_t mdp = NULL;
- if ((mdp =__mmalloc_default_mdp)){
- while(mdp){
- LOCK(mdp);
- if(mdp->fd >= 0){
- mdp->refcount++;
- }
- mdp = mdp->next_mdesc;
- }
- }
-}
-
-static void mmalloc_fork_parent(void)
-{
- xbt_mheap_t mdp = NULL;
- if ((mdp =__mmalloc_default_mdp)){
- while(mdp){
- if(mdp->fd < 0)
- UNLOCK(mdp);
- mdp = mdp->next_mdesc;
- }
- }
-}
-
-static void mmalloc_fork_child(void)
-{
- struct mdesc* mdp = NULL;
- if ((mdp =__mmalloc_default_mdp)){
- while(mdp){
- UNLOCK(mdp);
- mdp = mdp->next_mdesc;
- }
- }
-}
-
-/* Initialize the default malloc descriptor. */
-void *mmalloc_preinit(void)
-{
- int res;
- if (__mmalloc_default_mdp == NULL) {
- unsigned long mask = ~((unsigned long)getpagesize() - 1);
- void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
- __mmalloc_default_mdp = mmalloc_attach(-1, addr);
- /* Fixme? only the default mdp in protected against forks */
- res = xbt_os_thread_atfork(mmalloc_fork_prepare,
- mmalloc_fork_parent, mmalloc_fork_child);
- if (res != 0)
- THROWF(system_error,0,"xbt_os_thread_atfork() failed: return value %d",res);
- }
- xbt_assert(__mmalloc_default_mdp != NULL);
-
- return __mmalloc_default_mdp;
-}
-
-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);
- mmalloc_detach_no_free(__mmalloc_default_mdp);
-}
int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){
void mmalloc_display_info_heap(xbt_mheap_t h){
}
-
-/* Useless prototype to make gcc happy */
-void *valloc(size_t size);
-
-void *valloc(size_t size)
-{ //FIXME: won't work
- return mvalloc(NULL, size);
-}
-
-
-