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=4b4e0725ec451fbc4cdafba065be99e276892177;hp=7afac689fae39c9a46f51949ea231b5488cb587c;hb=8c3529062a426181861d58ee59fb8f10e0be68e5;hpb=4a9fa1a5a329754549f998536e0e68f19d42d7ab

diff --git a/lib/Object/Remote/Future.pm b/lib/Object/Remote/Future.pm
index 7afac68..4b4e072 100644
--- a/lib/Object/Remote/Future.pm
+++ b/lib/Object/Remote/Future.pm
@@ -4,7 +4,9 @@ use strict;
 use warnings;
 use base qw(Exporter);
 
-use Object::Remote::Logging qw( :log );
+use Object::Remote::Logging qw( :log router );
+
+BEGIN { router()->exclude_forwarding }
 
 use CPS::Future;
 
@@ -20,23 +22,32 @@ our @await;
 
 sub await_future {
   my $f = shift;
+  log_trace { my $ir = $f->is_ready; "await_future() invoked; is_ready: $ir" };
   return $f if $f->is_ready;
   require Object::Remote;
   my $loop = Object::Remote->current_loop;
   {
     local @await = (@await, $f);
     $f->on_ready(sub {
-      $loop->stop if $f == $await[-1]
+      log_trace { my $l = @await; "future has become ready, length of \@await: '$l'" };
+      if ($f == $await[-1]) {
+        log_trace { "This future is not waiting on anything so calling stop on the run loop" };
+        $loop->stop;         
+      }
     });
+    log_trace { "Starting run loop for newly created future" };
     $loop->run;
   }
   if (@await and $await[-1]->is_ready) {
+    log_trace { "Last future in await list was ready, stopping run loop" };
     $loop->stop;
   }
+  log_trace { "await_future() returning" };
   return wantarray ? $f->get : ($f->get)[0];
 }
 
 sub await_all {
+  log_trace { my $l = @_; "await_all() invoked with '$l' futures to wait on" };
   await_future(CPS::Future->wait_all(@_));
   map $_->get, @_;
 }