From: Gabriel Corona Date: Wed, 16 Mar 2016 09:02:49 +0000 (+0100) Subject: [mc] Remove commented-out/disabled code in mc_diff.cpp X-Git-Tag: v3_13~408 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ab13baf57930dc53a3398d59ba6cdb08d515b850?hp=b193c425928081a5534a14fb22501b24f7aac48a [mc] Remove commented-out/disabled code in mc_diff.cpp --- diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index 2a15fe2b21..fb5c0d3b7d 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -1387,201 +1387,5 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, s return 0; } -/*********************************************** Miscellaneous ***************************************************/ -/****************************************************************************************************************/ - -// Not used and broken code: -# if 0 - -// Not used: -static int get_pointed_area_size(void *area, int heap) -{ - - struct s_mc_diff *state = mc_diff_info; - - int block, frag; - malloc_info *heapinfo; - - if (heap == 1) - heapinfo = state->heapinfo1; - else - heapinfo = state->heapinfo2; - - block = - ((char *) area - - (char *) state->std_heap_copy.heapbase) / BLOCKSIZE + 1; - - if (((char *) area < (char *) state->std_heap_copy.heapbase) - || (block > state->heapsize1) || (block < 1)) - return -1; - - if (heapinfo[block].type == MMALLOC_TYPE_FREE || heapinfo[block].type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ - return -1; - else if (heapinfo[block].type == MMALLOC_TYPE_UNFRAGMENTED) /* Complete block */ - return (int) heapinfo[block].busy_block.busy_size; - else - frag = - ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type; - return (int) heapinfo[block].busy_frag.frag_size[frag]; - -} - -#ifndef max -#define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) -#endif - -// Not used: -int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) -{ - - struct s_mc_diff *state = mc_diff_info; - - if (heap1 == nullptr && heap1 == NULL) { - XBT_DEBUG("Malloc descriptors null"); - return 0; - } - - if (heap1->heaplimit != heap2->heaplimit) { - XBT_DEBUG("Different limit of valid info table indices"); - return 1; - } - - /* Heap information */ - state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - - state->std_heap_copy = *mc_model_checker->process().get_heap(); - - state->heapbase1 = (char *) heap1 + BLOCKSIZE; - state->heapbase2 = (char *) heap2 + BLOCKSIZE; - - state->heapinfo1 = - (malloc_info *) ((char *) heap1 + - ((uintptr_t) - ((char *) heap1->heapinfo - (char *) state->s_heap))); - state->heapinfo2 = - (malloc_info *) ((char *) heap2 + - ((uintptr_t) - ((char *) heap2->heapinfo - (char *) state->s_heap))); - - state->heapsize1 = heap1->heapsize; - state->heapsize2 = heap2->heapsize; - - /* Start comparison */ - size_t i, j, k; - void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; - - int distance = 0; - - /* Check busy blocks */ - - i = 1; - - while (i <= state->heaplimit) { - - addr_block1 = - ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + - (char *) state->heapbase1)); - addr_block2 = - ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + - (char *) state->heapbase2)); - - if (state->heapinfo1[i].type != state->heapinfo2[i].type) { - - distance += BLOCKSIZE; - XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, - state->heapinfo1[i].type, state->heapinfo2[i].type, distance); - i++; - - } else { - - if (state->heapinfo1[i].type == MMALLOC_TYPE_FREE - || state->heapinfo1[i].type == MMALLOC_TYPE_HAPINFO) { /* Free block */ - i++; - continue; - } - - if (state->heapinfo1[i].type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ - - if (state->heapinfo1[i].busy_block.size != - state->heapinfo2[i].busy_block.size) { - distance += - BLOCKSIZE * max(state->heapinfo1[i].busy_block.size, - state->heapinfo2[i].busy_block.size); - i += max(state->heapinfo1[i].busy_block.size, - state->heapinfo2[i].busy_block.size); - XBT_DEBUG - ("Different larger of cluster at block %zu : %zu - %zu -> distance = %d", - i, state->heapinfo1[i].busy_block.size, - state->heapinfo2[i].busy_block.size, distance); - continue; - } - - /*if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){ - distance += max(heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size); - i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); - XBT_DEBUG("Different size used oin large cluster at block %zu : %zu - %zu -> distance = %d", i, heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size, distance); - continue; - } */ - - k = 0; - - //while(k < (heapinfo1[i].busy_block.busy_size)){ - while (k < state->heapinfo1[i].busy_block.size * BLOCKSIZE) { - if (memcmp((char *) addr_block1 + k, (char *) addr_block2 + k, 1) != - 0) { - distance++; - } - k++; - } - - i++; - - } else { /* Fragmented block */ - - for (j = 0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++) { - - addr_frag1 = - (void *) ((char *) addr_block1 + (j << state->heapinfo1[i].type)); - addr_frag2 = - (void *) ((char *) addr_block2 + (j << state->heapinfo2[i].type)); - - if (state->heapinfo1[i].busy_frag.frag_size[j] == 0 - && state->heapinfo2[i].busy_frag.frag_size[j] == 0) { - continue; - } - - - /*if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){ - distance += max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]); - XBT_DEBUG("Different size used in fragment %zu in block %zu : %d - %d -> distance = %d", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j], distance); - continue; - } */ - - k = 0; - - //while(k < max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j])){ - while (k < (BLOCKSIZE / (BLOCKSIZE >> state->heapinfo1[i].type))) { - if (memcmp((char *) addr_frag1 + k, (char *) addr_frag2 + k, 1) != - 0) { - distance++; - } - k++; - } - - } - - i++; - - } - - } - - } - - return distance; - -} -#endif - } }