X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F40-threads.t;h=d10146d603254114379ae09e924d1f240aa7c507;hb=8edd65482a48cda016b4677014dcb80b2b923cb1;hp=2482e61f6dd0fea1f11111a6cdb10ece9af1dfa3;hpb=699cf35ef9ecbc8eec8ca35c2c10125ad6ec40e7;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/40-threads.t b/t/40-threads.t
index 2482e61..d10146d 100644
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,45 +3,60 @@
 use strict;
 use warnings;
 
+sub skipall {
+ my ($msg) = @_;
+ require Test::More;
+ Test::More::plan(skip_all => $msg);
+}
+
 use Config qw/%Config/;
 
 BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
+ my $t_v  = '1.67';
+ my $ts_v = '1.14';
+ skipall 'This perl wasn\'t built to support threads'
+                                                    unless $Config{useithreads};
+ skipall "threads $t_v required to test thread safety"
+                                              unless eval "use threads $t_v; 1";
+ skipall "threads::shared $ts_v required to test thread safety"
+                                     unless eval "use threads::shared $ts_v; 1";
 }
 
-use threads; # Before Test::More
-use threads::shared;
+use Test::More; # after threads
 
-use Test::More;
+use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
 
-use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE/;
-
-if (VMG_THREADSAFE) {
- plan tests => 2 * (2 * 16 + 1) + 2 * (2 * 11 + 1);
+BEGIN {
+ skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
+ plan tests => (4 * 18 + 1) + (4 * 13 + 1);
  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';
 }
 
 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");
@@ -59,6 +74,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");
@@ -66,28 +83,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 @t = map { threads->create(\&try, $dispell, $_) }
+                              (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
+ $_->join for @t;
 
- is($destroyed, (1 - $dispell) * 2, 'destructors');
+ {
+  lock $destroyed;
+  is $destroyed, (1 - $dispell) * 4, 'destructors';
+ }
 }