removed process groups from the connection class child cleanup logic

[scpubgit/Object-Remote.git] / lib / Object / Remote / FatNode.pm

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 0d10bb9..c840cf2 100644 (file)
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -5,6 +5,8 @@ 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) = @_;
@@ -49,14 +51,22 @@ foreach(keys(%mods)) {
   }
 }
 
-sub filter_not_core {
+my @non_core_non_arch = ( $mods{'Devel/GlobalDestruction.pm'} );
+push @non_core_non_arch, grep +(
   not (
-    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )        
-}
-
-my @before_inc = grep { filter_not_core() } keys %mods;
-my @after_inc;
+    #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
@@ -66,7 +76,7 @@ my $start = stripspace <<'END_START';
   my (%fatpacked,%fatpacked_extra);
 END_START
 
-$start .= 'my %exclude = map { $_ => 1 } qw(' . join(' ', @exclude_mods) . ");\n";
+$start .= 'my %exclude = map { $_ => 1 } (\'' . join("','", @exclude_mods) . "');\n";
 
 my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
@@ -78,7 +88,7 @@ my $end = stripspace <<'END_END';
         return undef; 
       }
  
-      warn "handling $_[1]";
+      #warn "Handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
@@ -95,26 +105,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, $/) = ($_); <> }),
-              @before_inc, @after_inc;
+              @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;
 }
 
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
-  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
+  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;