X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F41-clone.t;h=0e47d3694819bc8c37a75cdfb411854dd7ab4aa6;hb=dee682e232db910b1e38e162ac51b0d98725e40e;hp=71e090f0419c3cce701882ac59d24bbd4da5e33b;hpb=db973b1268853452f82bd5e2daa220cdac7ecb8f;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/41-clone.t b/t/41-clone.t
index 71e090f..0e47d36 100644
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -3,87 +3,97 @@
 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/;
-
-if (VMG_THREADSAFE) {
- plan tests => 3 + 2 * (2 * 8 + 2) + 2 * (2 * 5 + 2);
- diag 'This will leak a few scalars';
-} 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;
-my $wiz = eval {
- wizard get  => sub { ++$c },
-        data => sub { $_[1] + threads->tid() },
-        free => sub { ++$destroyed }
-};
-is($@,     '',    "wizard in main thread doesn't croak");
-isnt($wiz, undef, "wizard in main thread is defined");
-is($c,     0,     "wizard in main thread doesn't trigger magic");
 
-my $sig;
+sub spawn_wiz {
+ my ($op_info) = @_;
+
+ my $wiz = eval {
+  wizard data    => sub { $_[1] + threads->tid() },
+         get     => sub { lock $c; ++$c; 0 },
+         set     => sub {
+                     my $op = $_[-1];
+                     my $tid = threads->tid();
+                     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 { lock $destroyed; ++$destroyed; 0 },
+         op_info => $op_info
+ };
+ is($@,     '',    "wizard with op_info $op_info in main thread doesn't croak");
+ isnt($wiz, undef, "wizard with op_info $op_info in main thread is defined");
+ is($c,     0,     "wizard with op_info $op_info in main thread doesn't trigger magic");
+
+ return $wiz;
+}
 
 sub try {
- my ($dispell) = @_;
+ 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 };
   is($@, '', "get in thread $tid after dispell doesn't croak");
-  is($b, 3,  "get in thread $tid after dispell returns the right thing");
+  is($b, 9,  "get in thread $tid after dispell returns the right thing");
  }
  return; # Ugly if not here
 }
 
-for my $dispell (1, 0) {
- $c = 0;
- $destroyed = 0;
- $sig = $wiz;
-
- my @t = map { threads->create(\&try, $dispell) } 1 .. 2;
- $t[0]->join;
- $t[1]->join;
-
- is($c, 2, "get triggered twice");
- is($destroyed, (1 - $dispell) * 2, 'destructors');
-
- $c = 0;
- $destroyed = 0;
- $sig = getsig $wiz;
+my $wiz_name = spawn_wiz VMG_OP_INFO_NAME;
+my $wiz_obj  = spawn_wiz VMG_OP_INFO_OBJECT;
 
- @t = map { threads->create(\&try, $dispell) } 1 .. 2;
- $t[0]->join;
- $t[1]->join;
-
- is($c, 2, "get triggered twice");
- is($destroyed, (1 - $dispell) * 2, 'destructors');
+for my $dispell (1, 0) {
+ 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';
+  }
+ }
 }