From: Graham Knop <haarg@haarg.org>
Date: Fri, 1 Feb 2013 21:15:39 +0000 (-0500)
Subject: check B::main_start for old perl fallback
X-Git-Tag: Devel-GlobalDestruction-0.10~11
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=97415ced0e794c67b8fd9f2c189fc0b996604f14;p=p5sagit%2FDevel-GlobalDestruction.git

check B::main_start for old perl fallback
---

diff --git a/lib/Devel/GlobalDestruction.pm b/lib/Devel/GlobalDestruction.pm
index 97eedd0..e54d757 100644
--- a/lib/Devel/GlobalDestruction.pm
+++ b/lib/Devel/GlobalDestruction.pm
@@ -25,119 +25,10 @@ elsif (eval {
 }) {
   # the eval already installed everything, nothing to do
 }
-# We need pure-perl and we are running under -c
-# None of the END-block trickery will work, use a global scope guard instead,
-# as it is more than adequate in this situation
-# The whole thing is in an eval to prevent perl from parsing it in the
-# first place where none of this is needed
-#
-elsif ($^C) {
-  eval <<'PP_IGD' or die $@;
-
-  my $in_global_destruction;
-
-  sub in_global_destruction () { $in_global_destruction }
-
-  {
-    package Devel::GlobalDestgruction::_MinusC::ScopeGuard;
-    sub DESTROY { shift->[0]->() };
-  }
-
-  no warnings 'once';
-  $Devel::GlobalDestgruction::_MinusC::guard = bless [sub {
-    $in_global_destruction = 1;
-  }], 'Devel::GlobalDestgruction::_MinusC::ScopeGuard';
-
-  1; # keep eval happy
-
-PP_IGD
-}
-# Not core nor XS
-# The whole thing is in an eval to prevent perl from parsing it in the
-# first place under perls where none of this is needed
-#
 else {
-  eval <<'PP_IGD' or die $@;
-
-# 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;
-
-my ($in_global_destruction, $before_is_installed);
-
-sub in_global_destruction () { $in_global_destruction }
-
-# end_av trick suggested by liz++
-require B;
-my $add_endblock = sub {
-  push @{ B::end_av()->object_2svref }, sub { $in_global_destruction = 1 };
-};
-
-# This block will fire towards the end of the program execution
-# Use it to inject an END block which is guaranteed to run last
-# (as long as something else doesn't inject yet another block in
-# the same manner afterwards, at which point it hardly matters
-# anyway)
-#
-END { $add_endblock->() }
-
-# threads do not execute the global ENDs (it would be stupid). However
-# one can register a new thread-local END from 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 inserted in a CLONE is ignored :(
-# Hence blatantly hooking threads::create
-#
-if ($INC{'threads.pm'}) {
-  require Scalar::Util;
-
-  my $orig_create = threads->can('create');
-  no warnings 'redefine';
-
-  *threads::create = sub {
-    my $class = shift;
-    my $target = shift;
-
-    unless ( (Scalar::Util::reftype($target)||'') eq 'CODE' ) {
-      no strict 'refs';
-      $target = \&{ caller() . "::$target" };
-    }
-
-    @_ = (
-      $class,
-      sub {
-        # Perls compiled with THREADS_HAVE_PIDS do not copy end_av properly
-        # between threads, so B::end_av ends up returning a B::SPECIAL and it
-        # goes downhill from there
-        # Install a noop END just to be on the safe side
-        { local $@; eval 'END {}' }
-        $add_endblock->();
-        goto $target
-      },
-      @_,
-    );
-
-    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__ ]}");
-  }
-}
-
-1;  # keep eval happy
-
-PP_IGD
-
+  require B;
+  eval 'sub in_global_destruction () { B::main_start()->isa(q[B::NULL]) }; 1'
+    or die $@;
 }
 
 1;  # keep require happy