From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] pkt_op: remove blocking I/O support
Date: Thu, 3 Jun 2021 09:01:24 +0000 [thread overview]
Message-ID: <20210603090124.6654-1-e@80x24.org> (raw)
Since lei-daemon is guaranteed to be running, there's no
need to keep blocking I/O support around (and we can
get it back via git if we need it).
Followup-to: 1d6e1f9a6a66a42d ("lei: require Socket::MsgHdr or Inline::C, drop oneshot")
---
lib/PublicInbox/PktOp.pm | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/lib/PublicInbox/PktOp.pm b/lib/PublicInbox/PktOp.pm
index c3221735..639a4f62 100644
--- a/lib/PublicInbox/PktOp.pm
+++ b/lib/PublicInbox/PktOp.pm
@@ -18,13 +18,8 @@ our @EXPORT_OK = qw(pkt_do);
sub new {
my ($cls, $r) = @_;
my $self = bless { sock => $r }, $cls;
- if ($PublicInbox::DS::in_loop) { # iff using DS->EventLoop
- $r->blocking(0);
- $self->SUPER::new($r, EPOLLIN|EPOLLET);
- } else {
- $self->{blocking} = 1;
- }
- $self;
+ $r->blocking(0);
+ $self->SUPER::new($r, EPOLLIN|EPOLLET);
}
# returns a blessed object as the consumer, and a GLOB/IO for the producer
@@ -40,12 +35,6 @@ sub pkt_do { # for the producer to trigger event_step in consumer
send($producer, @args ? "$cmd\0".ipc_freeze(\@args) : $cmd, MSG_EOR);
}
-sub close {
- my ($self) = @_;
- my $c = $self->{sock} or return;
- $self->{blocking} ? delete($self->{sock}) : $self->SUPER::close;
-}
-
sub event_step {
my ($self) = @_;
my $c = $self->{sock};
@@ -75,12 +64,10 @@ sub event_step {
}
}
-# call this when we're ready to wait on events,
-# returns immediately if non-blocking
+# call this when we're ready to wait on events
sub op_wait_event {
my ($self, $ops) = @_;
$self->{ops} = $ops;
- while ($self->{blocking} && $self->{sock}) { event_step($self) }
}
1;
reply other threads:[~2021-06-03 9:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210603090124.6654-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).