parti8al conversion to future based system; start still being weird

[scpubgit/Object-Remote.git] / lib / Object / Remote.pm

diff --git a/lib/Object/Remote.pm b/lib/Object/Remote.pm
index 64355af..25f0349 100644 (file)
--- a/lib/Object/Remote.pm
+++ b/lib/Object/Remote.pm
@@ -3,6 +3,7 @@ package Object::Remote;
 use Object::Remote::MiniLoop;
 use Object::Remote::Proxy;
 use Scalar::Util qw(weaken blessed);
+use Object::Remote::Future;
 use Module::Runtime qw(use_module);
 use Moo;
 
@@ -40,7 +41,7 @@ sub BUILD {
     die "No id supplied and no class either" unless $args->{class};
     ref($_) eq 'HASH' and $_ = [ %$_ ] for $args->{args};
     $self->_set_id(
-      $self->_await(
+      await_future(
         $self->connection->send(
           class_call => $args->{class}, 0,
           $args->{constructor}||'new', @{$args->{args}||[]}
@@ -57,9 +58,10 @@ sub current_loop {
 
 sub call {
   my ($self, $method, @args) = @_;
-  $self->_await(
-    $self->connection->send(call => $self->id, wantarray, $method, @args)
-  );
+  my $w = wantarray;
+  future {
+    $self->connection->send(call => $self->id, $w, $method, @args)
+  };
 }
 
 sub call_discard {
@@ -73,14 +75,6 @@ sub call_discard_free {
   $self->connection->send_discard(call_free => $self->id, $method, @args);
 }
 
-sub _await {
-  my ($self, $future) = @_;
-  my $loop = $self->current_loop;
-  $future->on_ready(sub { $loop->stop });
-  $loop->run;
-  wantarray ? $future->get : ($future->get)[0];
-}
-
 sub DEMOLISH {
   my ($self, $gd) = @_;
   return if $gd or $self->disarmed_free;