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

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 488794c..5d4f4b6 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -16,11 +16,9 @@ use Module::Runtime qw(use_module);
 use Scalar::Util qw(weaken blessed refaddr openhandle);
 use JSON::PP qw(encode_json);
 use Moo;
+use Carp qw(croak);
 
-BEGIN { 
-  router()->exclude_forwarding;
-  $SIG{PIPE} = sub { log_debug { "Got a PIPE signal" } };
-}
+BEGIN { router()->exclude_forwarding }
 
 END {
   log_debug { "Killing all child processes in the process group" };
@@ -34,9 +32,9 @@ has _id => ( is => 'ro', required => 1, default => sub { our $NEXT_CONNECTION_ID
 has send_to_fh => (
   is => 'ro', required => 1,
   trigger => sub {
-      my $self = $_[0];
-      $_[1]->autoflush(1);
-      Dlog_trace { my $id = $self->_id; "connection had send_to_fh set to $_"  } $_[1];
+    my $self = $_[0];
+    $_[1]->autoflush(1);
+    Dlog_trace { my $id = $self->_id; "connection had send_to_fh set to $_"  } $_[1];
   },
 );
 
@@ -58,8 +56,8 @@ has read_channel => (
 has on_close => (
   is => 'rw', default => sub { $_[0]->_install_future_handlers(CPS::Future->new) },
   trigger => sub {
-      log_trace { "Installing handlers into future via trigger" };
-      $_[0]->_install_future_handlers($_[1])
+    log_trace { "Installing handlers into future via trigger" };
+    $_[0]->_install_future_handlers($_[1])
   },
 );
 
@@ -90,8 +88,8 @@ after BUILD => sub {
   my $pid = $self->child_pid;
   
   unless (defined $pid) {
-      log_trace { "After BUILD invoked for connection but there was no pid" };
-      return;
+    log_trace { "After BUILD invoked for connection but there was no pid" };
+    return;
   }
     
   log_trace { "Setting process group of child process '$pid'" };
@@ -101,11 +99,28 @@ after BUILD => sub {
 
 sub BUILD { }
 
+sub is_valid {
+  my ($self) = @_;
+  my $closed = $self->on_close->is_ready;
+  
+  log_trace { "Connection closed: $closed" };
+  return ! $closed;
+}
+
 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;
+  
+  Dlog_debug { 
+    sprintf "Failing %i outstanding futures with '$error'", scalar(keys(%$outstanding))
+  };
+
+  foreach(keys(%$outstanding)) {
+    log_trace { "Failing future for $_" };
+    my $future = $outstanding->{$_};
+    $future->fail("$error\n");
+  }
+
   %$outstanding = ();
   return;
 }
@@ -287,6 +302,9 @@ sub register_remote {
 sub send_free {
   my ($self, $id) = @_;
   Dlog_trace { "sending request to free object '$id' for connection $_" } $self->_id;
+  #TODO this shows up some times when a remote side dies in the middle of a remote
+  #method invocation - possibly only when the object is being constructed?
+  #(in cleanup) Use of uninitialized value $id in delete at ../Object-Remote/lib/Object/Remote/Connection.
   delete $self->remote_objects_by_id->{$id};
   $self->_send([ free => $id ]);
 }
@@ -322,6 +340,11 @@ sub send_discard {
 sub _send {
   my ($self, $to_send) = @_;
   my $fh = $self->send_to_fh;
+  
+  unless ($self->is_valid) {
+    croak "Attempt to invoke _send on a connection that is not valid";
+  }
+  
   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;