xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EventManager: Never block if a forced file descriptor is present

Browse Source
This commit is contained in:
Maxime Coste 2018-06-03 12:04:55 +10:00
parent c63502c7c6
commit 56e5322b45
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event_manager.cc
View File

@ -91,6 +91,9 @@ bool EventManager::handle_next_events(EventMode mode, sigset_t* sigmask, bool bl
} }
bool with_timeout = false; bool with_timeout = false;
if (m_has_forced_fd)
block = false;
timespec ts{}; timespec ts{};
if (block and not m_timers.empty()) if (block and not m_timers.empty())
{ {
@ -113,6 +116,7 @@ bool EventManager::handle_next_events(EventMode mode, sigset_t* sigmask, bool bl
// copy forced fds *after* select, so that signal handlers can write to // copy forced fds *after* select, so that signal handlers can write to
// m_forced_fd, interupt select, and directly be serviced. // m_forced_fd, interupt select, and directly be serviced.
m_has_forced_fd = false;
fd_set forced = m_forced_fd; fd_set forced = m_forced_fd;
FD_ZERO(&m_forced_fd); FD_ZERO(&m_forced_fd);
@ -147,6 +151,7 @@ bool EventManager::handle_next_events(EventMode mode, sigset_t* sigmask, bool bl
void EventManager::force_signal(int fd) void EventManager::force_signal(int fd)
{ {
FD_SET(fd, &m_forced_fd); FD_SET(fd, &m_forced_fd);
m_has_forced_fd = true;
} }
SignalHandler set_signal_handler(int signum, SignalHandler handler) SignalHandler set_signal_handler(int signum, SignalHandler handler)

1
src/event_manager.hh
View File

@ -98,6 +98,7 @@ private:
Vector<FDWatcher*, MemoryDomain::Events> m_fd_watchers; Vector<FDWatcher*, MemoryDomain::Events> m_fd_watchers;
Vector<Timer*, MemoryDomain::Events> m_timers; Vector<Timer*, MemoryDomain::Events> m_timers;
fd_set m_forced_fd; fd_set m_forced_fd;
bool m_has_forced_fd = false;
TimePoint m_last; TimePoint m_last;
}; };