external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 20:35:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: catch SIGTERM

Browse source 
And when exiting, log which signal we were killed by.
This commit is contained in:
Daniel Eklöf 2019-01-09 18:49:19 +01:00
parent 8dfe4af76b
commit c18b5a1bbe
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.c
View file

@ -27,7 +27,7 @@ static volatile sig_atomic_t aborted = 0;
static void static void
signal_handler(int signo) signal_handler(int signo)
{ {
aborted = 1; aborted = signo;
} }
static char * static char *
@ -94,6 +94,7 @@ main(int argc, const char *const *argv)
const struct sigaction sa = {.sa_handler = &signal_handler}; const struct sigaction sa = {.sa_handler = &signal_handler};
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
int abort_fd = eventfd(0, EFD_CLOEXEC); int abort_fd = eventfd(0, EFD_CLOEXEC);
if (abort_fd == -1) { if (abort_fd == -1) {
@ -121,6 +122,7 @@ main(int argc, const char *const *argv)
sigset_t signal_mask; sigset_t signal_mask;
sigemptyset(&signal_mask); sigemptyset(&signal_mask);
sigaddset(&signal_mask, SIGINT); sigaddset(&signal_mask, SIGINT);
sigaddset(&signal_mask, SIGTERM);
pthread_sigmask(SIG_BLOCK, &signal_mask, NULL); pthread_sigmask(SIG_BLOCK, &signal_mask, NULL);
thrd_t bar_thread; thrd_t bar_thread;
@ -156,7 +158,7 @@ main(int argc, const char *const *argv)
xcb_disconnect(xcb); xcb_disconnect(xcb);
if (aborted) if (aborted)
LOG_INFO("aborted"); LOG_INFO("aborted: %s (%d)", strsignal(aborted), aborted);
/* Signal abort to other threads */ /* Signal abort to other threads */
write(abort_fd, &(uint64_t){1}, sizeof(uint64_t)); write(abort_fd, &(uint64_t){1}, sizeof(uint64_t));