diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2010-11-13 22:47:47 +0100 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2010-11-13 22:47:47 +0100 |
| commit | 7f6615a37df0dadbe86fdfc980e0a8a15013a80e (patch) | |
| tree | a292e5daa99c0a14f9bcce22b6024d5eb483d478 | |
| parent | c91d17b3d5e11e5e5c08a60abb8a1d14e49480a2 (diff) | |
Move the generate backtrace call from MSGB_ABORT to osmo_panic handler
This has two benefits:
- All people calling osmo_panic() will have the backtrace
- It makes the thing build in 'target' mode in osmocom-bb
And one downside:
- The osmo_panic handler is now in the backtrace
(I can live with that :)
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
| -rw-r--r-- | include/osmocore/msgb.h | 2 | ||||
| -rw-r--r-- | src/panic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/osmocore/msgb.h b/include/osmocore/msgb.h index 44c59cd6..6fd24c7f 100644 --- a/include/osmocore/msgb.h +++ b/include/osmocore/msgb.h @@ -62,9 +62,7 @@ extern void msgb_reset(struct msgb *m); #ifdef MSGB_DEBUG #include <osmocore/panic.h> -#include <osmocore/gsm_utils.h> #define MSGB_ABORT(msg, fmt, args ...) do { \ - generate_backtrace(); \ osmo_panic("msgb(%p): " fmt, msg, ## args); \ } while(0) #else diff --git a/src/panic.c b/src/panic.c index 0c0a9204..5fb7b565 100644 --- a/src/panic.c +++ b/src/panic.c @@ -20,6 +20,7 @@ * */ +#include <osmocore/gsm_utils.h> #include <osmocore/panic.h> #include "../config.h" @@ -36,6 +37,7 @@ static osmo_panic_handler_t osmo_panic_handler = (void*)0; static void osmo_panic_default(const char *fmt, va_list args) { vfprintf(stderr, fmt, args); + generate_backtrace(); abort(); } |