AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-09 05:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

pselect atomic signal masking for Xlib (deadlocks bad)

Browse Source
This commit is contained in:
Jack Andersen
2015-11-17 10:25:17 -10:00
parent 4d133edd2c
commit 9e1441c323
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/inputdev/HIDListenerUdev.cpp
View File

@@ -129,6 +129,11 @@ class HIDListenerUdev final : public IHIDListener
s.sa_flags = 0;
sigaction(SIGTERM, &s, nullptr);
sigset_t waitmask, origmask;
sigemptyset(&waitmask);
sigaddset(&waitmask, SIGTERM);
pthread_sigmask(SIG_BLOCK, &waitmask, &origmask);
udev_monitor_enable_receiving(listener->m_udevMon);
int fd = udev_monitor_get_fd(listener->m_udevMon);
while (listener->m_udevRunning)
@@ -136,7 +141,7 @@ class HIDListenerUdev final : public IHIDListener
fd_set fds;
FD_ZERO(&fds);
FD_SET(fd, &fds);
if (select(fd+1, &fds, nullptr, nullptr, nullptr) < 0)
if (pselect(fd+1, &fds, nullptr, nullptr, nullptr, &origmask) < 0)
{
/* SIGTERM handled here */
if (errno == EINTR)