trigger => sub { $_[1]->autoflush(1) },
);
-has receive_from_fh => (
+has read_channel => (
is => 'ro', required => 1,
trigger => sub {
- my ($self, $fh) = @_;
+ my ($self, $ch) = @_;
weaken($self);
- Object::Remote->current_loop
- ->watch_io(
- handle => $fh,
- on_read_ready => sub { $self->_receive_data_from($fh) }
- );
+ $ch->on_line_call(sub { $self->_receive(@_) });
+ $ch->on_close_call(sub { $self->on_close->done(@_) });
},
);
-has on_close => (is => 'rw', default => sub { CPS::Future->new });
+has on_close => (
+ is => 'ro', default => sub { CPS::Future->new },
+ trigger => sub {
+ my ($self, $f) = @_;
+ weaken($self);
+ $f->on_done(sub {
+ $self->_fail_outstanding("Connection lost: ".($f->get)[0]);
+ });
+ }
+);
has child_pid => (is => 'ro');
-has ready_future => (is => 'lazy');
-
-sub _build_ready_future { CPS::Future->new }
-
-has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
-
has local_objects_by_id => (
is => 'ro', default => sub { {} },
coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
has outstanding_futures => (is => 'ro', default => sub { {} });
+sub _fail_outstanding {
+ my ($self, $error) = @_;
+ my $outstanding = $self->outstanding_futures;
+ $_->fail($error) for values %$outstanding;
+ %$outstanding = ();
+ return;
+}
+
has _json => (
is => 'lazy',
handles => {
return $remote;
}
-sub await_ready {
- my ($self) = @_;
- await_future($self->ready_future);
-}
-
sub send_free {
my ($self, $id) = @_;
delete $self->remote_objects_by_id->{$id};
sub _send {
my ($self, $to_send) = @_;
- $self->await_ready;
-
print { $self->send_to_fh } $self->_serialize($to_send)."\n";
}
return $data; # plain scalar
}
-sub _receive_data_from {
- my ($self, $fh) = @_;
- 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) ? '' : ": $!";
- if (defined($len) and $len > 0) {
- while ($$rb =~ s/^(.*)\n//) {
- if ($ready) {
- $self->_receive($1);
- } else {
- my $line = $1;
- die "New remote container did not send Shere - got ${line}"
- unless $line eq "Shere";
- $self->ready_future->done;
- }
- }
- } else {
- Object::Remote->current_loop
- ->unwatch_io(
- handle => $self->receive_from_fh,
- on_read_ready => 1
- );
- my $outstanding = $self->outstanding_futures;
- $_->fail("Connection lost${err}") for values %$outstanding;
- %$outstanding = ();
- $self->on_close->done();
- }
-}
-
sub _receive {
my ($self, $flat) = @_;
warn "$$ <<< $flat\n" if $DEBUG;
return;
}
-sub DEMOLISH {
- my ($self, $gd) = @_;
- return if $gd;
- Object::Remote->current_loop
- ->unwatch_io(
- handle => $self->receive_from_fh,
- on_read_ready => 1
- );
-}
-
1;
=head1 NAME
use File::Spec;
use IO::Handle;
use Object::Remote::Connection;
+use Object::Remote::ReadChannel;
use Moo;
sub connect {
open STDOUT, '>', File::Spec->devnull or die "Re-opening stdout: $!";
return Object::Remote::Connection->new(
send_to_fh => $stdout,
- receive_from_fh => $stdin
+ read_channel => Object::Remote::ReadChannel->new(fh => $stdin)
);
}
use CPS::Future;
sub run {
-
my $c = Object::Remote::Connector::STDIO->new->connect;
$c->register_class_call_handler;
- $c->ready_future->done;
-
my $loop = Object::Remote->current_loop;
- my $f = CPS::Future->new;
-
- $f->on_ready(sub { $loop->want_stop });
-
- $c->on_close($f);
+ $c->on_close->on_ready(sub { $loop->want_stop });
print { $c->send_to_fh } "Shere\n";
--- /dev/null
+package Object::Remote::ReadChannel;
+
+use CPS::Future;
+use Scalar::Util qw(weaken);
+use Moo;
+
+has fh => (
+ is => 'ro', required => 1,
+ trigger => sub {
+ my ($self, $fh) = @_;
+ weaken($self);
+ Object::Remote->current_loop
+ ->watch_io(
+ handle => $fh,
+ on_read_ready => sub { $self->_receive_data_from($fh) }
+ );
+ },
+);
+
+has on_close_call => (
+ is => 'rw', default => sub { sub {} },
+);
+
+has on_line_call => (is => 'rw');
+
+has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
+
+sub _receive_data_from {
+ my ($self, $fh) = @_;
+ my $rb = $self->_receive_data_buffer;
+ my $len = sysread($fh, $$rb, 1024, length($$rb));
+ my $err = defined($len) ? '' : ": $!";
+ if (defined($len) and $len > 0) {
+ while (my $cb = $self->on_line_call and $$rb =~ s/^(.*)\n//) {
+ $cb->(my $line = $1);
+ }
+ } else {
+ Object::Remote->current_loop
+ ->unwatch_io(
+ handle => $self->fh,
+ on_read_ready => 1
+ );
+ $self->on_close_call->($err);
+ }
+}
+
+sub DEMOLISH {
+ my ($self, $gd) = @_;
+ return if $gd;
+ Object::Remote->current_loop
+ ->unwatch_io(
+ handle => $self->fh,
+ on_read_ready => 1
+ );
+}
+
+1;
package Object::Remote::Role::Connector;
use Module::Runtime qw(use_module);
+use Object::Remote::Future;
use Moo::Role;
requires '_open2_for';
sub connect {
my $self = shift;
- my %args;
- @args{qw(send_to_fh receive_from_fh child_pid)} = $self->_open2_for(@_);
- return use_module('Object::Remote::Connection')->new(\%args);
+ my ($send_to_fh, $receive_from_fh, $child_pid) = $self->_open2_for(@_);
+ my $channel = use_module('Object::Remote::ReadChannel')->new(
+ fh => $receive_from_fh
+ );
+ return future {
+ my $f = shift;
+ $channel->on_line_call(sub {
+ if ($_[0] eq "Shere") {
+ $f->done(
+ use_module('Object::Remote::Connection')->new(
+ send_to_fh => $send_to_fh,
+ read_channel => $channel,
+ child_pid => $child_pid,
+ )
+ );
+ } else {
+ $f->fail("Expected Shere from remote but received: $_[0]");
+ }
+ undef($channel);
+ });
+ $channel->on_close_call(sub {
+ $f->fail("Channel closed without seeing Shere: $_[0]");
+ undef($channel);
+ });
+ Object::Remote->current_loop
+ ->watch_time(
+ after => 5,
+ code => sub {
+ $f->fail("Connection timed out") unless $f->is_ready;
+ undef($channel);
+ }
+ );
+ $f;
+ }
}
1;
projects / scpubgit/Object-Remote.git / commitdiff