Harden spawned threads against stray exit

[perl/modules/VPIT-TestHelpers.git] / lib / VPIT / TestHelpers.pm

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index f45da916882cf897002deb734a92cee7bd90abe6..75ca21603ff4c794b51e3752f9ebf6f497c4c323 100644 (file)
--- a/lib/VPIT/TestHelpers.pm
+++ b/lib/VPIT/TestHelpers.pm
@@ -600,6 +600,18 @@ C<spawn $coderef>
 
 =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
@@ -721,7 +735,7 @@ sub init_usleep {
   'select' => sub {
    if ($Config::Config{d_select}) {
     diag 'Using select()-based fallback usleep()';
-    return sub {
+    return sub ($) {
      my $s = $_[0];
      my $r = 0;
      while ($s > 0) {
@@ -739,9 +753,10 @@ sub init_usleep {
   },
   '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;
    };
   },