X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FAccessor%2FGrouped.pm;h=77c55750f8b52af306d267b843cf43a83a227233;hb=18922520eb03bc7fb5e1cdfd7304748365b7210e;hp=8eee167d47bbdf4cc9bc007aaa3cf2e23a802d0d;hpb=eda06cc6e50add4156f887b756e3dacd1b8a6d9e;p=p5sagit%2FClass-Accessor-Grouped.git diff --git a/lib/Class/Accessor/Grouped.pm b/lib/Class/Accessor/Grouped.pm index 8eee167..77c5575 100644 --- a/lib/Class/Accessor/Grouped.pm +++ b/lib/Class/Accessor/Grouped.pm @@ -3,16 +3,24 @@ use strict; use warnings; use Carp (); use Scalar::Util (); -use MRO::Compat; -our $VERSION = '0.09008'; -$VERSION = eval $VERSION; +BEGIN { + if ($] < 5.009_005) { + require MRO::Compat; + } + else { + require mro; + } +} + +our $VERSION = '0.10002'; +$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases # when changing minimum version don't forget to adjust L and # the Makefile.PL as well our $__minimum_xsa_version; BEGIN { - $__minimum_xsa_version = '1.06'; + $__minimum_xsa_version = '1.11'; } our $USE_XS; @@ -72,6 +80,14 @@ Class::Accessor::Grouped - Lets you build groups of accessors =head1 SYNOPSIS + use base 'Class::Accessor::Grouped'; + + # make basic accessors for objects + __PACKAGE__->mk_group_accessors(simple => qw(id name email)); + + # make accessor that works for objects and classes + __PACKAGE__->mk_group_accessors(inherited => 'awesome_level'); + =head1 DESCRIPTION This class lets you build groups of accessors that will call different @@ -81,6 +97,8 @@ getters and setters. =head2 mk_group_accessors + __PACKAGE__->mk_group_accessors(simple => 'hair_length'); + =over 4 =item Arguments: $group, @fieldspec @@ -113,6 +131,8 @@ sub mk_group_accessors { =head2 mk_group_ro_accessors + __PACKAGE__->mk_group_ro_accessors(simple => 'birthdate'); + =over 4 =item Arguments: $group, @fieldspec @@ -135,6 +155,8 @@ sub mk_group_ro_accessors { =head2 mk_group_wo_accessors + __PACKAGE__->mk_group_wo_accessors(simple => 'lie'); + =over 4 =item Arguments: $group, @fieldspec @@ -157,6 +179,8 @@ sub mk_group_wo_accessors { =head2 make_group_accessor + __PACKAGE__->make_group_accessor(simple => 'hair_length', 'hair_length'); + =over 4 =item Arguments: $group, $field, $method @@ -175,6 +199,8 @@ sub make_group_accessor { $gen_accessor->('rw', @_) } =head2 make_group_ro_accessor + __PACKAGE__->make_group_ro_accessor(simple => 'birthdate', 'birthdate'); + =over 4 =item Arguments: $group, $field, $method @@ -193,6 +219,8 @@ sub make_group_ro_accessor { $gen_accessor->('ro', @_) } =head2 make_group_wo_accessor + __PACKAGE__->make_group_wo_accessor(simple => 'lie', 'lie'); + =over 4 =item Arguments: $group, $field, $method @@ -410,25 +438,28 @@ To provide total flexibility L calls methods internally while performing get/set actions, which makes it noticeably slower than similar modules. To compensate, this module will automatically use the insanely fast L to generate the C-group -accessors, if L<< Class::XSAccessor >= 1.06|Class::XSAccessor >> is -available on your system. +accessors if this module is available on your system. =head2 Benchmark This is the result of a set/get/set loop benchmark on perl 5.12.1 with thread support, showcasing most popular accessor builders: L, L, -L, L -and L: - - Rate CAG moOse CAF HANDMADE CAF_XS moUse_XS CAG_XS XSA - CAG 1777/s -- -27% -29% -36% -62% -67% -72% -73% - moOse 2421/s 36% -- -4% -13% -48% -55% -61% -63% - CAF 2511/s 41% 4% -- -10% -47% -53% -60% -61% - HANDMADE 2791/s 57% 15% 11% -- -41% -48% -56% -57% - CAF_XS 4699/s 164% 94% 87% 68% -- -13% -25% -28% - moUse_XS 5375/s 203% 122% 114% 93% 14% -- -14% -18% - CAG_XS 6279/s 253% 159% 150% 125% 34% 17% -- -4% - XSA 6515/s 267% 169% 159% 133% 39% 21% 4% -- +L, L, L, +L, and L: + + Rate CAG moOse CAF moUse moo HANDMADE CAF_XS moUse_XS moo_XS CAF_XSA XSA CAG_XS + CAG 169/s -- -21% -24% -32% -32% -34% -59% -63% -67% -67% -67% -67% + moOse 215/s 27% -- -3% -13% -13% -15% -48% -53% -58% -58% -58% -58% + CAF 222/s 31% 3% -- -10% -10% -13% -46% -52% -57% -57% -57% -57% + moUse 248/s 46% 15% 11% -- -0% -3% -40% -46% -52% -52% -52% -52% + moo 248/s 46% 15% 11% 0% -- -3% -40% -46% -52% -52% -52% -52% + HANDMADE 255/s 50% 18% 14% 3% 3% -- -38% -45% -50% -51% -51% -51% + CAF_XS 411/s 143% 91% 85% 66% 66% 61% -- -11% -20% -20% -21% -21% + moUse_XS 461/s 172% 114% 107% 86% 86% 81% 12% -- -10% -11% -11% -11% + moo_XS 514/s 204% 139% 131% 107% 107% 102% 25% 12% -- -0% -1% -1% + CAF_XSA 516/s 205% 140% 132% 108% 108% 103% 26% 12% 0% -- -0% -0% + XSA 519/s 206% 141% 133% 109% 109% 104% 26% 13% 1% 0% -- -0% + CAG_XS 519/s 206% 141% 133% 109% 109% 104% 26% 13% 1% 0% 0% -- Benchmark program is available in the root of the L: @@ -450,12 +481,6 @@ an object, invoke a simple accessor on that object, and B manipulate the symbol table to install a C override - you get to keep all the pieces. -While L works surprisingly well for the amount of black -magic it tries to pull off, it's still black magic. At present (Sep 2010) -the module is known to have problems on Windows under heavy thread-stress -(e.g. Win32+Apache+mod_perl). Thus for the time being L -will not be used automatically if you are running under C. - =head1 AUTHORS Matt S. Trout @@ -466,6 +491,8 @@ Christopher H. Laco Caelum: Rafael Kitover +frew: Arthur Axel "fREW" Schmidt + groditi: Guillermo Roditi Jason Plum @@ -500,6 +527,7 @@ BEGIN { local $@; my $err; + $err = eval { require Sub::Name; 1; } ? undef : do { delete $INC{'Sub/Name.pm'}; # because older perls suck $@; @@ -537,15 +565,20 @@ BEGIN { : sub () { 0 } ; -}; + + *__CAG_TRACK_UNDEFER_FAIL = ( + $INC{'Test/Builder.pm'} || $INC{'Test/Builder2.pm'} + and + $0 =~ m|^ x?t / .+ \.t $|x + ) ? sub () { 1 } + : sub () { 0 } + ; +} # Autodetect unless flag supplied -# Class::XSAccessor is segfaulting on win32, in some -# esoteric heavily-threaded scenarios -# Win32 users can set $USE_XS/CAG_USE_XS to try to use it anyway my $xsa_autodetected; if (! defined $USE_XS) { - $USE_XS = (!__CAG_NO_CXSA and $^O ne 'MSWin32') ? 1 : 0; + $USE_XS = __CAG_NO_CXSA ? 0 : 1; $xsa_autodetected++; } @@ -559,7 +592,7 @@ my $maker_templates = { $field =~ s/'/\\'/g; " - \@_ > 1 + \@_ != 1 ? shift->$set('$field', \@_) : shift->$get('$field') " @@ -592,7 +625,7 @@ my $maker_templates = { $field =~ s/'/\\'/g; " - \@_ > 1 + \@_ != 1 ? shift->$set('$field', \@_) : do { my \$caller = caller; @@ -616,24 +649,31 @@ my $original_simple_setter = __PACKAGE__->can ('set_simple'); # Note!!! Unusual signature $gen_accessor = sub { my ($type, $class, $group, $field, $methname) = @_; - if (my $c = ref $class) { + if (my $c = Scalar::Util::blessed( $class )) { $class = $c; } - my $fq_name = "${class}::${methname}"; - # When installing an XSA simple accessor, we need to make sure we are not # short-circuiting a (compile or runtime) get_simple/set_simple override. # What we do here is install a lazy first-access check, which will decide # the ultimate coderef being placed in the accessor slot + # + # Also note that the *original* class will always retain this shim, as + # different branches inheriting from it may have different overrides. + # Thus the final method (properly labeled and all) is installed in the + # calling-package's namespace if ($USE_XS and $group eq 'simple') { - ($accessor_maker_cache->{xs}{$field}{$type}{$fq_name} ||= do { - die sprintf( "Class::XSAccessor requested but not available:\n%s\n", __CAG_NO_CXSA ) - if __CAG_NO_CXSA; + die sprintf( "Class::XSAccessor requested but not available:\n%s\n", __CAG_NO_CXSA ) + if __CAG_NO_CXSA; - sub { sub { - my $current_class = Scalar::Util::blessed( $_[0] ) || $_[0]; + my ($expected_cref, $cached_implementation); + my $ret = $expected_cref = sub { + my $current_class = Scalar::Util::blessed( $_[0] ) || $_[0]; + # $cached_implementation will be set only if the shim got + # 'around'ed, in which case it is handy to avoid re-running + # this block over and over again + my $resolved_implementation = $cached_implementation->{$current_class} || do { if ( $current_class->can('get_simple') == $original_simple_getter && @@ -645,39 +685,97 @@ $gen_accessor = sub { # *objects* (since XSA works on 'simple' only by definition). # If someone is mucking with the symbol table *after* there # are some objects already - look! many, shiny pieces! :) + # + # The weird breeder thingy is because XSA does not have an + # interface returning *just* a coderef, without installing it + # anywhere :( Class::XSAccessor->import( replace => 1, - class => $class, + class => '__CAG__XSA__BREEDER__', $maker_templates->{$type}{xs_call} => { $methname => $field, }, ); + __CAG__XSA__BREEDER__->can($methname); } else { if (! $xsa_autodetected and ! $no_xsa_warned_classes->{$current_class}++) { # not using Carp since the line where this happens doesn't mean much warn 'Explicitly requested use of Class::XSAccessor disabled for objects of class ' - . "'$current_class' due to an overriden get_simple and/or set_simple\n"; + . "'$current_class' inheriting from '$class' due to an overriden get_simple and/or " + . "set_simple\n"; } - no strict qw/refs/; - - *$fq_name = Sub::Name::subname($fq_name, do { + do { # that's faster than local $USE_XS = 0; my $c = $gen_accessor->($type, $class, 'simple', $field, $methname); $USE_XS = 1; $c; - }); + }; } + }; + + # if after this shim was created someone wrapped it with an 'around', + # we can not blindly reinstall the method slot - we will destroy the + # wrapper. Silently chain execution further... + if ( !$expected_cref or $expected_cref != $current_class->can($methname) ) { + + # there is no point in re-determining it on every subsequent call, + # just store for future reference + $cached_implementation->{$current_class} ||= $resolved_implementation; # older perls segfault if the cref behind the goto throws # http://rt.perl.org/rt3/Public/Bug/Display.html?id=35878 - return $current_class->can($methname)->(@_) if __CAG_BROKEN_GOTO; + return $resolved_implementation->(@_) if __CAG_BROKEN_GOTO; - goto $current_class->can($methname); - }} - })->(); + goto $resolved_implementation; + } + + if (__CAG_TRACK_UNDEFER_FAIL) { + my $deferred_calls_seen = do { + no strict 'refs'; + \%{"${current_class}::__cag_deferred_xs_shim_invocations"} + }; + my @cframe = caller(0); + if (my $already_seen = $deferred_calls_seen->{$cframe[3]}) { + Carp::carp ( + "Deferred version of method $cframe[3] invoked more than once (originally " + . "invoked at $already_seen). This is a strong indication your code has " + . 'cached the original ->can derived method coderef, and is using it instead ' + . 'of the proper method re-lookup, causing performance regressions' + ); + } + else { + $deferred_calls_seen->{$cframe[3]} = "$cframe[1] line $cframe[2]"; + } + } + + # install the resolved implementation into the code slot so we do not + # come here anymore (hopefully) + # since XSAccessor was available - so is Sub::Name + { + no strict 'refs'; + no warnings 'redefine'; + + my $fq_name = "${current_class}::${methname}"; + *$fq_name = Sub::Name::subname($fq_name, $resolved_implementation); + + # need to update what the shim expects too *in case* its + # ->can was cached for some moronic reason + $expected_cref = $resolved_implementation; + Scalar::Util::weaken($expected_cref); + } + + # older perls segfault if the cref behind the goto throws + # http://rt.perl.org/rt3/Public/Bug/Display.html?id=35878 + return $resolved_implementation->(@_) if __CAG_BROKEN_GOTO; + + goto $resolved_implementation; + }; + + Scalar::Util::weaken($expected_cref); # to break the self-reference + $ret; } # no Sub::Name - just install the coderefs directly (compiling every time) @@ -685,15 +783,16 @@ $gen_accessor = sub { my $src = $accessor_maker_cache->{source}{$type}{$group}{$field} ||= $maker_templates->{$type}{pp_code}->($group, $field); + no warnings 'redefine'; local $@ if __CAG_UNSTABLE_DOLLARAT; - eval "sub ${fq_name}{$src}"; + eval "sub ${class}::${methname} { $src }"; - undef; # so that no attempt will be made to install anything + undef; # so that no further attempt will be made to install anything } # a coderef generator with a variable pad (returns a fresh cref on every invocation) else { - ($accessor_maker_cache->{pp}{$group}{$field}{$type} ||= do { + ($accessor_maker_cache->{pp}{$type}{$group}{$field} ||= do { my $src = $accessor_maker_cache->{source}{$type}{$group}{$field} ||= $maker_templates->{$type}{pp_code}->($group, $field);