From 7e782e8ff3ec64500913069a2efb5815fe711a36 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 1 Jun 2020 10:06:52 +0000 Subject: www: remove smsg_mime API and adjust callers To further simplify callers and avoid embarrasing memory explosions[1], we can finally eliminate this method in favor of smsg_eml. [1] commit 7d02b9e64455831d3bda20cd2e64e0c15dc07df5 ("view: stop storing all MIME objects on large threads") fixed a huge memory blowup. --- lib/PublicInbox/Feed.pm | 6 ++--- lib/PublicInbox/Inbox.pm | 12 +++------ lib/PublicInbox/SearchView.pm | 4 +-- lib/PublicInbox/Smsg.pm | 7 +++-- lib/PublicInbox/View.pm | 63 +++++++++++++++++++++---------------------- 5 files changed, 44 insertions(+), 48 deletions(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index b770a350..4c1056b4 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -53,9 +53,9 @@ sub new_html_i { my ($nr, $ctx) = @_; my $msgs = $ctx->{msgs}; while (my $smsg = shift @$msgs) { - my $m = $ctx->{-inbox}->smsg_mime($smsg) or next; - my $more = scalar @$msgs; - return PublicInbox::View::index_entry($m, $ctx, $more); + my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next; + return PublicInbox::View::eml_entry($ctx, $smsg, $eml, + scalar @$msgs); } PublicInbox::View::pagination_footer($ctx, './new.html'); } diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 38abdfe5..af034358 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -326,18 +326,12 @@ sub msg_by_smsg ($$) { git($self)->cat_file($blob); } -sub smsg_mime { - my ($self, $smsg) = @_; - if (my $s = msg_by_smsg($self, $smsg)) { - $smsg->{mime} = PublicInbox::Eml->new($s); - return $smsg; - } -} - sub smsg_eml { my ($self, $smsg) = @_; my $bref = msg_by_smsg($self, $smsg) or return; - PublicInbox::Eml->new($bref); + my $eml = PublicInbox::Eml->new($bref); + $smsg->populate($eml) unless exists($smsg->{num}); # v1 w/o SQLite + $eml; } sub mid2num($$) { diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 249cf539..d53a533e 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -300,8 +300,8 @@ sub mset_thread_i { my ($nr, $ctx) = @_; my $msgs = $ctx->{msgs} or return; while (my $smsg = pop @$msgs) { - $ctx->{-inbox}->smsg_mime($smsg) or next; - return PublicInbox::View::index_entry($smsg, $ctx, + my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next; + return PublicInbox::View::eml_entry($ctx, $smsg, $eml, scalar @$msgs); } my ($skel) = delete @$ctx{qw(skel msgs)}; diff --git a/lib/PublicInbox/Smsg.pm b/lib/PublicInbox/Smsg.pm index 446bca81..9688c559 100644 --- a/lib/PublicInbox/Smsg.pm +++ b/lib/PublicInbox/Smsg.pm @@ -12,7 +12,7 @@ use strict; use warnings; use base qw(Exporter); our @EXPORT_OK = qw(subject_normalized); -use PublicInbox::MID qw/mid_mime/; +use PublicInbox::MID qw(mid_mime mids); use PublicInbox::Address; use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp); use Time::Local qw(timegm); @@ -105,7 +105,7 @@ sub __hdr ($$) { }; } -# for Import and v1 WWW code paths +# for Import and v1 non-SQLite WWW code paths sub populate { my ($self, $hdr, $v2w) = @_; for my $f (qw(From To Cc Subject)) { @@ -133,6 +133,9 @@ sub populate { $self->{-ts} = [ my @ts = msg_timestamp($hdr, $v2w->{cotime}) ]; $self->{ds} //= $ds[0]; # no zone $self->{ts} //= $ts[0]; + + # for v1 users w/o SQLite + $self->{mid} //= eval { mids($hdr)->[0] } // ''; } sub subject ($) { __hdr($_[0], 'Subject') } diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index a05ac414..0bc2b06e 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -74,11 +74,10 @@ sub msg_page_more { # cold my $ibx = $ctx->{-inbox}; my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev); $ctx->{more} = [ $id, $prev, $next ] if $next; - $smsg = $ibx->smsg_mime($smsg) or return ''; + my $eml = $ibx->smsg_eml($smsg) or return ''; $ctx->{mhref} = '../' . mid_href($smsg->{mid}) . '/'; - my $mime = delete $smsg->{mime}; - $ctx->{obuf} = _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr); - multipart_text_as_html($mime, $ctx); + $ctx->{obuf} = _msg_page_prepare_obuf($eml->header_obj, $ctx, $nr); + multipart_text_as_html($eml, $ctx); ${delete $ctx->{obuf}} .= '
'; } @@ -181,14 +180,14 @@ sub nr_to_s ($$$) { # human-friendly format sub fmt_ts ($) { strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } +# Displays the text of of the message for /$INBOX/$MSGID/[Tt]/ endpoint # this is already inside a
-sub index_entry {
-	my ($smsg, $ctx, $more) = @_;
-	my $subj = $smsg->subject;
-	my $mid_raw = $smsg->mid;
+sub eml_entry {
+	my ($ctx, $smsg, $eml, $more) = @_;
+	my $subj = delete $smsg->{subject};
+	my $mid_raw = $smsg->{mid};
 	my $id = id_compress($mid_raw, 1);
 	my $id_m = 'm'.$id;
-
 	my $root_anchor = $ctx->{root_anchor} || '';
 	my $irt;
 	my $obfs_ibx = $ctx->{-obfs_ibx};
@@ -201,12 +200,12 @@ sub index_entry {
 	$rv .= $subj . "\n";
 	$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
 	my @tocc;
-	my $ds = $smsg->ds; # for v1 non-Xapian/SQLite users
-	# deleting {mime} is critical to memory use,
-	# the rest of the fields saves about 400K as we iterate across 1K msgs
-	my ($mime) = delete @$smsg{qw(mime ds ts blob subject)};
+	my $ds = delete $smsg->{ds}; # for v1 non-Xapian/SQLite users
+
+	# Deleting these fields saves about 400K as we iterate across 1K msgs
+	delete @$smsg{qw(ts blob)};
 
-	my $hdr = $mime->header_obj;
+	my $hdr = $eml->header_obj;
 	my $from = _hdr_names_html($hdr, 'From');
 	obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
 	$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
@@ -244,7 +243,7 @@ sub index_entry {
 	# scan through all parts, looking for displayable text
 	$ctx->{mhref} = $mhref;
 	$ctx->{obuf} = \$rv;
-	$mime->each_part(\&add_text_body, $ctx, 1);
+	$eml->each_part(\&add_text_body, $ctx, 1);
 	delete $ctx->{obuf};
 
 	# add the footer
@@ -372,10 +371,10 @@ sub pre_thread  { # walk_thread callback
 	skel_dump($ctx, $level, $node);
 }
 
-sub thread_index_entry {
-	my ($ctx, $level, $smsg) = @_;
+sub thread_eml_entry {
+	my ($ctx, $level, $smsg, $eml) = @_;
 	my ($beg, $end) = thread_adj_level($ctx, $level);
-	$beg . '
' . index_entry($smsg, $ctx, 0) . '
' . $end; + $beg . '
' . eml_entry($ctx, $smsg, $eml, 0) . '
' . $end; } sub stream_thread_i { # PublicInbox::WwwStream::getline callback @@ -387,8 +386,8 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback my $node = shift @$q or next; my $cl = $level + 1; unshift @$q, map { ($cl, $_) } @{$node->{children}}; - if ($ctx->{-inbox}->smsg_mime($node)) { - return thread_index_entry($ctx, $level, $node); + if (my $eml = $ctx->{-inbox}->smsg_eml($node)) { + return thread_eml_entry($ctx, $level, $node, $eml); } else { return ghost_index_entry($ctx, $level, $node); } @@ -400,19 +399,19 @@ sub stream_thread ($$) { my ($rootset, $ctx) = @_; my $ibx = $ctx->{-inbox}; my @q = map { (0, $_) } @$rootset; - my ($smsg, $level); + my ($smsg, $eml, $level); while (@q) { $level = shift @q; - my $node = shift @q or next; + $smsg = shift @q or next; my $cl = $level + 1; - unshift @q, map { ($cl, $_) } @{$node->{children}}; - $smsg = $ibx->smsg_mime($node) and last; + unshift @q, map { ($cl, $_) } @{$smsg->{children}}; + $eml = $ibx->smsg_eml($smsg) and last; } - return missing_thread($ctx) unless $smsg; + return missing_thread($ctx) unless $eml; $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; $ctx->{-title_html} = ascii_html($smsg->{subject}); - $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg); + $ctx->{-html_tip} = thread_eml_entry($ctx, $level, $smsg, $eml); $ctx->{-queue} = \@q; PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i); } @@ -452,13 +451,13 @@ sub thread_html { return stream_thread($rootset, $ctx) unless $ctx->{flat}; # flat display: lazy load the full message from smsg - my $smsg; - while (my $m = shift @$msgs) { - $smsg = $ibx->smsg_mime($m) and last; + my ($smsg, $eml); + while ($smsg = shift @$msgs) { + $eml = $ibx->smsg_eml($smsg) and last; } return missing_thread($ctx) unless $smsg; $ctx->{-title_html} = ascii_html($smsg->{subject}); - $ctx->{-html_tip} = '
'.index_entry($smsg, $ctx, scalar @$msgs);
+	$ctx->{-html_tip} = '
'.eml_entry($ctx, $smsg, $eml, scalar @$msgs);
 	$ctx->{msgs} = $msgs;
 	PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i);
 }
@@ -467,8 +466,8 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback
 	my ($nr, $ctx) = @_;
 	my $msgs = $ctx->{msgs} or return;
 	while (my $smsg = shift @$msgs) {
-		$ctx->{-inbox}->smsg_mime($smsg) or next;
-		return index_entry($smsg, $ctx, scalar @$msgs);
+		my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
+		return eml_entry($ctx, $smsg, $eml, scalar @$msgs);
 	}
 	my ($skel) = delete @$ctx{qw(skel msgs)};
 	$$skel;
-- 
cgit v1.2.3-24-ge0c7