-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 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
# PublicInbox::Import already has the lock on its own.
sub lock_acquire {
my ($self) = @_;
- croak 'already locked' if $self->{lockfh};
- my $lock_path = $self->{lock_path} or return;
+ 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
- die "failed to open lock $lock_path: $!\n";
- flock($lockfh, LOCK_EX) or die "lock failed: $!\n";
+ croak "failed to open $lock_path: $!\n";
+ flock($lockfh, LOCK_EX) or croak "lock $lock_path failed: $!\n";
$self->{lockfh} = $lockfh;
}
sub lock_release {
- my ($self) = @_;
- return unless $self->{lock_path};
- my $lockfh = delete $self->{lockfh} or croak 'not locked';
- flock($lockfh, LOCK_UN) or die "unlock failed: $!\n";
- close $lockfh or die "close failed: $!\n";
+ my ($self, $wake) = @_;
+ defined(my $lock_path = $self->{lock_path}) or return;
+ my $lockfh = delete $self->{lockfh} or croak "not locked: $lock_path";
+
+ syswrite($lockfh, '.') if $wake;
+
+ flock($lockfh, LOCK_UN) or croak "unlock $lock_path failed: $!\n";
+ close $lockfh or croak "close $lock_path failed: $!\n";
}
1;