From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 09/10] ds: merge sigmask
Date: Sat, 2 Sep 2023 11:09:59 +0000 [thread overview]
Message-ID: <20230902111000.1747604-9-e@80x24.org> (raw)
In-Reply-To: <20230902111000.1747604-1-e@80x24.org>
---
lib/PublicInbox/DS.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 389ca70d..5168a6ee 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -24,7 +24,7 @@ use strict;
use v5.10.1;
use parent qw(Exporter);
use bytes qw(length substr); # FIXME(?): needed for PublicInbox::NNTP
-use POSIX qw(WNOHANG sigprocmask SIG_SETMASK);
+use POSIX qw(WNOHANG sigprocmask SIG_SETMASK SIG_UNBLOCK);
use Fcntl qw(SEEK_SET :DEFAULT O_APPEND);
use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use Scalar::Util qw(blessed);
@@ -292,7 +292,8 @@ sub event_loop (;$$) {
if (!$sigfd && $sig) {
# wake up every second to accept signals if we don't
# have signalfd or IO::KQueue:
- sig_setmask($oldset // allowset($sig));
+ sig_setmask($oldset) if $oldset;
+ sigprocmask(SIG_UNBLOCK, allowset($sig)) or die "SIG_UNBLOCK: $!";
PublicInbox::DS->SetLoopTimeout(1000);
}
$_[0] = $sigfd = $sig = undef; # $_[0] == sig
next prev parent reply other threads:[~2023-09-02 11:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 11:09 [PATCH 01/10] ds: don't block important signals we don't use Eric Wong
2023-09-02 11:09 ` [PATCH 02/10] t/sigfd: test EVFILT_SIGNAL vs signalfd differences Eric Wong
2023-09-02 11:09 ` [PATCH 03/10] t/sigfd: better checks related to SIGWINCH Eric Wong
2023-09-02 11:09 ` [PATCH 04/10] update devel/syscall-list to devel/sysdefs-list Eric Wong
2023-09-02 11:09 ` [PATCH 05/10] daemon: workaround pre-EVFILT_SIGNAL signals Eric Wong
2023-09-02 11:09 ` [PATCH 06/10] watch: ensure children can use signal handlers Eric Wong
2023-09-02 11:09 ` [PATCH 07/10] test_common: start_script: block signals around fork Eric Wong
2023-09-02 11:09 ` [PATCH 08/10] xap_helper: support SIGTTIN+SIGTTOU worker adjustments Eric Wong
2023-09-02 11:09 ` Eric Wong [this message]
2023-09-02 11:10 ` [PATCH 10/10] special cases for unblocking signals Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230902111000.1747604-9-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).