package PublicInbox::HTTPD::Async;
use strict;
use warnings;
-use base qw(Danga::Socket);
+use base qw(PublicInbox::DS);
use fields qw(cb cleanup);
require PublicInbox::EvCleanup;
sub new {
my ($class, $io, $cb, $cleanup) = @_;
+
+ # no $io? call $cb at the top of the next event loop to
+ # avoid recursion:
+ unless (defined($io)) {
+ PublicInbox::EvCleanup::asap($cb) if $cb;
+ PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
+ return;
+ }
+
my $self = fields::new($class);
IO::Handle::blocking($io, 0);
- $self->SUPER::new($io);
+ $self->SUPER::new($io, PublicInbox::DS::EPOLLIN());
$self->{cb} = $cb;
$self->{cleanup} = $cleanup;
- $self->watch_read(1);
$self;
}
+sub restart_read ($) { $_[0]->watch(PublicInbox::DS::EPOLLIN()) }
+
# fires after pending writes are complete:
sub restart_read_cb ($) {
my ($self) = @_;
- sub { $self->watch_read(1) }
+ sub { restart_read($self) }
}
sub main_cb ($$$) {
my $r = sysread($self->{sock}, $$bref, 8192);
if ($r) {
$fh->write($$bref);
- return if $http->{closed};
- if ($http->{write_buf_size}) {
- $self->watch_read(0);
- $http->write(restart_read_cb($self));
+ if ($http->{sock}) { # !closed
+ if ($http->{wbuf}) {
+ $self->watch(0);
+ $http->write(restart_read_cb($self));
+ }
+ # stay in EPOLLIN, but let other clients
+ # get some work done, too.
+ return;
}
- # stay in watch_read, but let other clients
- # get some work done, too.
- return;
+ # fall through to close below...
} elsif (!defined $r) {
- return if $!{EAGAIN} || $!{EINTR};
+ return restart_read($self) if $!{EAGAIN} || $!{EINTR};
}
# Done! Error handling will happen in $fh->close
$self->{cb} = main_cb($http, $fh, $bref);
}
-sub event_read { $_[0]->{cb}->(@_) }
-sub event_hup { $_[0]->{cb}->(@_) }
-sub event_err { $_[0]->{cb}->(@_) }
+sub event_step { $_[0]->{cb}->(@_) }
sub close {
my $self = shift;