ds: move requeue_once

It's the same subroutine everywhere.

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index daef9d893d5a555bd0fd5188db57edaacd22c43e..f0181b5461cfc4111574af2991d3522a57aba174 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -650,6 +650,20 @@ sub shutdn ($) {
 
 sub zflush {} # overridden by NNTPdeflate and IMAPdeflate
 
+sub requeue_once {
+       my ($self) = @_;
+       # COMPRESS users all share the same DEFLATE context.
+       # Flush it here to ensure clients don't see
+       # each other's data
+       $self->zflush;
+
+       # no recursion, schedule another call ASAP,
+       # but only after all pending writes are done.
+       # autovivify wbuf.  wbuf may be populated by $cb,
+       # no need to rearm if so: (push returns new size of array)
+       requeue($self) if push(@{$self->{wbuf}}, $self->can('long_step')) == 1;
+}
+
 sub dwaitpid ($;$$) {
        my ($pid, $cb, $arg) = @_;
        if ($in_loop) {

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index f4b08eeed04f3387b364822e22c865d692323fc3..18a12564dad042983f52a818da9ce56ae4196cbd 100644 (file)
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -563,22 +563,6 @@ sub fetch_body ($;$) {
        join('', @hold);
 }
 
-sub requeue_once ($) {
-       my ($self) = @_;
-       # COMPRESS users all share the same DEFLATE context.
-       # Flush it here to ensure clients don't see
-       # each other's data
-       $self->zflush;
-
-       # no recursion, schedule another call ASAP,
-       # but only after all pending writes are done.
-       # autovivify wbuf:
-       my $new_size = push(@{$self->{wbuf}}, \&long_step);
-
-       # wbuf may be populated by $cb, no need to rearm if so:
-       $self->requeue if $new_size == 1;
-}
-
 sub fetch_run_ops {
        my ($self, $smsg, $bref, $ops, $partial) = @_;
        my $uid = $smsg->{num};
@@ -601,7 +585,7 @@ sub fetch_blob_cb { # called by git->cat_async via ibx_async_cat
                # it's possible to have TOCTOU if an admin runs
                # public-inbox-(edit|purge), just move onto the next message
                warn "E: $smsg->{blob} missing in $ibx->{inboxdir}\n";
-               return requeue_once($self);
+               return $self->requeue_once;
        } else {
                $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
        }
@@ -611,7 +595,7 @@ sub fetch_blob_cb { # called by git->cat_async via ibx_async_cat
                                        \&fetch_blob_cb, $fetch_arg);
        }
        fetch_run_ops($self, $smsg, $bref, $ops, $partial);
-       $pre ? $self->zflush : requeue_once($self);
+       $pre ? $self->zflush : $self->requeue_once;
 }
 
 sub emit_rfc822 {
@@ -1198,7 +1182,7 @@ sub long_step {
                $self->close;
        } elsif ($more) { # $self->{wbuf}:
                # control passed to ibx_async_cat if $more == \undef
-               requeue_once($self) if !ref($more);
+               $self->requeue_once($self) if !ref($more);
        } else { # all done!
                delete $self->{long_cb};
                my $elapsed = now() - $t0;

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index f0ee11cb0b97a7889cdee091032fccbf9c47eb84..43219b36efd9fa4eafd36489f2e0f6fd9baa8b8c 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -635,17 +635,8 @@ sub long_step {
                out($self, " deferred[$fd] aborted - %0.6f", $elapsed);
                $self->close;
        } elsif ($more) { # $self->{wbuf}:
-               # COMPRESS users all share the same DEFLATE context.
-               # Flush it here to ensure clients don't see
-               # each other's data
-               $self->zflush;
-
-               # no recursion, schedule another call ASAP, but only after
-               # all pending writes are done.  autovivify wbuf:
-               my $new_size = push(@{$self->{wbuf}}, \&long_step);
-
-               # wbuf may be populated by $cb, no need to rearm if so:
-               $self->requeue if $new_size == 1;
+               # control passed to ibx_async_cat if $more == \undef
+               $self->requeue_once if !ref($more);
        } else { # all done!
                delete $self->{long_cb};
                $self->write(\".\r\n");

diff --git a/lib/PublicInbox/POP3.pm b/lib/PublicInbox/POP3.pm
index fcea4bb9d154ae4901b2c8fdc678d2d7481f1cb8..741b5e58a90949854fdcf4331d2e3ad8e89bcfdf 100644 (file)
--- a/lib/PublicInbox/POP3.pm
+++ b/lib/PublicInbox/POP3.pm
@@ -55,22 +55,6 @@ sub out ($$;@) {
        printf { $self->{pop3d}->{out} } $fmt."\n", @args;
 }
 
-sub requeue_once ($) {
-       my ($self) = @_;
-       # COMPRESS users all share the same DEFLATE context.
-       # Flush it here to ensure clients don't see
-       # each other's data
-       $self->zflush;
-
-       # no recursion, schedule another call ASAP,
-       # but only after all pending writes are done.
-       # autovivify wbuf:
-       my $new_size = push(@{$self->{wbuf}}, \&long_step);
-
-       # wbuf may be populated by $cb, no need to rearm if so:
-       $self->requeue if $new_size == 1;
-}
-
 sub long_step {
        my ($self) = @_;
        # wbuf is unset or empty, here; {long} may add to it