diff options
Diffstat (limited to 't/ds-leak.t')
| -rw-r--r-- | t/ds-leak.t | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/t/ds-leak.t b/t/ds-leak.t index ea0eeaa6..f39985e0 100644 --- a/t/ds-leak.t +++ b/t/ds-leak.t @@ -1,11 +1,9 @@ -# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # Licensed the same as Danga::Socket (and Perl5) # License: GPL-1.0+ or Artistic-1.0-Perl # <https://www.gnu.org/licenses/gpl-1.0.txt> # <https://dev.perl.org/licenses/artistic.html> -use strict; -use warnings; -use Test::More; +use v5.12; use PublicInbox::TestCommon; use_ok 'PublicInbox::DS'; if ('close-on-exec for epoll and kqueue') { @@ -13,15 +11,15 @@ if ('close-on-exec for epoll and kqueue') { my $pid; my $evfd_re = qr/(?:kqueue|eventpoll)/i; - PublicInbox::DS->SetLoopTimeout(0); - PublicInbox::DS->SetPostLoopCallback(sub { 0 }); + $PublicInbox::DS::loop_timeout = 0; + local @PublicInbox::DS::post_loop_do = (sub { 0 }); # make sure execve closes if we're using fork() my ($r, $w); pipe($r, $w) or die "pipe: $!"; PublicInbox::DS::add_timer(0, sub { $pid = spawn([qw(sleep 10)]) }); - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); ok($pid, 'subprocess spawned'); # wait for execve, we need to ensure lsof sees sleep(1) @@ -30,10 +28,9 @@ if ('close-on-exec for epoll and kqueue') { my $l = <$r>; is($l, undef, 'cloexec works and sleep(1) is running'); - my @of = grep(/$evfd_re/, `lsof -p $pid 2>/dev/null`); - my $err = $?; SKIP: { - skip "lsof missing? (\$?=$err)", 1 if $err; + my $rdr = { 2 => \(my $null) }; + my @of = grep /$evfd_re/, lsof_pid $pid, $rdr; is_deeply(\@of, [], 'no FDs leaked to subprocess'); }; if (defined $pid) { @@ -44,8 +41,9 @@ if ('close-on-exec for epoll and kqueue') { } SKIP: { - # not bothering with BSD::Resource - chomp(my $n = `/bin/sh -c 'ulimit -n'`); + require_mods('BSD::Resource', 1); + my $rlim = BSD::Resource::RLIMIT_NOFILE(); + my ($n,undef) = BSD::Resource::getrlimit($rlim); # FreeBSD 11.2 with 2GB RAM gives RLIMIT_NOFILE=57987! if ($n > 1024 && !$ENV{TEST_EXPENSIVE}) { @@ -53,9 +51,9 @@ SKIP: { } my $cb = sub {}; for my $i (0..$n) { - PublicInbox::DS->SetLoopTimeout(0); - PublicInbox::DS->SetPostLoopCallback($cb); - PublicInbox::DS->EventLoop; + $PublicInbox::DS::loop_timeout = 0; + local @PublicInbox::DS::post_loop_do = ($cb); + PublicInbox::DS::event_loop(); PublicInbox::DS->Reset; } ok(1, "Reset works and doesn't hit RLIMIT_NOFILE ($n)"); |