X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F40-threads.t;h=7f55f22fc43cea8ee85dcf3301ae06a3b6a14290;hb=51804c2b718abc276a95b4626f3fb30f829e51fe;hp=67afabb606656fcc5e23c8ee568deae42befec1e;hpb=c6abed5ccaa4d139bd636acc79f53df4e1e254bc;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/40-threads.t b/t/40-threads.t
index 67afabb..7f55f22 100644
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,87 +3,119 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use Variable::Magic qw<
+ wizard cast dispell getdata
+ VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
+>;
 
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'Variable::Magic' => Variable::Magic::VMG_THREADSAFE ],
+);
 
-use threads; # Before Test::More
-use threads::shared;
+use Test::Leaner 'no_plan';
 
-use Test::More;
+my $destroyed : shared = 0;
 
-use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE/;
+sub try {
+ my ($dispell, $op_info) = @_;
+ my $tid = threads->tid;
 
-if (VMG_THREADSAFE) {
- plan tests => 2 * (2 * 16 + 1) + 2 * (2 * 11 + 1);
-} else {
- plan skip_all => 'This Variable::Magic isn\'t thread safe';
-}
+ my $c = 0;
+ my $wiz;
 
-my $destroyed : shared = 0;
-my $sig = undef;
+ {
+  local $@;
+  $wiz = eval {
+   wizard(
+    data    => sub { $_[1] + $tid },
+    get     => sub { ++$c; 0 },
+    set     => sub {
+     my $op = $_[-1];
+
+     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";
+     }
+
+     return 0;
+    },
+    free    => sub { lock $destroyed; ++$destroyed; 0 },
+    op_info => $op_info,
+   );
+  };
+  is $@,     '',    "wizard in thread $tid doesn't croak";
+  isnt $wiz, undef, "wizard in thread $tid is defined";
+  is $c,     0,     "wizard in thread $tid doesn't trigger magic";
+ }
 
-sub try {
- my ($dispell) = @_;
- my $tid = threads->tid();
- my $c   = 0;
- my $wiz = eval {
-  wizard get  => sub { ++$c },
-         data => sub { $_[1] + $tid },
-         free => sub { ++$destroyed },
-         sig  => $sig;
- };
- is($@,     '',    "wizard in thread $tid doesn't croak");
- isnt($wiz, undef, "wizard in thread $tid is defined");
- is($c,     0,     "wizard in thread $tid doesn't trigger magic");
  my $a = 3;
- my $res = eval { cast $a, $wiz, sub { 5 }->() };
- is($@, '', "cast in thread $tid doesn't croak");
- is($c, 0,  "cast in thread $tid doesn't trigger magic");
- my $b;
- eval { $b = $a };
- is($@, '', "get in thread $tid doesn't croak");
- is($b, 3,  "get in thread $tid returns the right thing");
- is($c, 1,  "get in thread $tid triggers magic");
- 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");
- is($c, 1,        "getdata in thread $tid doesn't trigger magic");
- if ($dispell) {
-  $res = eval { dispell $a, $wiz };
-  is($@, '', "dispell in thread $tid doesn't croak");
-  is($c, 1,  "dispell in thread $tid doesn't trigger magic");
-  undef $b;
+
+ {
+  local $@;
+  my $res = eval { cast $a, $wiz, sub { 5 }->() };
+  is $@, '', "cast in thread $tid doesn't croak";
+  is $c, 0,  "cast in thread $tid doesn't trigger magic";
+ }
+
+ {
+  local $@;
+  my $b;
   eval { $b = $a };
-  is($@, '', "get in thread $tid after dispell doesn't croak");
-  is($b, 3,  "get in thread $tid after dispell returns the right thing");
-  is($c, 1,  "get in thread $tid after dispell doesn't trigger magic");
+  is $@, '', "get in thread $tid doesn't croak";
+  is $b, 3,  "get in thread $tid returns the right thing";
+  is $c, 1,  "get in thread $tid triggers magic";
  }
- return; # Ugly if not here
-}
 
-for my $dispell (1, 0) {
- $destroyed = 0;
- $sig = undef;
+ {
+  local $@;
+  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";
+  is $c, 1,        "getdata in thread $tid doesn't trigger magic";
+ }
 
- my @t = map { threads->create(\&try, $dispell) } 1 .. 2;
- $t[0]->join;
- $t[1]->join;
+ {
+  local $@;
+  eval { $a = 9 };
+  is $@, '', "set in thread $tid (check opname) doesn't croak";
+ }
 
- is($destroyed, (1 - $dispell) * 2, 'destructors');
+ if ($dispell) {
+  {
+   local $@;
+   my $res = eval { dispell $a, $wiz };
+   is $@, '', "dispell in thread $tid doesn't croak";
+   is $c, 1,  "dispell in thread $tid doesn't trigger magic";
+  }
 
- $destroyed = 0;
- $sig = Variable::Magic::gensig();
+  {
+   local $@;
+   my $b;
+   eval { $b = $a };
+   is $@, '', "get in thread $tid after dispell doesn't croak";
+   is $b, 9,  "get in thread $tid after dispell returns the right thing";
+   is $c, 1,  "get in thread $tid after dispell doesn't trigger magic";
+  }
+ }
+ return; # Ugly if not here
+}
+
+for my $dispell (1, 0) {
+ {
+  lock $destroyed;
+  $destroyed = 0;
+ }
 
- @t = map { threads->create(\&try, $dispell) } 1 .. 2;
- $t[0]->join;
- $t[1]->join;
+ my @threads = map spawn(\&try, $dispell, $_),
+                              (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
+ $_->join for @threads;
 
- is($destroyed, (1 - $dispell) * 2, 'destructors');
+ {
+  lock $destroyed;
+  is $destroyed, (1 - $dispell) * 4, 'destructors';
+ }
 }