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=8f4d44304db1cffc5b473c9f8e69b188c821634c;hp=eb3c6cb4ab85b21fc77ec1c49453be43baf81634;hb=c5736e1ce44d413c01e9497aa49d4174f9bb37bf;hpb=676438a11cbf6bd49102369824c9d87f70964fd3

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index eb3c6cb..8f4d443 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -3,6 +3,7 @@ package Object::Remote::Connection;
 use Object::Remote::Future;
 use Object::Remote::Null;
 use Object::Remote::Handle;
+use Object::Remote::CodeContainer;
 use Object::Remote;
 use IO::Handle;
 use Module::Runtime qw(use_module);
@@ -10,7 +11,7 @@ use Scalar::Util qw(weaken blessed refaddr);
 use JSON::PP qw(encode_json);
 use Moo;
 
-our $DEBUG;
+our $DEBUG = !!$ENV{OBJECT_REMOTE_DEBUG};
 
 has send_to_fh => (
   is => 'ro', required => 1,
@@ -30,15 +31,27 @@ has receive_from_fh => (
   },
 );
 
-has on_close => (is => 'rw', default => sub {});
+has on_close => (is => 'rw', default => sub { CPS::Future->new });
 
 has child_pid => (is => 'ro');
 
+has ready_future => (is => 'lazy');
+
+sub _build_ready_future { CPS::Future->new }
+
 has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
 
-has local_objects_by_id => (is => 'ro', default => sub { {} });
+has local_objects_by_id => (
+  is => 'ro', default => sub { {} },
+  coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
+);
+
+has remote_objects_by_id => (
+  is => 'ro', default => sub { {} },
+  coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
+);
 
-has remote_objects_by_id => (is => 'ro', default => sub { {} });
+has outstanding_futures => (is => 'ro', default => sub { {} });
 
 has _json => (
   is => 'lazy',
@@ -48,17 +61,25 @@ has _json => (
   },
 );
 
+sub _id_to_remote_object {
+  my ($self, $id) = @_;
+  return bless({}, 'Object::Remote::Null') if $id eq 'NULL';
+  (
+    $self->remote_objects_by_id->{$id}
+    or Object::Remote::Handle->new(connection => $self, id => $id)
+  )->proxy;
+}
+
 sub _build__json {
   weaken(my $self = shift);
-  my $remotes = $self->remote_objects_by_id;
   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::Handle->new(connection => $self, id => $id)
-      )->proxy;
+      $self->_id_to_remote_object(@_);
+    }
+  )->filter_json_single_key_object(
+    __remote_code__ => sub {
+      my $code_container = $self->_id_to_remote_object(@_);
+      sub { $code_container->call(@_) };
     }
   );
 }
@@ -66,23 +87,74 @@ sub _build__json {
 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 };
 }
 
 sub new_from_spec {
   my ($class, $spec) = @_;
+  return $spec if blessed $spec;
   foreach my $poss (do { our @Guess }) {
     if (my $obj = $poss->($spec)) { return $obj }
   }
   die "Couldn't figure out what to do with ${spec}";
 }
 
+sub remote_object {
+  my ($self, @args) = @_;
+  Object::Remote::Handle->new(
+    connection => $self, @args
+  )->proxy;
+}
+
+sub connect {
+  my ($self, $to) = @_;
+  return await_future(
+    $self->send_class_call(0, 'Object::Remote', connect => $to)
+  );
+}
+
+sub remote_sub {
+  my ($self, $sub) = @_;
+  my ($pkg, $name) = $sub =~ m/^(.*)::([^:]+)$/;
+  return await_future($self->send_class_call(0, $pkg, can => $name));
+}
+
+sub send_class_call {
+  my ($self, $ctx, @call) = @_;
+  $self->send(call => class_call_handler => $ctx => call => @call);
+}
+
+sub register_class_call_handler {
+  my ($self) = @_;
+  $self->local_objects_by_id->{'class_call_handler'} ||= do {
+    my $o = $self->new_class_call_handler;
+    $self->_local_object_to_id($o);
+    $o;
+  };
+}
+
+sub new_class_call_handler {
+  Object::Remote::CodeContainer->new(
+    code => sub {
+      my ($class, $method) = (shift, shift);
+      use_module($class)->$method(@_);
+    }
+  );
+}
+
 sub register_remote {
   my ($self, $remote) = @_;
   weaken($self->remote_objects_by_id->{$remote->id} = $remote);
   return $remote;
 }
 
+sub await_ready {
+  my ($self) = @_;
+  await_future($self->ready_future);
+}
+
 sub send_free {
   my ($self, $id) = @_;
   delete $self->remote_objects_by_id->{$id};
@@ -92,7 +164,13 @@ sub send_free {
 sub send {
   my ($self, $type, @call) = @_;
 
-  unshift @call, $type => my $future = CPS::Future->new;
+  my $future = CPS::Future->new;
+
+  unshift @call, $type => $self->_local_object_to_id($future);
+
+  my $outstanding = $self->outstanding_futures;
+  $outstanding->{$future} = $future;
+  $future->on_ready(sub { delete $outstanding->{$future} });
 
   $self->_send(\@call);
 
@@ -102,7 +180,7 @@ sub send {
 sub send_discard {
   my ($self, $type, @call) = @_;
 
-  unshift @call, $type => { __remote_object__ => 'NULL' };
+  unshift @call, $type => 'NULL';
 
   $self->_send(\@call);
 }
@@ -110,17 +188,19 @@ sub send_discard {
 sub _send {
   my ($self, $to_send) = @_;
 
+  $self->await_ready;
+
   print { $self->send_to_fh } $self->_serialize($to_send)."\n";
 }
 
 sub _serialize {
   my ($self, $data) = @_;
-  local our @New_Ids;
+  local our @New_Ids = (-1);
   return eval {
     my $flat = $self->_encode($self->_deobjectify($data));
     warn "$$ >>> ${flat}\n" if $DEBUG;
     $flat;
-  } or do {
+  } || 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};
@@ -128,20 +208,30 @@ sub _serialize {
   };
 }
 
+sub _local_object_to_id {
+  my ($self, $object) = @_;
+  my $id = refaddr($object);
+  $self->local_objects_by_id->{$id} ||= do {
+    push our(@New_Ids), $id if @New_Ids;
+    $object;
+  };
+  return $id;
+}
+
 sub _deobjectify {
   my ($self, $data) = @_;
   if (blessed($data)) {
-    my $id = refaddr($data);
-    $self->local_objects_by_id->{$id} ||= do {
-      push our(@New_Ids), $id;
-      $data;
-    };
-    return +{ __remote_object__ => $id };
+    return +{ __remote_object__ => $self->_local_object_to_id($data) };
   } elsif (my $ref = ref($data)) {
     if ($ref eq 'HASH') {
       return +{ map +($_ => $self->_deobjectify($data->{$_})), keys %$data };
     } elsif ($ref eq 'ARRAY') {
       return [ map $self->_deobjectify($_), @$data ];
+    } elsif ($ref eq 'CODE') {
+      my $id = $self->_local_object_to_id(
+                 Object::Remote::CodeContainer->new(code => $data)
+               );
+      return +{ __remote_code__ => $id };
     } else {
       die "Can't collapse reftype $ref";
     }
@@ -152,11 +242,29 @@ sub _deobjectify {
 sub _receive_data_from {
   my ($self, $fh) = @_;
   my $rb = $self->_receive_data_buffer;
-  if (sysread($fh, $$rb, 1024, length($$rb)) > 0) {
+  my $ready = $self->ready_future->is_ready;
+  my $len = sysread($fh, $$rb, 1024, length($$rb));
+  my $err = defined($len) ? '' : ": $!";
+  if (defined($len) and $len > 0) {
     while ($$rb =~ s/^(.*)\n//) {
-      $self->_receive($1);
+      if ($ready) {
+        $self->_receive($1);
+      } else {
+        my $line = $1;
+        die "New remote container did not send Shere - got ${line}"
+          unless $line eq "Shere";
+        $self->ready_future->done;
+      }
     }
   } else {
+    Object::Remote->current_loop
+                  ->unwatch_io(
+                      handle => $self->receive_from_fh,
+                      on_read_ready => 1
+                    );
+    my $outstanding = $self->outstanding_futures;
+    $_->fail("Connection lost${err}") for values %$outstanding;
+    %$outstanding = ();
     $self->on_close->done();
   }
 }
@@ -179,7 +287,8 @@ sub receive_free {
 }
 
 sub receive_call {
-  my ($self, $future, $id, @rest) = @_;
+  my ($self, $future_id, $id, @rest) = @_;
+  my $future = $self->_id_to_remote_object($future_id);
   $future->{method} = 'call_discard_free';
   my $local = $self->local_objects_by_id->{$id}
     or do { $future->fail("No such object $id"); return };
@@ -192,14 +301,6 @@ sub receive_call_free {
   $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);
-}
-
 sub _invoke {
   my ($self, $future, $local, $ctx, $method, @args) = @_;
   if ($method =~ /^start::/) {