Add support for my $foo : shared;

[p5sagit/p5-mst-13.2.git] / ext / threads / shared / shared.pm

diff --git a/ext/threads/shared/shared.pm b/ext/threads/shared/shared.pm
index f8d04e2..83bd92c 100644 (file)
--- a/ext/threads/shared/shared.pm
+++ b/ext/threads/shared/shared.pm
@@ -1,107 +1,50 @@
 package threads::shared;
-
 use strict;
 use warnings;
 use Config;
-use Scalar::Util qw(weaken);
-use attributes qw(reftype);
 
-BEGIN {
-    if($Config{'useithreads'} && $threads::threads) {
-       *share = \&share_enabled;
+require Exporter;
+our @ISA = qw(Exporter);
+our @EXPORT = qw(share cond_wait cond_broadcast cond_signal _refcnt _id _thrcnt);
+our $VERSION = '0.90';
+
+use Attribute::Handlers;
+
+
+if ($Config{'useithreads'}) {
        *cond_wait = \&cond_wait_enabled;
        *cond_signal = \&cond_signal_enabled;
        *cond_broadcast = \&cond_broadcast_enabled;
-       *unlock = \&unlock_enabled;
-    } else {
+       require XSLoader;
+       XSLoader::load('threads::shared',$VERSION);
+}
+else {
        *share = \&share_disabled;
        *cond_wait = \&cond_wait_disabled;
        *cond_signal = \&cond_signal_disabled;
-       *cond_broadcast = \&cond_broadcast_dosabled;
-       *unlock = \&unlock_disabled;
-    }
+       *cond_broadcast = \&cond_broadcast_disabled;
 }
 
-require Exporter;
-require DynaLoader;
-our @ISA = qw(Exporter DynaLoader);
-
-our @EXPORT = qw(share cond_wait cond_broadcast cond_signal unlock);
-our $VERSION = '0.90';
-
-our %shared;
 
 sub cond_wait_disabled { return @_ };
 sub cond_signal_disabled { return @_};
 sub cond_broadcast_disabled { return @_};
-sub unlock_disabled { 1 };
-sub lock_disabled { 1 }
 sub share_disabled { return @_}
 
-sub share_enabled (\[$@%]) { # \]     
-    my $value = $_[0];
-    my $ref = reftype($value);
-    if($ref eq 'SCALAR') {
-       my $obj = \threads::shared::sv->new($$value);
-       bless $obj, 'threads::shared::sv';
-       $shared{$$obj} = $value;
-       weaken($shared{$$obj});
-    } elsif($ref eq "ARRAY") {
-       tie @$value, 'threads::shared::av', $value;
-    } elsif($ref eq "HASH") {
-       tie %$value, "threads::shared::hv", $value;
-    } else {
-       die "You cannot share ref of type $_[0]\n";
-    }
-}
+$threads::shared::threads_shared = 1;
 
-sub CLONE {
-    return unless($_[0] eq "threads::shared");
-       foreach my $ptr (keys %shared) {
-           if($ptr) {
-               thrcnt_inc($shared{$ptr},$threads::origthread);
-           }
-       }
-}
-
-sub DESTROY {
-    my $self = shift;
-    _thrcnt_dec($$self);
-    delete($shared{$$self});
-}
+sub _thrcnt { 42 }
 
-package threads::shared::sv;
-use base 'threads::shared';
-
-sub DESTROY {}
-
-package threads::shared::av;
-use base 'threads::shared';
-use Scalar::Util qw(weaken);
-sub TIEARRAY {
-       my $class = shift;
-        my $value = shift;
-       my $self = bless \threads::shared::av->new($value),'threads::shared::av';
-       $shared{$self->ptr} = $value;
-       weaken($shared{$self->ptr});
-       return $self;
+sub threads::shared::tie::SPLICE
+{
+ die "Splice not implemented for shared arrays";
 }
 
-package threads::shared::hv;
-use base 'threads::shared';
-use Scalar::Util qw(weaken);
-sub TIEHASH {
-    my $class = shift;
-    my $value = shift;
-    my $self = bless \threads::shared::hv->new($value),'threads::shared::hv';
-    $shared{$self->ptr} = $value;
-    weaken($shared{$self->ptr});
-    return $self;
+sub UNIVERSAL::shared : ATTR {
+    my ($package, $symbol, $referent, $attr, $data, $phase) = @_;
+    share($referent);
 }
 
-package threads::shared;
-bootstrap threads::shared $VERSION;
-
 __END__
 
 =head1 NAME
@@ -153,7 +96,7 @@ C<lock> places a lock on a variable until the lock goes out of scope.  If
 the variable is locked by another thread, the C<lock> call will block until
 it's available. C<lock> is recursive, so multiple calls to C<lock> are
 safe--the variable will remain locked until the outermost lock on the
-variable goes out of scope or C<unlock> is called enough times to match 
+variable goes out of scope or C<unlock> is called enough times to match
 the number of calls to <lock>.
 
 If a container object, such as a hash or array, is locked, all the elements
@@ -205,6 +148,14 @@ The C<cond_broadcast> function works similarly to C<cond_signal>.
 C<cond_broadcast>, though, will unblock B<all> the threads that are blocked
 in a C<cond_wait> on the locked variable, rather than only one.
 
+
+=head1 NOTES
+
+threads::shared is designed to disable itself silently if threads are
+not available. If you want access to threads, you must C<use threads>
+before you C<use threads::shared>.  threads will emit a warning if you
+use it after threads::shared.
+
 =head1 BUGS
 
 C<bless> is not supported on shared references, in the current version