* [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup
2021-01-29 7:42 6% [PATCH 0/7] lei: more half-baked updates Eric Wong
@ 2021-01-29 7:43 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-01-29 7:43 UTC (permalink / raw)
To: meta
We don't need another hash slot when we can encode the object ID
and PID owner into the field name itself.
---
lib/PublicInbox/SharedKV.pm | 8 +++-----
t/shared_kv.t | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm
index 072c94ca..94f2429f 100644
--- a/lib/PublicInbox/SharedKV.pm
+++ b/lib/PublicInbox/SharedKV.pm
@@ -44,10 +44,7 @@ CREATE TABLE IF NOT EXISTS kv (
sub new {
my ($cls, $dir, $base, $opt) = @_;
my $self = bless { opt => $opt }, $cls;
- unless (defined $dir) {
- $self->{tmpdir} = $dir = tempdir('skv-XXXXXX', TMPDIR => 1);
- $self->{tmpid} = "$$.$self";
- }
+ $dir //= $self->{"tmp$$.$self"} = tempdir("skv.$$-XXXX", TMPDIR => 1);
-d $dir or mkdir($dir) or die "mkdir($dir): $!";
$base //= '';
my $f = $self->{filename} = "$dir/$base.sqlite3";
@@ -148,7 +145,8 @@ SELECT COUNT(k) FROM kv
sub DESTROY {
my ($self) = @_;
- rmtree($self->{tmpdir}) if ($self->{tmpid} // '') eq "$$.$self";
+ my $dir = delete $self->{"tmp$$.$self"} or return;
+ rmtree($dir);
}
1;
diff --git a/t/shared_kv.t b/t/shared_kv.t
index 6f6374f2..fcae688a 100644
--- a/t/shared_kv.t
+++ b/t/shared_kv.t
@@ -9,7 +9,7 @@ use_ok 'PublicInbox::SharedKV';
my ($tmpdir, $for_destroy) = tmpdir();
local $ENV{TMPDIR} = $tmpdir;
my $skv = PublicInbox::SharedKV->new;
-my $skv_tmpdir = $skv->{tmpdir};
+my $skv_tmpdir = $skv->{"tmp$$.$skv"};
ok(-d $skv_tmpdir, 'created a temporary dir');
$skv->dbh;
my $dead = "\xde\xad";
^ permalink raw reply related [relevance 7%]
* [PATCH 0/7] lei: more half-baked updates
@ 2021-01-29 7:42 6% Eric Wong
2021-01-29 7:43 7% ` [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-01-29 7:42 UTC (permalink / raw)
To: meta
I'm not sure if I want to keep 1/7.
4/7 is LONG overdue
Still chasing down difficult-to-reproduce lei2mail workers
segfaults which seem related to LeiDedupe + SharedKV and weird
object lifetimes; which is preventing me from doing anything
else. Worst case is we disable worker processes, but the
performance hit sucks.
Eric Wong (7):
ipc: wq: support passing fields to workers
lei_xsearch: drop repeated "Xapian" in error message
ipc: more consistent behavior between worker types
lei: less error-prone FD mapping
git: synchronous cat_file may return type and OID
ipc: move on_destroy scope to inside the eval
shared_kv: simplify PID+object guard for cleanup
lib/PublicInbox/Git.pm | 9 ++---
lib/PublicInbox/IPC.pm | 46 +++++++++++++---------
lib/PublicInbox/LEI.pm | 56 ++++++++++++++++++++-------
lib/PublicInbox/LeiOverview.pm | 9 ++---
lib/PublicInbox/LeiToMail.pm | 8 +---
lib/PublicInbox/LeiXSearch.pm | 70 +++++++++++++++-------------------
lib/PublicInbox/SharedKV.pm | 8 ++--
lib/PublicInbox/Spawn.pm | 2 +-
t/git.t | 8 ++--
t/shared_kv.t | 2 +-
10 files changed, 119 insertions(+), 99 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-01-29 7:42 6% [PATCH 0/7] lei: more half-baked updates Eric Wong
2021-01-29 7:43 7% ` [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup 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).