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=a6df92c8de7a309e4222f4983c6101e7c965c639;hp=7a078b5a7afcb580a12e60f5cd4966651c0a9039;hb=47c83a1379a33fc8baa4a128edc1d75d780776b0;hpb=9e72f0cf54e92bccdba71eb75037f1cfe4f69f36

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 7a078b5..a6df92c 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -1,6 +1,7 @@
 package Object::Remote::Connection;
 
 use CPS::Future;
+use Object::Remote::Null;
 use Object::Remote;
 use IO::Handle;
 use Module::Runtime qw(use_module);
@@ -8,6 +9,8 @@ use Scalar::Util qw(weaken blessed refaddr);
 use JSON::PP qw(encode_json);
 use Moo;
 
+our $DEBUG;
+
 has send_to_fh => (
   is => 'ro', required => 1,
   trigger => sub { $_[1]->autoflush(1) },
@@ -26,6 +29,10 @@ has receive_from_fh => (
   },
 );
 
+has on_close => (is => 'rw', default => sub {});
+
+has child_pid => (is => 'ro');
+
 has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
 
 has local_objects_by_id => (is => 'ro', default => sub { {} });
@@ -46,6 +53,7 @@ sub _build__json {
   JSON::PP->new->filter_json_single_key_object(
     __remote_object__ => sub {
       my $id = shift;
+      return bless({}, 'Object::Remote::Null') if $id eq 'NULL';
       (
         $remotes->{$id}
         or Object::Remote->new(connection => $self, id => $id)
@@ -76,20 +84,33 @@ sub send {
   return $future;
 }
 
+sub send_discard {
+  my ($self, $type, @call) = @_;
+
+  unshift @call, $type => { __remote_object__ => 'NULL' };
+
+  $self->_send(\@call);
+}
+
 sub _send {
   my ($self, $to_send) = @_;
 
-  print { $self->send_to_fh } $self->_serialize($to_send);
+  print { $self->send_to_fh } $self->_serialize($to_send)."\n";
 }
 
 sub _serialize {
   my ($self, $data) = @_;
   local our @New_Ids;
-  eval { return $self->_encode($self->_deobjectify($data)) };
-  my $err = $@; # won't get here if the eval doesn't die
-  # don't keep refs to new things
-  delete @{$self->local_objects_by_id}{@New_Ids};
-  die "Error serializing: $err";
+  return eval {
+    my $flat = $self->_encode($self->_deobjectify($data));
+    warn "$$ >>> ${flat}\n" if $DEBUG;
+    $flat;
+  } or do {
+    my $err = $@; # won't get here if the eval doesn't die
+    # don't keep refs to new things
+    delete @{$self->local_objects_by_id}{@New_Ids};
+    die "Error serializing: $err";
+  };
 }
 
 sub _deobjectify {
@@ -116,37 +137,49 @@ sub _deobjectify {
 sub _receive_data_from {
   my ($self, $fh) = @_;
   my $rb = $self->_receive_data_buffer;
-  if (sysread($self->read_fh, $$rb, 1024, length($$rb)) > 0) {
+  if (sysread($fh, $$rb, 1024, length($$rb)) > 0) {
     while ($$rb =~ s/^(.*)\n//) {
       $self->_receive($1);
     }
+  } else {
+    $self->on_close->();
   }
 }
 
 sub _receive {
-  my ($self, $data) = @_;
-  my ($type, @rest) = eval { @{$self->_deserialize($data)} }
-    or do { warn "Deserialize failed for ${data}: $@"; return };
+  my ($self, $flat) = @_;
+  warn "$$ <<< $flat\n" if $DEBUG;
+  my ($type, @rest) = eval { @{$self->_deserialize($flat)} }
+    or do { warn "Deserialize failed for ${flat}: $@"; return };
   eval { $self->${\"receive_${type}"}(@rest); 1 }
-    or do { warn "Receive failed for ${data}: $@"; return };
+    or do { warn "Receive failed for ${flat}: $@"; return };
   return;
 }
 
 sub receive_free {
   my ($self, $id) = @_;
-  delete $self->local_objects_by_id->{$id};
+  delete $self->local_objects_by_id->{$id}
+    or warn "Free: no such object $id";
   return;
 }
 
 sub receive_call {
   my ($self, $future, $id, @rest) = @_;
+  $future->{method} = 'call_discard_free';
   my $local = $self->local_objects_by_id->{$id}
     or do { $future->fail("No such object $id"); return };
   $self->_invoke($future, $local, @rest);
 }
 
+sub receive_call_free {
+  my ($self, $future, $id, @rest) = @_;
+  $self->receive_call($future, $id, @rest);
+  $self->receive_free($id);
+}
+
 sub receive_class_call {
   my ($self, $future, $class, @rest) = @_;
+  $future->{method} = 'call_discard_free';
   eval { use_module($class) }
     or do { $future->fail("Error loading ${class}: $@"); return };
   $self->_invoke($future, $class, @rest);
@@ -154,7 +187,7 @@ sub receive_class_call {
 
 sub _invoke {
   my ($self, $future, $local, $method, @args) = @_;
-  eval { $future->done($local->$method(@args)); 1 }
+  eval { $future->done(scalar $local->$method(@args)); 1 }
     or do { $future->fail($@); return; };
   return;
 }