diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-03 12:26:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:30 -0500 |
| commit | e6b8c811cac0730c16e685d04ee41fce036fd51c (patch) | |
| tree | 66d2656755d23e9542846eca05f5369a9a2a22d7 /source4/lib/events/events.c | |
| parent | 131dc76d56df40b3511c47e54f15412a25b491f8 (diff) | |
| download | samba-e6b8c811cac0730c16e685d04ee41fce036fd51c.tar.gz samba-e6b8c811cac0730c16e685d04ee41fce036fd51c.tar.bz2 samba-e6b8c811cac0730c16e685d04ee41fce036fd51c.zip | |
r5198: don't consider failure to remove an epoll event as enough reason to
fallback to select(). This can happen in too many situations.
(This used to be commit 2d7242f2ec945c1e5fbc6f256265471f60ac8cd9)
Diffstat (limited to 'source4/lib/events/events.c')
| -rw-r--r-- | source4/lib/events/events.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c index a852df68eb..3a15172d95 100644 --- a/source4/lib/events/events.c +++ b/source4/lib/events/events.c @@ -158,7 +158,7 @@ static void calc_maxfd(struct event_context *ev) */ static void epoll_fallback_to_select(struct event_context *ev, const char *reason) { - DEBUG(0,("%s - using select() - %s\n", reason, strerror(errno))); + DEBUG(0,("%s (%s) - falling back to select()\n", reason, strerror(errno))); close(ev->epoll_fd); ev->epoll_fd = -1; } @@ -197,9 +197,7 @@ static int event_fd_destructor(void *ptr) ZERO_STRUCT(event); event.events = epoll_map_flags(fde->flags); event.data.ptr = fde; - if (epoll_ctl(ev->epoll_fd, EPOLL_CTL_DEL, fde->fd, &event) != 0) { - epoll_fallback_to_select(ev, "EPOLL_CTL_DEL failed"); - } + epoll_ctl(ev->epoll_fd, EPOLL_CTL_DEL, fde->fd, &event); } #endif return 0; |