use warnings;
use strict;
+use ANFANG;
use Carp;
use Scalar::Util qw(isweak weaken blessed reftype);
-use DBIx::Class::_Util qw(refcount hrefaddr refdesc);
-use DBIx::Class::Optional::Dependencies;
-use Data::Dumper::Concise;
+use DBIx::Class::_Util qw(refcount hrefaddr refdesc dump_value visit_namespaces);
+use DBICTest::RunMode;
use DBICTest::Util 'stacktrace';
use constant {
- CV_TRACING => DBIx::Class::Optional::Dependencies->req_ok_for ('test_leaks_heavy'),
+ CV_TRACING => !!(
+ !DBICTest::RunMode->is_plain
+ &&
+ require DBIx::Class::Optional::Dependencies
+ &&
+ DBIx::Class::Optional::Dependencies->req_ok_for ('test_leaks_heavy')
+ ),
};
use base 'Exporter';
for keys %$reg;
}
+ return $target if (
+ DBIx::Class::_ENV_::BROKEN_WEAK_SCALARREF_VALUES
+ and
+ ref $target eq 'SCALAR'
+ );
+
if (! defined $weak_registry->{$refaddr}{weakref}) {
+
+ # replace slot entirely
$weak_registry->{$refaddr} = {
stacktrace => stacktrace(1),
weakref => $target,
};
- # on perl < 5.8.3 sometimes a weaken can throw (can't find RT)
- # so guard against that unlikely event
- local $@;
- eval { weaken( $weak_registry->{$refaddr}{weakref} ); $refs_traced++ }
- or delete $weak_registry->{$refaddr};
+ weaken( $weak_registry->{$refaddr}{weakref} );
+
+ $refs_traced++;
}
my $desc = refdesc $target;
}
# Regenerate the slots names on a thread spawn
-sub CLONE {
+sub DBICTest::__LeakTracer_iThreads_handler__::CLONE {
my @individual_regs = grep { scalar keys %{$_||{}} } values %reg_of_regs;
%reg_of_regs = ();
$reg->{$new_addr} = $slot_info;
}
}
+
+ # Dummy NEXTSTATE ensuring the all temporaries on the stack are garbage
+ # collected before leaving this scope. Depending on the code above, this
+ # may very well be just a preventive measure guarding future modifications
+ undef;
}
sub visit_refs {
my $type = reftype $r;
+ local $SIG{__DIE__} if $SIG{__DIE__};
local $@;
eval {
if ($type eq 'HASH') {
$visited_cnt;
}
-sub visit_namespaces {
- my $args = { (ref $_[0]) ? %{$_[0]} : @_ };
-
- my $visited = 1;
-
- $args->{package} ||= '::';
- $args->{package} = '::' if $args->{package} eq 'main';
-
- if ( $args->{action}->($args->{package}) ) {
-
- my $base = $args->{package};
- $base = '' if $base eq '::';
-
-
- $visited += visit_namespaces({ %$args, package => $_ }) for map
- { $_ =~ /(.+?)::$/ ? "${base}::$1" : () }
- grep
- { $_ =~ /(?<!^main)::$/ }
- do { no strict 'refs'; keys %{ $base . '::'} }
- }
-
- return $visited;
-}
-
# compiles a list of addresses stored as globals (possibly even catching
# class data in the form of method closures), so we can skip them further on
sub symtable_referenced_addresses {
no strict 'refs';
my $pkg = shift;
- $pkg = '' if $pkg eq '::';
- $pkg .= '::';
# the unless regex at the end skips some dangerous namespaces outright
# (but does not prevent descent)
action => sub { 1 },
refs => [ map { my $sym = $_;
- # *{"$pkg$sym"}{CODE} won't simply work - MRO-cached CVs are invisible there
- ( CV_TRACING ? Class::MethodCache::get_cv("${pkg}$sym") : () ),
+ # *{"${pkg}::$sym"}{CODE} won't simply work - MRO-cached CVs are invisible there
+ ( CV_TRACING ? Class::MethodCache::get_cv("${pkg}::$sym") : () ),
- ( defined *{"$pkg$sym"}{SCALAR} and length ref ${"$pkg$sym"} and ! isweak( ${"$pkg$sym"} ) )
- ? ${"$pkg$sym"} : ()
+ ( defined *{"${pkg}::$sym"}{SCALAR} and length ref ${"${pkg}::$sym"} and ! isweak( ${"${pkg}::$sym"} ) )
+ ? ${"${pkg}::$sym"} : ()
,
( map {
- ( defined *{"$pkg$sym"}{$_} and ! isweak(defined *{"$pkg$sym"}{$_}) )
- ? *{"$pkg$sym"}{$_}
+ ( defined *{"${pkg}::$sym"}{$_} and ! isweak(defined *{"${pkg}::$sym"}{$_}) )
+ ? *{"${pkg}::$sym"}{$_}
: ()
} qw(HASH ARRAY IO GLOB) ),
- } keys %$pkg ],
- ) unless $pkg =~ /^ :: (?:
+ } keys %{"${pkg}::"} ],
+ ) unless $pkg =~ /^ (?:
DB | next | B | .+? ::::ISA (?: ::CACHE ) | Class::C3
- ) :: $/x;
+ ) $/x;
}
);
sub assert_empty_weakregistry {
my ($weak_registry, $quiet) = @_;
- Sub::Defer::undefer_all();
-
# in case we hooked bless any extra object creation will wreak
# havoc during the assert phase
local *CORE::GLOBAL::bless;
- *CORE::GLOBAL::bless = sub { CORE::bless( $_[0], (@_ > 1) ? $_[1] : caller() ) };
+ *CORE::GLOBAL::bless = sub { CORE::bless( $_[0], (@_ > 1) ? $_[1] : CORE::caller() ) };
croak 'Expecting a registry hashref' unless ref $weak_registry eq 'HASH';
# the symtable walk is very expensive
# if we are $quiet (running in an END block) we do not really need to be
- # that thorough - can get by with only %Sub::Quote::QUOTED
+ # that thorough - can get by with our own registry
delete $weak_registry->{$_} for $quiet
? do {
my $refs = {};
visit_refs (
# only look at the closed over stuffs
- refs => [ grep { length ref $_ } map { values %{$_->[2]} } grep { ref $_ eq 'ARRAY' } values %Sub::Quote::QUOTED ],
+ refs => [ values %DBIx::Class::_Util::refs_closed_over_by_quote_sub_installed_crefs ],
seen_refs => $refs,
action => sub { 1 },
);
ref($weak_registry->{$addr}{weakref}) eq 'CODE'
and
B::svref_2object($weak_registry->{$addr}{weakref})->XSUB
- ) ? '__XSUB__' : Dumper( $weak_registry->{$addr}{weakref} )
+ ) ? '__XSUB__' : dump_value $weak_registry->{$addr}{weakref}
;
};
# Devel::MAT::Dumper::dumpfh( $fh );
# close ($fh) or die $!;
#
-# use POSIX;
+# require POSIX;
# POSIX::_exit(1);
# }
}
if (! $quiet and !$leaks_found and ! $tb->in_todo) {
- $tb->ok(1, sprintf "No leaks found at %s line %d", (caller())[1,2] );
+ $tb->ok(1, sprintf "No leaks found at %s line %d", (CORE::caller())[1,2] );
}
}
projects / dbsrgits/DBIx-Class.git / blobdiff