about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-06-03 09:01:24 +0000
committerEric Wong <e@80x24.org>2021-06-03 09:10:09 +0000
commit3be19bfae0e1e458441979b65461d647abf5599a (patch)
tree8d0101fc235df2ad164d1de632d70f39dd703e29
parentbdecd7ed8e0dcf0b45491b947cd737ba8cfe38a3 (diff)
downloadpublic-inbox-3be19bfae0e1e458441979b65461d647abf5599a.tar.gz
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")
-rw-r--r--lib/PublicInbox/PktOp.pm19
1 files 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;