X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FRole%2FConnector%2FPerlInterpreter.pm;h=31e13e2259cd96e4c3339e719c83a1eb015f4b64;hp=84b298840f86e7960d2351e9182ac88fe4e3df83;hb=b9baacc29444767f88abdbca93f65c8bd5e5a676;hpb=18e789ab29dc85ae3bc1ad88df0512f07aaad0d7

diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 84b2988..31e13e2 100644
--- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
+++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
@@ -1,41 +1,207 @@
 package Object::Remote::Role::Connector::PerlInterpreter;
 
 use IPC::Open2;
+use IPC::Open3; 
+use IO::Handle;
+use Object::Remote::Logging qw( :log :dlog );
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
-use Scalar::Util qw(blessed);
+use Object::Remote::Future;
+use Scalar::Util qw(blessed weaken);
 use Moo::Role;
+use Symbol; 
 
 with 'Object::Remote::Role::Connector';
 
-around connect => sub {
-  my ($orig, $self) = (shift, shift);
-  my $conn = $self->$orig(@_);
+has module_sender => (is => 'lazy');
+
+#if no child_stderr file handle is specified then stderr
+#of the child will be connected to stderr of the parent
+has stderr => ( is => 'rw', default => sub { undef } );
+
+sub _build_module_sender {
   my ($hook) =
     grep {blessed($_) && $_->isa('Object::Remote::ModuleLoader::Hook') }
       @INC;
-  my $sender = $hook ? $hook->sender : Object::Remote::ModuleSender->new;
-  Object::Remote::Handle->new(
-    connection => $conn,
-    class => 'Object::Remote::ModuleLoader',
-    args => { module_sender => $sender }
-  )->disarm_free;
-  return $conn;
+  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' ] }
+
+around connect => sub {
+  my ($orig, $self) = (shift, shift);
+  my $f = $self->$start::start($orig => @_);
+  return future {
+    $f->on_done(sub {
+      my ($conn) = $f->get;
+      $self->_setup_watchdog_reset($conn); 
+      my $sub = $conn->remote_sub('Object::Remote::Logging::init_logging_forwarding');
+      $sub->('Object::Remote::Logging', Object::Remote::Logging->arg_router);
+      Object::Remote::Handle->new(
+        connection => $conn,
+        class => 'Object::Remote::ModuleLoader',
+        args => { module_sender => $self->module_sender }
+      )->disarm_free;
+      require Object::Remote::Prompt;
+      Object::Remote::Prompt::maybe_set_prompt_command_on($conn);
+    });
+    $f;
+  } 2;
 };
 
-sub _perl_command { 'perl', '-' }
+sub final_perl_command { shift->perl_command }
 
-sub _open2_for {
+sub _start_perl {
   my $self = shift;
-  my $pid = open2(
-    my $foreign_stdout,
+  my $given_stderr = $self->stderr;
+  my $foreign_stderr;
+ 
+  Dlog_debug { "invoking connection to perl interpreter using command line: $_" } @{$self->final_perl_command};
+    
+  if (defined($given_stderr)) {
+      #if the stderr data goes to an existing file handle
+      #an need 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();
+  } else {
+      #if no file handle has been specified
+      #for the child's stderr then connect
+      #the child stderr to the parent stderr
+      $foreign_stderr = ">&STDERR";
+  }
+  
+  my $pid = open3(
     my $foreign_stdin,
-    $self->_perl_command(@_),
+    my $foreign_stdout,
+    $foreign_stderr,
+    @{$self->final_perl_command},
   ) or die "Failed to run perl at '$_[0]': $!";
-  require Object::Remote::FatNode;
-  print $foreign_stdin $Object::Remote::FatNode::DATA, "__END__\n"
-    or die "Failed to send fatpacked data to new node on '$_[0]': $!";
+  
+  if (defined($given_stderr)) {   
+      log_warn { "using experimental cat for child stderr" };
+        
+      #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) or $len == 0) {
+                            log_trace { "Got EOF or error on child stderr, removing from watcher" };
+                            $self->stderr(undef);
+                            Object::Remote->current_loop
+                                          ->unwatch_io(
+                                              handle => $foreign_stderr,
+                                              on_read_ready => 1
+                                            );
+                          } else {
+                              Dlog_trace { "got $len characters of stderr data for connection" };
+                              print $given_stderr $buf or die "could not send stderr data: $!";
+                          }
+                         } 
+                      );     
+  }
+      
   return ($foreign_stdin, $foreign_stdout, $pid);
 }
 
+sub _open2_for {
+  my $self = shift;
+  my ($foreign_stdin, $foreign_stdout, $pid) = $self->_start_perl(@_);
+  my $to_send = $self->fatnode_text;
+  log_debug { my $len = length($to_send); "Sending contents of fat node to remote node; size is '$len' characters"  };
+  Object::Remote->current_loop
+                ->watch_io(
+                    handle => $foreign_stdin,
+                    on_write_ready => sub {
+                      my $len = syswrite($foreign_stdin, $to_send, 32768);
+                      if (defined $len) {
+                        substr($to_send, 0, $len) = '';
+                      }
+                      # 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) 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(
+                                          handle => $foreign_stdin,
+                                          on_write_ready => 1
+                                        );
+                      } else {
+                          log_trace { "Sent $len bytes of fatnode data to remote side" };
+                      }
+                    }
+                  );
+  return ($foreign_stdin, $foreign_stdout, $pid);
+}
+
+sub _setup_watchdog_reset {
+    my ($self, $conn) = @_;
+    my $timer_id; 
+    
+    return unless $self->watchdog_timeout; 
+        
+    Dlog_trace { "Creating Watchdog management timer for connection id $_" } $conn->_id;
+
+    $timer_id = Object::Remote->current_loop->watch_time(
+        every => $self->watchdog_timeout / 3,
+        code => sub {
+            unless(defined($conn)) {
+                log_trace { "Weak reference to connection in Watchdog was lost, terminating update timer $timer_id" };
+                Object::Remote->current_loop->unwatch_time($timer_id);
+                return;  
+            }
+            
+            Dlog_debug { "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 {
+  my ($self) = @_;
+  my $text = '';
+
+  require Object::Remote::FatNode;
+  
+  $text = "my \$WATCHDOG_TIMEOUT = '" . $self->watchdog_timeout . "';\n";
+  
+  if (my $duration = $self->watchdog_timeout) {
+    $text .= "alarm(\$WATCHDOG_TIMEOUT);\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';
+END
+  $text .= do { no warnings 'once'; $Object::Remote::FatNode::DATA };
+  $text .= "ENDFAT\n";
+  $text .= <<'END';
+eval $Object::Remote::FatNode::DATA;
+die $@ if $@;
+END
+  
+  $text .= "__END__\n";
+  return $text;
+}
+
 1;