X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=594f281a7178c9e6ce541e6d49e1aee36dfb5361;hp=f95705db462a28c1eb5566ec2d78cfad3dd62bb6;hb=668343cde7e6339cca56c66a41defdd28327f224;hpb=1900601d36909443e9b9dff3288d1041d72e834f

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index f95705d..594f281 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -4,6 +4,10 @@ use strictures 1;
 use Config;
 use B qw(perlstring);
 
+my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+#used by t/watchdog_fatnode
+our $INHIBIT_RUN_NODE = 0;
+
 sub stripspace {
   my ($text) = @_;
   $text =~ /^(\s+)/ && $text =~ s/^$1//mg;
@@ -13,15 +17,18 @@ sub stripspace {
 my %maybe_libs = map +($_ => 1), grep defined, (values %Config, '.');
 
 my @extra_libs = grep not(ref($_) or $maybe_libs{$_}), @INC;
-
-my $extra_libs = join '', map "  -I$_\n", @extra_libs;
+my $extra_libs = join '', map {
+    my $lib = $_;
+    $lib =~ s{'}{'\\''}g;
+    "  -I'$lib'\n";
+} @extra_libs;
 
 my $command = qq(
   $^X
   $extra_libs
   -mObject::Remote
   -mObject::Remote::Connector::STDIO
-  -mCPS::Future
+  -mFuture
   -mMRO::Compat
   -mClass::C3
   -mClass::C3::next
@@ -38,20 +45,32 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
+my %exclude = map { $_ => 1 } @exclude_mods;
 my %mods = reverse @inc;
+my %file_names = @inc;
 
-#my @non_core = grep +(
-#  not (
-#    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-#  )
-#), keys %mods;
-
-my @non_core = keys %mods; 
+foreach(keys(%mods)) {
+  if ($exclude{ $mods{$_} }) {
+    delete($mods{$_});
+  }
+}
 
-#my @core_non_arch = grep +(
-#  /^\Q$Config{privlibexp}/
-#), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
-my @core_non_arch; 
+my @non_core_non_arch = ( $file_names{'Devel/GlobalDestruction.pm'} );
+push @non_core_non_arch, grep +(
+  not (
+    #some of the config variables can be empty which will eval as a matching regex
+    $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+      or $Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+      or $Config{vendorarchexp} ne '' && /^\Q$Config{vendorarchexp}/
+      or $Config{sitearchexp} ne '' && /^\Q$Config{sitearchexp}/
+  )
+), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+
+my @core_non_arch = grep +(
+  $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+  and not($Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+    or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
+), keys %mods;
 
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
@@ -60,23 +79,27 @@ my $start = stripspace <<'END_START';
   BEGIN {
   my (%fatpacked,%fatpacked_extra);
 END_START
+
+$start .= 'my %exclude = map { $_ => 1 } (\'' . join("','", @exclude_mods) . "');\n";
+
 my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
 
   sub load_from_hash {
-    if ($_[1] eq 'XSLoader.pm') {
-      warn "XSLoader made it into the fat node";
-      return undef; 
-    }
-
     if (my $fat = $_[0]->{$_[1]}) {
+      if ($exclude{$_[1]}) {
+        warn "Will not pre-load '$_[1]'";
+        return undef;
+      }
+
+      #warn "Handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
-    
+
     #Uncomment this to find brokenness
     #warn "Missing $_[1]";
-    return
+    return;
   }
 
   unshift @INC, sub { load_from_hash(\%fatpacked, $_[1]) };
@@ -86,31 +109,34 @@ my $end = stripspace <<'END_END';
 
   use strictures 1;
   use Object::Remote::Node;
-  Object::Remote::Node->run;
+
+  unless ($Object::Remote::FatNode::INHIBIT_RUN_NODE) {
+    Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);
+  }
+
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @non_core, @core_non_arch;
+              @non_core_non_arch, @core_non_arch;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
   (my $stub = $orig) =~ s/\.pm$//;
   my $name = uc join '_', split '/', $stub;
   my $data = $files{$orig} or die $orig; $data =~ s/^/  /mg;
-  return '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
-  .qq!${data}${name}\n!;
+  $data .= "\n" unless $data =~ m/\n$/;
+  my $ret = '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
+    .qq!${data}${name}\n!;
+#  warn $ret;
+  return $ret;
 }
 
-use Data::Dumper;
-warn "Dumping list of shipped modules";
-print STDERR "Core non-arch: ", Dumper(\@core_non_arch);
-print STDERR "Non-core: ", Dumper(\@non_core); 
-
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core),
+  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch),
   map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
 );
 
+#print STDERR Dumper(\@segments);
 our $DATA = join "\n", $start, @segments, $end;
 
 1;