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
Add useful gnets headers to the dist.
[simgrid.git]
/
src
/
xbt
/
backtrace_linux.c
diff --git
a/src/xbt/backtrace_linux.c
b/src/xbt/backtrace_linux.c
index 1bec9b22236bc2b58071b33de825f6860dfd635e..d4aa200ee18eac5ccf60b79e309633c0706ca578 100644
(file)
--- a/
src/xbt/backtrace_linux.c
+++ b/
src/xbt/backtrace_linux.c
@@
-19,7
+19,7
@@
void xbt_backtrace_current(xbt_ex_t * e) {
e->used = backtrace((void **) e->bt, XBT_BACKTRACE_SIZE);
}
e->used = backtrace((void **) e->bt, XBT_BACKTRACE_SIZE);
}
-
+
void xbt_ex_setup_backtrace(xbt_ex_t * e)
{
int i;
void xbt_ex_setup_backtrace(xbt_ex_t * e)
{
int i;
@@
-44,12
+44,12
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e)
/* To search for the right executable path when not trivial */
struct stat stat_buf;
char *binary_name = NULL;
/* To search for the right executable path when not trivial */
struct stat stat_buf;
char *binary_name = NULL;
-
+
xbt_assert0(e && e->used,"Backtrace not setup yet, cannot set it up for display");
xbt_assert0(e && e->used,"Backtrace not setup yet, cannot set it up for display");
-
+
backtrace_syms = backtrace_symbols(e->bt, e->used);
addrs = xbt_new(char *, e->used);
backtrace_syms = backtrace_symbols(e->bt, e->used);
addrs = xbt_new(char *, e->used);
-
+
e->bt_strings = NULL;
/* Some arches only have stubs of backtrace, no implementation (hppa comes to mind) */
e->bt_strings = NULL;
/* Some arches only have stubs of backtrace, no implementation (hppa comes to mind) */
@@
-130,10
+130,15
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e)
}
for (i = 0; i < e->used; i++) {
}
for (i = 0; i < e->used; i++) {
+ char *fgets_res;
DEBUG2("Looking for symbol %d, addr = '%s'", i, addrs[i]);
DEBUG2("Looking for symbol %d, addr = '%s'", i, addrs[i]);
- fgets(line_func, 1024, pipe);
+ fgets_res = fgets(line_func, 1024, pipe);
+ if (fgets_res == NULL)
+ THROW2(system_error,0, "Cannot run fgets to look for symbol %d, addr %s",i, addrs[i]);
line_func[strlen(line_func) - 1] = '\0';
line_func[strlen(line_func) - 1] = '\0';
- fgets(line_pos, 1024, pipe);
+ fgets_res = fgets(line_pos, 1024, pipe);
+ if (fgets_res == NULL)
+ THROW2(system_error,0, "Cannot run fgets to look for symbol %d, addr %s",i, addrs[i]);
line_pos[strlen(line_pos) - 1] = '\0';
if (strcmp("??", line_func)) {
line_pos[strlen(line_pos) - 1] = '\0';
if (strcmp("??", line_func)) {
@@
-184,7
+189,7
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e)
if (found) {
DEBUG3("%#lx in [%#lx-%#lx]", addr, first, last);
DEBUG0
if (found) {
DEBUG3("%#lx in [%#lx-%#lx]", addr, first, last);
DEBUG0
-
("Symbol found, map lines not further displayed (even if looking for next ones)");
+ ("Symbol found, map lines not further displayed (even if looking for next ones)");
}
}
fclose(maps);
}
}
fclose(maps);
@@
-192,13
+197,13
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e)
if (!found) {
VERB0
if (!found) {
VERB0
-
("Problem while reading the maps file. Following backtrace will be mangled.");
+ ("Problem while reading the maps file. Following backtrace will be mangled.");
DEBUG1("No dynamic. Static symbol: %s", backtrace_syms[i]);
e->bt_strings[i] = bprintf("** In ?? (%s)", backtrace_syms[i]);
continue;
}
DEBUG1("No dynamic. Static symbol: %s", backtrace_syms[i]);
e->bt_strings[i] = bprintf("** In ?? (%s)", backtrace_syms[i]);
continue;
}
- /* Ok, Found the offset of the maps line containing the searched symbol.
+ /* Ok, Found the offset of the maps line containing the searched symbol.
We now need to substract this from the address we got from backtrace.
*/
We now need to substract this from the address we got from backtrace.
*/
@@
-206,7
+211,7
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e)
addrs[i] = bprintf("0x%0*lx", addr_len - 2, addr - offset);
DEBUG2("offset=%#lx new addr=%s", offset, addrs[i]);
addrs[i] = bprintf("0x%0*lx", addr_len - 2, addr - offset);
DEBUG2("offset=%#lx new addr=%s", offset, addrs[i]);
- /* Got it. We have our new address. Let's get the library path and we
+ /* Got it. We have our new address. Let's get the library path and we
are set */
p = xbt_strdup(backtrace_syms[i]);
if (p[0] == '[') {
are set */
p = xbt_strdup(backtrace_syms[i]);
if (p[0] == '[') {
@@
-230,9
+235,13
@@
void xbt_ex_setup_backtrace(xbt_ex_t * e)
CRITICAL0("Cannot fork addr2line to display the backtrace");
abort();
}
CRITICAL0("Cannot fork addr2line to display the backtrace");
abort();
}
- fgets(line_func, 1024, subpipe);
+ fgets_res=fgets(line_func, 1024, subpipe);
+ if (fgets_res == NULL)
+ THROW1(system_error,0, "Cannot read result of subcommand %s",subcmd);
line_func[strlen(line_func) - 1] = '\0';
line_func[strlen(line_func) - 1] = '\0';
- fgets(line_pos, 1024, subpipe);
+ fgets_res = fgets(line_pos, 1024, subpipe);
+ if (fgets_res == NULL)
+ THROW1(system_error,0, "Cannot read result of subcommand %s",subcmd);
line_pos[strlen(line_pos) - 1] = '\0';
pclose(subpipe);
free(subcmd);
line_pos[strlen(line_pos) - 1] = '\0';
pclose(subpipe);
free(subcmd);