From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] www_stream: use DESTROY to cleanup temporary gits
Date: Sat, 1 Oct 2022 15:52:50 -0300 [thread overview]
Message-ID: <20221001185250.22577-1-e@80x24.org> (raw)
Relying on a timer to handle cleanup in f9ac22a4b485 was
sub-optimal since the delay could prove expensive under heavy
traffic. So rely on ->DESTROY instead since we we no longer
hold reference cycles by the time the show_blob callback
executes.
Fixes: f9ac22a4b485 ("git_async_cat: automatically cleanup temporary gits")
---
lib/PublicInbox/GitAsyncCat.pm | 8 --------
lib/PublicInbox/ViewVCS.pm | 1 +
lib/PublicInbox/WwwStream.pm | 5 +++++
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 2d601542..b32c2fd3 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -45,12 +45,6 @@ sub event_step {
}
}
-sub git_tmp_cleanup {
- my ($git) = @_;
- $git->cleanup(1) and
- PublicInbox::DS::add_timer(3, \&git_tmp_cleanup, $git);
-}
-
sub ibx_async_cat ($$$$) {
my ($ibx, $oid, $cb, $arg) = @_;
my $git = $ibx->{git} // $ibx->git;
@@ -69,8 +63,6 @@ sub ibx_async_cat ($$$$) {
$git->{async_cat} //= do {
my $self = bless { git => $git }, __PACKAGE__;
$git->{in}->blocking(0);
- $git->{-tmp} and PublicInbox::DS::add_uniq_timer(
- 3, \&git_tmp_cleanup, $git);
$self->SUPER::new($git->{in}, EPOLLIN|EPOLLET);
\undef; # this is a true ref()
};
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 915cf2c5..b0f58455 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -414,6 +414,7 @@ blob $oid $size bytes $raw_link</pre>
EOM
}
@{$ctx->{-paths}} = ($path, $raw_link);
+ bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY
$ctx->{git} = $git;
if ($ctx->{env}->{'pi-httpd.async'}) {
ibx_async_cat($ctx, $oid, \&show_blob, $ctx);
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 77b6f9c2..16442d51 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -220,4 +220,9 @@ sub html_init {
print { $ctx->zfh } html_top($ctx);
}
+sub DESTROY {
+ my ($ctx) = @_;
+ $ctx->{git}->cleanup if $ctx->{git} && $ctx->{git}->{-tmp};
+}
+
1;
reply other threads:[~2022-10-01 18:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221001185250.22577-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).