ipc: wq_do => wq_io_do

[public-inbox.git] / t / ipc.t

diff --git a/t/ipc.t b/t/ipc.t
index 22423a78a014dc806fc2eddbc520f72ab2badc22..345024bd9038e3bcab03e9cce205305b4211226c 100644 (file)
--- a/t/ipc.t
+++ b/t/ipc.t
@@ -6,11 +6,13 @@ use v5.10.1;
 use Test::More;
 use PublicInbox::TestCommon;
 use Fcntl qw(SEEK_SET);
+use Digest::SHA qw(sha1_hex);
 require_mods(qw(Storable||Sereal));
 require_ok 'PublicInbox::IPC';
 state $once = eval <<'';
 package PublicInbox::IPC;
 use strict;
+use Digest::SHA qw(sha1_hex);
 sub test_array { qw(test array) }
 sub test_scalar { 'scalar' }
 sub test_scalarref { \'scalarref' }
@@ -24,13 +26,17 @@ sub test_write_each_fd {
                $self->{$fd}->flush;
        }
 }
+sub test_sha {
+       my ($self, $buf) = @_;
+       print { $self->{1} } sha1_hex($buf), "\n";
+       $self->{1}->flush;
+}
 1;
 
 my $ipc = bless {}, 'PublicInbox::IPC';
 my @t = qw(array scalar scalarref undef);
 my $test = sub {
        my $x = shift;
-       my @res;
        for my $type (@t) {
                my $m = "test_$type";
                my @ret = $ipc->ipc_do($m);
@@ -39,34 +45,10 @@ my $test = sub {
 
                $ipc->ipc_do($m);
 
-               $ipc->ipc_async($m, [], sub { push @res, \@_ }, \$m);
-
                my $ret = $ipc->ipc_do($m);
                my $exp = $ipc->$m;
                is_deeply($ret, $exp, "!wantarray $m $x");
-
-               is_deeply(\@res, [ [ \$m, \@exp ] ], "async $m $x");
-               @res = ();
-       }
-       $ipc->ipc_async_wait(-1);
-       is_deeply(\@res, [], 'no leftover results');
-       $ipc->ipc_async('test_die', ['die test'],
-                       sub { push @res, \@_  }, 'die arg');
-       $ipc->ipc_async_wait(1);
-       is(scalar(@res), 1, 'only one result');
-       is(scalar(@{$res[0]}), 2, 'result has 2-element array');
-       is($res[0]->[0], 'die arg', 'got async die arg '.$x);
-       is(ref($res[0]->[1]), 'PublicInbox::IPC::Die',
-               "exception type $x");
-       {
-               my $nr = PublicInbox::IPC::PIPE_BUF();
-               my $count = 0;
-               my $cb = sub { ++$count };
-               $ipc->ipc_async('test_undef', [], $cb) for (1..$nr);
-               $ipc->ipc_async_wait(-1);
-               is($count, $nr, "$x async runs w/o deadlock");
        }
-
        my $ret = eval { $ipc->test_die('phail') };
        my $exp = $@;
        $ret = eval { $ipc->ipc_do('test_die', 'phail') };
@@ -112,7 +94,6 @@ $test->('local');
 $ipc->ipc_worker_stop; # idempotent
 
 # work queues
-$ipc->wq_set_recv_modes(qw( >&= >&= >&= ));
 pipe(my ($ra, $wa)) or BAIL_OUT $!;
 pipe(my ($rb, $wb)) or BAIL_OUT $!;
 pipe(my ($rc, $wc)) or BAIL_OUT $!;
@@ -120,8 +101,12 @@ open my $warn, '+>', undef or BAIL_OUT;
 $warn->autoflush(0);
 local $SIG{__WARN__} = sub { print $warn "PID:$$ ", @_ };
 my @ppids;
+open my $agpl, '<', 'COPYING' or BAIL_OUT "AGPL-3 missing: $!";
+my $big = do { local $/; <$agpl> } // BAIL_OUT "read: $!";
+close $agpl or BAIL_OUT "close: $!";
+
 for my $t ('local', 'worker', 'worker again') {
-       $ipc->wq_do('test_write_each_fd', [ $wa, $wb, $wc ], 'hello world');
+       $ipc->wq_io_do('test_write_each_fd', [ $wa, $wb, $wc ], 'hello world');
        my $i = 0;
        for my $fh ($ra, $rb, $rc) {
                my $buf = readline($fh);
@@ -129,12 +114,21 @@ for my $t ('local', 'worker', 'worker again') {
                like($buf, qr/\Ai=$i \d+ hello world\z/, "got expected ($t)");
                $i++;
        }
-       $ipc->wq_do('test_die', [ $wa, $wb, $wc ]);
+       $ipc->wq_io_do('test_die', [ $wa, $wb, $wc ]);
+       $ipc->wq_io_do('test_sha', [ $wa, $wb ], 'hello world');
+       is(readline($rb), sha1_hex('hello world')."\n", "SHA small ($t)");
+       {
+               my $bigger = $big x 10;
+               $ipc->wq_io_do('test_sha', [ $wa, $wb ], $bigger);
+               my $exp = sha1_hex($bigger)."\n";
+               undef $bigger;
+               is(readline($rb), $exp, "SHA big ($t)");
+       }
        my $ppid = $ipc->wq_workers_start('wq', 1);
        push(@ppids, $ppid);
 }
 
-# wq_do works across fork (siblings can feed)
+# wq_io_do works across fork (siblings can feed)
 SKIP: {
        skip 'Socket::MsgHdr or Inline::C missing', 3 if !$ppids[0];
        is_deeply(\@ppids, [$$, undef, undef],
@@ -142,7 +136,7 @@ SKIP: {
        my $pid = fork // BAIL_OUT $!;
        if ($pid == 0) {
                use POSIX qw(_exit);
-               $ipc->wq_do('test_write_each_fd', [ $wa, $wb, $wc ], $$);
+               $ipc->wq_io_do('test_write_each_fd', [ $wa, $wb, $wc ], $$);
                _exit(0);
        } else {
                my $i = 0;
@@ -166,7 +160,7 @@ SKIP: {
        seek($warn, 0, SEEK_SET) or BAIL_OUT;
        my @warn = <$warn>;
        is(scalar(@warn), 3, 'warned 3 times');
-       like($warn[0], qr/ wq_do: /, '1st warned from wq_do');
+       like($warn[0], qr/ wq_io_do: /, '1st warned from wq_do');
        like($warn[1], qr/ wq_worker: /, '2nd warned from wq_worker');
        is($warn[2], $warn[1], 'worker did not die');