* [PATCH] pkt_op: remove blocking I/O support
@ 2021-06-03 9:01 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-06-03 9:01 UTC (permalink / raw)
To: meta
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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-03 9:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-03 9:01 [PATCH] pkt_op: remove blocking I/O support Eric Wong
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).