From 761baa2a300e426885675a01e4773193ab7101ff Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Jun 2020 10:34:20 +0000 Subject: spawn: unblock SIGCHLD in subprocess Subprocess we spawn may want to use SIGCHLD for themselves. This also ensures we restore default signal handlers in the pure Perl version. --- t/spawn.t | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 't/spawn.t') diff --git a/t/spawn.t b/t/spawn.t index 44355f43..fd669e22 100644 --- a/t/spawn.t +++ b/t/spawn.t @@ -4,6 +4,7 @@ use strict; use warnings; use Test::More; use PublicInbox::Spawn qw(which spawn popen_rd); +use PublicInbox::Sigfd; { my $true = which('true'); @@ -17,6 +18,32 @@ use PublicInbox::Spawn qw(which spawn popen_rd); is($?, 0, 'true exited successfully'); } +{ # ensure waitpid(-1, 0) and SIGCHLD works in spawned process + my $script = <<'EOF'; +$| = 1; # unbuffer stdout +defined(my $pid = fork) or die "fork: $!"; +if ($pid == 0) { exit } +elsif ($pid > 0) { + my $waited = waitpid(-1, 0); + $waited == $pid or die "mismatched child $pid != $waited"; + $? == 0 or die "child err: $>"; + $SIG{CHLD} = sub { print "HI\n"; exit }; + print "RDY $$\n"; + sleep while 1; +} +EOF + my $oldset = PublicInbox::Sigfd::block_signals(); + my $rd = popen_rd([$^X, '-e', $script]); + diag 'waiting for child to reap grandchild...'; + chomp(my $line = readline($rd)); + my ($rdy, $pid) = split(' ', $line); + is($rdy, 'RDY', 'got ready signal, waitpid(-1) works in child'); + ok(kill('CHLD', $pid), 'sent SIGCHLD to child'); + is(readline($rd), "HI\n", '$SIG{CHLD} works in child'); + ok(close $rd, 'popen_rd close works'); + PublicInbox::Sigfd::sig_setmask($oldset); +} + { my ($r, $w); pipe $r, $w or die "pipe failed: $!"; -- cgit v1.2.3-24-ge0c7