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

diff --git a/t/40-threads.t b/t/40-threads.t
index 67afabb..3b850e3 100644
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,41 +3,38 @@
 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 'no_plan';
 
-use Test::More;
-
-use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE/;
-
-if (VMG_THREADSAFE) {
- plan tests => 2 * (2 * 16 + 1) + 2 * (2 * 11 + 1);
-} 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 $sig = undef;
 
 sub try {
- my ($dispell) = @_;
+ my ($dispell, $op_info) = @_;
  my $tid = threads->tid();
  my $c   = 0;
  my $wiz = eval {
-  wizard get  => sub { ++$c },
-         data => sub { $_[1] + $tid },
-         free => sub { ++$destroyed },
-         sig  => $sig;
+  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";
+                     }
+                     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");
@@ -55,6 +52,8 @@ sub try {
  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");
+ eval { $a = 9 };
+ is($@, '', "set in thread $tid (check opname) doesn't croak");
  if ($dispell) {
   $res = eval { dispell $a, $wiz };
   is($@, '', "dispell in thread $tid doesn't croak");
@@ -62,28 +61,24 @@ sub try {
   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");
   is($c, 1,  "get in thread $tid after dispell doesn't trigger magic");
  }
  return; # Ugly if not here
 }
 
 for my $dispell (1, 0) {
- $destroyed = 0;
- $sig = undef;
-
- my @t = map { threads->create(\&try, $dispell) } 1 .. 2;
- $t[0]->join;
- $t[1]->join;
-
- is($destroyed, (1 - $dispell) * 2, 'destructors');
-
- $destroyed = 0;
- $sig = Variable::Magic::gensig();
+ {
+  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';
+ }
 }