use IPC::Open2;
use IPC::Open3;
use IO::Handle;
+use Symbol;
use Object::Remote::Logging qw( :log :dlog );
use Object::Remote::ModuleSender;
use Object::Remote::Handle;
use Object::Remote::Future;
use Scalar::Util qw(blessed weaken);
-use POSIX;
use Moo::Role;
-use Symbol;
with 'Object::Remote::Role::Connector';
has module_sender => (is => 'lazy');
+has ulimit => ( is => 'ro' );
+has nice => ( is => 'ro' );
+has watchdog_timeout => ( is => 'ro', required => 1, default => sub { undef } );
+has perl_command => (is => 'lazy');
#if no child_stderr file handle is specified then stderr
#of the child will be connected to stderr of the parent
return $hook ? $hook->sender : Object::Remote::ModuleSender->new;
}
-has perl_command => (is => 'lazy');
-has watchdog_timeout => ( is => 'ro', required => 1, default => sub { 0 } );
-
-#TODO convert nice value into optional feature enabled by
-#setting value of attribute
-#ulimit of ~500 megs of v-ram
-#TODO only works with ssh with quotes but only works locally
-#with out quotes
-sub _build_perl_command {[ 'sh -c "ulimit -v 200000; nice -n 15 perl -"' ] }
-#sub _build_perl_command { [ 'perl', '-' ] }
-#sub _build_perl_command { [ 'cat' ] }
+sub _build_perl_command {
+ my ($self) = @_;
+ my $nice = $self->nice;
+ my $ulimit = $self->ulimit;
+ my $shell_code = '';
+
+ if (defined($ulimit)) {
+ $shell_code .= "ulimit -v $ulimit; ";
+ }
+
+ if (defined($nice)) {
+ $shell_code .= "nice -n $nice ";
+ }
+
+ $shell_code .= 'perl -';
+
+ return [ 'sh', '-c', $shell_code ];
+}
around connect => sub {
my ($orig, $self) = (shift, shift);
if (defined($given_stderr)) {
#if the stderr data goes to an existing file handle
- #an need an anonymous file handle is required
+ #an anonymous file handle is required
#as the other half of a pipe style file handle pair
#so the file handles can go into the run loop
$foreign_stderr = gensym();
) or die "Failed to run perl at '$_[0]': $!";
if (defined($given_stderr)) {
- log_warn { "using experimental cat for child stderr" };
+ Dlog_debug { "Child process STDERR is being handled via run loop" };
- #TODO refactor if this solves the problem
Object::Remote->current_loop
->watch_io(
handle => $foreign_stderr,
on_read_ready => sub {
my $buf = '';
my $len = sysread($foreign_stderr, $buf, 32768);
- if ((!defined($len) && $! != EAGAIN) or $len == 0) {
+ if (!defined($len) or $len == 0) {
log_trace { "Got EOF or error on child stderr, removing from watcher" };
$self->stderr(undef);
Object::Remote->current_loop
}
# if the stdin went away, we'll never get Shere
# so it's not a big deal to simply give up on !defined
- if ((!defined($len) && $! != EAGAIN) or 0 == length($to_send)) {
+ if (!defined($len) or 0 == length($to_send)) {
log_trace { "Got EOF or error when writing fatnode data to filehandle, unwatching it" };
Object::Remote->current_loop
->unwatch_io(
$text = "my \$WATCHDOG_TIMEOUT = undef;\n";
}
- $text .= 'BEGIN { $ENV{OBJECT_REMOTE_DEBUG} = 1 }'."\n"
- if $ENV{OBJECT_REMOTE_DEBUG};
$text .= <<'END';
$INC{'Object/Remote/FatNode.pm'} = __FILE__;
$Object::Remote::FatNode::DATA = <<'ENDFAT';