Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix busy loop calling epoll_wait #603

Merged
merged 2 commits into from
Nov 24, 2015
Merged

fix busy loop calling epoll_wait #603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcdb444
remove fd from epoll set if not read or written
kazuho Nov 24, 2015
6828ce0
handle EPOLLHUP, EPOLLERR
kazuho Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions lib/common/socket/evloop/epoll.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static int update_status(struct st_h2o_evloop_epoll_t *loop)
if ((sock->_flags & H2O_SOCKET_FLAG_IS_DISPOSED) != 0) {
free(sock);
} else {
int changed = 0;
int changed = 0, op, ret;
struct epoll_event ev;
ev.events = 0;
if (h2o_socket_is_reading(&sock->super)) {
Expand Down Expand Up @@ -75,13 +75,24 @@ static int update_status(struct st_h2o_evloop_epoll_t *loop)
}
}
if (changed) {
int op = (sock->_flags & H2O_SOCKET_FLAG__EPOLL_IS_REGISTERED) != 0 ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, ret;
if ((sock->_flags & H2O_SOCKET_FLAG__EPOLL_IS_REGISTERED) != 0) {
if (ev.events != 0)
op = EPOLL_CTL_MOD;
else
op = EPOLL_CTL_DEL;
} else {
assert(ev.events != 0);
op = EPOLL_CTL_ADD;
}
ev.data.ptr = sock;
while ((ret = epoll_ctl(loop->ep, op, sock->fd, &ev)) != 0 && errno == EINTR)
;
if (ret != 0)
return -1;
sock->_flags |= H2O_SOCKET_FLAG__EPOLL_IS_REGISTERED;
if (op == EPOLL_CTL_DEL)
sock->_flags &= ~H2O_SOCKET_FLAG__EPOLL_IS_REGISTERED;
else
sock->_flags |= H2O_SOCKET_FLAG__EPOLL_IS_REGISTERED;
}
}
}
Expand Down Expand Up @@ -109,16 +120,30 @@ int evloop_do_proceed(h2o_evloop_t *_loop)
/* update readable flags, perform writes */
for (i = 0; i != nevents; ++i) {
struct st_h2o_evloop_socket_t *sock = events[i].data.ptr;
if ((events[i].events & EPOLLIN) != 0) {
if (sock->_flags != H2O_SOCKET_FLAG_IS_DISPOSED) {
int notified = 0;
if ((events[i].events & (EPOLLIN | EPOLLHUP | EPOLLERR)) != 0) {
if ((sock->_flags & H2O_SOCKET_FLAG_IS_POLLED_FOR_READ) != 0) {
sock->_flags |= H2O_SOCKET_FLAG_IS_READ_READY;
link_to_pending(sock);
notified = 1;
}
}
if ((events[i].events & EPOLLOUT) != 0) {
if (sock->_flags != H2O_SOCKET_FLAG_IS_DISPOSED) {
if ((events[i].events & (EPOLLOUT | EPOLLHUP | EPOLLERR)) != 0) {
if ((sock->_flags & H2O_SOCKET_FLAG_IS_POLLED_FOR_WRITE) != 0) {
write_pending(sock);
notified = 1;
}
}
if (!notified) {
pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static time_t last_reported = 0;
time_t now = time(NULL);
pthread_mutex_lock(&lock);
if (last_reported + 60 < now) {
last_reported = now;
fprintf(stderr, "ignoring epoll event (fd:%d,event:%x)\n", sock->fd, (int)events[i].events);
}
pthread_mutex_unlock(&lock);
}
}

Expand Down