X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=488794cf133aff53ce8a7698f650d65e804a5454;hp=bfd9996173530e75a08fcd30e991ecee89f70a3f;hb=998ff9a49b1f18c9ec82212eda094c8261c0ef1c;hpb=7790ca36241acfa9379cb2b89b68c9f4b0da2371

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index bfd9996..488794c 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -1,26 +1,34 @@
 package Object::Remote::Connection;
 
+use Object::Remote::Logging qw (:log :dlog router);
 use Object::Remote::Future;
 use Object::Remote::Null;
 use Object::Remote::Handle;
 use Object::Remote::CodeContainer;
 use Object::Remote::GlobProxy;
 use Object::Remote::GlobContainer;
-use Object::Remote::Logging qw (:log :dlog);
 use Object::Remote::Tied;
 use Object::Remote;
 use Symbol;
 use IO::Handle;
+use POSIX ":sys_wait_h";
 use Module::Runtime qw(use_module);
-use Scalar::Util qw(weaken blessed refaddr);
+use Scalar::Util qw(weaken blessed refaddr openhandle);
 use JSON::PP qw(encode_json);
 use Moo;
 
-our $DEBUG = !!$ENV{OBJECT_REMOTE_DEBUG};
-#numbering each connection allows it to be
-#tracked along with file handles in
-#the logs
-BEGIN { our $NEXT_CONNECTION_ID = 0 }
+BEGIN { 
+  router()->exclude_forwarding;
+  $SIG{PIPE} = sub { log_debug { "Got a PIPE signal" } };
+}
+
+END {
+  log_debug { "Killing all child processes in the process group" };
+    
+  #send SIGINT to the process group for our children
+  kill(1, -2);
+}
+
 has _id => ( is => 'ro', required => 1, default => sub { our $NEXT_CONNECTION_ID++ } );
 
 has send_to_fh => (
@@ -36,23 +44,23 @@ has read_channel => (
   is => 'ro', required => 1,
   trigger => sub {
     my ($self, $ch) = @_;
-    Dlog_trace { my $id = $self->_id; "trigger for read_channel has been invoked for connection $id; file handle is " } $ch->fh; 
+    my $id = $self->_id; 
+    Dlog_trace { "trigger for read_channel has been invoked for connection $id; file handle is $_" } $ch->fh;
     weaken($self);
     $ch->on_line_call(sub { $self->_receive(@_) });
-    $ch->on_close_call(sub { $self->on_close->done(@_) });
+    $ch->on_close_call(sub { 
+      log_trace { "invoking 'done' on on_close handler for connection id '$id'" };
+      $self->on_close->done(@_);
+    });
   },
 );
 
 has on_close => (
-  is => 'ro', default => sub { CPS::Future->new },
+  is => 'rw', default => sub { $_[0]->_install_future_handlers(CPS::Future->new) },
   trigger => sub {
-    my ($self, $f) = @_;
-    Dlog_trace { "trigger for on_close has been invoked for connection $_" } $self->_id;
-    weaken($self);
-    $f->on_done(sub {
-      $self->_fail_outstanding("Connection lost: ".($f->get)[0]);
-    });
-  }
+      log_trace { "Installing handlers into future via trigger" };
+      $_[0]->_install_future_handlers($_[1])
+  },
 );
 
 has child_pid => (is => 'ro');
@@ -69,15 +77,6 @@ has remote_objects_by_id => (
 
 has outstanding_futures => (is => 'ro', default => sub { {} });
 
-sub _fail_outstanding {
-  my ($self, $error) = @_;
-  Dlog_debug { "Failing outstanding futures with '$error' for connection $_" } $self->_id;
-  my $outstanding = $self->outstanding_futures;
-  $_->fail($error) for values %$outstanding;
-  %$outstanding = ();
-  return;
-}
-
 has _json => (
   is => 'lazy',
   handles => {
@@ -86,6 +85,57 @@ has _json => (
   },
 );
 
+after BUILD => sub {
+  my ($self) = @_;
+  my $pid = $self->child_pid;
+  
+  unless (defined $pid) {
+      log_trace { "After BUILD invoked for connection but there was no pid" };
+      return;
+  }
+    
+  log_trace { "Setting process group of child process '$pid'" };
+  
+  setpgrp($self->child_pid, 1);
+};
+
+sub BUILD { }
+
+sub _fail_outstanding {
+  my ($self, $error) = @_;
+  Dlog_debug { "$$ Failing outstanding futures with '$error' for connection $_" } $self->_id;
+  my $outstanding = $self->outstanding_futures;
+  $_->fail("$error\n") for values %$outstanding;
+  %$outstanding = ();
+  return;
+}
+
+sub _install_future_handlers {
+    my ($self, $f) = @_;
+    Dlog_trace { "Installing handlers into future for connection $_" } $self->_id;
+    weaken($self);
+    $f->on_done(sub {
+      my $pid = $self->child_pid;
+      Dlog_trace { "Executing on_done handler in future for connection $_" } $self->_id;
+      $self->_fail_outstanding("Object::Remote connection lost: " . ($f->get)[0]);
+      return unless defined $pid;
+      log_debug { "Waiting for child '$pid' to exit" };
+      my $ret = waitpid($pid, 0);
+      if ($ret != $pid) {
+        log_debug { "Waited for pid $pid but waitpid() returned $ret" };
+        return;
+      } elsif ($? & 127) {
+          log_warn { "Remote interpreter did not exit cleanly" };
+      } else {
+        log_verbose {
+          my $exit_value = $? >> 8;
+          "Remote Perl interpreter exited with value '$exit_value'"
+        };
+      }
+    });
+    return $f; 
+};
+
 sub _id_to_remote_object {
   my ($self, $id) = @_;
   Dlog_trace { "fetching proxy for remote object with id '$id' for connection $_" } $self->_id;
@@ -125,37 +175,60 @@ sub _build__json {
     }
   )->filter_json_single_key_object(
     __remote_tied_hash__ => sub {
-        my %tied_hash;
-        tie %tied_hash, 'Object::Remote::Tied', $self->_id_to_remote_object(@_);
-        return \%tied_hash;
+      my %tied_hash;
+      tie %tied_hash, 'Object::Remote::Tied', $self->_id_to_remote_object(@_);
+      return \%tied_hash;
     }
   )->filter_json_single_key_object(
     __remote_tied_array__ => sub {
-        my @tied_array;
-        tie @tied_array, 'Object::Remote::Tied', $self->_id_to_remote_object(@_);
-        return \@tied_array;
+      my @tied_array;
+      tie @tied_array, 'Object::Remote::Tied', $self->_id_to_remote_object(@_);
+      return \@tied_array;
     }
   ); 
 }
 
+sub _load_if_possible {
+  my ($class) = @_; 
+
+  use_module($class); 
+
+  if ($@) {
+    log_debug { "Attempt at loading '$class' failed with '$@'" };
+  }
+
+}
+
 BEGIN {
   unshift our @Guess, sub { blessed($_[0]) ? $_[0] : undef };
-  eval { require Object::Remote::Connector::Local };
-  eval { require Object::Remote::Connector::LocalSudo };
-  eval { require Object::Remote::Connector::SSH };
-  eval { require Object::Remote::Connector::UNIX };
+  map _load_if_possible($_), qw(
+    Object::Remote::Connector::Local
+    Object::Remote::Connector::LocalSudo
+    Object::Remote::Connector::SSH
+    Object::Remote::Connector::UNIX
+  ); 
 }
 
-sub new_from_spec {
-  my ($class, $spec) = @_;
-  return $spec if blessed $spec;
-  Dlog_debug { "creating a new connection from spec" };
+sub conn_from_spec {
+  my ($class, $spec, @args) = @_;
   foreach my $poss (do { our @Guess }) {
-    if (my $conn = $poss->($spec)) {
-      return $conn->maybe::start::connect;
+    if (my $conn = $poss->($spec, @args)) {
+      return $conn;
     }
   }
-  die "Couldn't figure out what to do with ${spec}";
+  
+  return undef;
+}
+
+sub new_from_spec {
+  my ($class, $spec) = @_;
+  return $spec if blessed $spec;
+  my $conn = $class->conn_from_spec($spec); 
+  
+  die "Couldn't figure out what to do with ${spec}"
+    unless defined $conn;
+    
+  return $conn->maybe::start::connect;  
 }
 
 sub remote_object {
@@ -252,14 +325,23 @@ sub _send {
   Dlog_trace { "Starting to serialize data in argument to _send for connection $_" } $self->_id;
   my $serialized = $self->_serialize($to_send)."\n";
   Dlog_trace { my $l = length($serialized); "serialization is completed; sending '$l' characters of serialized data to $_" } $fh;
-  #TODO this is very risky for deadlocks unless it's set to non-blocking and then with out extra
-  #logic it could easily do short-writes to the remote side - how about taking this entire buffer
-  #and having the run loop send it to the file handle so this doesn't block while the sending
-  #is happening? 
-  my $ret = print $fh $serialized;
-  Dlog_trace { my $r = defined $ret ? $ret : 'undef'; "print() returned $r with $_" } $fh;
-  #TODO hrm reason print's return value was ignored?
-  die "could not write to filehandle: $!" unless $ret;
+  my $ret; 
+  eval { 
+    #TODO this should be converted over to a non-blocking ::WriteChannel class
+    die "filehandle is not open" unless openhandle($fh);
+    log_trace { "file handle has passed openhandle() test; printing to it" };
+    $ret = print $fh $serialized;
+    die "print was not successful: $!" unless defined $ret
+  };
+    
+  if ($@) {
+    Dlog_debug { "exception encountered when trying to write to file handle $_: $@" } $fh;
+    my $error = $@;
+    chomp($error);
+    $self->on_close->done("could not write to file handle: $error") unless $self->on_close->is_ready;
+    return; 
+  }
+      
   return $ret; 
 }
 
@@ -268,7 +350,6 @@ sub _serialize {
   local our @New_Ids = (-1);
   return eval {
     my $flat = $self->_encode($self->_deobjectify($data));
-    warn "$$ >>> ${flat}\n" if $DEBUG;
     $flat;
   } || do {
     my $err = $@; # won't get here if the eval doesn't die
@@ -334,7 +415,6 @@ sub _deobjectify {
 
 sub _receive {
   my ($self, $flat) = @_;
-  warn "$$ <<< $flat\n" if $DEBUG;
   Dlog_trace { my $l = length($flat); "Starting to deserialize $l characters of data for connection $_" } $self->_id;
   my ($type, @rest) = eval { @{$self->_deserialize($flat)} }
     or do { warn "Deserialize failed for ${flat}: $@"; return };