We shouldn't need sigprocmask unless we're running multiple
native threads or using vfork, neither of which is the case,
here.
- my ($pid, $err) = do_fork();
- die "could not fork: $err\n" unless defined $pid;
+ my $pid = fork;
+ die "could not fork: $!\n" unless defined $pid;
exit if $pid;
open STDOUT, '>&STDIN' or die "redirect stdout failed: $!\n";
open STDERR, '>&STDIN' or die "redirect stderr failed: $!\n";
POSIX::setsid();
exit if $pid;
open STDOUT, '>&STDIN' or die "redirect stdout failed: $!\n";
open STDERR, '>&STDIN' or die "redirect stderr failed: $!\n";
POSIX::setsid();
- ($pid, $err) = do_fork();
- die "could not fork: $err\n" unless defined $pid;
+ $pid = fork;
+ die "could not fork: $!\n" unless defined $pid;
exit if $pid;
}
if (defined $pid_file) {
exit if $pid;
}
if (defined $pid_file) {
$pid_file .= '.oldbin';
write_pid($pid_file);
}
$pid_file .= '.oldbin';
write_pid($pid_file);
}
- my ($pid, $err) = do_fork();
- warn "fork failed: $err\n";
+ warn "fork failed: $!\n";
return;
}
if ($pid == 0) {
return;
}
if ($pid == 0) {
-sub do_fork () {
- my $new = POSIX::SigSet->new;
- $new->fillset;
- my $old = POSIX::SigSet->new;
- POSIX::sigprocmask(&POSIX::SIG_BLOCK, $new, $old) or die "SIG_BLOCK: $!";
- my $pid = fork;
- my $err = $!;
- POSIX::sigprocmask(&POSIX::SIG_SETMASK, $old) or die "SIG_SETMASK: $!";
- ($pid, $err);
-}
-
sub upgrade_aborted ($) {
my ($p) = @_;
warn "reexec PID($p) died with: $?\n";
sub upgrade_aborted ($) {
my ($p) = @_;
warn "reexec PID($p) died with: $?\n";
$n = $worker_processes;
}
foreach my $i ($n..($worker_processes - 1)) {
$n = $worker_processes;
}
foreach my $i ($n..($worker_processes - 1)) {
- my ($pid, $err) = do_fork();
- warn "failed to fork worker[$i]: $err\n";
+ warn "failed to fork worker[$i]: $!\n";
} elsif ($pid == 0) {
$set_user->() if $set_user;
return $p0; # run normal work code
} elsif ($pid == 0) {
$set_user->() if $set_user;
return $p0; # run normal work code