XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mm_legacy, xbt,
"Logging specific to mm_legacy in mmalloc");
-static void *__mmalloc_current_heap = NULL; /* The heap we are currently using. */
+/* 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;
+
+
+static xbt_mheap_t __mmalloc_current_heap = NULL; /* The heap we are currently using. */
#include "xbt_modinter.h"
-void *mmalloc_get_current_heap(void)
+xbt_mheap_t mmalloc_get_current_heap(void)
{
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;
}
#ifdef MMALLOC_WANT_OVERIDE_LEGACY
void *malloc(size_t n)
{
- void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
- if (!mdp)
- mmalloc_preinit();
-#endif
+ xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
LOCK(mdp);
void *ret = mmalloc(mdp, n);
UNLOCK(mdp);
void *calloc(size_t nmemb, size_t size)
{
- size_t total_size = nmemb * size;
- void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
- if (!mdp)
- mmalloc_preinit();
-#endif
+ 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;
}
void *realloc(void *p, size_t s)
{
void *ret = NULL;
- void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
- if (!mdp)
- mmalloc_preinit();
-#endif
+ 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;
void free(void *p)
{
- void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_GTNETS
- if(!mdp) return;
-#endif
+ xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
LOCK(mdp);
mfree(mdp, p);
UNLOCK(mdp);
* valgrind. */
#define HEAP_OFFSET (128UL<<20)
-void *mmalloc_get_default_md(void)
+xbt_mheap_t mmalloc_get_default_md(void)
{
xbt_assert(__mmalloc_default_mdp);
return __mmalloc_default_mdp;
static void mmalloc_fork_prepare(void)
{
- struct mdesc* mdp = NULL;
+ xbt_mheap_t mdp = NULL;
if ((mdp =__mmalloc_default_mdp)){
while(mdp){
LOCK(mdp);
static void mmalloc_fork_parent(void)
{
- struct mdesc* mdp = NULL;
+ xbt_mheap_t mdp = NULL;
if ((mdp =__mmalloc_default_mdp)){
while(mdp){
if(mdp->fd < 0)
}
/* Initialize the default malloc descriptor. */
-void mmalloc_preinit(void)
+void *mmalloc_preinit(void)
{
int res;
- if (!__mmalloc_default_mdp) {
+ 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);
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_pre_detach(__mmalloc_default_mdp);
+ mmalloc_detach_no_free(__mmalloc_default_mdp);
}
-int mmalloc_compare_heap(void *h1, void *h2){
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){
- if(h1 == NULL && h2 == NULL){
+ if(mdp1 == NULL && mdp2 == NULL){
XBT_DEBUG("Malloc descriptors null");
return 0;
}
/* Heapstats */
- int errors = 0;
+ int errors = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr);
- struct mstats ms1 = mmstats(h1);
- struct mstats ms2 = mmstats(h2);
-
- if(ms1.chunks_used != ms2.chunks_used){
- if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different chunks allocated by the user : %zu - %zu", ms1.chunks_used, ms2.chunks_used);
- errors++;
- }else{
- return 1;
- }
- }
-
- if(ms1.bytes_used != ms2.bytes_used){
- if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different byte total of user-allocated chunks : %zu - %zu", ms1.bytes_used, ms2.bytes_used);
- errors++;
- }else{
- return 1;
- }
- }
-
- if(ms1.bytes_free != ms2.bytes_free){
- if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different byte total of chunks in the free list : %zu - %zu", ms1.bytes_free, ms2.bytes_free);
- errors++;
- }else{
- return 1;
- }
- }
-
- if(ms1.chunks_free != ms2.chunks_free){
- if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different chunks in the free list : %zu - %zu", ms1.chunks_free, ms2.chunks_free);
- errors++;
- }else{
- return 1;
- }
- }
-
- struct mdesc *mdp1, *mdp2;
- mdp1 = MD_TO_MDP(h1);
- mdp2 = MD_TO_MDP(h2);
-
- int res = mmalloc_compare_mdesc(mdp1, mdp2);
-
- return ((errors + res ) > 0);
+ return (errors > 0);
}
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr){
int errors = 0;
}
}
- if(mdp1->saved_errno != mdp2->saved_errno){
- if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different errno");
- errors++;
- }else{
- return 1;
- }
- }
-
- if(mdp1->version != mdp2->version){
+ if(mdp1->version != mdp2->version){
if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
XBT_DEBUG("Different version of the mmalloc package");
errors++;
switch(mdp1->heapinfo[i].busy.type){
case 0 :
- if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+ if(mdp1->heapinfo[i].busy.info.block.size != mdp2->heapinfo[i].busy.info.block.size){
if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
XBT_DEBUG("Different size of a large cluster");
errors++;
return 1;
}
}else{
- if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
+ if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.block.size * BLOCKSIZE)) != 0){
if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different data in block %zu (size = %zu) (addr_block1 = %p - addr_block2 = %p)", i, mdp1->heapinfo[i].busy.info.size, addr_block1, addr_block2);
+ XBT_DEBUG("Different data in block %zu (size = %zu) (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, mdp1->heapinfo[i].busy.info.block.size, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2);
errors++;
}else{
return 1;
}
}
}
- i = i+mdp1->heapinfo[i].busy.info.size;
+ i = i+mdp1->heapinfo[i].busy.info.block.size;
break;
default :
switch(mdp1->heapinfo[i].busy.type){
case 0 :
- if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+ if(mdp1->heapinfo[i].busy.info.block.size != mdp2->heapinfo[i].busy.info.block.size){
if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
XBT_DEBUG("Different size of a large cluster");
errors++;
return 1;
}
}else{
- if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
+ if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.block.size * BLOCKSIZE)) != 0){
if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
- XBT_DEBUG("Different data in block %zu (addr_block1 = %p - addr_block2 = %p)", i, addr_block1, addr_block2);
+ XBT_DEBUG("Different data in block %zu (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2);
errors++;
}else{
return 1;
}
}
- i = i+mdp1->heapinfo[i].busy.info.size;
+ i = i+mdp1->heapinfo[i].busy.info.block.size;
break;
default :
}
-void mmalloc_display_info_heap(void *h){
+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);
+}
+
