* [PATCH 06/11] ds: move requeue_once
2022-07-23 4:41 7% [PATCH 00/11] IMAP, NNTP, POP3 golfing Eric Wong
@ 2022-07-23 4:41 4% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-07-23 4:41 UTC (permalink / raw)
To: meta
It's the same subroutine everywhere.
---
lib/PublicInbox/DS.pm | 14 ++++++++++++++
lib/PublicInbox/IMAP.pm | 22 +++-------------------
lib/PublicInbox/NNTP.pm | 13 ++-----------
lib/PublicInbox/POP3.pm | 16 ----------------
4 files changed, 19 insertions(+), 46 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index daef9d89..f0181b54 100644
--- 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 f4b08eee..18a12564 100644
--- 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 f0ee11cb..43219b36 100644
--- 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 fcea4bb9..741b5e58 100644
--- 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
^ permalink raw reply related [relevance 4%]
* [PATCH 00/11] IMAP, NNTP, POP3 golfing
@ 2022-07-23 4:41 7% Eric Wong
2022-07-23 4:41 4% ` [PATCH 06/11] ds: move requeue_once Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2022-07-23 4:41 UTC (permalink / raw)
To: meta
More to come, but duplicate code and data structures are
to be eliminated.
Eric Wong (11):
nntp: pass regexp to split() callers
nntp: start adding CRLF to responses natively
nntp: remove more() wrapper
ds: support greeting protocols
ds: move no-op ->zflush to common base class
ds: move requeue_once
nntp: listgroup_range_i: remove useless `map' op
nntp: inline CRLF in all response lines
ds: share long_step between NNTP and IMAP
nntp: resolve inboxes immediately on group listings
imap+nntp: share COMPRESS implementation
MANIFEST | 3 +-
lib/PublicInbox/DS.pm | 72 ++++
.../{NNTPdeflate.pm => DSdeflate.pm} | 15 +-
lib/PublicInbox/IMAP.pm | 102 +----
lib/PublicInbox/IMAPD.pm | 2 +-
lib/PublicInbox/IMAPdeflate.pm | 126 ------
lib/PublicInbox/NNTP.pm | 404 +++++++-----------
lib/PublicInbox/NNTPD.pm | 4 +-
lib/PublicInbox/POP3.pm | 80 +---
t/nntpd.t | 2 +-
xt/mem-imapd-tls.t | 4 +-
11 files changed, 262 insertions(+), 552 deletions(-)
rename lib/PublicInbox/{NNTPdeflate.pm => DSdeflate.pm} (91%)
delete mode 100644 lib/PublicInbox/IMAPdeflate.pm
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-07-23 4:41 7% [PATCH 00/11] IMAP, NNTP, POP3 golfing Eric Wong
2022-07-23 4:41 4% ` [PATCH 06/11] ds: move requeue_once Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).