X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLock.pm;h=0ee2a8bd60bd964a13c0c24f958f43e0ca9a6b5b;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=f6eaa5ce1101128eef02885f444e09b08f5fcbb1;hpb=7f17df5c6f1892ef53f149a0ab24a5d917cce7d9;p=public-inbox.git

diff --git a/lib/PublicInbox/Lock.pm b/lib/PublicInbox/Lock.pm
index f6eaa5ce..0ee2a8bd 100644
--- a/lib/PublicInbox/Lock.pm
+++ b/lib/PublicInbox/Lock.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Base class for per-inbox locking
@@ -8,7 +8,6 @@ use v5.10.1;
 use Fcntl qw(:flock :DEFAULT);
 use Carp qw(croak);
 use PublicInbox::OnDestroy;
-use File::Temp ();
 
 # we only acquire the flock if creating or reindexing;
 # PublicInbox::Import already has the lock on its own.
@@ -17,7 +16,7 @@ sub lock_acquire {
 	my $lock_path = $self->{lock_path};
 	croak 'already locked '.($lock_path // '(undef)') if $self->{lockfh};
 	return unless defined($lock_path);
-	sysopen(my $lockfh, $lock_path, O_WRONLY|O_CREAT) or
+	sysopen(my $lockfh, $lock_path, O_RDWR|O_CREAT) or
 		croak "failed to open $lock_path: $!\n";
 	flock($lockfh, LOCK_EX) or croak "lock $lock_path failed: $!\n";
 	$self->{lockfh} = $lockfh;
@@ -36,15 +35,26 @@ sub lock_release {
 
 # caller must use return value
 sub lock_for_scope {
-	my ($self) = @_;
-	$self->lock_acquire;
-	PublicInbox::OnDestroy->new(\&lock_release, $self);
+	my ($self, @single_pid) = @_;
+	lock_acquire($self) or return; # lock_path not set
+	PublicInbox::OnDestroy->new(@single_pid, \&lock_release, $self);
+}
+
+sub lock_acquire_fast {
+	$_[0]->{lockfh} or return lock_acquire($_[0]);
+	flock($_[0]->{lockfh}, LOCK_EX) or croak "lock (fast) failed: $!";
 }
 
-sub new_tmp {
-	my ($cls, $ident) = @_;
-	my $tmp = File::Temp->new("$ident.lock-XXXXXX", TMPDIR => 1);
-	bless { lock_path => $tmp->filename, tmp => $tmp }, $cls;
+sub lock_release_fast {
+	flock($_[0]->{lockfh} // return, LOCK_UN) or
+			croak "unlock (fast) $_[0]->{lock_path}: $!";
+}
+
+# caller must use return value
+sub lock_for_scope_fast {
+	my ($self, @single_pid) = @_;
+	lock_acquire_fast($self) or return; # lock_path not set
+	PublicInbox::OnDestroy->new(@single_pid, \&lock_release_fast, $self);
 }
 
 1;