Don't attempt to intercept SIGKILL, it doesn't work on any OS

ulab-next-nosound
Jay Sorg 9 years ago
parent cdb967c0f3
commit 7393579205

@ -2714,17 +2714,6 @@ g_signal_user_interrupt(void (*func)(int))
#endif #endif
} }
/*****************************************************************************/
/* does not work in win32 */
void APP_CC
g_signal_kill(void (*func)(int))
{
#if defined(_WIN32)
#else
signal(SIGKILL, func);
#endif
}
/*****************************************************************************/ /*****************************************************************************/
/* does not work in win32 */ /* does not work in win32 */
void APP_CC void APP_CC

@ -147,7 +147,6 @@ void APP_CC g_signal_child_stop(void (*func)(int));
void APP_CC g_signal_segfault(void (*func)(int)); void APP_CC g_signal_segfault(void (*func)(int));
void APP_CC g_signal_hang_up(void (*func)(int)); void APP_CC g_signal_hang_up(void (*func)(int));
void APP_CC g_signal_user_interrupt(void (*func)(int)); void APP_CC g_signal_user_interrupt(void (*func)(int));
void APP_CC g_signal_kill(void (*func)(int));
void APP_CC g_signal_terminate(void (*func)(int)); void APP_CC g_signal_terminate(void (*func)(int));
void APP_CC g_signal_pipe(void (*func)(int)); void APP_CC g_signal_pipe(void (*func)(int));
void APP_CC g_signal_usr1(void (*func)(int)); void APP_CC g_signal_usr1(void (*func)(int));

@ -1525,7 +1525,6 @@ main(int argc, char **argv)
LOGM((LOG_LEVEL_ALWAYS, "main: app started pid %d(0x%8.8x)", pid, pid)); LOGM((LOG_LEVEL_ALWAYS, "main: app started pid %d(0x%8.8x)", pid, pid));
/* set up signal handler */ /* set up signal handler */
g_signal_kill(term_signal_handler); /* SIGKILL */
g_signal_terminate(term_signal_handler); /* SIGTERM */ g_signal_terminate(term_signal_handler); /* SIGTERM */
g_signal_user_interrupt(term_signal_handler); /* SIGINT */ g_signal_user_interrupt(term_signal_handler); /* SIGINT */
g_signal_pipe(nil_signal_handler); /* SIGPIPE */ g_signal_pipe(nil_signal_handler); /* SIGPIPE */

@ -331,7 +331,6 @@ main(int argc, char **argv)
#if 1 #if 1
g_signal_hang_up(sig_sesman_reload_cfg); /* SIGHUP */ g_signal_hang_up(sig_sesman_reload_cfg); /* SIGHUP */
g_signal_user_interrupt(sig_sesman_shutdown); /* SIGINT */ g_signal_user_interrupt(sig_sesman_shutdown); /* SIGINT */
g_signal_kill(sig_sesman_shutdown); /* SIGKILL */
g_signal_terminate(sig_sesman_shutdown); /* SIGTERM */ g_signal_terminate(sig_sesman_shutdown); /* SIGTERM */
g_signal_child_stop(sig_sesman_session_end); /* SIGCHLD */ g_signal_child_stop(sig_sesman_session_end); /* SIGCHLD */
#endif #endif

@ -93,7 +93,6 @@ main(int argc, char **argv)
return 1; return 1;
} }
g_signal_kill(term_signal_handler); /* SIGKILL */
g_signal_terminate(term_signal_handler); /* SIGTERM */ g_signal_terminate(term_signal_handler); /* SIGTERM */
g_signal_user_interrupt(term_signal_handler); /* SIGINT */ g_signal_user_interrupt(term_signal_handler); /* SIGINT */
g_signal_pipe(nil_signal_handler); /* SIGPIPE */ g_signal_pipe(nil_signal_handler); /* SIGPIPE */

@ -563,7 +563,6 @@ main(int argc, char **argv)
g_threadid = tc_get_threadid(); g_threadid = tc_get_threadid();
g_listen = xrdp_listen_create(); g_listen = xrdp_listen_create();
g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */ g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */
g_signal_kill(xrdp_shutdown); /* SIGKILL */
g_signal_pipe(pipe_sig); /* SIGPIPE */ g_signal_pipe(pipe_sig); /* SIGPIPE */
g_signal_terminate(xrdp_shutdown); /* SIGTERM */ g_signal_terminate(xrdp_shutdown); /* SIGTERM */
g_signal_child_stop(xrdp_child); /* SIGCHLD */ g_signal_child_stop(xrdp_child); /* SIGCHLD */

@ -618,7 +618,6 @@ main(int argc, char **argv)
g_threadid = tc_get_threadid(); g_threadid = tc_get_threadid();
g_listen = xrdp_listen_create(); g_listen = xrdp_listen_create();
g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */ g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */
g_signal_kill(xrdp_shutdown); /* SIGKILL */
g_signal_pipe(pipe_sig); /* SIGPIPE */ g_signal_pipe(pipe_sig); /* SIGPIPE */
g_signal_terminate(xrdp_shutdown); /* SIGTERM */ g_signal_terminate(xrdp_shutdown); /* SIGTERM */
g_sync_mutex = tc_mutex_create(); g_sync_mutex = tc_mutex_create();

Loading…
Cancel
Save