X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FGlobalDestruction.pm;h=cf94048e2f3f5af04d28fb3a64a6381d6d2a3fdf;hb=0e762adeb08fb1fc9534c0e629e269d18951791a;hp=d2427273bf6ebef8312733e6c8360249eeb00d61;hpb=f615b0ff13c3d7547cca03c37f2877bb8307b709;p=p5sagit%2FDevel-GlobalDestruction.git

diff --git a/lib/Devel/GlobalDestruction.pm b/lib/Devel/GlobalDestruction.pm
index d242727..cf94048 100644
--- a/lib/Devel/GlobalDestruction.pm
+++ b/lib/Devel/GlobalDestruction.pm
@@ -1,53 +1,91 @@
-#!/usr/bin/perl
-
 package Devel::GlobalDestruction;
 
 use strict;
 use warnings;
 
-use vars qw($VERSION @ISA);
+our $VERSION = '0.04';
+
+use Sub::Exporter -setup => {
+    exports => [ qw(in_global_destruction) ],
+    groups  => { default => [ -all ] },
+};
+
+if (defined ${^GLOBAL_PHASE}) {
+    eval 'sub in_global_destruction () { ${^GLOBAL_PHASE} eq q[DESTRUCT] }';
+}
+elsif (eval {
+    require XSLoader;
+    XSLoader::load(__PACKAGE__, $VERSION);
+    1;
+}) {
+    # the eval already installed everything, nothing to do
+}
+else {
+  eval <<'PP_IGD' or die $@;
 
-BEGIN {
-	$VERSION = '0.02';
+my ($in_global_destruction, $before_is_installed);
 
+sub in_global_destruction { $in_global_destruction }
 
-	if ( do { local $@; eval { require XSLoader; 1 } } ) {
-		__PACKAGE__->XSLoader::load($VERSION);
-	} else {
-		require DynaLoader;
-		push @ISA, 'DynaLoader';
-		__PACKAGE__->bootstrap($VERSION);
-	}
+END {
+  # SpeedyCGI runs END blocks every cycle but somehow keeps object instances
+  # hence lying about it seems reasonable...ish
+  $in_global_destruction = 1 unless $CGI::SpeedyCGI::i_am_speedy;
 }
 
-use Sub::Exporter -setup => {
-	exports => [ qw(in_global_destruction) ],
-	groups  => { default => [ -all ] },
-};
+# threads do not execute the global ENDs (it would be stupid). However
+# one can register a new END via simple string eval within a thread, and
+# achieve the same result. A logical place to do this would be CLONE, which
+# is claimed to run in the context of the new thread. However this does
+# not really seem to be the case - any END evaled in a CLONE is ignored :(
+# Hence blatantly hooking threads::create
+
+if ($INC{'threads.pm'}) {
+  my $orig_create = threads->can('create');
+  no warnings 'redefine';
+  *threads::create = sub {
+    { local $@; eval 'END { $in_global_destruction = 1 }' };
+    goto $orig_create;
+  };
+  $before_is_installed = 1;
+}
 
-__PACKAGE__
+# just in case threads got loaded after us (silly)
+sub CLONE {
+  unless ($before_is_installed) {
+    require Carp;
+    Carp::croak("You must load the 'threads' module before @{[ __PACKAGE__ ]}");
+  }
+}
 
-__END__
+1;  # keep eval happy
 
-=pod
+PP_IGD
+
+}
+
+1;  # keep require happy
+
+
+__END__
 
 =head1 NAME
 
-Devel::GlobalDestruction - Expose PL_dirty, the flag which marks global
+Devel::GlobalDestruction - Expose the flag which marks global
 destruction.
 
 =head1 SYNOPSIS
 
-	package Foo;
-	use Devel::GlobalDestruction;
+    package Foo;
+    use Devel::GlobalDestruction;
 
-	use namespace::clean; # to avoid having an "in_global_destruction" method
+    use namespace::clean; # to avoid having an "in_global_destruction" method
 
-	sub DESTROY {
-		return if in_global_destruction;
+    sub DESTROY {
+        return if in_global_destruction;
 
-		do_something_a_little_tricky();
-	}
+        do_something_a_little_tricky();
+    }
 
 =head1 DESCRIPTION
 
@@ -69,26 +107,26 @@ This module uses L<Sub::Exporter> so the exports may be renamed, aliased, etc.
 
 =item in_global_destruction
 
-Returns the current value of C<PL_dirty>.
+Returns true if the interpreter is in global destruction. In perl 5.14+, this
+returns C<${^GLOBAL_PHASE} eq 'DESTRUCT'>, and on earlier perls, it returns the
+current value of C<PL_dirty>.
 
 =back
 
-=head1 VERSION CONTROL
+=head1 AUTHORS
 
-This module is maintained using Darcs. You can get the latest version from
-L<http://nothingmuch.woobling.org/code>, and use C<darcs send> to commit
-changes.
+Yuval Kogman E<lt>nothingmuch@woobling.orgE<gt>
 
-=head1 AUTHOR
+Florian Ragwitz E<lt>rafl@debian.orgE<gt>
 
-Yuval Kogman E<lt>nothingmuch@woobling.orgE<gt>
+Jesse Luehrs E<lt>doy@tozt.netE<gt>
+
+Peter Rabbitson E<lt>ribasushi@cpan.orgE<gt>
 
 =head1 COPYRIGHT
 
-	Copyright (c) 2008 Yuval Kogman. All rights reserved
-	This program is free software; you can redistribute
-	it and/or modify it under the same terms as Perl itself.
+    Copyright (c) 2008 Yuval Kogman. All rights reserved
+    This program is free software; you can redistribute
+    it and/or modify it under the same terms as Perl itself.
 
 =cut
-
-