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

Get forced file descriptors after calling poll

Browse Source 
That way, we do not wait for the next poll to finish before servicing
forced fd triggered by a signal that interupted the poll call.
This commit is contained in:
Maxime Coste 2014-08-17 15:58:42 +01:00
parent 541ec58d76
commit e6b9a1d982
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/event_manager.cc
View File

@ -52,8 +52,6 @@ void EventManager::handle_next_events()
events.reserve(m_fd_watchers.size()); events.reserve(m_fd_watchers.size());
for (auto& watcher : m_fd_watchers) for (auto& watcher : m_fd_watchers)
events.emplace_back(pollfd{ watcher->fd(), POLLIN | POLLPRI, 0 }); events.emplace_back(pollfd{ watcher->fd(), POLLIN | POLLPRI, 0 });
std::vector<int> forced;
std::swap(forced, m_forced_fd);
TimePoint next_timer = TimePoint::max(); TimePoint next_timer = TimePoint::max();
for (auto& timer : m_timers) for (auto& timer : m_timers)
@ -64,6 +62,12 @@ void EventManager::handle_next_events()
using namespace std::chrono; using namespace std::chrono;
auto timeout = duration_cast<milliseconds>(next_timer - Clock::now()).count(); auto timeout = duration_cast<milliseconds>(next_timer - Clock::now()).count();
poll(events.data(), events.size(), timeout < INT_MAX ? (int)timeout : INT_MAX); poll(events.data(), events.size(), timeout < INT_MAX ? (int)timeout : INT_MAX);
// gather forced fds *after* poll, so that signal handlers can write to
// m_forced_fd, interupt poll, and directly be serviced.
std::vector<int> forced;
std::swap(forced, m_forced_fd);
for (size_t i = 0; i < events.size(); ++i) for (size_t i = 0; i < events.size(); ++i)
{ {
auto& event = events[i]; auto& event = events[i];