diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 19:06:44 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 19:07:49 +0100 |
| commit | 44d72333ad29df02bd546cc2f2f3955b982bc03e (patch) | |
| tree | 89541aa5e44f9c3e7da4b5c5395817095d014395 | |
| parent | 28d0a1db794c862d34cee05e33b903c5c1493070 (diff) | |
oc2g-mgr: 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: I7a5756e106ac1061d37b42c22cc127fdacd87ce7
Fixes: OS#4865
| -rw-r--r-- | src/osmo-bts-oc2g/misc/oc2gbts_mgr.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c index 66c9f28c..9469259c 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c @@ -1,7 +1,7 @@ /* Main program for NuRAN Wireless OC-2G BTS management daemon */ /* Copyright (C) 2015 by Yves Godin <support@nuranwireless.com> - * + * * Based on sysmoBTS: * sysmobts_mgr.c * (C) 2012 by Harald Welte <laforge@gnumonks.org> @@ -201,11 +201,11 @@ static int parse_options(int argc, char **argv) return 0; } -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stderr, "signal %u received\n", signal); + fprintf(stderr, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: oc2gbts_check_temp(no_rom_write); oc2gbts_check_power(no_rom_write); @@ -214,6 +214,16 @@ static void signal_handler(int signal) exit(0); break; case SIGABRT: + /* 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_full(tall_mgr_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: case SIGUSR2: talloc_report_full(tall_mgr_ctx, stderr); @@ -280,6 +290,7 @@ int main(int argc, char **argv) osmo_init_ignore_signals(); signal(SIGINT, &signal_handler); + signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); |