X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FVPIT%2FTestHelpers.pm;h=75ca21603ff4c794b51e3752f9ebf6f497c4c323;hb=ba865c42d13de4c435b55379b0a32fe232053668;hp=65fc2569ba1c2a70776d4cd99d11bb3327bd1f13;hpb=cd89e4206b75ac471deac8c71e2655ab19c8ff75;p=perl%2Fmodules%2FVPIT-TestHelpers.git diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm index 65fc256..75ca216 100644 --- a/lib/VPIT/TestHelpers.pm +++ b/lib/VPIT/TestHelpers.pm @@ -600,6 +600,18 @@ C =back +=item * + +Notes : + +=over 8 + +=item - + +C<< exit => 'threads_only' >> is passed to C<< threads->import >>. + +=back + =back =cut @@ -644,7 +656,9 @@ sub init_threads { die "$test_module was loaded too soon" if defined $test_module; } - load_or_skip_all 'threads', $force ? '0' : '1.67', [ ]; + load_or_skip_all 'threads', $force ? '0' : '1.67', [ + exit => 'threads_only', + ]; load_or_skip_all 'threads::shared', $force ? '0' : '1.14', [ ]; diag "Threads testing forced by \$ENV{$force_var}" if $force; @@ -680,7 +694,7 @@ where : =item - -C<@impls> is the list of desired implementations (which may be C<'Time::HiRes'> or C<'sleep'>), in the order they should be checked. +C<@impls> is the list of desired implementations (which may be C<'Time::HiRes'>, C<'select'> or C<'sleep'>), in the order they should be checked. When the list is empty, it defaults to all of them. =back @@ -718,17 +732,37 @@ sub init_usleep { return undef; } }, + 'select' => sub { + if ($Config::Config{d_select}) { + diag 'Using select()-based fallback usleep()'; + return sub ($) { + my $s = $_[0]; + my $r = 0; + while ($s > 0) { + my ($found, $t) = select(undef, undef, undef, $s / 1e6); + last unless defined $t; + $t = int($t * 1e6); + $s -= $t; + $r += $t; + } + return $r; + }; + } else { + return undef; + } + }, 'sleep' => sub { diag 'Using sleep()-based fallback usleep()'; - return sub { - my $s = int($_[0] / 1e6); - my $t = sleep $s; + return sub ($) { + my $ms = int $_[0]; + my $s = int($ms / 1e6) + ($ms % 1e6 == 0 ? 0 : 1); + my $t = sleep $s; return $t * 1e6; }; }, ); - @impls = qw unless @impls; + @impls = qw unless @impls; my $usleep; for my $impl (@impls) {