diff options
| author | Eric Wong <e@80x24.org> | 2021-02-21 07:41:32 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-02-21 08:59:32 +0000 |
| commit | 707d4aca2256f284718c247ef00db64cd976d244 (patch) | |
| tree | dc3b7100b6a50e0df55528fd7875af28d4f66b5a /lib/PublicInbox/IPC.pm | |
| parent | 07bb4d74f25b0c2c14a8762905087be5a0f7e934 (diff) | |
| download | public-inbox-707d4aca2256f284718c247ef00db64cd976d244.tar.gz | |
We can use this to ensure sharded work doesn't do unexpected things if workers are added/removed. We currently don't increase/decrease workers once a workqueue is started, but non-lei code (-httpd/imapd) may start doing so. This also fixes a bug where lei2mail workers could not be adjusted via --jobs on the command-line.
Diffstat (limited to 'lib/PublicInbox/IPC.pm')
| -rw-r--r-- | lib/PublicInbox/IPC.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 2aeb6462..1fa67d00 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -341,7 +341,7 @@ sub wq_workers_start { socketpair($self->{-wq_s1}, $self->{-wq_s2}, AF_UNIX, $SEQPACKET, 0) or die "socketpair: $!"; $self->ipc_atfork_prepare; - $nr_workers //= 4; + $nr_workers //= $self->{-wq_nr_workers}; $nr_workers = $WQ_MAX_WORKERS if $nr_workers > $WQ_MAX_WORKERS; my $sigset = $oldset // PublicInbox::DS::block_signals(); $self->{-wq_workers} = {}; @@ -354,6 +354,7 @@ sub wq_workers_start { sub wq_worker_incr { # SIGTTIN handler my ($self, $oldset, $fields) = @_; $self->{-wq_s2} or return; + die "-wq_nr_workers locked" if defined $self->{-wq_nr_workers}; return if wq_workers($self) >= $WQ_MAX_WORKERS; $self->ipc_atfork_prepare; my $sigset = $oldset // PublicInbox::DS::block_signals(); @@ -369,6 +370,7 @@ sub wq_exit { # wakes up wq_worker_decr_wait sub wq_worker_decr { # SIGTTOU handler, kills first idle worker my ($self) = @_; return unless wq_workers($self); + die "-wq_nr_workers locked" if defined $self->{-wq_nr_workers}; $self->wq_io_do('wq_exit'); # caller must call wq_worker_decr_wait in main loop } @@ -376,6 +378,7 @@ sub wq_worker_decr { # SIGTTOU handler, kills first idle worker sub wq_worker_decr_wait { my ($self, $timeout, $cb, @args) = @_; return if $self->{-wq_ppid} != $$; # can't reap siblings or parents + die "-wq_nr_workers locked" if defined $self->{-wq_nr_workers}; my $s1 = $self->{-wq_s1} // croak 'BUG: no wq_s1'; vec(my $rin = '', fileno($s1), 1) = 1; select(my $rout = $rin, undef, undef, $timeout) or |