From cfdce461c3f12183da4094296139197ad2a6cb45 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 11 Apr 2016 16:43:12 +0900 Subject: [PATCH] Do not attempt to trap SIGKILL part 2 it doesn't work on any OS. --- sesman/sig.c | 6 ------ tests/tcp_proxy/main.c | 8 -------- 2 files changed, 14 deletions(-) diff --git a/sesman/sig.c b/sesman/sig.c index d881515b..b10be5fb 100644 --- a/sesman/sig.c +++ b/sesman/sig.c @@ -158,7 +158,6 @@ sig_handler_thread(void *arg) sigaddset(&waitmask, SIGHUP); sigaddset(&waitmask, SIGCHLD); sigaddset(&waitmask, SIGTERM); - sigaddset(&waitmask, SIGKILL); sigaddset(&waitmask, SIGINT); // sigaddset(&waitmask, SIGFPE); @@ -188,11 +187,6 @@ sig_handler_thread(void *arg) LOG_DBG("sesman received SIGINT", 0); sig_sesman_shutdown(recv_signal); break; - case SIGKILL: - /* we die */ - LOG_DBG("sesman received SIGKILL", 0); - sig_sesman_shutdown(recv_signal); - break; case SIGTERM: /* we die */ LOG_DBG("sesman received SIGTERM", 0); diff --git a/tests/tcp_proxy/main.c b/tests/tcp_proxy/main.c index 1cc58889..1a275395 100644 --- a/tests/tcp_proxy/main.c +++ b/tests/tcp_proxy/main.c @@ -397,13 +397,6 @@ g_signal_user_interrupt(void (*func)(int)) signal(SIGINT, func); } -/*****************************************************************************/ -static void APP_CC -g_signal_kill(void (*func)(int)) -{ - signal(SIGKILL, func); -} - /*****************************************************************************/ static void APP_CC g_signal_terminate(void (*func)(int)) @@ -685,7 +678,6 @@ main(int argc, char **argv) g_init("tcp_proxy"); g_signal_user_interrupt(proxy_shutdown); /* SIGINT */ - g_signal_kill(proxy_shutdown); /* SIGKILL */ g_signal_usr1(clear_counters); /* SIGUSR1 */ g_signal_terminate(proxy_shutdown); /* SIGTERM */