snailed
/
dwmblocks-custom
2
0
Fork 0
Code Pull Requests 3 Actions Activity

Ignore all realtime signals to avoid crash. Closes #14

This commit is contained in:
Utkarsh Verma 2022-01-18 22:30:20 +05:30
parent 2e1e93c3da
commit 3afc4d7d24
No known key found for this signature in database
GPG Key ID: 817656CF818EFCCC
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main.c
View File

@ -180,8 +180,16 @@ void termHandler() {
} }
void setupSignals() { void setupSignals() {
signal(SIGTERM, termHandler); // Ignore all realtime signals
sigset_t ignoredSignals;
sigemptyset(&ignoredSignals);
for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
sigaddset(&ignoredSignals, i);
sigprocmask(SIG_BLOCK, &ignoredSignals, NULL);
// Handle termination signals
signal(SIGINT, termHandler); signal(SIGINT, termHandler);
signal(SIGTERM, termHandler);
// Avoid zombie subprocesses // Avoid zombie subprocesses
struct sigaction sa; struct sigaction sa;
@ -191,14 +199,12 @@ void setupSignals() {
sigaction(SIGCHLD, &sa, 0); sigaction(SIGCHLD, &sa, 0);
// Handle block update signals // Handle block update signals
sigset_t sigset; sigset_t handledSignals;
sigemptyset(&sigset); sigemptyset(&handledSignals);
for (int i = 0; i < LEN(blocks); i++) for (int i = 0; i < LEN(blocks); i++)
if (blocks[i].signal > 0) if (blocks[i].signal > 0)
sigaddset(&sigset, SIGRTMIN + blocks[i].signal); sigaddset(&handledSignals, SIGRTMIN + blocks[i].signal);
signalFD = signalfd(-1, &handledSignals, 0);
signalFD = signalfd(-1, &sigset, 0);
sigprocmask(SIG_BLOCK, &sigset, NULL);
event.data.u32 = LEN(blocks) + 1; event.data.u32 = LEN(blocks) + 1;
epoll_ctl(epollFD, EPOLL_CTL_ADD, signalFD, &event); epoll_ctl(epollFD, EPOLL_CTL_ADD, signalFD, &event);
} }
@ -239,7 +245,7 @@ void timerLoop() {
struct timespec sleepTime = {sleepInterval, 0}; struct timespec sleepTime = {sleepInterval, 0};
struct timespec toSleep = sleepTime; struct timespec toSleep = sleepTime;
while (1) { while (statusContinue) {
// Notify parent to update blocks // Notify parent to update blocks
write(timerPipe[1], &i, sizeof(i)); write(timerPipe[1], &i, sizeof(i));