X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F40-threads.t;h=151116bab11f44b9aebe5b25a1e6240380d8576a;hb=b1c264655ccc1eca4423e9dd9479855938bbac24;hp=013794bd348a1a57926ae30972050e2c5c112bc3;hpb=3bc98bdbdb230943e7fb3135e325f10013acac2d;p=perl%2Fmodules%2FVariable-Magic.git diff --git a/t/40-threads.t b/t/40-threads.t index 013794b..151116b 100644 --- a/t/40-threads.t +++ b/t/40-threads.t @@ -1,96 +1,109 @@ -#!perl -T +#!perl use strict; use warnings; -sub skipall { - my ($msg) = @_; - require Test::More; - Test::More::plan(skip_all => $msg); -} - -use Config qw<%Config>; - -BEGIN { - my $force = $ENV{PERL_VARIABLE_MAGIC_TEST_THREADS} ? 1 : !1; - my $t_v = $force ? '0' : '1.67'; - my $ts_v = $force ? '0' : '1.14'; - skipall 'This perl wasn\'t built to support threads' - unless $Config{useithreads}; - skipall 'perl 5.13.4 required to test thread safety' - unless $force or $] >= 5.013004; - 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 lib 't/lib'; +use VPIT::TestHelpers ( + threads => [ 'Variable::Magic' => 'Variable::Magic::VMG_THREADSAFE()' ], +); -use Test::More; # after threads - -use Variable::Magic qw< - wizard cast dispell getdata - VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT ->; - -BEGIN { - skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE; - plan tests => (4 * 18 + 1) + (4 * 13 + 1); - defined and diag "Using threads $_" for $threads::VERSION; - defined and diag "Using threads::shared $_" for $threads::shared::VERSION; -} +use Test::Leaner 'no_plan'; my $destroyed : shared = 0; sub try { my ($dispell, $op_info) = @_; - my $tid = threads->tid(); - my $c = 0; - my $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"; - } - 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"); + my $tid = threads->tid; + + my $c = 0; + my $wiz; + + { + local $@; + eval { require Variable::Magic; 1 } or return; + } + + { + local $@; + $wiz = eval { + Variable::Magic::wizard( + data => sub { $_[1] + $tid }, + get => sub { ++$c; 0 }, + set => sub { + my $op = $_[-1]; + + if ($op_info eq '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 eq 'object' ? Variable::Magic::VMG_OP_INFO_OBJECT() + : Variable::Magic::VMG_OP_INFO_NAME() + ); + }; + 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"); - 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"); - is($c, 1, "dispell in thread $tid doesn't trigger magic"); - undef $b; + + { + local $@; + my $res = eval { &Variable::Magic::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, 9, "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 + + { + local $@; + my $d = eval { &Variable::Magic::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"; + } + + { + local $@; + eval { $a = 9 }; + is $@, '', "set in thread $tid (check opname) doesn't croak"; + } + + if ($dispell) { + { + local $@; + my $res = eval { &Variable::Magic::dispell(\$a, $wiz) }; + is $@, '', "dispell in thread $tid doesn't croak"; + is $c, 1, "dispell 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, 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 1; } for my $dispell (1, 0) { @@ -99,12 +112,16 @@ for my $dispell (1, 0) { $destroyed = 0; } - my @t = map { threads->create(\&try, $dispell, $_) } - (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2; - $_->join for @t; + my $completed = 0; + + my @threads = map spawn(\&try, $dispell, $_), ('name') x 2, ('object') x 2; + for my $thr (@threads) { + my $res = $thr->join; + $completed += $res if defined $res; + } { lock $destroyed; - is $destroyed, (1 - $dispell) * 4, 'destructors'; + is $destroyed, (1 - $dispell) * $completed, 'destructors'; } }