package Object::Remote::FatNode;
+#TODO If a file does not end in a new line by itself
+#then fat node fails
+
use strictures 1;
use Config;
use B qw(perlstring);
+my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+
sub stripspace {
my ($text) = @_;
$text =~ /^(\s+)/ && $text =~ s/^$1//mg;
chomp(my @inc = qx($command));
+my %exclude = map { $_ => 1 } @exclude_mods;
my %mods = reverse @inc;
-#my @non_core = grep +(
-# not (
-# /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-# )
-#), keys %mods;
+foreach(keys(%mods)) {
+ if ($exclude{ $mods{$_} }) {
+ delete($mods{$_});
+ }
+}
+
+sub filter_not_core {
+ not (
+ /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
+ )
+}
-my @non_core = keys %mods;
+my @file_names = keys %mods;
+my @before_inc = grep { filter_not_core() } @file_names;
+my @after_inc;
-#my @core_non_arch = grep +(
-# /^\Q$Config{privlibexp}/
-#), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
-my @core_non_arch;
+my $env_pass = '';
+if (defined($ENV{OBJECT_REMOTE_LOG_LEVEL})) {
+ my $level = $ENV{OBJECT_REMOTE_LOG_LEVEL};
+ return unless $level =~ /^\w+$/;
+ $env_pass = '$ENV{OBJECT_REMOTE_LOG_LEVEL} = "' . $level . "\";\n";
+}
my $start = stripspace <<'END_START';
# This chunk of stuff was generated by Object::Remote::FatNode. To find
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]) };
END_END
my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
- @non_core, @core_non_arch;
+ @before_inc, @after_inc;
sub generate_fatpack_hash {
my ($hash_name, $orig) = @_;
.qq!${data}${name}\n!;
}
-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_extra', $_), sort map $mods{$_}, @core_non_arch),
+ map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
+ map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
);
-our $DATA = join "\n", $start, @segments, $end;
+our $DATA = join "\n", $start, $env_pass, @segments, $end;
1;