* [PATCH 0/5] DS: drop more unused stuff
@ 2019-05-22 21:46 Eric Wong
2019-05-22 21:46 ` [PATCH 1/5] DS: get rid of unused methods and aliases Eric Wong
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Eric Wong @ 2019-05-22 21:46 UTC (permalink / raw
To: meta
No point in bloating processes with this stuff.
Eric Wong (5):
DS: get rid of unused methods and aliases
DS: remove support OtherFds code
DS: drop $VERSION var
DS: remove IPPROTO_TCP import
DS: warn on deprecations
lib/PublicInbox/DS.pm | 98 ++++---------------------------------------
1 file changed, 9 insertions(+), 89 deletions(-)
--
EW
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] DS: get rid of unused methods and aliases
2019-05-22 21:46 [PATCH 0/5] DS: drop more unused stuff Eric Wong
@ 2019-05-22 21:46 ` Eric Wong
2019-05-22 21:46 ` [PATCH 2/5] DS: remove support OtherFds code Eric Wong
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eric Wong @ 2019-05-22 21:46 UTC (permalink / raw
To: meta
"make syntax" is clean, now
---
lib/PublicInbox/DS.pm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 779215c..0acb034 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -105,17 +105,6 @@ sub HaveEpoll {
return $HaveEpoll;
}
-=head2 C<< CLASS->WatchedSockets() >>
-
-Returns the number of file descriptors which are registered with the global
-poll object.
-
-=cut
-sub WatchedSockets {
- return scalar keys %DescriptorMap;
-}
-*watched_sockets = *WatchedSockets;
-
=head2 C<< CLASS->ToClose() >>
Return the list of sockets that are awaiting close() at the end of the
@@ -206,20 +195,6 @@ sub AddTimer {
die "Shouldn't get here.";
}
-=head2 C<< CLASS->DescriptorMap() >>
-
-Get the hash of PublicInbox::DS objects keyed by the file descriptor (fileno) they
-are wrapping.
-
-Returns a hash in list context or a hashref in scalar context.
-
-=cut
-sub DescriptorMap {
- return wantarray ? %DescriptorMap : \%DescriptorMap;
-}
-*descriptor_map = *DescriptorMap;
-*get_sock_ref = *DescriptorMap;
-
sub _InitPoller
{
return if $DoneInit;
--
EW
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] DS: remove support OtherFds code
2019-05-22 21:46 [PATCH 0/5] DS: drop more unused stuff Eric Wong
2019-05-22 21:46 ` [PATCH 1/5] DS: get rid of unused methods and aliases Eric Wong
@ 2019-05-22 21:46 ` Eric Wong
2019-05-22 21:46 ` [PATCH 3/5] DS: drop $VERSION var Eric Wong
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eric Wong @ 2019-05-22 21:46 UTC (permalink / raw
To: meta
It's easy enough to wrap FDs in classes that can use
all of the functionality of the event loop, not just
the read-only interface AddOtherFds provided.
---
lib/PublicInbox/DS.pm | 68 ++++++-------------------------------------
1 file changed, 9 insertions(+), 59 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 0acb034..751ae41 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -54,8 +54,6 @@ our (
$Epoll, # Global epoll fd (for epoll mode only)
$KQueue, # Global kqueue fd (for kqueue mode only)
@ToClose, # sockets to close when event loop is done
- %OtherFds, # A hash of "other" (non-PublicInbox::DS) file
- # descriptors for the event loop to track.
$PostLoopCallback, # subref to call at the end of each loop, if defined (global)
%PLCMap, # fd (num) -> PostLoopCallback (per-object)
@@ -81,7 +79,6 @@ Reset all state
sub Reset {
%DescriptorMap = ();
@ToClose = ();
- %OtherFds = ();
$LoopTimeout = -1; # no timeout by default
@Timers = ();
@@ -113,29 +110,6 @@ current event loop.
=cut
sub ToClose { return @ToClose; }
-=head2 C<< CLASS->OtherFds( [%fdmap] ) >>
-
-Get/set the hash of file descriptors that need processing in parallel with
-the registered PublicInbox::DS objects.
-
-=cut
-sub OtherFds {
- my $class = shift;
- if ( @_ ) { %OtherFds = @_ }
- return wantarray ? %OtherFds : \%OtherFds;
-}
-
-=head2 C<< CLASS->AddOtherFds( [%fdmap] ) >>
-
-Add fds to the OtherFds hash for processing.
-
-=cut
-sub AddOtherFds {
- my $class = shift;
- %OtherFds = ( %OtherFds, @_ ); # FIXME investigate what happens on dupe fds
- return wantarray ? %OtherFds : \%OtherFds;
-}
-
=head2 C<< CLASS->SetLoopTimeout( $timeout ) >>
Set the loop timeout for the event loop to some value in milliseconds.
@@ -275,12 +249,6 @@ sub RunTimers {
sub EpollEventLoop {
my $class = shift;
- foreach my $fd ( keys %OtherFds ) {
- if (epoll_ctl($Epoll, EPOLL_CTL_ADD, $fd, EPOLLIN) == -1) {
- warn "epoll_ctl(): failure adding fd=$fd; $! (", $!+0, ")\n";
- }
- }
-
while (1) {
my @events;
my $i;
@@ -303,14 +271,10 @@ sub EpollEventLoop {
# if we didn't find a Perlbal::Socket subclass for that fd, try other
# pseudo-registered (above) fds.
if (! $pob) {
- if (my $code = $OtherFds{$ev->[0]}) {
- $code->($state);
- } else {
- my $fd = $ev->[0];
- warn "epoll() returned fd $fd w/ state $state for which we have no mapping. removing.\n";
- epoll_ctl($Epoll, EPOLL_CTL_DEL, $fd, 0);
- POSIX::close($fd);
- }
+ my $fd = $ev->[0];
+ warn "epoll() returned fd $fd w/ state $state for which we have no mapping. removing.\n";
+ epoll_ctl($Epoll, EPOLL_CTL_DEL, $fd, 0);
+ POSIX::close($fd);
next;
}
@@ -345,9 +309,6 @@ sub PollEventLoop {
# modifies the array in place with the even elements being
# replaced with the event masks that occured.
my @poll;
- foreach my $fd ( keys %OtherFds ) {
- push @poll, $fd, POLLIN;
- }
while ( my ($fd, $sock) = each %DescriptorMap ) {
push @poll, $fd, $sock->{event_watch};
}
@@ -374,9 +335,6 @@ sub PollEventLoop {
$pob = $DescriptorMap{$fd};
if (!$pob) {
- if (my $code = $OtherFds{$fd}) {
- $code->($state);
- }
next;
}
@@ -397,10 +355,6 @@ sub PollEventLoop {
sub KQueueEventLoop {
my $class = shift;
- foreach my $fd (keys %OtherFds) {
- $KQueue->EV_SET($fd, IO::KQueue::EVFILT_READ(), IO::KQueue::EV_ADD());
- }
-
while (1) {
my $timeout = RunTimers();
my @ret = eval { $KQueue->kevent($timeout) };
@@ -417,12 +371,8 @@ sub KQueueEventLoop {
my ($fd, $filter, $flags, $fflags) = @$kev;
my PublicInbox::DS $pob = $DescriptorMap{$fd};
if (!$pob) {
- if (my $code = $OtherFds{$fd}) {
- $code->($filter);
- } else {
- warn "kevent() returned fd $fd for which we have no mapping. removing.\n";
- POSIX::close($fd); # close deletes the kevent entry
- }
+ warn "kevent() returned fd $fd for which we have no mapping. removing.\n";
+ POSIX::close($fd); # close deletes the kevent entry
next;
}
@@ -453,7 +403,7 @@ called every time the event loop finishes.
Return 1 (or any true value) from the sub to make the loop continue, 0 or false
and it will exit.
-The callback function will be passed two parameters: \%DescriptorMap, \%OtherFds.
+The callback function will be passed two parameters: \%DescriptorMap
=cut
sub SetPostLoopCallback {
@@ -498,12 +448,12 @@ sub PostEventLoop {
# per-object post-loop-callbacks
for my $plc (values %PLCMap) {
- $keep_running &&= $plc->(\%DescriptorMap, \%OtherFds);
+ $keep_running &&= $plc->(\%DescriptorMap);
}
# now we're at the very end, call callback if defined
if (defined $PostLoopCallback) {
- $keep_running &&= $PostLoopCallback->(\%DescriptorMap, \%OtherFds);
+ $keep_running &&= $PostLoopCallback->(\%DescriptorMap);
}
return $keep_running;
--
EW
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] DS: drop $VERSION var
2019-05-22 21:46 [PATCH 0/5] DS: drop more unused stuff Eric Wong
2019-05-22 21:46 ` [PATCH 1/5] DS: get rid of unused methods and aliases Eric Wong
2019-05-22 21:46 ` [PATCH 2/5] DS: remove support OtherFds code Eric Wong
@ 2019-05-22 21:46 ` Eric Wong
2019-05-22 21:46 ` [PATCH 4/5] DS: remove IPPROTO_TCP import Eric Wong
2019-05-22 21:46 ` [PATCH 5/5] DS: warn on deprecations Eric Wong
4 siblings, 0 replies; 6+ messages in thread
From: Eric Wong @ 2019-05-22 21:46 UTC (permalink / raw
To: meta
It was only relevant to Danga::Socket.
---
lib/PublicInbox/DS.pm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 751ae41..68af4d6 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -13,9 +13,6 @@ use bytes;
use POSIX ();
use Time::HiRes ();
-use vars qw{$VERSION};
-$VERSION = "1.61";
-
use warnings;
no warnings qw(deprecated);
--
EW
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] DS: remove IPPROTO_TCP import
2019-05-22 21:46 [PATCH 0/5] DS: drop more unused stuff Eric Wong
` (2 preceding siblings ...)
2019-05-22 21:46 ` [PATCH 3/5] DS: drop $VERSION var Eric Wong
@ 2019-05-22 21:46 ` Eric Wong
2019-05-22 21:46 ` [PATCH 5/5] DS: warn on deprecations Eric Wong
4 siblings, 0 replies; 6+ messages in thread
From: Eric Wong @ 2019-05-22 21:46 UTC (permalink / raw
To: meta
Unlike Danga::Socket, we do not support TCP_CORK, either
---
lib/PublicInbox/DS.pm | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 68af4d6..d73c8d0 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -31,7 +31,6 @@ use fields ('sock', # underlying socket
use Errno qw(EINPROGRESS EWOULDBLOCK EISCONN ENOTSOCK
EPIPE EAGAIN EBADF ECONNRESET ENOPROTOOPT);
-use Socket qw(IPPROTO_TCP);
use Carp qw(croak confess);
use constant DebugLevel => 0;
--
EW
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] DS: warn on deprecations
2019-05-22 21:46 [PATCH 0/5] DS: drop more unused stuff Eric Wong
` (3 preceding siblings ...)
2019-05-22 21:46 ` [PATCH 4/5] DS: remove IPPROTO_TCP import Eric Wong
@ 2019-05-22 21:46 ` Eric Wong
4 siblings, 0 replies; 6+ messages in thread
From: Eric Wong @ 2019-05-22 21:46 UTC (permalink / raw
To: meta
Enabling deprecation warnings didn't seem to have any
noticeable effects with "perl -w -c", so whatever reason
Danga had for it is long irrelevant.
---
lib/PublicInbox/DS.pm | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index d73c8d0..737f4c7 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -14,7 +14,6 @@ use POSIX ();
use Time::HiRes ();
use warnings;
-no warnings qw(deprecated);
use PublicInbox::Syscall qw(:epoll);
--
EW
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-22 21:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-22 21:46 [PATCH 0/5] DS: drop more unused stuff Eric Wong
2019-05-22 21:46 ` [PATCH 1/5] DS: get rid of unused methods and aliases Eric Wong
2019-05-22 21:46 ` [PATCH 2/5] DS: remove support OtherFds code Eric Wong
2019-05-22 21:46 ` [PATCH 3/5] DS: drop $VERSION var Eric Wong
2019-05-22 21:46 ` [PATCH 4/5] DS: remove IPPROTO_TCP import Eric Wong
2019-05-22 21:46 ` [PATCH 5/5] DS: warn on deprecations Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).