* [PATCH 12/12] httpd/async: switch to level-triggered epoll
2021-10-16 1:00 6% [PATCH 00/16] some yak-shaving and annoyance fixes Eric Wong
@ 2021-10-16 1:01 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-10-16 1:01 UTC (permalink / raw)
To: meta
We'll save ourselves some code here and let the kernel do more
work, instead.
---
Documentation/technical/ds.txt | 3 +--
lib/PublicInbox/HTTPD/Async.pm | 16 +++++-----------
lib/PublicInbox/Qspawn.pm | 1 -
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/Documentation/technical/ds.txt b/Documentation/technical/ds.txt
index 7bc1ad79ce0c..5a1655a1450e 100644
--- a/Documentation/technical/ds.txt
+++ b/Documentation/technical/ds.txt
@@ -77,8 +77,7 @@ New features
which (if any) events it's interested in for the next loop iteration.
* Edge-triggering available via EPOLLET or EV_CLEAR. These reduce wakeups
- for unidirectional classes (e.g. PublicInbox::Listener sockets,
- and pipes via PublicInbox::HTTPD::Async).
+ for unidirectional classes when throughput is more important than fairness.
* IO::Socket::SSL support (for NNTPS, STARTTLS+NNTP, HTTPS)
diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 7238650aff97..1651da88ac03 100644
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -17,7 +17,7 @@ package PublicInbox::HTTPD::Async;
use strict;
use parent qw(PublicInbox::DS);
use Errno qw(EAGAIN);
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::Syscall qw(EPOLLIN);
# This is called via: $env->{'pi-httpd.async'}->()
# $io is a read-only pipe ($rpipe) for now, but may be a
@@ -39,7 +39,7 @@ sub new {
}, $class;
my $pp = tied *$io;
$pp->{fh}->blocking(0) // die "$io->blocking(0): $!";
- $self->SUPER::new($io, EPOLLIN | EPOLLET);
+ $self->SUPER::new($io, EPOLLIN);
}
sub event_step {
@@ -54,15 +54,12 @@ sub event_step {
my $r = sysread($sock, my $buf, 65536);
if ($r) {
$self->{fh}->write($buf); # may call $http->close
- if ($http->{sock}) { # !closed
- $self->requeue;
- # let other clients get some work done, too
- return;
- }
+ # let other clients get some work done, too
+ return if $http->{sock}; # !closed
# else: fall through to close below...
} elsif (!defined $r && $! == EAGAIN) {
- return; # EPOLLET means we'll be notified
+ return; # EPOLLIN means we'll be notified
}
# Done! Error handling will happen in $self->{fh}->close
@@ -89,9 +86,6 @@ sub async_pass {
$self->{http} = $http;
$self->{fh} = $fh;
-
- # either hit EAGAIN or ->requeue to keep EPOLLET happy
- event_step($self);
}
# may be called as $forward->close in PublicInbox::HTTP or EOF (event_step)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index a1ff65b65324..53d0ad55ee84 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -192,7 +192,6 @@ sub event_step {
sub rd_hdr ($) {
my ($self) = @_;
# typically used for reading CGI headers
- # we must loop until EAGAIN for EPOLLET in HTTPD/Async.pm
# We also need to check EINTR for generic PSGI servers.
my $ret;
my $total_rd = 0;
^ permalink raw reply related [relevance 7%]
* [PATCH 00/16] some yak-shaving and annoyance fixes
@ 2021-10-16 1:00 6% Eric Wong
2021-10-16 1:01 7% ` [PATCH 12/12] httpd/async: switch to level-triggered epoll Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-10-16 1:00 UTC (permalink / raw)
To: meta
Hopefully having less code will make bug-hunting easier and
and more robust in the future at handling failures and
unexpected interrupts (e.g. Ctrl-C).
There's a lot of YAGNI elimination and more to come.
Eric Wong (12):
smsg: add ->oidbin method
dir_idle: do not add watches in ->new
imapd+nntpd: drop timer-based expiration
httpd: move pipeline logic into event_step
lei: golf PATH2CFG cleanup
lei: always keep cwd fd {3} for ->fchdir
lei: more eval guards for die on failure
extindex: prune invalid alternate entries on --gc
lei_overview: die rather than lei->fail
lei_to_mail: quiet down abort messages
inbox + search: use 5.10.1 and do some golfing
httpd/async: switch to level-triggered epoll
Documentation/technical/ds.txt | 3 +-
lib/PublicInbox/DS.pm | 37 +------------------
lib/PublicInbox/Daemon.pm | 8 ++---
lib/PublicInbox/DirIdle.pm | 8 +----
lib/PublicInbox/ExtSearch.pm | 2 +-
lib/PublicInbox/ExtSearchIdx.pm | 19 +++++-----
lib/PublicInbox/HTTP.pm | 64 +++++++++------------------------
lib/PublicInbox/HTTPD/Async.pm | 16 +++------
lib/PublicInbox/IMAP.pm | 17 +++------
lib/PublicInbox/Import.pm | 2 +-
lib/PublicInbox/Inbox.pm | 11 +++---
lib/PublicInbox/LEI.pm | 29 +++++++--------
lib/PublicInbox/LeiLcat.pm | 21 +++++------
lib/PublicInbox/LeiOverview.pm | 24 ++++++-------
lib/PublicInbox/LeiQuery.pm | 24 ++++++-------
lib/PublicInbox/LeiToMail.pm | 1 +
lib/PublicInbox/LeiXSearch.pm | 9 ++---
lib/PublicInbox/MultiGit.pm | 6 +++-
lib/PublicInbox/NNTP.pm | 12 ++-----
lib/PublicInbox/OverIdx.pm | 3 +-
lib/PublicInbox/Qspawn.pm | 1 -
lib/PublicInbox/Search.pm | 7 ++--
lib/PublicInbox/Smsg.pm | 6 ++--
lib/PublicInbox/Watch.pm | 3 +-
t/dir_idle.t | 3 +-
25 files changed, 118 insertions(+), 218 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-10-16 1:00 6% [PATCH 00/16] some yak-shaving and annoyance fixes Eric Wong
2021-10-16 1:01 7% ` [PATCH 12/12] httpd/async: switch to level-triggered epoll Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).