xt: fold perf-obfuscate into perf-msgview, future-proof

perf-obfuscate was close enough to perf-msgview that it only
required setting the `obfuscate' field of the inbox.
Then update perf-msgview to account for upcoming internal
changes.  The current use of {obuf} and concat ops results in
excessive scratchpad space and I may be able to even get
speedups by avoiding concat ops.

diff --git a/MANIFEST b/MANIFEST
index ac21ddccb21c66ac52d667e098dfac949150a94b..8be912d0a8a907f8d621bb4c230a89f486acb12f 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -602,7 +602,6 @@ xt/nntpd-validate.t
 xt/over-fsck.perl
 xt/perf-msgview.t
 xt/perf-nntpd.t
-xt/perf-obfuscate.t
 xt/perf-threading.t
 xt/pop3d-mpop.t
 xt/solver.t

diff --git a/xt/perf-msgview.t b/xt/perf-msgview.t
index 7f92ce858a2e4cb5172a6832447c9f0fe26b14bd..ef261359bbc76e6281da091abf952e2c330918e7 100644 (file)
--- a/xt/perf-msgview.t
+++ b/xt/perf-msgview.t
@@ -11,6 +11,8 @@ use PublicInbox::WwwStream;
 
 my $inboxdir = $ENV{GIANT_INBOX_DIR} // $ENV{GIANT_PI_DIR};
 my $blob = $ENV{TEST_BLOB};
+my $obfuscate = $ENV{PI_OBFUSCATE} ? 1 : 0;
+diag "PI_OBFUSCATE=$obfuscate";
 plan skip_all => "GIANT_INBOX_DIR not defined for $0" unless $inboxdir;
 
 my @cat = qw(cat-file --buffer --batch-check --batch-all-objects);
@@ -21,7 +23,8 @@ if (require_git(2.19, 1)) {
 "git <2.19, cat-file lacks --unordered, locality suffers\n";
 }
 require_mods qw(Plack::Util);
-my $ibx = PublicInbox::Inbox->new({ inboxdir => $inboxdir, name => 'name' });
+my $ibx = PublicInbox::Inbox->new({ inboxdir => $inboxdir, name => 'name',
+                                   obfuscate => $obfuscate});
 my $git = $ibx->git;
 my $fh = $blob ? undef : $git->popen(@cat);
 if ($fh) {
@@ -46,10 +49,11 @@ $ctx->{mhref} = '../';
 my $cb = sub {
        $eml = PublicInbox::Eml->new(shift);
        $eml->each_part(\&PublicInbox::View::add_text_body, $ctx, 1);
-       $ctx->zflush;
+       $ctx->zflush(grep defined, delete @$ctx{'obuf'}); # compat
        ++$m;
        delete $ctx->{zbuf};
-       ${$ctx->{obuf}} = '';
+       ${$ctx->{obuf}} = ''; # compat
+       $ctx->{gz} = PublicInbox::GzipFilter::gzip_or_die();
 };
 
 my $t = timeit(1, sub {

diff --git a/xt/perf-obfuscate.t b/xt/perf-obfuscate.t
deleted file mode 100644 (file)
index 4da3612..0000000
--- a/xt/perf-obfuscate.t
+++ /dev/null
@@ -1,66 +0,0 @@
-#!perl -w
-# Copyright (C) all contributors <meta@public-inbox.org>
-# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use v5.10.1;
-use PublicInbox::TestCommon;
-use Benchmark qw(:all);
-use PublicInbox::Inbox;
-use PublicInbox::View;
-use PublicInbox::WwwStream;
-
-my $inboxdir = $ENV{GIANT_INBOX_DIR};
-plan skip_all => "GIANT_INBOX_DIR not defined for $0" unless $inboxdir;
-
-my $obfuscate = $ENV{PI_OBFUSCATE} ? 1 : 0;
-diag "obfuscate=$obfuscate\n";
-
-my @cat = qw(cat-file --buffer --batch-check --batch-all-objects);
-if (require_git(2.19, 1)) {
-       push @cat, '--unordered';
-} else {
-       warn
-"git <2.19, cat-file lacks --unordered, locality suffers\n";
-}
-require_mods qw(Plack::Util);
-my $ibx = PublicInbox::Inbox->new({ inboxdir => $inboxdir, name => 'name' ,
-                                   obfuscate => $obfuscate});
-my $git = $ibx->git;
-my $fh = $git->popen(@cat);
-my $vec = '';
-vec($vec, fileno($fh), 1) = 1;
-select($vec, undef, undef, 60) or die "timed out waiting for --batch-check";
-
-my $ctx = bless {
-       env => { HTTP_HOST => 'example.com', 'psgi.url_scheme' => 'https' },
-       ibx => $ibx,
-       www => Plack::Util::inline_object(style => sub {''}),
-       gz => PublicInbox::GzipFilter::gzip_or_die(),
-}, 'PublicInbox::WwwStream';
-my ($eml, $res, $oid, $type);
-my $n = 0;
-my $m = 0;
-${$ctx->{obuf}} = '';
-$ctx->{mhref} = '../';
-
-my $cb = sub {
-       $eml = PublicInbox::Eml->new(shift);
-       $eml->each_part(\&PublicInbox::View::add_text_body, $ctx, 1);
-       $ctx->zflush;
-       ++$m;
-       delete $ctx->{zbuf};
-       ${$ctx->{obuf}} = '';
-};
-
-my $t = timeit(1, sub {
-       while (<$fh>) {
-               ($oid, $type) = split / /;
-               next if $type ne 'blob';
-               ++$n;
-               $git->cat_async($oid, $cb);
-       }
-       $git->async_wait_all;
-});
-diag 'add_text_body took '.timestr($t)." for $n <=> $m messages";
-is($m, $n, 'rendered all messages');
-done_testing();