X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fperf-msgview.t;h=cf550c1a284b80b9dd516444f93302a604bd194d;hb=refs%2Fheads%2Fmaster;hp=f97c06fb2e65a0427fb2e4c8c738d3fb7e506e53;hpb=5cec164a0c5688a0410964cdc07c7e843e175545;p=public-inbox.git

diff --git a/xt/perf-msgview.t b/xt/perf-msgview.t
index f97c06fb..ef261359 100644
--- a/xt/perf-msgview.t
+++ b/xt/perf-msgview.t
@@ -7,10 +7,12 @@ use PublicInbox::TestCommon;
 use Benchmark qw(:all);
 use PublicInbox::Inbox;
 use PublicInbox::View;
-use PublicInbox::Spawn qw(popen_rd);
+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,8 +23,8 @@ if (require_git(2.19, 1)) {
 "git <2.19, cat-file lacks --unordered, locality suffers\n";
 }
 require_mods qw(Plack::Util);
-use_ok '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) {
@@ -32,26 +34,29 @@ if ($fh) {
 		die "timed out waiting for --batch-check";
 }
 
-my $ctx = {
+my $ctx = bless {
 	env => { HTTP_HOST => 'example.com', 'psgi.url_scheme' => 'https' },
 	ibx => $ibx,
 	www => Plack::Util::inline_object(style => sub {''}),
-};
-my ($mime, $res, $oid, $type);
+	gz => PublicInbox::GzipFilter::gzip_or_die(),
+}, 'PublicInbox::WwwStream';
+my ($eml, $res, $oid, $type);
 my $n = 0;
-my $obuf = '';
 my $m = 0;
+${$ctx->{obuf}} = '';
+$ctx->{mhref} = '../';
 
 my $cb = sub {
-	$mime = PublicInbox::Eml->new(shift);
-	PublicInbox::View::multipart_text_as_html($mime, $ctx);
+	$eml = PublicInbox::Eml->new(shift);
+	$eml->each_part(\&PublicInbox::View::add_text_body, $ctx, 1);
+	$ctx->zflush(grep defined, delete @$ctx{'obuf'}); # compat
 	++$m;
-	$obuf = '';
+	delete $ctx->{zbuf};
+	${$ctx->{obuf}} = ''; # compat
+	$ctx->{gz} = PublicInbox::GzipFilter::gzip_or_die();
 };
 
 my $t = timeit(1, sub {
-	$ctx->{obuf} = \$obuf;
-	$ctx->{mhref} = '../';
 	if (defined $blob) {
 		my $nr = $ENV{NR} // 10000;
 		for (1..$nr) {
@@ -66,8 +71,8 @@ my $t = timeit(1, sub {
 			$git->cat_async($oid, $cb);
 		}
 	}
-	$git->cat_async_wait;
+	$git->async_wait_all;
 });
-diag 'multipart_text_as_html took '.timestr($t)." for $n <=> $m messages";
+diag 'add_text_body took '.timestr($t)." for $n <=> $m messages";
 is($m, $n, 'rendered all messages');
 done_testing();