From 67d9420f78fbf068e11d3f575ebd59a995aeefee Mon Sep 17 00:00:00 2001
From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Sat, 7 Jul 2012 21:38:02 +0200
Subject: [PATCH] model-checker : remove unused function

---
 include/xbt/mmalloc.h     |  4 ---
 src/mc/mc_global.c        |  2 +-
 src/xbt/mmalloc/mm_diff.c | 61 +++++----------------------------------
 3 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index 93ba1f582a..3108a4fd26 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -52,16 +52,12 @@ extern void *xbt_mheap_destroy(xbt_mheap_t md);
 /* return the heap used when NULL is passed as first argument to any mm* function */
 extern xbt_mheap_t mmalloc_get_default_md(void);
 
-extern void mmalloc_display_info_heap(xbt_mheap_t h);
-
 /* To change the heap used when using the legacy version malloc/free/realloc and such */
 void mmalloc_set_current_heap(xbt_mheap_t new_heap);
 xbt_mheap_t mmalloc_get_current_heap(void);
 
 int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2);
 
-void mmalloc_backtrace_display(xbt_mheap_t mdp, void *addr);
-
 void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block);
 
 void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag);
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 476c4d452f..ad54b842ad 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -131,6 +131,7 @@ void MC_init_safety(void)
   MC_take_snapshot(initial_snapshot);
   MC_UNSET_RAW_MEM;
 
+
   if(raw_mem_set)
     MC_SET_RAW_MEM;
   else
@@ -599,7 +600,6 @@ void MC_diff(void){
     switch(sn->regions[i]->type){
     case 0: /* heap */
       XBT_INFO("Size of heap : %zu", sn->regions[i]->size);
-      mmalloc_display_info_heap(sn->regions[i]->data);
       break;
     case 1 : /* libsimgrid */
       XBT_INFO("Size of libsimgrid : %zu", sn->regions[i]->size);
diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 6fc74ec557..fe69f23ef7 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -14,65 +14,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
 
 extern char *xbt_binary_name;
 
-void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
-  size_t block = BLOCK(ptr);
-  int type;
-  xbt_ex_t e;
-
-  if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) {
-    fprintf(stderr,"Ouch, this pointer is not mine. I cannot display its backtrace. I refuse it to death!!\n");
-    abort();
-  }
-
-  type = mdp->heapinfo[block].type;
-
-  if (type != 0) {
-    //fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
-    return;
-  }
-  if (mdp->heapinfo[block].busy_block.bt_size == 0) {
-    fprintf(stderr,"No backtrace available for that block, sorry.\n");
-    return;
-  }
-
-  memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
-  e.used = mdp->heapinfo[block].busy_block.bt_size;
-
-  xbt_ex_setup_backtrace(&e);
-  if (e.used == 0) {
-    fprintf(stderr, "(backtrace not set)\n");
-  } else if (e.bt_strings == NULL) {
-    fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
-  } else {
-    int i;
-
-    fprintf(stderr, "Backtrace of where the block %p was malloced (%d frames):\n",ptr,e.used);
-    for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
-      fprintf(stderr,"%d",i);fflush(NULL);
-      fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
-    }
-  }
-}
-
-
-void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block){
+void mmalloc_backtrace_block_display(xbt_mheap_t heap, size_t block){
 
   int type;
   xbt_ex_t e;
 
-  type = mdp->heapinfo[block].type;
+  type = heap->heapinfo[block].type;
 
   if (type != 0) {
     fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
     return;
   }
-  if (mdp->heapinfo[block].busy_block.bt_size == 0) {
+  if (heap->heapinfo[block].busy_block.bt_size == 0) {
     fprintf(stderr,"No backtrace available for that block, sorry.\n");
     return;
   }
 
-  memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
-  e.used = mdp->heapinfo[block].busy_block.bt_size;
+  memcpy(&e.bt,&(heap->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
+  e.used = heap->heapinfo[block].busy_block.bt_size;
 
   xbt_ex_setup_backtrace(&e);
   if (e.used == 0) {
@@ -141,7 +100,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
   void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
 
   size_t i, j;
-  void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
+  void *addr_block1 = NULL, *addr_block2 = NULL, *addr_frag1 = NULL, *addr_frag2 = NULL;
   size_t frag_size;
 
   i = 1;
@@ -151,7 +110,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
   int total_distance = 0;
 
   int pointer_align;
-  void *address_pointed1, *address_pointed2;
+  void *address_pointed1 = NULL, *address_pointed2 = NULL;
 
   int block_pointed1, block_pointed2, frag_pointed1, frag_pointed2;
   void *addr_block_pointed1 = NULL, *addr_block_pointed2 = NULL, *addr_frag_pointed1 = NULL, *addr_frag_pointed2 = NULL;
@@ -606,9 +565,3 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 
 
 
-void mmalloc_display_info_heap(xbt_mheap_t h){
-
-}
-
-
-
-- 
2.20.1