Algorithmique Numérique Distribuée Public GIT Repository
 author Marion Guthmuller Fri, 17 Aug 2012 07:55:59 +0000 (09:55 +0200) committer Marion Guthmuller Fri, 17 Aug 2012 07:55:59 +0000 (09:55 +0200)

index 8f7a717..3935b9f 100644 (file)
@@ -118,7 +118,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
heapsize2 = heap2->heapsize;

/* Start comparison */
-  size_t i1, i2, j1, j2, k;
+  size_t i1, i2, j1, j2, k, current_block, current_fragment;

xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
@@ -160,10 +160,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){

i1 = 1;

-  while(i1 < heaplimit){
+  while(i1 <= heaplimit){

-    i2 = 1;
-    equal = 0;
+    current_block = i1;

if(heapinfo1[i1].type == -1){ /* Free block */
i1++;
@@ -174,8 +173,55 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){

if(heapinfo1[i1].type == 0){  /* Large block */

+      if(heapinfo1[i1].busy_block.busy_size == 0){
+        i1++;
+        continue;
+      }
+
+      i2 = 1;
+      equal = 0;
+
+      /* Try first to associate to same block in the other heap */
+      if(heapinfo2[current_block].type == heapinfo1[current_block].type){
+
+        if(heapinfo1[current_block].busy_block.busy_size == heapinfo2[current_block].busy_block.busy_size){
+
+
+          add_heap_area_pair(previous, current_block, -1, current_block, -1);
+
+          if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
+            if(in_mmalloc_ignore((int)current_block, -1))
+            else
+          }else{
+          }
+
+          if(res_compare == 0){
+            for(k=1; k < heapinfo2[current_block].busy_block.size; k++)
+              heapinfo2[current_block+k].busy_block.equal_to = 1 ;
+            for(k=1; k < heapinfo1[current_block].busy_block.size; k++)
+              heapinfo1[current_block+k].busy_block.equal_to = 1 ;
+            equal = 1;
+            match_equals(previous);
+            i1 = i1 + heapinfo1[i1].busy_block.size;
+          }
+
+          xbt_dynar_reset(previous);
+
+        }
+
+      }
+
while(i2 <= heaplimit && !equal){

+        if(i2 == current_block){
+          i2++;
+          continue;
+        }
+
if(heapinfo2[i2].type != 0){
i2++;
continue;
@@ -225,18 +271,54 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){

}

+      if(!equal)
+        i1++;
+
}else{ /* Fragmented block */

for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){

+        current_fragment = j1;
+
if(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */
continue;

-
+
i2 = 1;
equal = 0;

+        /* Try first to associate to same fragment in the other heap */
+        if(heapinfo2[current_block].type == heapinfo1[current_block].type){
+
+          if(heapinfo1[current_block].busy_frag.frag_size[current_fragment] == heapinfo2[current_block].busy_frag.frag_size[current_fragment]){
+
+
+            add_heap_area_pair(previous, current_block, current_fragment, current_block, current_fragment);
+
+            if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
+              if(in_mmalloc_ignore((int)current_block, (int)current_fragment))
+              else
+            }else{
+            }
+
+            if(res_compare == 0){
+              equal = 1;
+              match_equals(previous);
+            }
+
+            xbt_dynar_reset(previous);
+
+          }
+
+        }
+
+
while(i2 <= heaplimit && !equal){

if(heapinfo2[i2].type <= 0){
@@ -246,13 +328,14 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){

for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){

-            if(heapinfo2[i2].busy_frag.equal_to[j2] == 1){
+            if(heapinfo2[i2].type == heapinfo1[i1].type && i2 == current_block && j2 == current_fragment)
+              continue;
+
+            if(heapinfo2[i2].busy_frag.equal_to[j2] == 1)
continue;
-            }

-            if(heapinfo1[i1].busy_frag.frag_size[j1] != heapinfo2[i2].busy_frag.frag_size[j2]){ /* Different size_used */
+            if(heapinfo1[i1].busy_frag.frag_size[j1] != heapinfo2[i2].busy_frag.frag_size[j2]) /* Different size_used */
continue;
-            }

@@ -286,10 +369,10 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){

}

+      i1++;
+
}

-    i1++;
-
}

/* All blocks/fragments are equal to another block/fragment ? */
@@ -491,7 +574,7 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ

}else{ /* Fragmented block */

-           /* Get pointed fragments number */
+          /* Get pointed fragments number */