cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

osmo-msc: Improve shutdown due to signal and print talloc report on exit 

Same as we do in osmo-hlr.

Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814
This commit is contained in:
Pau Espin 2018-08-13 16:29:50 +02:00
parent f02d17f75a
commit b874486e8e
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/osmo-msc/msc_main.c
View File

@ -110,6 +110,8 @@ static struct {
static struct osmo_timer_list db_sync_timer; static struct osmo_timer_list db_sync_timer;
static int quit = 0;
static void print_usage() static void print_usage()
{ {
printf("Usage: osmo-msc\n"); printf("Usage: osmo-msc\n");
@ -233,10 +235,8 @@ static void signal_handler(int signal)
switch (signal) { switch (signal) {
case SIGINT: case SIGINT:
case SIGTERM: case SIGTERM:
msc_network_shutdown(msc_network); LOGP(DMSC, LOGL_NOTICE, "Terminating due to signal %d\n", signal);
osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); quit++;
sleep(3);
exit(0);
break; break;
case SIGABRT: case SIGABRT:
osmo_generate_backtrace(); osmo_generate_backtrace();
@ -692,8 +692,29 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i
} }
} }
while (1) { while (!quit) {
log_reset_context(); log_reset_context();
osmo_select_main(0); osmo_select_main(0);
} }
msc_network_shutdown(msc_network);
osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);
sleep(3);
log_fini();
/**
* Report the heap state of root context, then free,
* so both ASAN and Valgrind are happy...
*/
talloc_report_full(tall_msc_ctx, stderr);
talloc_free(tall_msc_ctx);
/**
* Report the heap state of NULL context, then free,
* so both ASAN and Valgrind are happy...
*/
talloc_report_full(NULL, stderr);
talloc_disable_null_tracking();
return 0;
} }