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.
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;
PublicInbox::OnDestroy->new(@single_pid, \&lock_release, $self);
}
-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_acquire_fast {
+ $_[0]->{lockfh} or return lock_acquire($_[0]);
+ flock($_[0]->{lockfh}, LOCK_EX) or croak "lock (fast) failed: $!";
+}
+
+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;