#include "mmprivate.h"
#include "gras_config.h"
+#include <math.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mm_legacy, xbt,
"Logging specific to mm_legacy in mmalloc");
+/* 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. */
+struct mdesc *__mmalloc_default_mdp;
+
+
static void *__mmalloc_current_heap = NULL; /* The heap we are currently using. */
#include "xbt_modinter.h"
else
ret = mmalloc(mdp, s);
} else {
- if (p)
- mfree(mdp, p);
+ mfree(mdp, p);
}
UNLOCK(mdp);
mmalloc_pre_detach(__mmalloc_default_mdp);
}
-int mmalloc_compare_heap(void *h1, void *h2){
+int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr){
if(h1 == NULL && h2 == NULL){
XBT_DEBUG("Malloc descriptors null");
return 0;
}
-
/* Heapstats */
+ int errors = 0;
+
struct mstats ms1 = mmstats(h1);
struct mstats ms2 = mmstats(h2);
- if(ms1.bytes_total != ms2.bytes_total){
- XBT_DEBUG("Different total size of the heap");
- return 1;
- }
-
if(ms1.chunks_used != ms2.chunks_used){
- XBT_DEBUG("Different chunks allocated by the user");
- return 1;
+ 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){
- XBT_DEBUG("Different byte total of user-allocated chunks");
- return 1;
+ 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){
- XBT_DEBUG("Different byte total of chunks in the free list");
- return 1;
+ 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){
- XBT_DEBUG("Different chunks in the free list");
- return 1;
+ 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);
-
- if(mmalloc_compare_mdesc(mdp1, mdp2))
- return 1;
-
- return 0;
+ int res = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr);
+
+ return ((errors + res ) > 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->headersize != mdp2->headersize){
- XBT_DEBUG("Different size of the file header for the mapped files");
- return 1;
+ if(mdp1->headersize != mdp2->headersize){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size of the file header for the mapped files");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mdp1->refcount != mdp2->refcount){
- XBT_DEBUG("Different number of processes that attached the heap");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different number of processes that attached the heap");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(strcmp(mdp1->magic, mdp2->magic) != 0){
- XBT_DEBUG("Different magic number");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different magic number");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mdp1->flags != mdp2->flags){
- XBT_DEBUG("Different flags");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different flags");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mdp1->heapsize != mdp2->heapsize){
- XBT_DEBUG("Different number of info entries");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different number of info entries");
+ errors++;
+ }else{
+ return 1;
+ }
}
- //XBT_DEBUG("Heap size : %d", mdp1->heapsize);
+ //XBT_DEBUG("Heap size : %zu", mdp1->heapsize);
if(mdp1->heapbase != mdp2->heapbase){
- XBT_DEBUG("Different first block of the heap");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different first block of the heap");
+ errors++;
+ }else{
+ return 1;
+ }
}
+
if(mdp1->heapindex != mdp2->heapindex){
- XBT_DEBUG("Different index for the heap table");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different index for the heap table : %zu - %zu", mdp1->heapindex, mdp2->heapindex);
+ errors++;
+ }else{
+ return 1;
+ }
}
- //XBT_DEBUG("Heap index : %d", mdp1->heapindex);
+ //XBT_DEBUG("Heap index : %zu", mdp1->heapindex);
if(mdp1->base != mdp2->base){
- XBT_DEBUG("Different base address of the memory region");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different base address of the memory region");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mdp1->breakval != mdp2->breakval){
- XBT_DEBUG("Different current location in the memory region");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different current location in the memory region");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mdp1->top != mdp2->top){
- XBT_DEBUG("Different end of the current location in the memory region");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different end of the current location in the memory region");
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mdp1->heaplimit != mdp2->heaplimit){
- XBT_DEBUG("Different limit of valid info table indices");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different limit of valid info table indices");
+ errors++;
+ }else{
+ return 1;
+ }
}
- //XBT_DEBUG("Heap limit : %d", mdp1->heaplimit);
-
-
if(mdp1->fd != mdp2->fd){
- XBT_DEBUG("Different file descriptor for the file to which this malloc heap is mapped");
- return 1;
- }
-
- if(mdp1->saved_errno != mdp2->saved_errno){
- XBT_DEBUG("Different errno");
- return 1;
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different file descriptor for the file to which this malloc heap is mapped");
+ errors++;
+ }else{
+ return 1;
+ }
}
- if(mdp1->version != mdp2->version){
- XBT_DEBUG("Different version of the mmalloc package");
- return 1;
+ 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++;
+ }else{
+ return 1;
+ }
}
- size_t block_free1, start1, block_free2 , start2, block_busy1, block_busy2 ;
- unsigned int i;
+ size_t block_free1, block_free2 , next_block_free, first_block_free, block_free ;
+ size_t i, j;
void *addr_block1, *addr_block2;
- struct mdesc* mdp;
+ size_t frag_size;
+
- start1 = block_free1 = mdp1->heapindex;
- start2 = block_free2 = mdp2->heapindex;
- block_busy1 = start1 + mdp1->heapinfo[start1].free.size;
- block_busy2 = start2 + mdp2->heapinfo[start2].free.size;
+ /* Search index of the first free block */
- XBT_DEBUG("Block busy : %d - %d", block_busy1, block_busy2);
+ block_free1 = mdp1->heapindex;
+ block_free2 = mdp2->heapindex;
+ while(mdp1->heapinfo[block_free1].free.prev != 0){
+ block_free1 = mdp1->heapinfo[block_free1].free.prev;
+ }
- if(mdp1->heapinfo[start1].free.size != mdp2->heapinfo[start2].free.size){ // <=> check block_busy
-
- XBT_DEBUG("Different size (in blocks) of a free cluster");
- return 1;
+ while(mdp2->heapinfo[block_free2].free.prev != 0){
+ block_free2 = mdp1->heapinfo[block_free2].free.prev;
+ }
- }else{
+ if(block_free1 != block_free2){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different first free block");
+ errors++;
+ }else{
+ return 1;
+ }
+ }
- if(mdp1->heapinfo[start1].free.next != mdp2->heapinfo[start1].free.next){
+ first_block_free = block_free1;
- XBT_DEBUG("Different index of next free cluster");
+ if(mdp1->heapinfo[first_block_free].free.size != mdp2->heapinfo[first_block_free].free.size){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size (in blocks) of the first free cluster");
+ errors++;
+ }else{
return 1;
+ }
+ }
- }else{
-
- i=block_busy1 ;
+ /* Check busy blocks (circular checking)*/
+
+ i = first_block_free + mdp1->heapinfo[first_block_free].free.size;
- XBT_DEBUG("Next free : %d", mdp1->heapinfo[start1].free.next);
+ if(mdp1->heapinfo[first_block_free].free.next != mdp2->heapinfo[first_block_free].free.next){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different next block free");
+ errors++;
+ }else{
+ return 1;
+ }
+ }
+
+ block_free = first_block_free;
+ next_block_free = mdp1->heapinfo[first_block_free].free.next;
+ if(next_block_free == 0)
+ next_block_free = mdp1->heaplimit;
- while(i<mdp1->heapinfo[start1].free.next){
+ while(i != first_block_free){
- XBT_DEBUG("i (block busy) : %d", i);
+ while(i<next_block_free){
- if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+ if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
XBT_DEBUG("Different type of busy block");
- return 1;
+ errors++;
}else{
- mdp = mdp1;
- addr_block1 = ADDRESS(i);
- mdp = mdp2;
- addr_block2 = ADDRESS(i);
- switch(mdp1->heapinfo[i].busy.type){
- case 0 :
- if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+ return 1;
+ }
+ }else{
+
+ addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
+ addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
+
+ switch(mdp1->heapinfo[i].busy.type){
+ case 0 :
+ 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++;
+ }else{
return 1;
+ }
+ }else{
+ 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 (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.block.size;
+
+ break;
+ default :
+ if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different free fragments in the fragmented block %zu", i);
+ errors++;
}else{
- XBT_DEBUG("Blocks %d : %p - %p / Data size : %d (%d blocks)", i, addr_block1, addr_block2, (mdp->heapinfo[i].busy.info.size * BLOCKSIZE),mdp->heapinfo[i].busy.info.size );
- if(memcmp(addr_block1, addr_block2, mdp1->heapinfo[i].busy.info.size * BLOCKSIZE) != 0){
- XBT_DEBUG("Different data in block %d", i);
+ return 1;
+ }
+ }else{
+ if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different first free fragments in the block %zu", i);
+ errors++;
+ }else{
return 1;
}
- }
- i = i + mdp1->heapinfo[i].busy.info.size;
- break;
- default :
- if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
- XBT_DEBUG("Different free fragments in a fragmented block");
- return 1;
}else{
- if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
- XBT_DEBUG("Different first free fragments of the block");
- return 1;
- }else{
- if(memcmp(addr_block1, addr_block2, BLOCKSIZE) != 0){
- XBT_DEBUG("Different data in block %d", i);
- return 1;
+ frag_size = pow(2,mdp1->heapinfo[i].busy.type);
+ for(j=0 ; j< (BLOCKSIZE/frag_size); j++){
+ if(memcmp((char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), frag_size) != 0){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different data in fragment %zu (addr_frag1 = %p - addr_frag2 = %p) of block %zu", j + 1, (char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), i);
+ errors++;
+ }else{
+ return 1;
+ }
}
}
}
- i++;
- break;
}
- }
- }
-
- block_free1 = mdp1->heapinfo[start1].free.next;
- block_free2 = mdp2->heapinfo[start2].free.next;
+ i++;
- //XBT_DEBUG("Index of next free cluster : %d", block_free1);
+ break;
+ }
- while((block_free1 != start1) && (block_free2 != start2)){
+ }
+ }
- block_busy1 = block_free1 + mdp1->heapinfo[block_free1].free.size;
- block_busy2 = block_free2 + mdp2->heapinfo[block_free2].free.size;
+ if( i != first_block_free){
- if(block_busy1 != block_busy2){
- XBT_DEBUG("Different index of busy block");
- return 1;
+ if(mdp1->heapinfo[block_free].free.next != mdp2->heapinfo[block_free].free.next){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different next block free");
+ errors++;
}else{
+ return 1;
+ }
+ }
+
+ block_free = mdp1->heapinfo[block_free].free.next;
+ next_block_free = mdp1->heapinfo[block_free].free.next;
- XBT_DEBUG("Index of next busy block : %d - %d", block_busy1, block_busy2);
- XBT_DEBUG("Index of next free cluster : %d", mdp1->heapinfo[block_free1].free.next);
-
- i = block_busy1;
+ i = block_free + mdp1->heapinfo[block_free].free.size;
- while(i<mdp1->heapinfo[block_free1].free.next){
+ if((next_block_free == 0) && (i != mdp1->heaplimit)){
- XBT_DEBUG("i (block busy) : %d", i);
+ while(i < mdp1->heaplimit){
- if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+ if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
XBT_DEBUG("Different type of busy block");
- return 1;
+ errors++;
}else{
- mdp = mdp1;
- addr_block1 = ADDRESS(i);
- mdp = mdp2;
- addr_block2 = ADDRESS(i);
- switch(mdp1->heapinfo[i].busy.type){
- case 0 :
- if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+ return 1;
+ }
+ }else{
+
+ addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
+ addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
+
+ switch(mdp1->heapinfo[i].busy.type){
+ case 0 :
+ 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++;
+ }else{
return 1;
+ }
+ }else{
+ 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 (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.block.size;
+
+ break;
+ default :
+ if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different free fragments in the fragmented block %zu", i);
+ errors++;
}else{
- XBT_DEBUG("Blocks %d : %p - %p / Data size : %d", i, addr_block1, addr_block2, (mdp->heapinfo[i].busy.info.size * BLOCKSIZE));
- //XBT_DEBUG("Size of large cluster %d", mdp->heapinfo[i].busy.info.size);
- if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
- XBT_DEBUG("Different data in block %d", i);
+ return 1;
+ }
+ }else{
+ if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different first free fragments in the block %zu", i);
+ errors++;
+ }else{
return 1;
}
- }
- i = i+mdp1->heapinfo[i].busy.info.size;
- break;
- default :
- if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
- XBT_DEBUG("Different free fragments in a fragmented block");
- return 1;
}else{
- if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
- XBT_DEBUG("Different first free fragments of the block");
- return 1;
- }else{
- if(memcmp(addr_block1, addr_block2, BLOCKSIZE) != 0){
- XBT_DEBUG("Different data in fragmented block %d", i);
- return 1;
+ frag_size = pow(2,mdp1->heapinfo[i].busy.type);
+ for(j=0 ; j< (BLOCKSIZE/frag_size); j++){
+ if(memcmp((char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), frag_size) != 0){
+ if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
+ XBT_DEBUG("Different data in fragment %zu (addr_frag1 = %p - addr_frag2 = %p) of block %zu", j + 1, (char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), i);
+ errors++;
+ }else{
+ return 1;
+ }
}
}
}
- i++;
- break;
}
- }
+
+ i++;
+
+ break;
+ }
}
}
- block_free1 = mdp1->heapinfo[block_free1].free.next;
- block_free2 = mdp2->heapinfo[block_free2].free.next;
-
- }
-
- }
-
}
- return 0;
-
-
+
+ }
+ }
+ return (errors>0);
}
-
+void mmalloc_display_info_heap(void *h){
+
+}
