From 17c6b11aff7b32922cbc2255975d8a257687045c Mon Sep 17 00:00:00 2001 From: Marion Guthmuller Date: Tue, 21 Feb 2012 15:05:29 +0100 Subject: [PATCH] model-checker : function mmalloc_compare_mdesc rewritten with new version of mmalloc --- src/xbt/mmalloc/mm_diff.c | 394 ++++++++++---------------------------- 1 file changed, 98 insertions(+), 296 deletions(-) diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index 5a081425dd..b0fe4c79f2 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -7,6 +7,9 @@ #include "xbt/ex_interface.h" /* internals of backtrace setup */ +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt, + "Logging specific to mm_diff in mmalloc"); + extern char *xbt_binary_name; void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){ @@ -52,12 +55,10 @@ void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){ int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){ if(mdp1 == NULL && mdp2 == NULL){ - XBT_DEBUG("Malloc descriptors null"); + XBT_DEBUG("Malloc descriptors null\n"); return 0; } - /* Heapstats */ - int errors = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr); return (errors > 0); @@ -66,365 +67,166 @@ int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr){ - int errors = 0; - 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; - } + fprintf(stderr, "Different size of the file header for the mapped files\n"); + return 1; } if(mdp1->refcount != mdp2->refcount){ - 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; - } + fprintf(stderr, "Different number of processes that attached the heap\n"); + return 1; } if(strcmp(mdp1->magic, mdp2->magic) != 0){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different magic number"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different magic number\n"); + return 1; } if(mdp1->flags != mdp2->flags){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different flags"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different flags\n"); + return 1; } if(mdp1->heapsize != mdp2->heapsize){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different number of info entries"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different number of info entries\n"); + return 1; } - - //XBT_DEBUG("Heap size : %zu", mdp1->heapsize); + if(mdp1->heapbase != mdp2->heapbase){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different first block of the heap"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different first block of the heap\n"); + return 1; } if(mdp1->heapindex != mdp2->heapindex){ - 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; - } + fprintf(stderr,"Different index for the heap table : %zu - %zu\n", mdp1->heapindex, mdp2->heapindex); + return 1; } - //XBT_DEBUG("Heap index : %zu", mdp1->heapindex); if(mdp1->base != mdp2->base){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different base address of the memory region"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different base address of the memory region\n"); + return 1; } if(mdp1->breakval != mdp2->breakval){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different current location in the memory region"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different current location in the memory region\n"); + return 1; } if(mdp1->top != mdp2->top){ - 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; - } + fprintf(stderr,"Different end of the current location in the memory region\n"); + return 1; } if(mdp1->heaplimit != mdp2->heaplimit){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different limit of valid info table indices"); - errors++; - }else{ - return 1; - } + fprintf(stderr,"Different limit of valid info table indices\n"); + return 1; } if(mdp1->fd != mdp2->fd){ - 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; - } + fprintf(stderr,"Different file descriptor for the file to which this malloc heap is mapped\n"); + 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; - } + fprintf(stderr,"Different version of the mmalloc package\n"); + return 1; } - size_t block_free1, block_free2 , next_block_free, first_block_free, block_free ; size_t i, j; - void *addr_block1, *addr_block2; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; size_t frag_size; + i = 0; - /* Search index of the first free block */ - - block_free1 = mdp1->heapindex; - block_free2 = mdp2->heapindex; + /* Check busy blocks*/ - while(mdp1->heapinfo[block_free1].free_block.prev != 0){ - block_free1 = mdp1->heapinfo[block_free1].free_block.prev; - } - - while(mdp2->heapinfo[block_free2].free_block.prev != 0){ - block_free2 = mdp1->heapinfo[block_free2].free_block.prev; - } + while(i < mdp1->heapindex){ - if(block_free1 != block_free2){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different first free block"); - errors++; - }else{ + if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){ + fprintf(stderr,"Different type of block : %d - %d\n", mdp1->heapinfo[i].type, mdp2->heapinfo[i].type); return 1; } - } - first_block_free = block_free1; + addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + (i * BLOCKSIZE); + addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + (i * BLOCKSIZE); - if(mdp1->heapinfo[first_block_free].free_block.size != mdp2->heapinfo[first_block_free].free_block.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; - } - } + if(mdp1->heapinfo[i].type == 0){ /* busy large block */ - /* Check busy blocks (circular checking)*/ + if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_block.size){ + fprintf(stderr,"Different size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.size, mdp2->heapinfo[i].busy_block.size); + return 1; + } - i = first_block_free + mdp1->heapinfo[first_block_free].free_block.size; + if(mdp1->heapinfo[i].busy_block.busy_size != mdp2->heapinfo[i].busy_block.busy_size){ + fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size); + return 1; + } + + if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.busy_size)) != 0){ + fprintf(stderr,"Different data in large block %zu (size = %zu (in blocks), busy_size = %zu (in bytes))\n", i, mdp1->heapinfo[i].busy_block.size, mdp1->heapinfo[i].busy_block.busy_size); + return 1; + } + + i = i + mdp1->heapinfo[i].busy_block.size; - if(mdp1->heapinfo[first_block_free].free_block.next != mdp2->heapinfo[first_block_free].free_block.next){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different next block free"); - errors++; }else{ - return 1; - } - } + + if(mdp1->heapinfo[i].type > 0){ /* busy fragmented block */ - block_free = first_block_free; - next_block_free = mdp1->heapinfo[first_block_free].free_block.next; - - if(next_block_free == 0) - next_block_free = mdp1->heaplimit; - - while(i != first_block_free){ - - while(iheapinfo[i].type != mdp2->heapinfo[i].type){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different type of busy block"); - errors++; - }else{ - 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].type){ //FIXME deal with type<0 == free - case 0 : - if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_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_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_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_block.size; - - break; - default : - if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_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{ - return 1; - } - }else{ - if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_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; - } - }else{ - frag_size = pow(2,mdp1->heapinfo[i].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; - } + if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){ + fprintf(stderr,"Different size of fragments in fragmented block %zu : %d - %d\n", i, mdp1->heapinfo[i].type, mdp2->heapinfo[i].type); + return 1; + } - } - } + if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_frag.nfree){ + fprintf(stderr,"Different free fragments in fragmented block %zu : %zu - %zu\n", i, mdp1->heapinfo[i].busy_frag.nfree, mdp2->heapinfo[i].busy_frag.nfree); + return 1; + } + + if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_frag.first){ + fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size); + return 1; + } - if( i != first_block_free){ + for(j=0; j< MAX_FRAGMENT_PER_BLOCK; j++){ - if(mdp1->heapinfo[block_free].free_block.next != mdp2->heapinfo[block_free].free_block.next){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different next block free"); - errors++; - }else{ - return 1; - } - } + if(mdp1->heapinfo[i].busy_frag.frag_size[j] != mdp2->heapinfo[i].busy_frag.frag_size[j]){ + fprintf(stderr,"Different busy_size for fragment %zu in block %zu : %u - %u\n", j, i, mdp1->heapinfo[i].busy_frag.frag_size[j], mdp2->heapinfo[i].busy_frag.frag_size[j]); + return 1; + } - block_free = mdp1->heapinfo[block_free].free_block.next; - next_block_free = mdp1->heapinfo[block_free].free_block.next; - - i = block_free + mdp1->heapinfo[block_free].free_block.size; - - if((next_block_free == 0) && (i != mdp1->heaplimit)){ - - while(i < mdp1->heaplimit){ - - if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){ - if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){ - XBT_DEBUG("Different type of busy block"); - errors++; - }else{ - 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].type){ - case 0 : - if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_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_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_block.size; - - break; - default : - if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_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{ - return 1; - } - }else{ - if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_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; - } - }else{ - frag_size = pow(2,mdp1->heapinfo[i].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; - } - } - } + if(mdp1->heapinfo[i].busy_frag.frag_size[j] > 0){ + + frag_size = pow(2, mdp1->heapinfo[i].type); + addr_frag1 = (char *)addr_block1 + (j * frag_size); + addr_frag2 = (char *)addr_block2 + (j * frag_size); - } + if(memcmp(addr_frag1, addr_frag2, frag_size) != 0){ + fprintf(stderr,"Different data in fragment %zu in block %zu \n", j, i); + return 1; + } + + } + } + + i++; + + }else{ /* free block */ + i++; + + } + } + } - return (errors>0); + + return 0; } -- 2.20.1