From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 4B8651F5AE
	for <meta@public-inbox.org>; Thu,  3 Jun 2021 09:01:24 +0000 (UTC)
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
Message-Id: <20210603090124.6654-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

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;