/** \brief show the backtrace of the current point (lovely while debuging) */
-void xbt_display_backtrace(void) {
+void xbt_backtrace_display(void) {
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
xbt_ex_t e;
int i;
e.used = backtrace((void**)e.bt,XBT_BACKTRACE_SIZE);
e.bt_strings = NULL;
xbt_ex_setup_backtrace(&e);
- for (i=0; i<e.used; i++)
+ for (i=1; i<e.used; i++) /* no need to display "xbt_display_backtrace" */
fprintf(stderr,"%s\n",e.bt_strings[i]);
e.msg=NULL;
e.remote=0;
- xbt_ex_free(&e);
+ xbt_ex_free(e);
#else
fprintf(stderr,"No backtrace on this arch");
#endif
/* To read the output of addr2line */
FILE *pipe;
char line_func[1024],line_pos[1024];
+
+ /* size (in char) of pointers on this arch */
+ int addr_len=0;
/* build the commandline */
curr += sprintf(curr,"%s -f -e %s ",ADDR2LINE,xbt_binary_name);
/* Add it to the command line args */
curr+=sprintf(curr,"%s ",addrs[i]);
}
-
+ addr_len = strlen(addrs[0]);
+
/* parse the output and build a new backtrace */
e->bt_strings = xbt_new(char*,e->used);
line_pos[strlen(line_pos)-1]='\0';
if (strcmp("??",line_func)) {
- e->bt_strings[i] = bprintf("** At %s: %s (%s)", addrs[i], line_func,line_pos);
+ e->bt_strings[i] = bprintf("** At %s: %s (%s)",
+ addrs[i], line_func,line_pos);
} else {
- char *p=bprintf("%s",backtrace[i]);
- char *pos=strrchr(p,' ');
- *pos = '\0';
- e->bt_strings[i] = bprintf("** At %s: ?? (%s)", addrs[i], p);
+ /* Damn. The symbol is in a dynamic library. Let's get wild */
+ char *maps_name;
+ FILE *maps;
+ char maps_buff[512];
+
+ long int addr,offset,offset_save;
+ char *p,*p2;
+
+ char *subcmd;
+ FILE *subpipe;
+ int found=0;
+
+ /* let's look for the offset of this library in our addressing space */
+ maps_name=bprintf("/proc/%d/maps",(int)getpid());
+ maps=fopen(maps_name,"r");
+
+ addr=strtol(addrs[i]+2, NULL,16);
+
+ while (!found) {
+ if (fgets(maps_buff,512,maps) == NULL)
+ break;
+ offset_save = offset;
+ offset=strtol(maps_buff,NULL,16);
+ if (offset > addr)
+ found=1;
+ }
+
+ fclose(maps);
+ free(maps_name);
+
+ /* Ok, the maps line we just read is beyond the searched symbol. Got it,
+ the symbol is in previous map, which offset is in offset_save.
+ We now need to substract this from the address we got from backtrace.
+ */
+ offset=offset_save;
+
+ free(addrs[i]);
+ addrs[i] = bprintf("0x%0*lx",addr_len-2,addr-offset);
+
+ /* Got it. We have our new address. Let's get the library path and we
+ are set */
+ p = xbt_strdup(backtrace[i]);
+ p2 = strrchr(p,'(');
+ if (p2) *p2= '\0';
+ p2 = strrchr(p,' ');
+ if (p2) *p2= '\0';
+
+ /* Here we go, fire an addr2line up */
+ subcmd = bprintf("%s -f -e %s %s",ADDR2LINE,p, addrs[i]);
free(p);
+ subpipe = popen(subcmd,"r");
+ fgets(line_func,1024,subpipe);
+ line_func[strlen(line_func)-1]='\0';
+ fgets(line_pos,1024,subpipe);
+ line_pos[strlen(line_pos)-1]='\0';
+ pclose(subpipe);
+ free(subcmd);
+
+ /* check whether the trick worked */
+ if (strcmp("??",line_func)) {
+ e->bt_strings[i] = bprintf("** At %s: %s (%s)",
+ addrs[i], line_func,line_pos);
+ } else {
+ /* damn, nothing to do here. Let's print the raw address */
+ p = bprintf("%s",backtrace[i]);
+ p2 = strrchr(p,' ');
+ *p2= '\0';
+ e->bt_strings[i] = bprintf("** At %s: ?? (%s)", addrs[i], p);
+ free(p);
+ }
}
free(addrs[i]);
}
+ pclose(pipe);
free(addrs);
free(backtrace);
free(cmd);
fprintf(stderr," at %s:%d:%s (no backtrace available on that arch)\n",
e->file,e->line,e->func);
#endif
- xbt_ex_free(e);
+ xbt_ex_free(*e);
}
ex_ctx_cb_t __xbt_ex_ctx = &__xbt_ex_ctx_default;
ex_term_cb_t __xbt_ex_terminate = &__xbt_ex_terminate_default;
-void xbt_ex_free(xbt_ex_t *e) {
+void xbt_ex_free(xbt_ex_t e) {
int i;
- if (e->msg) free(e->msg);
- if (e->remote) {
- free(e->procname);
- free(e->file);
- free(e->func);
- free(e->host);
+ if (e.msg) free(e.msg);
+ if (e.remote) {
+ free(e.procname);
+ free(e.file);
+ free(e.func);
+ free(e.host);
}
- if (e->bt_strings) {
- for (i=0; i<e->used; i++)
- free((char*)e->bt_strings[i]);
- free((char **)e->bt_strings);
+ if (e.bt_strings) {
+ for (i=0; i<e.used; i++)
+ free((char*)e.bt_strings[i]);
+ free((char **)e.bt_strings);
}
- memset(e,0,sizeof(xbt_ex_t));
+// memset(e,0,sizeof(xbt_ex_t));
}
/** \brief returns a short name for the given exception category */
if (n != 3)
xbt_test_fail1("M3: n=%d (!= 3)", n);
n++;
- xbt_ex_free(&ex);
+ xbt_ex_free(ex);
}
n++;
TRY {
if (n != 7)
xbt_test_fail1("M4: n=%d (!= 7)", n);
n++;
- xbt_ex_free(&ex);
+ xbt_ex_free(ex);
}
if (n != 8)
xbt_test_fail1("M5: n=%d (!= 8)", n);
xbt_test_fail1("value=%d (!= 2)", ex.value);
if (strcmp(ex.msg,"toto"))
xbt_test_fail1("message=%s (!= toto)", ex.msg);
- xbt_ex_free(&ex);
+ xbt_ex_free(ex);
}
}
/* r2 is allowed to be destroyed because not volatile */
if (v2 != 5678)
xbt_test_fail1("v2=%d (!= 5678)", v2);
- xbt_ex_free(&ex);
+ xbt_ex_free(ex);
}
}
xbt_test_fail1("v1 = %d (!= 5678)", v1);
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg,"blah")))
xbt_test_fail0("unexpected exception contents");
- xbt_ex_free(&ex);
+ xbt_ex_free(ex);
}
if (!c)
xbt_test_fail0("xbt_ex_free not executed");
