use warnings;
use base qw(Exporter);
-use Object::Remote::Logging qw( :log Dlog_trace );
+use Object::Remote::Logging qw( :log router );
-use CPS::Future;
+BEGIN { router()->exclude_forwarding }
+
+use Future;
our @EXPORT = qw(future await_future await_all);
sub future (&;$) {
- my $f = $_[0]->(CPS::Future->new);
+ my $f = $_[0]->(Future->new);
return $f if ((caller(1+($_[1]||0))||'') eq 'start');
await_future($f);
}
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;
+ $loop->stop;
}
});
log_trace { "Starting run loop for newly created future" };
sub await_all {
log_trace { my $l = @_; "await_all() invoked with '$l' futures to wait on" };
- await_future(CPS::Future->wait_all(@_));
+ await_future(Future->wait_all(@_));
map $_->get, @_;
}
my ($method) = our $AUTOLOAD =~ /^start::(.+)$/;
my $res;
unless (eval { $res = $invocant->$method(@_); 1 }) {
- my $f = CPS::Future->new;
+ my $f = Future->new;
$f->fail($@);
return $f;
}
- unless (Scalar::Util::blessed($res) and $res->isa('CPS::Future')) {
- my $f = CPS::Future->new;
+ unless (Scalar::Util::blessed($res) and $res->isa('Future')) {
+ my $f = Future->new;
$f->done($res);
return $f;
}
my $invocant = shift;
my ($method) = our $AUTOLOAD =~ /^then::(.+)$/;
my @args = @_;
- # Need two copies since if we're called on an already complete future
- # $f will be freed immediately
- my $ret = my $f = CPS::Future->new;
- $invocant->on_fail(sub { $f->fail(@_); undef($f); });
- $invocant->on_done(sub {
+ return $invocant->then(sub {
my ($obj) = @_;
- my $next = $obj->${\"start::${method}"}(@args);
- $next->on_done(sub { $f->done(@_); undef($f); });
- $next->on_fail(sub { $f->fail(@_); undef($f); });
+ return $obj->${\"start::${method}"}(@args);
});
- return $ret;
}
1;