diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 17:55:07 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-02-23 17:40:46 +0100 |
| commit | 685816f97f57ba904e12827f48695d096a581a67 (patch) | |
| tree | a025abefaeb2f086580358e2511d42a2bbd11062 | |
| parent | 2181d644bc0aec6853778aa9aa8e2398c1a58ff1 (diff) | |
stp: generate coredump and exit upon SIGABRT received
Previous code relied on abort() switching sigaction to SIG_FDL +
retriggering SIGABRT in case the signal handler returns, which would
then generate the coredump + terminate the process.
However, if a SIGABRT is received from somewhere else (kill -SIGABRT),
then the process would print the talloc report and continue running,
which is not desired.
Change-Id: Idca8e360968cb6998591737348ce520954e251b2
Fixes: OS#4865
| -rw-r--r-- | stp/stp_main.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/stp/stp_main.c b/stp/stp_main.c index c7a6272..1e83615 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -170,11 +170,11 @@ static void handle_options(int argc, char **argv) } } -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stdout, "signal %u received\n", signal); + fprintf(stdout, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: case SIGTERM: /* FIXME: handle the signal somewhere else and gracefully shut down @@ -185,8 +185,17 @@ static void signal_handler(int signal) break; case SIGABRT: osmo_generate_backtrace(); - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_stp_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_stp_ctx, stderr); |