Threads tests may not be able to spawn all the threads

[perl/modules/Variable-Magic.git] / t / 41-clone.t

diff --git a/t/41-clone.t b/t/41-clone.t
index 90f15e0fc08fceb517af25711869b441f1862524..0e47d3694819bc8c37a75cdfb411854dd7ab4aa6 100644 (file)
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -3,32 +3,15 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use lib 't/lib';
+use Variable::Magic::TestThreads;
 
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
-
-use threads; # Before Test::More
-use threads::shared;
-
-use Test::More;
+use Test::More 'no_plan';
 
-use Variable::Magic qw/wizard cast dispell getdata getsig VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
-
-if (VMG_THREADSAFE) {
- plan tests => 2 * 3 + 4 * (2 * 10 + 2) + 4 * (2 * 7 + 2);
- my $v = $threads::VERSION;
- diag "Using threads $v" if defined $v;
- $v = $threads::shared::VERSION;
- diag "Using threads::shared $v" if defined $v;
-} else {
- plan skip_all => 'This Variable::Magic isn\'t thread safe';
-}
+use Variable::Magic qw<
+ wizard cast dispell getdata
+ VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
+>;
 
 my $destroyed : shared = 0;
 my $c         : shared = 0;
@@ -38,15 +21,20 @@ sub spawn_wiz {
 
  my $wiz = eval {
   wizard data    => sub { $_[1] + threads->tid() },
-         get     => sub { ++$c; 0 },
+         get     => sub { lock $c; ++$c; 0 },
          set     => sub {
-                     my $name = $_[-1];
-                     $name = $name->name if $op_info == VMG_OP_INFO_OBJECT;
+                     my $op = $_[-1];
                      my $tid = threads->tid();
-                     is $name, 'sassign', "opname for op_info $op_info in thread $tid is correct";
+                     if ($op_info == VMG_OP_INFO_OBJECT) {
+                      is_deeply { class => ref($op),   name => $op->name },
+                                { class => 'B::BINOP', name => 'sassign' },
+                                "op object in thread $tid is correct";
+                     } else {
+                      is $op, 'sassign', "op name in thread $tid is correct";
+                     }
                      0
                     },
-         free    => sub { ++$destroyed; 0 },
+         free    => sub { lock $destroyed; ++$destroyed; 0 },
          op_info => $op_info
  };
  is($@,     '',    "wizard with op_info $op_info in main thread doesn't croak");
@@ -57,22 +45,22 @@ sub spawn_wiz {
 }
 
 sub try {
- my ($dispell, $sig) = @_;
+ my ($dispell, $wiz) = @_;
  my $tid = threads->tid();
  my $a   = 3;
- my $res = eval { cast $a, $sig, sub { 5 }->() };
+ my $res = eval { cast $a, $wiz, sub { 5 }->() };
  is($@, '', "cast in thread $tid doesn't croak");
  my $b;
  eval { $b = $a };
  is($@, '', "get in thread $tid doesn't croak");
  is($b, 3,  "get in thread $tid returns the right thing");
- my $d = eval { getdata $a, $sig };
+ my $d = eval { getdata $a, $wiz };
  is($@, '',       "getdata in thread $tid doesn't croak");
  is($d, 5 + $tid, "getdata in thread $tid returns the right thing");
  eval { $a = 9 };
  is($@, '', "set in thread $tid (check opname) doesn't croak");
  if ($dispell) {
-  $res = eval { dispell $a, $sig };
+  $res = eval { dispell $a, $wiz };
   is($@, '', "dispell in thread $tid doesn't croak");
   undef $b;
   eval { $b = $a };
@@ -86,14 +74,26 @@ my $wiz_name = spawn_wiz VMG_OP_INFO_NAME;
 my $wiz_obj  = spawn_wiz VMG_OP_INFO_OBJECT;
 
 for my $dispell (1, 0) {
- for my $sig ($wiz_name, getsig($wiz_name), $wiz_obj, getsig($wiz_obj)) {
-  $c = 0;
-  $destroyed = 0;
-
-  my @t = map { threads->create(\&try, $dispell, $sig) } 1 .. 2;
-  $_->join for @t;
-
-  is($c, 2, "get triggered twice");
-  is($destroyed, (1 - $dispell) * 2, 'destructors');
+ for my $wiz ($wiz_name, $wiz_obj) {
+  {
+   lock $c;
+   $c = 0;
+  }
+  {
+   lock $destroyed;
+   $destroyed = 0;
+  }
+
+  my @threads = map spawn(\&try, $dispell, $wiz), 1 .. 2;
+  $_->join for @threads;
+
+  {
+   lock $c;
+   is $c, 2, "get triggered twice";
+  }
+  {
+   lock $destroyed;
+   is $destroyed, (1 - $dispell) * 2, 'destructors';
+  }
  }
 }