From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Thu, 18 Oct 2012 19:13:39 +0000 (+0200)
Subject: model-checker : remove instruction pointer offset for local variables comparison
X-Git-Tag: v3_9_rc1~91^2~180
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f0caab39332af0b46570a9be4ec17a1dceefc229

model-checker : remove instruction pointer offset for local variables comparison
---

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 5384c3893f..47d1be9239 100644
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -365,7 +365,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap)
   int ret;
   //char *stack_name;
 
-  char buf[512], frame_name[256];
+  char frame_name[256];
   
   ret = unw_init_local(&c, (unw_context_t *)stack_context);
   if(ret < 0){
@@ -397,16 +397,9 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap)
     unw_get_reg(&c, UNW_REG_IP, &ip);
     unw_get_reg(&c, UNW_REG_SP, &sp);
 
-    buf[0] = '\0';
-    if (unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off) == 0){
-      if (off)
-        snprintf (buf, sizeof (buf), "<%s+0x%lx>", frame_name, (long) off);
-      else
-        snprintf (buf, sizeof (buf), "<%s>", frame_name);
+    unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off);
 
-    }
-
-    xbt_strbuff_append(variables, bprintf("ip=%-32s\n", buf));
+    xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
 
     frame = xbt_dict_get_or_null(mc_local_variables, frame_name);