about summary refs log tree commit homepage
path: root/lib/PublicInbox/NNTP.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-06-28 05:25:40 +0000
committerEric Wong <e@80x24.org>2019-06-29 19:59:00 +0000
commit7c83d3e706811095cedab0bf62ac530d7b0f3a5a (patch)
tree14492c1fd2e0f567b70e691ffd75fb88a28a238c /lib/PublicInbox/NNTP.pm
parente37ac4015fa6f9616c845a73abc36ec5a21d57a7 (diff)
downloadpublic-inbox-7c83d3e706811095cedab0bf62ac530d7b0f3a5a.tar.gz
ds: handle deferred DS->close after timers
Our hacks in EvCleanup::next_tick and EvCleanup::asap were due
to the fact "closed" sockets were deferred and could not wake
up the event loop, causing certain actions to be delayed until
an event fired.

Instead, ensure we don't sleep if there are pending sockets to
close.

We can then remove most of the EvCleanup stuff

While we're at it, split out immediate timer handling into a
separate array so we don't need to deal with time calculations
for the event loop.
Diffstat (limited to 'lib/PublicInbox/NNTP.pm')
-rw-r--r--lib/PublicInbox/NNTP.pm14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 83970309..9973fcaf 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -50,14 +50,11 @@ sub expire_old () {
         my $exp = $EXPTIME;
         my $old = $now - $exp;
         my $nr = 0;
-        my $closed = 0;
         my %new;
         while (my ($fd, $v) = each %$EXPMAP) {
                 my ($idle_time, $nntp) = @$v;
                 if ($idle_time < $old) {
-                        if ($nntp->shutdn) {
-                                $closed++;
-                        } else {
+                        if (!$nntp->shutdn) {
                                 ++$nr;
                                 $new{$fd} = $v;
                         }
@@ -67,14 +64,7 @@ sub expire_old () {
                 }
         }
         $EXPMAP = \%new;
-        if ($nr) {
-                $expt = PublicInbox::EvCleanup::later(*expire_old);
-        } else {
-                $expt = undef;
-                # noop to kick outselves out of the loop ASAP so descriptors
-                # really get closed
-                PublicInbox::EvCleanup::asap(sub {}) if $closed;
-        }
+        $expt = PublicInbox::EvCleanup::later(*expire_old) if $nr;
 }
 
 sub greet ($) { $_[0]->write($_[0]->{nntpd}->{greet}) };