* [PATCH 5/9] ipc: use autodie for most syscalls
2023-10-07 21:24 7% [PATCH 0/9] more process-related cleanups Eric Wong
@ 2023-10-07 21:24 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-10-07 21:24 UTC (permalink / raw)
To: meta
I'm not sure how/if we should bother recovering from these,
so just croak and let some caller deal with it. `autodie'
uses Carp internally, so setting `PERL5OPT=-MCarp=verbose'
in the environment gives us full stacktraces.
---
lib/PublicInbox/IPC.pm | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index ba8b5739..5964645e 100644
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -8,9 +8,9 @@
# use ipc_do when you need work done on a certain process
# use wq_io_do when your work can be done on any idle worker
package PublicInbox::IPC;
-use strict;
-use v5.10.1;
+use v5.12;
use parent qw(Exporter);
+use autodie qw(fork pipe read socketpair sysread);
use Carp qw(croak);
use PublicInbox::DS qw(awaitpid);
use PublicInbox::Spawn;
@@ -54,9 +54,9 @@ our $send_cmd = PublicInbox::Spawn->can('send_cmd4') // do {
sub _get_rec ($) {
my ($r) = @_;
- defined(my $len = <$r>) or return;
+ my $len = <$r> // return;
chop($len) eq "\n" or croak "no LF byte in $len";
- defined(my $n = read($r, my $buf, $len)) or croak "read error: $!";
+ my $n = read($r, my $buf, $len);
$n == $len or croak "short read: $n != $len";
ipc_thaw($buf);
}
@@ -98,12 +98,12 @@ sub ipc_worker_spawn {
my ($self, $ident, $oldset, $fields, @cb_args) = @_;
return if ($self->{-ipc_ppid} // -1) == $$; # idempotent
delete(@$self{qw(-ipc_req -ipc_res -ipc_ppid -ipc_pid)});
- pipe(my ($r_req, $w_req)) or die "pipe: $!";
- pipe(my ($r_res, $w_res)) or die "pipe: $!";
+ pipe(my $r_req, my $w_req);
+ pipe(my $r_res, my $w_res);
my $sigset = $oldset // PublicInbox::DS::block_signals();
$self->ipc_atfork_prepare;
my $seed = rand(0xffffffff);
- my $pid = fork // die "fork: $!";
+ my $pid = fork;
if ($pid == 0) {
srand($seed);
eval { Net::SSLeay::randomize() };
@@ -211,15 +211,12 @@ sub recv_and_run {
my $n = length($buf) or return 0;
my $nfd = 0;
for my $fd (@fds) {
- if (open(my $cmdfh, '+<&=', $fd)) {
- $self->{$nfd++} = $cmdfh;
- $cmdfh->autoflush(1);
- } else {
- die "$$ open(+<&=$fd) (FD:$nfd): $!";
- }
+ open(my $cmdfh, '+<&=', $fd);
+ $self->{$nfd++} = $cmdfh;
+ $cmdfh->autoflush(1);
}
while ($full_stream && $n < $len) {
- my $r = sysread($s2, $buf, $len - $n, $n) // croak "read: $!";
+ my $r = sysread($s2, $buf, $len - $n, $n);
croak "read EOF after $n/$len bytes" if $r == 0;
$n = length($buf);
}
@@ -267,8 +264,7 @@ sub wq_broadcast {
sub stream_in_full ($$$) {
my ($s1, $fds, $buf) = @_;
- socketpair(my $r, my $w, AF_UNIX, SOCK_STREAM, 0) or
- croak "socketpair: $!";
+ socketpair(my $r, my $w, AF_UNIX, SOCK_STREAM, 0);
my $n = $send_cmd->($s1, [ fileno($r) ],
ipc_freeze(['do_sock_stream', length($buf)]),
0) // croak "sendmsg: $!";
@@ -315,7 +311,7 @@ sub wq_sync_run {
sub wq_do {
my ($self, $sub, @args) = @_;
if (defined(wantarray)) {
- pipe(my ($r, $w)) or die "pipe: $!";
+ pipe(my $r, my $w);
wq_io_do($self, 'wq_sync_run', [ $w ], wantarray, $sub, @args);
undef $w;
_wait_return($r, $sub);
@@ -344,10 +340,9 @@ sub wq_nonblock_do { # always async
sub _wq_worker_start {
my ($self, $oldset, $fields, $one, @cb_args) = @_;
my ($bcast1, $bcast2);
- $one or socketpair($bcast1, $bcast2, AF_UNIX, SOCK_SEQPACKET, 0) or
- die "socketpair: $!";
+ $one or socketpair($bcast1, $bcast2, AF_UNIX, SOCK_SEQPACKET, 0);
my $seed = rand(0xffffffff);
- my $pid = fork // die "fork: $!";
+ my $pid = fork;
if ($pid == 0) {
srand($seed);
eval { Net::SSLeay::randomize() };
@@ -381,9 +376,7 @@ sub wq_workers_start {
my ($self, $ident, $nr_workers, $oldset, $fields, @cb_args) = @_;
($send_cmd && $recv_cmd) or return;
return if $self->{-wq_s1}; # idempotent
- $self->{-wq_s1} = $self->{-wq_s2} = undef;
- socketpair($self->{-wq_s1}, $self->{-wq_s2}, AF_UNIX, SOCK_SEQPACKET, 0)
- or die "socketpair: $!";
+ socketpair($self->{-wq_s1}, $self->{-wq_s2},AF_UNIX, SOCK_SEQPACKET, 0);
$self->ipc_atfork_prepare;
$nr_workers //= $self->{-wq_nr_workers}; # was set earlier
my $sigset = $oldset // PublicInbox::DS::block_signals();
^ permalink raw reply related [relevance 6%]
* [PATCH 0/9] more process-related cleanups
@ 2023-10-07 21:24 7% Eric Wong
2023-10-07 21:24 6% ` [PATCH 5/9] ipc: use autodie for most syscalls Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-10-07 21:24 UTC (permalink / raw)
To: meta
2/9 fixes an annoying syslog error I spotted running tests;
3/9 is long overdue, and there's a few more overdue things
coming up...
Eric Wong (9):
xt/httpd-async-stream: avoid waitpid call
lei: do not issue sto->done if socket is inactive
lei: always use async `done' requests to store
ipc: require fork+SOCK_SEQPACKET for wq_* functions
ipc: use autodie for most syscalls
import: use autodie, rely on PerlIO for retries
rename ProcessPipe to ProcessIO
process_io: pass args to awaitpid as list
cindex: start using autodie
MANIFEST | 3 +-
lib/PublicInbox/CodeSearchIdx.pm | 70 ++++++++--------
lib/PublicInbox/Gcf2Client.pm | 4 +-
lib/PublicInbox/Git.pm | 4 +-
lib/PublicInbox/HTTPD/Async.pm | 2 +-
lib/PublicInbox/IPC.pm | 82 ++++++++-----------
lib/PublicInbox/Import.pm | 45 ++++------
lib/PublicInbox/LEI.pm | 11 ++-
lib/PublicInbox/LeiInput.pm | 2 +-
lib/PublicInbox/LeiRediff.pm | 2 +-
lib/PublicInbox/LeiRemote.pm | 2 +-
lib/PublicInbox/LeiStore.pm | 17 ++--
lib/PublicInbox/LeiToMail.pm | 6 +-
lib/PublicInbox/LeiXSearch.pm | 6 +-
.../{ProcessPipe.pm => ProcessIO.pm} | 12 ++-
lib/PublicInbox/Qspawn.pm | 8 +-
lib/PublicInbox/Spamcheck/Spamc.pm | 2 +-
lib/PublicInbox/Spawn.pm | 12 +--
t/ipc.t | 19 ++---
t/lei-store-fail.t | 51 ++++++++++++
t/spawn.t | 12 +--
xt/httpd-async-stream.t | 6 +-
22 files changed, 196 insertions(+), 182 deletions(-)
rename lib/PublicInbox/{ProcessPipe.pm => ProcessIO.pm} (83%)
create mode 100644 t/lei-store-fail.t
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-10-07 21:24 7% [PATCH 0/9] more process-related cleanups Eric Wong
2023-10-07 21:24 6% ` [PATCH 5/9] ipc: use autodie for most syscalls 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).