Unverified Commit c5927e1a authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #565 from kiplingw/master

Fixed EINTR epoll_wait() signal interruption
parents 7eb69e52 ccf0ab86
pistache (0.0.001-git20190611-kip1~disco) disco; urgency=medium
pistache (0.0.001-git20190623-kip1~disco) disco; urgency=medium
* Built from latest git head.
-- Kip Warner <kip@thevertigo.com> Tue, 11 Jun 2019 18:35:18 -0700
pistache (0.0.001-git20190526-kip1~disco) disco; urgency=medium
* Built from latest git head.
-- Kip Warner <kip@thevertigo.com> Sun, 26 May 2019 09:25:37 -0700
pistache (0.0.001-git20190525-kip1~disco) disco; urgency=medium
* Built from latest git head.
-- Kip Warner <kip@thevertigo.com> Sat, 25 May 2019 18:00:20 -0700
-- Kip Warner <kip@thevertigo.com> Sun, 23 Jun 2019 16:04:46 -0700
pistache (0.0.001-kip1~cosmic) cosmic; urgency=medium
......
......@@ -191,7 +191,10 @@ namespace Polling {
Epoll::poll(std::vector<Event>& events, const std::chrono::milliseconds timeout) const {
struct epoll_event evs[Const::MaxEvents];
int ready_fds = epoll_wait(epoll_fd, evs, Const::MaxEvents, timeout.count());
int ready_fds = -1;
do {
ready_fds = ::epoll_wait(epoll_fd, evs, Const::MaxEvents, timeout.count());
} while(ready_fds < 0 && errno == EINTR);
for (int i = 0; i < ready_fds; ++i) {
const struct epoll_event *ev = evs + i;
......
VERSION_MAJOR 0
VERSION_MINOR 0
VERSION_PATCH 001
VERSION_GIT_DATE 20190611
VERSION_GIT_DATE 20190623
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment