X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fipc.t;h=fd4d559962c877d7125f3d554b41721558bf710a;hb=1d88b8639596a549dd972e113b52f9c2d035d529;hp=5801c760cf8bcb960896138f4c05b75483eac774;hpb=9dfc0b670fc634b54998c3020f173b82de1915ac;p=public-inbox.git
diff --git a/t/ipc.t b/t/ipc.t
index 5801c760..fd4d5599 100644
--- a/t/ipc.t
+++ b/t/ipc.t
@@ -1,18 +1,19 @@
#!perl -w
-# Copyright (C) 2020-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
use strict;
use v5.10.1;
use Test::More;
use PublicInbox::TestCommon;
use Fcntl qw(SEEK_SET);
-use Digest::SHA qw(sha1_hex);
+use PublicInbox::SHA qw(sha1_hex);
require_mods(qw(Storable||Sereal));
require_ok 'PublicInbox::IPC';
+my ($tmpdir, $for_destroy) = tmpdir();
state $once = eval <<'';
package PublicInbox::IPC;
use strict;
-use Digest::SHA qw(sha1_hex);
+use PublicInbox::SHA qw(sha1_hex);
sub test_array { qw(test array) }
sub test_scalar { 'scalar' }
sub test_scalarref { \'scalarref' }
@@ -31,13 +32,18 @@ sub test_sha {
print { $self->{1} } sha1_hex($buf), "\n";
$self->{1}->flush;
}
+sub test_append_pid {
+ my ($self, $file) = @_;
+ open my $fh, '>>', $file or die "open: $!";
+ $fh->autoflush(1);
+ print $fh "$$\n" or die "print: $!";
+}
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);
@@ -46,34 +52,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') };
@@ -108,11 +90,8 @@ $test->('local');
defined($pid) or BAIL_OUT 'no spawn, no test';
is($ipc->ipc_do('test_pid'), $pid, 'worker pid returned');
$test->('worker');
- {
- my ($tmp, $for_destroy) = tmpdir();
- $ipc->ipc_lock_init("$tmp/lock");
- is($ipc->ipc_do('test_pid'), $pid, 'worker pid returned');
- }
+ $ipc->ipc_lock_init("$tmpdir/lock");
+ is($ipc->ipc_do('test_pid'), $pid, 'worker pid returned');
$ipc->ipc_worker_stop;
ok(!kill(0, $pid) && $!{ESRCH}, 'worker stopped');
}
@@ -131,7 +110,7 @@ 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);
@@ -139,21 +118,26 @@ 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_do('test_sha', [ $wa, $wb ], 'hello world');
+ $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_do('test_sha', [ $wa, $wb ], $bigger);
+ my $bigger = $big x 10; # to hit EMSGSIZE
+ $ipc->wq_io_do('test_sha', [ $wa, $wb ], $bigger);
my $exp = sha1_hex($bigger)."\n";
- undef $bigger;
- is(readline($rb), $exp, "SHA big ($t)");
+ is(readline($rb), $exp, "SHA big for EMSGSIZE ($t)");
+
+ # to hit the WQWorker recv_and_run length
+ substr($bigger, my $MY_MAX_ARG_STRLEN = 4096 * 33, -1) = '';
+ $ipc->wq_io_do('test_sha', [ $wa, $wb ], $bigger);
+ $exp = sha1_hex($bigger)."\n";
+ is(readline($rb), $exp, "SHA WQWorker limit ($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],
@@ -161,7 +145,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;
@@ -177,6 +161,12 @@ SKIP: {
is(waitpid($pid, 0), $pid, 'waitpid complete');
is($?, 0, 'child wq producer exited');
}
+ my @ary = $ipc->wq_do('test_array');
+ is_deeply(\@ary, [ qw(test array) ], 'wq_do wantarray');
+ is(my $s = $ipc->wq_do('test_scalar'), 'scalar', 'defined wantarray');
+ my $exp = bless ['blessed'], 'PublicInbox::WTF';
+ my $ret = eval { $ipc->wq_do('test_die', $exp) };
+ is_deeply($@, $exp, 'die with blessed ref');
}
$ipc->wq_close;
@@ -185,26 +175,18 @@ 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');
$SIG{__WARN__} = 'DEFAULT';
- is($ipc->wq_workers_start('wq', 1), $$, 'workers started again');
- is($ipc->wq_workers, 1, '1 worker started');
- SKIP: {
- $ipc->WQ_MAX_WORKERS > 1 or
- skip 'Inline::C or Socket::MsgHdr not available', 4;
- $ipc->wq_worker_incr;
- is($ipc->wq_workers, 2, 'worker count bumped');
- $ipc->wq_worker_decr;
- $ipc->wq_worker_decr_wait(10);
- is($ipc->wq_workers, 1, 'worker count lowered');
- is($ipc->wq_workers(2), 2, 'worker count set');
- is($ipc->wq_workers, 2, 'worker count stayed set');
- }
+ is($ipc->wq_workers_start('wq', 2), $$, 'workers started again');
+ $ipc->wq_broadcast('test_append_pid', "$tmpdir/append_pid");
$ipc->wq_close;
- is($ipc->wq_workers, undef, 'workers undef after close');
+ open my $fh, '<', "$tmpdir/append_pid" or BAIL_OUT "open: $!";
+ chomp(my @pids = <$fh>);
+ my %pids = map { $_ => 1 } grep(/\A[0-9]+\z/, @pids);
+ is(scalar keys %pids, 2, 'broadcast hit both PIDs');
}
done_testing;