* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/ex_interface.h" /* internals of backtrace setup */
+#include "xbt/str.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
"Logging specific to mm_diff in mmalloc");
return 1;
}*/
-
size_t i, j;
void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
size_t frag_size;
int distance = 0;
int pointer_align;
+ char *pointed_address1 = NULL, *pointed_address2 = NULL;
+
/* Check busy blocks*/
- while(i < mdp1->heapindex){
+ while(i < mdp1->heaplimit){
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);
errors++;
}
- addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + (i * BLOCKSIZE);
- addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + (i * BLOCKSIZE);
+ addr_block1 = (char *)mdp1 + mdp1->headersize + ((i-1) * BLOCKSIZE);
+ addr_block2 = (char *)mdp2 + mdp2->headersize + ((i-1) * BLOCKSIZE);
if(mdp1->heapinfo[i].type == 0){ /* busy large block */
errors++;
}
+ //if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.size)) != 0){
if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.busy_size)) != 0){
fprintf(stderr,"\nDifferent 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);
/* Hamming distance on different blocks */
distance = 0;
+ //for(k=0;k<mdp1->heapinfo[i].busy_block.size;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);
distance++;
pointer_align = (k / sizeof(void*)) * sizeof(void*);
- fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_block1 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_block1 + pointer_align)), s_heap, r_heap), *((void **)((char *)addr_block2 + pointer_align)),get_addr_memory_map(*((void **)((char *)addr_block2 + pointer_align)), s_heap, r_heap) );
+ pointed_address1 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_block1 + pointer_align)), s_heap, r_heap));
+ pointed_address2 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_block2 + pointer_align)), s_heap, r_heap));
+ fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_block1 + pointer_align)), pointed_address1, *((void **)((char *)addr_block2 + pointer_align)), pointed_address2);
+ if((strcmp(pointed_address1, pointed_address2) == 0) && (strcmp(pointed_address1, "std_heap") == 0)){
+ /* FIXME : compare value pointed thanks to DWARF */
+ }
}
}
errors++;
}
-
- i = i + mdp1->heapinfo[i].busy_block.size;
+ if( mdp1->heapinfo[i].busy_block.size == 0)
+ i = i + 1;
+ else
+ i = i + mdp1->heapinfo[i].busy_block.size;
}else{
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){
fprintf(stderr,"\nDifferent data in fragment %zu (size = %zu, size used = %hu) in block %zu \n", j, frag_size, mdp1->heapinfo[i].busy_frag.frag_size[j], i);
/* 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);
distance++;
pointer_align = (k / sizeof(void*)) * sizeof(void*);
- fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_frag1 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_frag1 + pointer_align)), s_heap, r_heap), *((void **)((char *)addr_frag2 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_frag2 + pointer_align)), s_heap, r_heap));
+ pointed_address1 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_frag1 + pointer_align)), s_heap, r_heap));
+ pointed_address2 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_frag2 + pointer_align)), s_heap, r_heap));
+ fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_frag1 + pointer_align)), pointed_address1, *((void **)((char *)addr_frag2 + pointer_align)), pointed_address2);
+ if((strcmp(pointed_address1, pointed_address2) == 0) && (strcmp(pointed_address1, "std_heap") == 0)){
+ /* FIXME : compare value pointed thanks to DWARF */
+ }
}
}
}
+ free(pointed_address1);
+ free(pointed_address2);
return (errors);
}
if(fp == NULL)
perror("fopen failed");
- if(addr == NULL)
+ if(addr == NULL){
+ free(line);
+ fclose(fp);
return "nil";
+ }
- char *lfields[6], *start, *end, *endptr;
- int i;
+ xbt_dynar_t lfields = NULL;
+ xbt_dynar_t start_end = NULL;
void *start_addr;
void *end_addr;
while ((read = getline(&line, &n, fp)) != -1) {
- line[read - 1] = '\0';
+ xbt_str_trim(line, NULL);
+ xbt_str_strip_spaces(line);
+ lfields = xbt_str_split(line,NULL);
- lfields[0] = strtok(line, " ");
+ start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-");
+ start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16);
+ end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16);
- for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) {
- lfields[i] = strtok(NULL, " ");
- }
-
- start = strtok(lfields[0], "-");
- start_addr = (void *) strtoul(start, &endptr, 16);
-
- if(start_addr == s_heap)
- lfields[5] = strdup("std_heap");
- if(start_addr == r_heap)
- lfields[5] = strdup("raw_heap");
- end = strtok(NULL, "-");
- end_addr = (void *) strtoul(end, &endptr, 16);
-
if((addr > start_addr) && ( addr < end_addr)){
free(line);
fclose(fp);
- if(lfields[5] != NULL){
- return lfields[5];
- }else{
+ if(start_addr == s_heap)
+ return "std_heap";
+ if(start_addr == r_heap)
+ return "raw_heap";
+ if(xbt_dynar_length(lfields) == 6)
+ return xbt_dynar_get_as(lfields, xbt_dynar_length(lfields) - 1, char*);
+ else
return "Anonymous";
- }
}
-
+
}
+ free(line);
+ fclose(fp);
return "Unknown area";
}
