X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=8f4d44304db1cffc5b473c9f8e69b188c821634c;hb=8c81a0e51d629a4f53975c6f738aa14d680b73c1;hp=c5bc9f673af6e22e7af162adac9798de1e782f8b;hpb=11dbd4a02cce95ee689233d2b1d2392470518732;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index c5bc9f6..8f4d443 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -110,15 +110,38 @@ sub remote_object {
 
 sub connect {
   my ($self, $to) = @_;
-  return await_future($self->send(
-    class_call => 'Object::Remote', 0, connect => $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 => $pkg, 0, can => $name));
+  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 {
@@ -141,7 +164,9 @@ 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;
@@ -155,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);
 }
@@ -170,7 +195,7 @@ sub _send {
 
 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;
@@ -187,7 +212,7 @@ sub _local_object_to_id {
   my ($self, $object) = @_;
   my $id = refaddr($object);
   $self->local_objects_by_id->{$id} ||= do {
-    push our(@New_Ids), $id;
+    push our(@New_Ids), $id if @New_Ids;
     $object;
   };
   return $id;
@@ -219,7 +244,7 @@ sub _receive_data_from {
   my $rb = $self->_receive_data_buffer;
   my $ready = $self->ready_future->is_ready;
   my $len = sysread($fh, $$rb, 1024, length($$rb));
-  my $err = defined($len) ? undef : ": $!";
+  my $err = defined($len) ? '' : ": $!";
   if (defined($len) and $len > 0) {
     while ($$rb =~ s/^(.*)\n//) {
       if ($ready) {
@@ -262,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 };
@@ -275,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::/) {