X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FGlobalDestruction.pm;h=c1c9b5e172c26bbed02f1ceb4b36da12d2bc5928;hb=6f93d768566ef08e28e5b1b732a63c0e04dfbf68;hp=8cf559c61febd481f5dfa816bce4f3f4e64e14ea;hpb=aaa7f60fc32505c436095fb1e5a91b8bc11f3e3a;p=p5sagit%2FDevel-GlobalDestruction.git

diff --git a/lib/Devel/GlobalDestruction.pm b/lib/Devel/GlobalDestruction.pm
index 8cf559c..c1c9b5e 100644
--- a/lib/Devel/GlobalDestruction.pm
+++ b/lib/Devel/GlobalDestruction.pm
@@ -1,31 +1,48 @@
-#!/usr/bin/perl
-
 package Devel::GlobalDestruction;
 
 use strict;
 use warnings;
 
-use XSLoader;
-
-our $VERSION = '0.04';
+our $VERSION = '0.09';
 
-use Sub::Exporter -setup => {
-	exports => [ qw(in_global_destruction) ],
-	groups  => { default => [ -all ] },
+use Sub::Exporter::Progressive -setup => {
+  exports => [ qw(in_global_destruction) ],
+  groups  => { default => [ -all ] },
 };
 
+# we run 5.14+ - everything is in core
+#
 if (defined ${^GLOBAL_PHASE}) {
-    eval 'sub in_global_destruction () { ${^GLOBAL_PHASE} eq q[DESTRUCT] }';
+  eval 'sub in_global_destruction () { ${^GLOBAL_PHASE} eq q[DESTRUCT] }; 1'
+    or die $@;
+}
+# try to load the xs version if it was compiled
+#
+elsif (eval {
+  require XSLoader;
+  XSLoader::load(__PACKAGE__, $VERSION);
+  1;
+}) {
+  # the eval already installed everything, nothing to do
 }
 else {
-    XSLoader::load(__PACKAGE__, $VERSION);
+  # internally, PL_main_start is nulled immediately before entering global destruction
+  # and we can use B to detect that.  It will also be null before the main runloop starts,
+  # so we check install a CHECK if needed to detect that.
+  require B;
+  my $started = !B::main_start()->isa(q[B::NULL]);
+  unless ($started) {
+    eval 'CHECK { $started = 1 }; 1'
+      or die $@;
+  }
+  eval 'sub in_global_destruction () { $started && B::main_start()->isa(q[B::NULL]) }; 1'
+    or die $@;
 }
 
-__PACKAGE__
+1;  # keep require happy
 
-__END__
 
-=pod
+__END__
 
 =head1 NAME
 
@@ -34,16 +51,16 @@ 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
 
@@ -59,24 +76,19 @@ destruction is in effect.
 
 =head1 EXPORTS
 
-This module uses L<Sub::Exporter> so the exports may be renamed, aliased, etc.
+This module uses L<Sub::Exporter::Progressive> so the exports may be renamed,
+aliased, etc. if L<Sub::Exporter> is present.
 
 =over 4
 
 =item in_global_destruction
 
 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>.
+returns C<${^GLOBAL_PHASE} eq 'DESTRUCT'>, and on earlier perls, detects it using
+the value of C<PL_main_start> or C<PL_dirty>.
 
 =back
 
-=head1 VERSION CONTROL
-
-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.
-
 =head1 AUTHORS
 
 Yuval Kogman E<lt>nothingmuch@woobling.orgE<gt>
@@ -85,12 +97,18 @@ Florian Ragwitz E<lt>rafl@debian.orgE<gt>
 
 Jesse Luehrs E<lt>doy@tozt.netE<gt>
 
-=head1 COPYRIGHT
+Peter Rabbitson E<lt>ribasushi@cpan.orgE<gt>
 
-	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.
+Arthur Axel 'fREW' Schmidt E<lt>frioux@gmail.comE<gt>
 
-=cut
+Elizabeth Mattijsen E<lt>liz@dijkmat.nlE<gt>
+
+Greham Knop E<lt>haarg@haarg.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.
 
+=cut