imap+nntp: share COMPRESS implementation

[public-inbox.git] / lib / PublicInbox / PktOp.pm

diff --git a/lib/PublicInbox/PktOp.pm b/lib/PublicInbox/PktOp.pm
index ca098d3cb53993734dc7398843022bc032e9a9a1..4c434566d31f90104d921b76adf1844a9d6aefde 100644 (file)
--- a/lib/PublicInbox/PktOp.pm
+++ b/lib/PublicInbox/PktOp.pm
@@ -9,16 +9,17 @@ package PublicInbox::PktOp;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::DS);
-use Errno qw(EAGAIN EINTR);
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use Errno qw(EAGAIN ECONNRESET);
+use PublicInbox::Syscall qw(EPOLLIN);
 use Socket qw(AF_UNIX MSG_EOR SOCK_SEQPACKET);
 use PublicInbox::IPC qw(ipc_freeze ipc_thaw);
+use Scalar::Util qw(blessed);
 
 sub new {
        my ($cls, $r) = @_;
        my $self = bless { sock => $r }, $cls;
        $r->blocking(0);
-       $self->SUPER::new($r, EPOLLIN|EPOLLET);
+       $self->SUPER::new($r, EPOLLIN);
 }
 
 # returns a blessed objects as the consumer and producer
@@ -37,36 +38,28 @@ sub pkt_do { # for the producer to trigger event_step in consumer
 sub event_step {
        my ($self) = @_;
        my $c = $self->{sock};
-       my $msg;
-       while (1) {
-               my $n = recv($c, $msg, 4096, 0);
-               unless (defined $n) {
-                       return if $! == EAGAIN;
-                       next if $! == EINTR;
-                       $self->close;
-                       die "recv: $!";
-               }
-               my ($cmd, @pargs);
-               if (index($msg, "\0") > 0) {
-                       ($cmd, my $pargs) = split(/\0/, $msg, 2);
-                       @pargs = @{ipc_thaw($pargs)};
-               } else {
-                       # for compatibility with the script/lei in client mode,
-                       # it doesn't load Sereal||Storable for startup speed
-                       ($cmd, @pargs) = split(/ /, $msg);
-               }
-               my $op = $self->{ops}->{$cmd //= $msg};
-               die "BUG: unknown message: `$cmd'" unless $op;
-               my ($sub, @args) = @$op;
-               $sub->(@args, @pargs);
-               return $self->close if $msg eq ''; # close on EOF
+       my $n = recv($c, my $msg, 4096, 0);
+       unless (defined $n) {
+               return if $! == EAGAIN;
+               die "recv: $!" if $! != ECONNRESET; # we may be bidirectional
        }
-}
-
-# call this when we're ready to wait on events
-sub op_wait_event {
-       my ($self, $ops) = @_;
-       $self->{ops} = $ops;
+       my ($cmd, @pargs);
+       if (index($msg, "\0") > 0) {
+               ($cmd, my $pargs) = split(/\0/, $msg, 2);
+               @pargs = @{ipc_thaw($pargs)};
+       } else {
+               # for compatibility with the script/lei in client mode,
+               # it doesn't load Sereal||Storable for startup speed
+               ($cmd, @pargs) = split(/ /, $msg);
+       }
+       my $op = $self->{ops}->{$cmd //= $msg};
+       if ($op) {
+               my ($obj, @args) = (@$op, @pargs);
+               blessed($obj) ? $obj->$cmd(@args) : $obj->(@args);
+       } elsif ($msg ne '') {
+               die "BUG: unknown message: `$cmd'";
+       }
+       $self->close if $msg eq ''; # close on EOF
 }
 
 1;