diff options
author | Eric Wong <e@80x24.org> | 2019-06-26 07:58:15 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-06-26 07:58:15 +0000 |
commit | 7d7e5013e3d2e56c48735698e39890e8f67b6b56 (patch) | |
tree | 4ead243f0c08ce31bf8da9ada8bcda05ad63bc22 /lib/PublicInbox | |
parent | 84d8920b92686e975929aebe845b6d4ea0a9ef0d (diff) | |
download | public-inbox-7d7e5013e3d2e56c48735698e39890e8f67b6b56.tar.gz |
On Linux systems with epoll support, we don't want to be clobbering defined subs in the t/ds-poll.t test; so use OO ->method dispatch instead and require users to explicitly import subs via EXPORT_OK.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/DS.pm | 2 | ||||
-rw-r--r-- | lib/PublicInbox/DSKQXS.pm | 2 | ||||
-rw-r--r-- | lib/PublicInbox/DSPoll.pm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 08f4e9e8..a8700bc5 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -151,7 +151,7 @@ sub _InitPoller $cls = "PublicInbox::$_"; last if eval "require $cls"; } - $cls->import; + $cls->import(qw(epoll_ctl epoll_wait)); $Epoll = $cls->new; } *EventLoop = *EpollEventLoop; diff --git a/lib/PublicInbox/DSKQXS.pm b/lib/PublicInbox/DSKQXS.pm index 38e13446..364df3d6 100644 --- a/lib/PublicInbox/DSKQXS.pm +++ b/lib/PublicInbox/DSKQXS.pm @@ -17,7 +17,7 @@ use parent qw(IO::KQueue); use parent qw(Exporter); use IO::KQueue; use PublicInbox::Syscall qw(EPOLLONESHOT EPOLLIN EPOLLOUT EPOLL_CTL_DEL); -our @EXPORT = qw(epoll_ctl epoll_wait); +our @EXPORT_OK = qw(epoll_ctl epoll_wait); my $owner_pid = -1; # kqueue is close-on-fork (yes, fork, not exec) # map EPOLL* bits to kqueue EV_* flags for EV_SET diff --git a/lib/PublicInbox/DSPoll.pm b/lib/PublicInbox/DSPoll.pm index e65640a8..ce7c2fac 100644 --- a/lib/PublicInbox/DSPoll.pm +++ b/lib/PublicInbox/DSPoll.pm @@ -14,7 +14,7 @@ use warnings; use parent qw(Exporter); use IO::Poll; use PublicInbox::Syscall qw(EPOLLONESHOT EPOLLIN EPOLLOUT EPOLL_CTL_DEL); -our @EXPORT = qw(epoll_ctl epoll_wait); +our @EXPORT_OK = qw(epoll_ctl epoll_wait); sub new { bless {}, $_[0] } # fd => events |