X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FGlobalDestruction.pm;h=949d1d4e83d841bc30e3ed9685b2d329ecb03b86;hb=5629eb97bd5b25e57bec2dc3920728b7a89a4e29;hp=5507824ecd22f263e48cdab629aca9b45c07f952;hpb=78be2b4a5f7971e996f688e20ae18d3e7e4931db;p=p5sagit%2FDevel-GlobalDestruction.git

diff --git a/lib/Devel/GlobalDestruction.pm b/lib/Devel/GlobalDestruction.pm
index 5507824..949d1d4 100644
--- a/lib/Devel/GlobalDestruction.pm
+++ b/lib/Devel/GlobalDestruction.pm
@@ -3,83 +3,40 @@ package Devel::GlobalDestruction;
 use strict;
 use warnings;
 
-our $VERSION = '0.07';
+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;
+  require XSLoader;
+  XSLoader::load(__PACKAGE__, $VERSION);
+  1;
 }) {
-    # the eval already installed everything, nothing to do
+  # the eval already installed everything, nothing to do
 }
-# Not core nor XS
-#
 else {
-
-  # SpeedyCGI runs END blocks every cycle but somehow keeps object instances
-  # hence DIAF
-  die("The pure-perl version of @{[__PACKAGE__]} can not function correctly under CGI::SpeedyCGI. "
-    . "Please ensure you have a working compiler, and reinstall @{[__PACKAGE__]} to enable the XS "
-    . "codepath.\n"
-  ) if $CGI::SpeedyCGI::i_am_speedy;
-
-  eval <<'PP_IGD' or die $@;
-
-my ($in_global_destruction, $before_is_installed);
-
-sub in_global_destruction () { $in_global_destruction }
-
-# This block will fire towards the end of the program execution
-# Since there is no way for us to generate an END which will execute *last*
-# this is *NOT 100% INCOMPATIBLE* with XS/${^GLOBAL_PHASE}. We *may* end up
-# with a true in_gloal_destruction() in the middle of another END block
-# There are no practical cases where this matters.
-#
-END {
-  $in_global_destruction = 1;
-}
-
-# 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;
-}
-
-# 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__ ]}");
+  # 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 $@;
   }
-}
-
-1;  # keep eval happy
-
-PP_IGD
-
+  eval 'sub in_global_destruction () { $started && B::main_start()->isa(q[B::NULL]) }; 1'
+    or die $@;
 }
 
 1;  # keep require happy
@@ -119,7 +76,8 @@ 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
 
@@ -141,6 +99,10 @@ Jesse Luehrs E<lt>doy@tozt.netE<gt>
 
 Peter Rabbitson E<lt>ribasushi@cpan.orgE<gt>
 
+Arthur Axel 'fREW' Schmidt E<lt>frioux@gmail.comE<gt>
+
+Elizabeth Mattijsen E<lt>liz@dijkmat.nlE<gt>
+
 =head1 COPYRIGHT
 
     Copyright (c) 2008 Yuval Kogman. All rights reserved