From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Mon, 11 Jun 2012 13:34:10 +0000 (+0200)
Subject: model-checker : remove useless memcmp in heap comparison algorithm
X-Git-Tag: v3_8~643
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/efeea455e4864b202dd362d944175ec5fb2b2b04?ds=sidebyside

model-checker : remove useless memcmp in heap comparison algorithm
---

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index faf89a91fe..1700835fda 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -245,75 +245,73 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 	errors++;
       } 
 
-      //if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.size * BLOCKSIZE)) != 0){
-      if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.busy_size)) != 0){
-
-	/* Hamming distance on different blocks */
-	distance = 0;
-	//for(k=0;k<mdp1->heapinfo[i].busy_block.size * BLOCKSIZE;k++){
-	for(k=0;k<mdp1->heapinfo[i].busy_block.busy_size;k++){
-	  if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 0){
-	    //fprintf(stderr, "Different byte (offset=%d) (%p - %p) in block %zu\n", k, (char *)addr_block1 + k, (char *)addr_block2 + k, i); fflush(NULL);
-	    pointer_align = (k / sizeof(void*)) * sizeof(void*); 
-	    address_pointed1 = *((void **)((char *)addr_block1 + pointer_align));
-	    address_pointed2 = *((void **)((char *)addr_block2 + pointer_align));				   
-	    if(((address_pointed1 > s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > s_heap) && (address_pointed2 < end_heap))){
-	      block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
-	      block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
-	      //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
-	      if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
-		if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
-		  while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
-		    block_pointed1--;
-		  while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
-		    block_pointed2--;
-		  if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
-		    addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
-		    addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-		    fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_block.busy_size); 
-		    if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
-		      distance++;
-		    }else{
-		      fprintf(stderr, "False difference detected\n");
-		    }
-		  }else{
-		    distance++;
-		  }
-		}else{ // Fragmented block
-		  frag_size_pointed = pow(2, mdp1->heapinfo[block_pointed1].type);
-		  address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
-		  address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
+  
+      /* Hamming distance on different blocks */
+      distance = 0;
+
+      //for(k=0;k<mdp1->heapinfo[i].busy_block.size * BLOCKSIZE;k++){
+      for(k=0;k<mdp1->heapinfo[i].busy_block.busy_size;k++){
+	if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 0){
+	  //fprintf(stderr, "Different byte (offset=%d) (%p - %p) in block %zu\n", k, (char *)addr_block1 + k, (char *)addr_block2 + k, i); fflush(NULL);
+	  pointer_align = (k / sizeof(void*)) * sizeof(void*); 
+	  address_pointed1 = *((void **)((char *)addr_block1 + pointer_align));
+	  address_pointed2 = *((void **)((char *)addr_block2 + pointer_align));				   
+	  if(((address_pointed1 > s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > s_heap) && (address_pointed2 < end_heap))){
+	    block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+	    block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+	    //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
+	    if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+	      if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+		while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
+		  block_pointed1--;
+		while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
+		  block_pointed2--;
+		if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
 		  addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
 		  addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-		  frag_pointed1 = 1;
-		  while(address_pointed1 > (void*)((char*)addr_block_pointed1 + (frag_pointed1 * frag_size))){
-		    frag_pointed1++;
-		  }
-		  frag_pointed2 = 1;
-		  while(address_pointed2 > (void*)((char*)addr_block_pointed2 + (frag_pointed2 * frag_size))){
-		    frag_pointed2++;
+		  fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_block.busy_size); 
+		  if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
+		    distance++;
+		  }else{
+		    fprintf(stderr, "False difference detected\n");
 		  }
-		  if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
-		    fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
-		    if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
-		      distance++;
-		    }else{
-		      fprintf(stderr, "False difference detected\n");
-		    }
+		}else{
+		  distance++;
+		}
+	      }else{ // Fragmented block
+		frag_size_pointed = pow(2, mdp1->heapinfo[block_pointed1].type);
+		address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
+		address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
+		addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
+		addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
+		frag_pointed1 = 0;
+		while(address_pointed1 > (void*)((char*)addr_block_pointed1 + ((frag_pointed1 +1 ) * frag_size))){
+		  frag_pointed1++;
+		}
+		frag_pointed2 = 0;
+		while(address_pointed2 > (void*)((char*)addr_block_pointed2 + ((frag_pointed2 +1) * frag_size))){
+		  frag_pointed2++;
+		}
+		if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+		  fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
+		  if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+		    distance++;
 		  }else{
-		    distance ++;
+		    fprintf(stderr, "False difference detected\n");
 		  }
+		}else{
+		  distance ++;
+		}
 		  
 		  
-		}
-	      }else{
-		distance++;
 	      }
 	    }else{
 	      distance++;
 	    }
-	    
+	  }else{
+	    distance++;
 	  }
+	    
 	}
 
 	if(distance>0){
@@ -363,70 +361,68 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 	    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){
-	    if(memcmp(addr_frag1, addr_frag2, mdp1->heapinfo[i].busy_frag.frag_size[j]) != 0){
-	      /* Hamming distance on different blocks */
-	      distance = 0;
-	      //for(k=0;k<frag_size;k++){
-	      for(k=0;k<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
-		if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){
-		  //fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); fflush(NULL);
-		  pointer_align = (k / sizeof(void*)) * sizeof(void*);
-		  address_pointed1 = *((void **)((char *)addr_frag1 + pointer_align));
-		  address_pointed2 = *((void **)((char *)addr_frag2 + pointer_align));				   
-		  if(((address_pointed1 > s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > s_heap) && (address_pointed2 < end_heap))){
-		    block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
-		    block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
-		    //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
-		    if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
-		      if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
-			while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
-			  block_pointed1--;
-			while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
-			  block_pointed2--;
-			if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
-			  addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
-			  addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-			  fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_block.busy_size); 
-			  if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
-			    distance++;
-			  }else{
-			    fprintf(stderr, "False difference detected\n");
-			  }
-			}else{
-			  distance++;
-			}
-		      }else{ // Fragmented block
-			frag_size_pointed = pow(2, mdp1->heapinfo[block_pointed1].type);
-			address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
-			address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
+
+	    /* Hamming distance on different blocks */
+	    distance = 0;
+	    //for(k=0;k<frag_size;k++){
+	    for(k=0;k<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
+	      if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){
+		//fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); fflush(NULL);
+		pointer_align = (k / sizeof(void*)) * sizeof(void*);
+		address_pointed1 = *((void **)((char *)addr_frag1 + pointer_align));
+		address_pointed2 = *((void **)((char *)addr_frag2 + pointer_align));				   
+		if(((address_pointed1 > s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > s_heap) && (address_pointed2 < end_heap))){
+		  block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+		  block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+		  //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
+		  if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+		    if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+		      while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
+			block_pointed1--;
+		      while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
+			block_pointed2--;
+		      if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
 			addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
 			addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-			frag_pointed1 = 1;
-			while(address_pointed1 > (void*)((char*)addr_block_pointed1 + (frag_pointed1 * frag_size))){
-			  frag_pointed1++;
-			}
-			frag_pointed2 = 1;
-			while(address_pointed2 > (void*)((char*)addr_block_pointed2 + (frag_pointed2 * frag_size))){
-			  frag_pointed2++;
+			fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_block.busy_size); 
+			if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
+			  distance++;
+			}else{
+			  fprintf(stderr, "False difference detected\n");
 			}
-			if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
-			   fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
-			  if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
-			    distance++;
-			  }else{
-			    fprintf(stderr, "False difference detected\n");
-			  }
+		      }else{
+			distance++;
+		      }
+		    }else{ // Fragmented block
+		      frag_size_pointed = pow(2, mdp1->heapinfo[block_pointed1].type);
+		      address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
+		      address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
+		      addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
+		      addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
+		      frag_pointed1 = 0;
+		      while(address_pointed1 > (void*)((char*)addr_block_pointed1 + ((frag_pointed1 + 1) * frag_size))){
+			frag_pointed1++;
+		      }
+		      frag_pointed2 = 0;
+		      while(address_pointed2 > (void*)((char*)addr_block_pointed2 + ((frag_pointed2 + 1) * frag_size))){
+			frag_pointed2++;
+		      }
+		      if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+			fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
+			if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+			  distance++;
 			}else{
-			  distance ++;
+			  fprintf(stderr, "False difference detected\n");
 			}
+		      }else{
+			distance ++;
 		      }
-		    }else{
-		      distance++;
 		    }
 		  }else{
 		    distance++;
 		  }
+		}else{
+		  distance++;
 		}
 	      }