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 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,
return unless $self->watchdog_timeout;
Dlog_trace { "Creating Watchdog management timer for connection id $_" } $conn->_id;
-
+
+ weaken($conn);
+
$timer_id = Object::Remote->current_loop->watch_time(
every => $self->watchdog_timeout / 3,
code => sub {
return;
}
- Dlog_debug { "Reseting Watchdog for connection id $_" } $conn->_id;
+ Dlog_trace { "Reseting Watchdog for connection id $_" } $conn->_id;
#we do not want to block in the run loop so send the
#update off and ignore any result, we don't need it
#anyway
$conn->send_class_call(0, 'Object::Remote::WatchDog', 'reset');
}
- );
-
- $conn->on_close->on_done(sub { Object::Remote->current_loop->unwatch_time($timer_id) });
+ );
}
sub fatnode_text {
require Object::Remote::FatNode;
- $text = "my \$WATCHDOG_TIMEOUT = '" . $self->watchdog_timeout . "';\n";
-
- if (my $duration = $self->watchdog_timeout) {
+ if (defined($self->watchdog_timeout)) {
+ $text = "my \$WATCHDOG_TIMEOUT = '" . $self->watchdog_timeout . "';\n";
$text .= "alarm(\$WATCHDOG_TIMEOUT);\n";
+ } else {
+ $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';