Commit 4bd30663 authored by Ben Walker's avatar Ben Walker
Browse files

event: Always handle SIGINT and SIGTERM 



Cleanly shutdown in response to these signals,
even if the user didn't provide a custom
signal handler.

Change-Id: I387bbbc0e4d848fd87ea489bae2cc79a2240d2da
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/372168


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 1c442639

lib/event/app.c

+26 −23
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ spdk_app_start_shutdown(void) 
	if (g_shutdown_event != NULL) {

		spdk_event_call(g_shutdown_event);

		g_shutdown_event = NULL;

	} else {

		spdk_app_stop(0);

	}

}
@@ -281,6 +283,13 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, 
		exit(EXIT_FAILURE);

	}



	/* Set up custom shutdown handling if the user requested it. */

	if (opts->shutdown_cb != NULL) {

		g_shutdown_event = spdk_event_allocate(spdk_env_get_current_core(),

						       __shutdown_event_cb,

						       NULL, NULL);

	}



	/* setup signal handler thread */

	pthread_sigmask(SIG_SETMASK, NULL, &signew);
@@ -294,11 +303,6 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, 
		exit(EXIT_FAILURE);

	}



	if (opts->shutdown_cb != NULL) {

		g_shutdown_event = spdk_event_allocate(spdk_env_get_current_core(),

						       __shutdown_event_cb,

						       NULL, NULL);



	sigact.sa_handler = __shutdown_signal;

	sigemptyset(&sigact.sa_mask);

	rc = sigaction(SIGINT, &sigact, NULL);
@@ -318,7 +322,6 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, 
		exit(EXIT_FAILURE);

	}

	sigaddset(&signew, SIGTERM);

	}



	if (opts->usr1_handler != NULL) {

		sigact.sa_handler = opts->usr1_handler;