X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFuture.pm;h=893fb6d663579dcb8ddaeffc326494a295958af0;hp=609799a94ceb57701d3f3df133556464511d472d;hb=fbd3b8ecbd2c9004f0e56ff1c0bc30f677a19c62;hpb=12fb4a80d68ad14c18a35f60cc6d8a671f728ac9

diff --git a/lib/Object/Remote/Future.pm b/lib/Object/Remote/Future.pm
index 609799a..893fb6d 100644
--- a/lib/Object/Remote/Future.pm
+++ b/lib/Object/Remote/Future.pm
@@ -8,19 +8,29 @@ use CPS::Future;
 
 our @EXPORT = qw(future await_future await_all);
 
-sub future (&) {
+sub future (&;$) {
   my $f = $_[0]->(CPS::Future->new);
-  return $f if ((caller(1)||'') eq 'start');
+  return $f if ((caller(1+($_[1]||0))||'') eq 'start');
   await_future($f);
 }
 
+our @await;
+
 sub await_future {
   my $f = shift;
   return $f if $f->is_ready;
   require Object::Remote;
   my $loop = Object::Remote->current_loop;
-  $f->on_ready(sub { $loop->stop });
-  $loop->run;
+  {
+    local @await = (@await, $f);
+    $f->on_ready(sub {
+      $loop->stop if $f == $await[-1]
+    });
+    $loop->run;
+  }
+  if (@await and $await[-1]->is_ready) {
+    $loop->stop;
+  }
   return wantarray ? $f->get : ($f->get)[0];
 }
 
@@ -31,6 +41,8 @@ sub await_all {
 
 package start;
 
+our $start = sub { my ($obj, $call) = (shift, shift); $obj->$call(@_); };
+
 sub AUTOLOAD {
   my $invocant = shift;
   my ($method) = our $AUTOLOAD =~ /^start::(.+)$/;
@@ -48,6 +60,17 @@ sub AUTOLOAD {
   return $res;
 }
 
+package maybe;
+
+sub start {
+  my ($obj, $call) = (shift, shift);
+  if ((caller(1)||'') eq 'start') {
+    $obj->$start::start($call => @_);
+  } else {
+    $obj->$call(@_);
+  }
+}
+
 package maybe::start;
 
 sub AUTOLOAD {