* [PATCH 09/15] watch: remove redundant signal mask manipulation
2021-10-21 21:10 6% [PATCH 00/15] use RENAME_NOREPLACE on Linux 3.15+ Eric Wong
@ 2021-10-21 21:10 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-10-21 21:10 UTC (permalink / raw)
To: meta
The top-level daemon process already blocks all signals,
so there's no reason to block them around fork() calls.
---
lib/PublicInbox/Watch.pm | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index e80bbdec16fd..3f6fe21b726f 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -391,11 +391,7 @@ sub watch_atfork_child ($) {
PublicInbox::DS::sig_setmask($self->{oldset});
}
-sub watch_atfork_parent ($) {
- my ($self) = @_;
- _done_for_now($self);
- PublicInbox::DS::block_signals();
-}
+sub watch_atfork_parent ($) { _done_for_now($_[0]) }
sub imap_idle_requeue { # DS::add_timer callback
my ($self, $uri_intvl) = @_;
@@ -449,13 +445,12 @@ sub event_step {
return if $self->{quit};
my $idle_todo = $self->{idle_todo};
if ($idle_todo && @$idle_todo) {
- my $oldset = watch_atfork_parent($self);
+ watch_atfork_parent($self);
eval {
while (my $uri_intvl = shift(@$idle_todo)) {
imap_idle_fork($self, $uri_intvl);
}
};
- PublicInbox::DS::sig_setmask($oldset);
die $@ if $@;
}
fs_scan_step($self) if $self->{mdre};
@@ -492,7 +487,7 @@ sub poll_fetch_fork { # DS::add_timer callback
my ($self, $intvl, $uris) = @_;
return if $self->{quit};
pipe(my ($r, $w)) or die "pipe: $!";
- my $oldset = watch_atfork_parent($self);
+ watch_atfork_parent($self);
my $seed = rand(0xffffffff);
my $pid = fork;
if (defined($pid) && $pid == 0) {
@@ -508,7 +503,6 @@ sub poll_fetch_fork { # DS::add_timer callback
close $w;
_exit(0);
}
- PublicInbox::DS::sig_setmask($oldset);
die "fork: $!" unless defined $pid;
$self->{poll_pids}->{$pid} = [ $intvl, $uris ];
PublicInbox::EOFpipe->new($r, \&reap, [$pid, \&poll_fetch_reap, $self]);
^ permalink raw reply related [relevance 7%]
* [PATCH 00/15] use RENAME_NOREPLACE on Linux 3.15+
@ 2021-10-21 21:10 6% Eric Wong
2021-10-21 21:10 7% ` [PATCH 09/15] watch: remove redundant signal mask manipulation Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-10-21 21:10 UTC (permalink / raw)
To: meta
What started off as a trivial, "something-to-do-before-bedtime"
change several days ago (15/15) ended up forcing me to fix
various hard-to-reproduce race conditions around Maildirs.
Eventually, `schedtool -a 0x1 -e ...' helped me reproduce
some races more easily (but still not with 100% reliability).
t/lei-{watch,auto-watch,export-kw}.t should all be more
reliable, now.
There's also several other minor fixes I found along the way...
Eric Wong (15):
t/lei-{auto-watch,export-kw}: extra diagnostics on failure
t/lei-import-maildir: rename fix (SR -> RS)
t/lei-p2q: extra diagnostics
lei/store: check for any unexpected process death
lei note-event: drop unnecessary eval guard
lei note-event: wq_io_do => wq_do
lei_search: try harder to associate "lei index"-ed messages
watch: check for {quit} before IDLE
watch: remove redundant signal mask manipulation
doc: lei-overview: add CAVEATS section
lei note-event: clear_src on ENOENT
dir_idle: treat IN_MOVED_FROM as a gone event
lei: no Perl FileHandle for `undef' w/ ECONNRESET
lei_mail_sync: mv_src: use transaction, check UNIQUE
lei: use RENAME_NOREPLACE on Linux 3.15+
Documentation/lei-overview.pod | 5 ++++
MANIFEST | 1 +
devel/syscall-list | 8 +++++-
lib/PublicInbox/DirIdle.pm | 3 +-
lib/PublicInbox/FakeInotify.pm | 3 ++
lib/PublicInbox/LEI.pm | 3 +-
lib/PublicInbox/LeiExportKw.pm | 19 ++++---------
lib/PublicInbox/LeiMailSync.pm | 8 ++++--
lib/PublicInbox/LeiNoteEvent.pm | 13 +++++----
lib/PublicInbox/LeiSearch.pm | 13 ++++++++-
lib/PublicInbox/LeiStore.pm | 16 +++++++----
lib/PublicInbox/LeiToMail.pm | 7 ++---
lib/PublicInbox/Syscall.pm | 49 +++++++++++++++++++++++++++++++--
lib/PublicInbox/Watch.pm | 13 +++------
t/lei-auto-watch.t | 3 +-
t/lei-export-kw.t | 39 ++++++++++++++++++--------
t/lei-import-maildir.t | 2 +-
t/lei-p2q.t | 2 +-
t/rename_noreplace.t | 26 +++++++++++++++++
19 files changed, 173 insertions(+), 60 deletions(-)
create mode 100644 t/rename_noreplace.t
^ 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-10-21 21:10 6% [PATCH 00/15] use RENAME_NOREPLACE on Linux 3.15+ Eric Wong
2021-10-21 21:10 7% ` [PATCH 09/15] watch: remove redundant signal mask manipulation 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).