X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FPktOp.pm;h=4c434566d31f90104d921b76adf1844a9d6aefde;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=59b37ff8129c3f8c6ac59e6115f01af0c50688cd;hpb=a3b3e0d4c48a85cb411ac5059a1d85906d0c97de;p=public-inbox.git

diff --git a/lib/PublicInbox/PktOp.pm b/lib/PublicInbox/PktOp.pm
index 59b37ff8..4c434566 100644
--- a/lib/PublicInbox/PktOp.pm
+++ b/lib/PublicInbox/PktOp.pm
@@ -4,66 +4,62 @@
 # op dispatch socket, reads a message, runs a sub
 # There may be multiple producers, but (for now) only one consumer
 # Used for lei_xsearch and maybe other things
-# "literal" => [ sub, @operands ]
-# /regexp/ => [ sub, @operands ]
+# "command" => [ $sub, @fixed_operands ]
 package PublicInbox::PktOp;
 use strict;
 use v5.10.1;
-use parent qw(PublicInbox::DS Exporter);
-use Errno qw(EAGAIN EINTR);
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use parent qw(PublicInbox::DS);
+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);
-our @EXPORT_OK = qw(pkt_do);
+use Scalar::Util qw(blessed);
 
 sub new {
-	my ($cls, $r, $ops, $in_loop) = @_;
-	my $self = bless { sock => $r, ops => $ops, re => [] }, $cls;
-	if ($in_loop) { # iff using DS->EventLoop
-		$r->blocking(0);
-		$self->SUPER::new($r, EPOLLIN|EPOLLET);
-	}
-	$self;
+	my ($cls, $r) = @_;
+	my $self = bless { sock => $r }, $cls;
+	$r->blocking(0);
+	$self->SUPER::new($r, EPOLLIN);
 }
 
-# returns a blessed object as the consumer, and a GLOB/IO for the producer
+# returns a blessed objects as the consumer and producer
 sub pair {
-	my ($cls, $ops, $in_loop) = @_;
+	my ($cls) = @_;
 	my ($c, $p);
 	socketpair($c, $p, AF_UNIX, SOCK_SEQPACKET, 0) or die "socketpair: $!";
-	(new($cls, $c, $ops, $in_loop), $p);
+	(new($cls, $c), bless { op_p => $p }, $cls);
 }
 
 sub pkt_do { # for the producer to trigger event_step in consumer
-	my ($producer, $cmd, @args) = @_;
-	send($producer, @args ? "$cmd\0".ipc_freeze(\@args) : $cmd, MSG_EOR);
-}
-
-sub close {
-	my ($self) = @_;
-	my $c = $self->{sock} or return;
-	$c->blocking ? delete($self->{sock}) : $self->SUPER::close;
+	my ($self, $cmd, @args) = @_;
+	send($self->{op_p}, @args ? "$cmd\0".ipc_freeze(\@args) : $cmd, MSG_EOR)
 }
 
 sub event_step {
 	my ($self) = @_;
 	my $c = $self->{sock};
-	my $msg;
-	do {
-		my $n = recv($c, $msg, 4096, 0);
-		unless (defined $n) {
-			return if $! == EAGAIN;
-			next if $! == EINTR;
-			$self->close;
-			die "recv: $!";
-		}
-		my ($cmd, $pargs) = split(/\0/, $msg, 2);
-		my $op = $self->{ops}->{$cmd //= $msg};
-		die "BUG: unknown message: `$cmd'" unless $op;
-		my ($sub, @args) = @$op;
-		$sub->(@args, $pargs ? ipc_thaw($pargs) : ());
-		return $self->close if $msg eq ''; # close on EOF
-	} while (1);
+	my $n = recv($c, my $msg, 4096, 0);
+	unless (defined $n) {
+		return if $! == EAGAIN;
+		die "recv: $!" if $! != ECONNRESET; # we may be bidirectional
+	}
+	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;