From b86c1790854c6d8b8299e5b71ad067b97cff548b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 24 Jun 2019 02:52:47 +0000 Subject: ds: always use EV_ADD with EV_SET kqueue EV_ONESHOT semantics are different than epoll EPOLLONESHOT. epoll only disables watches for that event while keeping the item in the rbtree for future EPOLL_CTL_MOD. kqueue removes the watch from the filter set entirely, necessitating the use of EV_ADD for future modifications. --- lib/PublicInbox/DS.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/PublicInbox/DS.pm') diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 0e48ed07..8f77ce24 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -321,7 +321,7 @@ sub kq_flag ($$) { my $fl = EV_ADD() | EV_ENABLE(); ($ev & EPOLLONESHOT) ? ($fl|EV_ONESHOT()) : $fl; } else { - EV_DISABLE(); + EV_ADD() | EV_DISABLE(); } } @@ -364,8 +364,8 @@ retry: } } elsif ($HaveKQueue) { - $KQueue->EV_SET($fd, EVFILT_READ(), EV_ADD() | kq_flag(EPOLLIN, $ev)); - $KQueue->EV_SET($fd, EVFILT_WRITE(), EV_ADD() | kq_flag(EPOLLOUT, $ev)); + $KQueue->EV_SET($fd, EVFILT_READ(), kq_flag(EPOLLIN, $ev)); + $KQueue->EV_SET($fd, EVFILT_WRITE(), kq_flag(EPOLLOUT, $ev)); } Carp::cluck("PublicInbox::DS::new blowing away existing descriptor map for fd=$fd ($DescriptorMap{$fd})") -- cgit v1.2.3-24-ge0c7