From e266bd48aca6f5b7831eb7c44e4773e9884d4c56 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Fri, 13 Jul 2012 14:00:21 +0200 Subject: Adding signal handler to allow clean exit of PCU The signal handler will end the main loop, so clean exit is performed. The allocated memory is dumped in order to detect memory leaks. All talloc functions use tall_pcu_ctx context instead of NULL, to track memory leaks. --- src/openbts_sock.cpp | 4 +++- src/pcu_l1_if.cpp | 2 ++ src/pcu_main.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/sysmo_sock.cpp | 3 ++- 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/src/openbts_sock.cpp b/src/openbts_sock.cpp index cbf7adcc..1f1e9044 100644 --- a/src/openbts_sock.cpp +++ b/src/openbts_sock.cpp @@ -35,6 +35,8 @@ extern "C" { #include } +extern void *tall_pcu_ctx; + struct femtol1_hdl { struct gsm_time gsm_time; uint32_t hLayer1; /* handle to the L1 instance in the DSP */ @@ -142,7 +144,7 @@ int pcu_l1if_open() int rc; /* allocate new femtol1_handle */ - fl1h = talloc_zero(NULL, struct femtol1_hdl); + fl1h = talloc_zero(tall_pcu_ctx, struct femtol1_hdl); INIT_LLIST_HEAD(&fl1h->wlc_list); l1fh->fl1h = fl1h; diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index fd8b3c34..d0f2e325 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -37,6 +37,8 @@ extern "C" { #include #include +extern void *tall_pcu_ctx; + // Variable for storage current FN. int frame_number; diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 2a01b9b0..2c6d7638 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -25,6 +25,7 @@ #include #include #include +#include extern "C" { #include "pcu_vty.h" #include @@ -38,6 +39,7 @@ static int config_given = 0; static const char *config_file = "osmo-pcu.cfg"; extern struct vty_app_info pcu_vty_info; void *tall_pcu_ctx; +static int quit = 0; static void print_help() { @@ -93,6 +95,39 @@ static void handle_options(int argc, char **argv) } } +void sighandler(int sigset) +{ + if (sigset == SIGHUP || sigset == SIGPIPE) + return; + + fprintf(stderr, "Signal %d received.\n", sigset); + + switch (sigset) { + case SIGINT: + /* If another signal is received afterwards, the program + * is terminated without finishing shutdown process. + */ + signal(SIGINT, SIG_DFL); + signal(SIGHUP, SIG_DFL); + signal(SIGTERM, SIG_DFL); + signal(SIGPIPE, SIG_DFL); + signal(SIGABRT, SIG_DFL); + signal(SIGUSR1, SIG_DFL); + signal(SIGUSR2, SIG_DFL); + + quit = 1; + break; + case SIGABRT: + /* in case of abort, we want to obtain a talloc report + * and then return to the caller, who will abort the process + */ + case SIGUSR1: + case SIGUSR2: + talloc_report_full(tall_pcu_ctx, stderr); + break; + } +} + int main(int argc, char *argv[]) { struct gprs_rlcmac_bts *bts; @@ -118,6 +153,8 @@ int main(int argc, char *argv[]) bts->n3103 = 4; bts->n3105 = 8; + msgb_set_talloc_ctx(tall_pcu_ctx); + osmo_init_logging(&gprs_log_info); vty_init(&pcu_vty_info); @@ -151,8 +188,15 @@ int main(int argc, char *argv[]) if (rc < 0) return rc; - while (1) - { + signal(SIGINT, sighandler); + signal(SIGHUP, sighandler); + signal(SIGTERM, sighandler); + signal(SIGPIPE, sighandler); + signal(SIGABRT, sighandler); + signal(SIGUSR1, sighandler); + signal(SIGUSR2, sighandler); + + while (!quit) { osmo_gsm_timers_check(); osmo_gsm_timers_prepare(); osmo_gsm_timers_update(); @@ -160,8 +204,13 @@ int main(int argc, char *argv[]) osmo_select_main(0); } + telnet_exit(); + pcu_l1if_close(); + talloc_free(gprs_rlcmac_bts); + + talloc_report_full(tall_pcu_ctx, stderr); talloc_free(tall_pcu_ctx); return 0; diff --git a/src/sysmo_sock.cpp b/src/sysmo_sock.cpp index 8d83ca20..390f3f69 100644 --- a/src/sysmo_sock.cpp +++ b/src/sysmo_sock.cpp @@ -37,6 +37,7 @@ extern "C" { #include #include +extern void *tall_pcu_ctx; /* * SYSMO-PCU socket functions @@ -219,7 +220,7 @@ int pcu_l1if_open(void) state = pcu_sock_state; if (!state) { - state = talloc_zero(NULL, struct pcu_sock_state); + state = talloc_zero(tall_pcu_ctx, struct pcu_sock_state); if (!state) return -ENOMEM; INIT_LLIST_HEAD(&state->upqueue); -- cgit v1.2.3