A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Some typos in source code
[simgrid.git]
/
src
/
xbt
/
backtrace_linux.c
diff --git
a/src/xbt/backtrace_linux.c
b/src/xbt/backtrace_linux.c
index
ce4d0d3
..
084e668
100644
(file)
--- a/
src/xbt/backtrace_linux.c
+++ b/
src/xbt/backtrace_linux.c
@@
-74,10
+74,10
@@
void xbt_backtrace_current(xbt_ex_t * e)
{
e->used = backtrace((void **) e->bt, XBT_BACKTRACE_SIZE);
if (e->used == 0) {
- fprintf(stderr, "The backtrace() function failed, which probably means that the memory is exhausted. Here is a crude dump of the exception that I was trying to build:");
- fprintf(stderr, "%s:%s(%d) [%s:%d] %s", e->host,e->procname,e->pid, e->file,e->line,e->msg);
- fprintf(stderr, "Bailing out now since there is nothing I can do without a decent amount of memory. Please go fix the memleaks\n");
-
exit(1
);
+ XBT_DEBUG("The backtrace() function failed.\n"
+ "Here is a crude dump of the exception that I was trying to build:\n"
+ "%s:%s(%d) [%s:%d] %s",
+
e->host, e->procname, e->pid, e->file, e->line, e->msg
);
}
}
@@
-94,7
+94,7
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
/* to extract the addresses from the backtrace */
char **addrs;
- char buff[256]
, *p
;
+ char buff[256];
/* To read the output of addr2line */
FILE *pipe;
@@
-107,30
+107,25
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
struct stat stat_buf;
char *binary_name = NULL;
- xbt_assert(e
- && e->used,
- "Backtrace not setup yet, cannot set it up for display");
+ xbt_assert(e, "Backtrace not setup yet, cannot set it up for display");
e->bt_strings = NULL;
if (!xbt_binary_name) /* no binary name, nothing to do */
return;
- backtrace_syms = backtrace_symbols(e->bt, e->used);
- /* ignore first one, which is this xbt_backtrace_current() */
- e->used--;
- memmove(backtrace_syms, backtrace_syms + 1, sizeof(char *) * e->used);
+ if (e->used <= 1)
+ return;
+ /* ignore first one, which is xbt_backtrace_current() */
+ e->used--;
+ memmove(e->bt, e->bt + 1, (sizeof *e->bt) * e->used);
- /* Some arches only have stubs of backtrace, no implementation (hppa comes to mind) */
- if (!e->used)
- return;
+ backtrace_syms = backtrace_symbols(e->bt, e->used);
/* build the commandline */
if (stat(xbt_binary_name, &stat_buf)) {
/* Damn. binary not in current dir. We'll have to dig the PATH to find it */
- int i;
-
for (i = 0; environ[i]; i++) {
if (!strncmp("PATH=", environ[i], 5)) {
xbt_dynar_t path = xbt_str_split(environ[i] + 5, ":");
@@
-173,6
+168,7
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
addrs = xbt_new(char *, e->used);
for (i = 0; i < e->used; i++) {
+ char *p;
/* retrieve this address */
XBT_DEBUG("Retrieving address number %d from '%s'", i, backtrace_syms[i]);
snprintf(buff, 256, "%s", strchr(backtrace_syms[i], '[') + 1);