use PublicInbox::Tmpfile;
use Errno qw(EAGAIN EINVAL);
use Carp qw(carp croak);
-our @EXPORT_OK = qw(now msg_more dwaitpid add_timer add_uniq_timer);
+our @EXPORT_OK = qw(now msg_more dwaitpid awaitpid add_timer add_uniq_timer);
my %Stack;
my $nextq; # queue for next_tick
my $wait_pids; # list of [ pid, callback, callback_arg ]
+my $AWAIT_PIDS; # pid => [ $callback, @args ]
my $reap_armed;
my $ToClose; # sockets to close when event loop is done
our (
# we may be iterating inside one of these on our stack
my @q = delete @Stack{keys %Stack};
for my $q (@q) { @$q = () }
- $wait_pids = $nextq = $ToClose = undef;
+ $AWAIT_PIDS = $wait_pids = $nextq = $ToClose = undef;
$ep_io = undef; # closes real $Epoll FD
$Epoll = undef; # may call DSKQXS::DESTROY
} while (@Timers || keys(%Stack) || $nextq || $wait_pids ||
- $ToClose || keys(%DescriptorMap) ||
+ $ToClose || keys(%DescriptorMap) || $AWAIT_PIDS ||
$PostLoopCallback || keys(%UniqTimer));
$reap_armed = undef;
# caller sets return value to $Epoll
sub _InitPoller () {
- if (PublicInbox::Syscall::epoll_defined()) {
+ if (defined $PublicInbox::Syscall::SYS_epoll_create) {
my $fd = epoll_create();
die "epoll_create: $!" if $fd < 0;
open($ep_io, '+<&=', $fd) or return;
- my $fl = fcntl($ep_io, F_GETFD, 0);
- fcntl($ep_io, F_SETFD, $fl | FD_CLOEXEC);
+ fcntl($ep_io, F_SETFD, FD_CLOEXEC);
$fd;
} else {
my $cls;
$oldset;
}
+sub await_cb ($;@) {
+ my ($pid, @cb_args) = @_;
+ my $cb = shift @cb_args or return;
+ eval { $cb->($pid, @cb_args) };
+ warn "E: awaitpid($pid): $@" if $@;
+}
+
# We can't use waitpid(-1) safely here since it can hit ``, system(),
# and other things. So we scan the $wait_pids list, which is hopefully
# not too big. We keep $wait_pids small by not calling dwaitpid()
sub reap_pids {
$reap_armed = undef;
- my $tmp = $wait_pids or return;
+ my $tmp = $wait_pids // [];
$wait_pids = undef;
$Stack{reap_runq} = $tmp;
my $oldset = block_signals();
+
+ # old API
foreach my $ary (@$tmp) {
my ($pid, $cb, $arg) = @$ary;
my $ret = waitpid($pid, WNOHANG);
warn "waitpid($pid, WNOHANG) = $ret, \$!=$!, \$?=$?";
}
}
+
+ # new API TODO: convert to waitpid(-1) in the future as long
+ # as we don't use threads
+ for my $pid (keys %$AWAIT_PIDS) {
+ my $wpid = waitpid($pid, WNOHANG) // next;
+ my $cb_args = delete $AWAIT_PIDS->{$wpid} or next;
+ await_cb($pid, @$cb_args);
+ }
sig_setmask($oldset);
delete $Stack{reap_runq};
}
if ($@ || !$self->{sock}) { # something bad happened...
delete $self->{long_cb};
my $elapsed = now() - $t0;
- $@ and $self->err("%s during long response[$fd] - %0.6f",
- $@, $elapsed);
+ $@ and warn("$@ during long response[$fd] - ",
+ sprintf('%0.6f', $elapsed),"\n");
$self->out(" deferred[$fd] aborted - %0.6f", $elapsed);
$self->close;
} elsif ($more) { # $self->{wbuf}:
}
}
+sub awaitpid {
+ my ($pid, @cb_args) = @_;
+ $AWAIT_PIDS->{$pid} //= @cb_args ? \@cb_args : 0;
+ # provide synchronous API
+ if (defined(wantarray) || (!$in_loop && !@cb_args)) {
+ my $ret = waitpid($pid, 0) // -2;
+ if ($ret == $pid) {
+ my $cb_args = delete $AWAIT_PIDS->{$pid};
+ @cb_args = @$cb_args if !@cb_args && $cb_args;
+ await_cb($pid, @cb_args);
+ return $ret;
+ }
+ }
+ # We could've just missed our SIGCHLD, cover it, here:
+ enqueue_reap() if $in_loop;
+}
+
1;
=head1 AUTHORS (Danga::Socket)