diff options
author | Eric Wong <e@80x24.org> | 2019-12-28 21:43:17 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-12-28 21:43:17 +0000 |
commit | 65e3cc8f6cc73e45db827cbeee4ccecbf1502496 (patch) | |
tree | c7575754de71f56b92b9ac808cc3d675f374fef2 /lib/PublicInbox/HTTPD/Async.pm | |
parent | ac1ac3b4e2858bcee5a644aac8b6320422ea7383 (diff) | |
parent | f2364c5765f0692d2f1e82b61804359a38f3fdfc (diff) | |
download | public-inbox-65e3cc8f6cc73e45db827cbeee4ccecbf1502496.tar.gz |
* no-closure: (30 commits) search: retry_reopen passes user arg to callback solvergit: allow passing arg to user-supplied callback viewvcs: avoid anonymous sub for HTML response wwwattach: avoid anonymous sub for msg_iter view: msg_iter calls add_body_text directly searchview: remove anonymous sub when sorting threads by relevance view: thread_html: pass named sub to WwwStream searchview: pass named subs to Www*Stream wwwtext: avoid anonymous sub in response contentid: no anonymous sub view: msg_html: stop using an anonymous sub view: avoid anon sub in stream_thread config: each_inbox: pass user arg to callback feed: avoid anonymous subs mboxgz: pass $ctx to callback to avoid anon subs www: lazy load Plack::Util githttpbackend: split out wwwstatic qspawn: psgi_return: allow non-anon parse_hdr callback qspawn: drop "qspawn.filter" support, for now qspawn: psgi_qx: eliminate anonymous subs ...
Diffstat (limited to 'lib/PublicInbox/HTTPD/Async.pm')
-rw-r--r-- | lib/PublicInbox/HTTPD/Async.pm | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm index d5628ee8..f4de2719 100644 --- a/lib/PublicInbox/HTTPD/Async.pm +++ b/lib/PublicInbox/HTTPD/Async.pm @@ -10,7 +10,7 @@ package PublicInbox::HTTPD::Async; use strict; use warnings; use base qw(PublicInbox::DS); -use fields qw(cb end); +use fields qw(http fh cb arg end_obj); use Errno qw(EAGAIN); use PublicInbox::Syscall qw(EPOLLIN EPOLLET); @@ -18,33 +18,37 @@ use PublicInbox::Syscall qw(EPOLLIN EPOLLET); # $io is a read-only pipe ($rpipe) for now, but may be a # bidirectional socket in the future. sub new { - my ($class, $io, $cb, $end) = @_; + my ($class, $io, $cb, $arg, $end_obj) = @_; # no $io? call $cb at the top of the next event loop to # avoid recursion: unless (defined($io)) { - PublicInbox::DS::requeue($cb); - die '$end unsupported w/o $io' if $end; + PublicInbox::DS::requeue($cb ? $cb : $arg); + die '$end_obj unsupported w/o $io' if $end_obj; return; } my $self = fields::new($class); IO::Handle::blocking($io, 0); $self->SUPER::new($io, EPOLLIN | EPOLLET); - $self->{cb} = $cb; # initial read callback, later replaced by main_cb - $self->{end} = $end; # like END {}, but only for this object + $self->{cb} = $cb; # initial read callback + $self->{arg} = $arg; # arg for $cb + $self->{end_obj} = $end_obj; # like END{}, can ->event_step $self; } -sub main_cb ($$) { - my ($http, $fh) = @_; - sub { - my ($self) = @_; +sub event_step { + my ($self) = @_; + if (my $cb = delete $self->{cb}) { + # this may call async_pass when headers are done + $cb->(delete $self->{arg}); + } elsif (my $sock = $self->{sock}) { + my $http = $self->{http}; # $self->{sock} is a read pipe for git-http-backend or cgit # and 65536 is the default Linux pipe size - my $r = sysread($self->{sock}, my $buf, 65536); + my $r = sysread($sock, my $buf, 65536); if ($r) { - $fh->write($buf); # may call $http->close + $self->{fh}->write($buf); # may call $http->close if ($http->{sock}) { # !closed $self->requeue; # let other clients get some work done, too @@ -56,11 +60,11 @@ sub main_cb ($$) { return; # EPOLLET means we'll be notified } - # Done! Error handling will happen in $fh->close - # called by the {end} handler + # Done! Error handling will happen in $self->{fh}->close + # called by end_obj->event_step handler delete $http->{forward}; - $self->close; # queues ->{end} to be called - } + $self->close; # queues end_obj->event_step to be called + } # else { # we may've been requeued but closed by $http } # once this is called, all data we read is passed to the @@ -78,26 +82,24 @@ sub async_pass { # calls after this may use much memory: $$bref = undef; - # replace the header read callback with the main one - my $cb = $self->{cb} = main_cb($http, $fh); - $cb->($self); # either hit EAGAIN or ->requeue to keep EPOLLET happy -} + $self->{http} = $http; + $self->{fh} = $fh; -sub event_step { - # {cb} may be undef after ->requeue due to $http->close happening - my $cb = $_[0]->{cb} or return; - $cb->(@_); + # either hit EAGAIN or ->requeue to keep EPOLLET happy + event_step($self); } -# may be called as $forward->close in PublicInbox::HTTP or EOF (main_cb) +# may be called as $forward->close in PublicInbox::HTTP or EOF (event_step) sub close { my $self = $_[0]; - delete $self->{cb}; $self->SUPER::close; # DS::close # we defer this to the next timer loop since close is deferred - if (my $end = delete $self->{end}) { - PublicInbox::DS::requeue($end); + if (my $end_obj = delete $self->{end_obj}) { + # this calls $end_obj->event_step + # (likely PublicInbox::Qspawn::event_step, + # NOT PublicInbox::HTTPD::Async::event_step) + PublicInbox::DS::requeue($end_obj); } } |