user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/5] DS: remove support OtherFds code
Date: Wed, 22 May 2019 21:46:56 +0000
Message-ID: <20190522214659.6183-3-e@80x24.org> (raw)
In-Reply-To: <20190522214659.6183-1-e@80x24.org>

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


  parent reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190522214659.6183-3-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox