From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/7] ipc: wq: support passing fields to workers
Date: Fri, 29 Jan 2021 12:42:54 +0500 [thread overview]
Message-ID: <20210129074300.14475-2-e@80x24.org> (raw)
In-Reply-To: <20210129074300.14475-1-e@80x24.org>
This will be useful for pre-sharing certain file handles.
---
lib/PublicInbox/IPC.pm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index c52441f7..838f9530 100644
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -311,14 +311,15 @@ sub wq_do { # always async
}
}
-sub _wq_worker_start ($$) {
- my ($self, $oldset) = @_;
+sub _wq_worker_start ($$$) {
+ my ($self, $oldset, $fields) = @_;
my $seed = rand(0xffffffff);
my $pid = fork // die "fork: $!";
if ($pid == 0) {
srand($seed);
eval { PublicInbox::DS->Reset };
delete @$self{qw(-wq_s1 -wq_workers -wq_ppid)};
+ @$self{keys %$fields} = values(%$fields) if $fields;
$SIG{$_} = 'IGNORE' for (qw(PIPE TTOU TTIN));
$SIG{$_} = 'DEFAULT' for (qw(TERM QUIT INT CHLD));
local $0 = $self->{-wq_ident};
@@ -337,7 +338,7 @@ sub _wq_worker_start ($$) {
# starts workqueue workers if Sereal or Storable is installed
sub wq_workers_start {
- my ($self, $ident, $nr_workers, $oldset) = @_;
+ my ($self, $ident, $nr_workers, $oldset, $fields) = @_;
($enc && $send_cmd && $recv_cmd && defined($SEQPACKET)) or return;
return if $self->{-wq_s1}; # idempotent
$self->{-wq_s1} = $self->{-wq_s2} = undef;
@@ -349,18 +350,18 @@ sub wq_workers_start {
my $sigset = $oldset // PublicInbox::DS::block_signals();
$self->{-wq_workers} = {};
$self->{-wq_ident} = $ident;
- _wq_worker_start($self, $sigset) for (1..$nr_workers);
+ _wq_worker_start($self, $sigset, $fields) for (1..$nr_workers);
PublicInbox::DS::sig_setmask($sigset) unless $oldset;
$self->{-wq_ppid} = $$;
}
sub wq_worker_incr { # SIGTTIN handler
- my ($self, $oldset) = @_;
+ my ($self, $oldset, $fields) = @_;
$self->{-wq_s2} or return;
return if wq_workers($self) >= $WQ_MAX_WORKERS;
$self->ipc_atfork_prepare;
my $sigset = $oldset // PublicInbox::DS::block_signals();
- _wq_worker_start($self, $sigset);
+ _wq_worker_start($self, $sigset, $fields);
PublicInbox::DS::sig_setmask($sigset) unless $oldset;
}
next prev parent reply other threads:[~2021-01-29 7:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 7:42 [PATCH 0/7] lei: more half-baked updates Eric Wong
2021-01-29 7:42 ` Eric Wong [this message]
2021-01-29 7:42 ` [PATCH 2/7] lei_xsearch: drop repeated "Xapian" in error message Eric Wong
2021-01-29 7:42 ` [PATCH 3/7] ipc: more consistent behavior between worker types Eric Wong
2021-01-29 7:42 ` [PATCH 4/7] lei: less error-prone FD mapping Eric Wong
2021-01-29 7:42 ` [PATCH 5/7] git: synchronous cat_file may return type and OID Eric Wong
2021-01-29 7:42 ` [PATCH 6/7] ipc: move on_destroy scope to inside the eval Eric Wong
2021-01-29 7:43 ` [PATCH 7/7] shared_kv: simplify PID+object guard for cleanup 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
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210129074300.14475-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.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.
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).