has child_pid => (is => 'ro');
-has is_ready => (is => 'rwp', trigger => sub {
- my ($self, $value) = @_;
- $self->ready_future->done if $value;
-});
-
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 { {} });
+has local_objects_by_id => (
+ is => 'ro', default => sub { {} },
+ coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
+);
-has remote_objects_by_id => (is => 'ro', default => sub { {} });
+has remote_objects_by_id => (
+ is => 'ro', default => sub { {} },
+ coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
+);
has outstanding_futures => (is => 'ro', default => sub { {} });
eval { require Object::Remote::Connector::Local };
eval { require Object::Remote::Connector::LocalSudo };
eval { require Object::Remote::Connector::SSH };
+ eval { require Object::Remote::Connector::UNIX };
}
sub new_from_spec {
die "Couldn't figure out what to do with ${spec}";
}
-sub new_remote {
+sub remote_object {
my ($self, @args) = @_;
Object::Remote::Handle->new(
connection => $self, @args
));
}
-sub get_remote_sub {
+sub remote_sub {
my ($self, $sub) = @_;
my ($pkg, $name) = $sub =~ m/^(.*)::([^:]+)$/;
return await_future($self->send(class_call => $pkg, 0, can => $name));
sub await_ready {
my ($self) = @_;
- return if $self->is_ready;
await_future($self->ready_future);
}
sub _send {
my ($self, $to_send) = @_;
- $self->await_ready unless $self->is_ready;
+ $self->await_ready;
print { $self->send_to_fh } $self->_serialize($to_send)."\n";
}
sub _receive_data_from {
my ($self, $fh) = @_;
my $rb = $self->_receive_data_buffer;
- my $ready = $self->is_ready;
- if (sysread($fh, $$rb, 1024, length($$rb)) > 0) {
+ my $ready = $self->ready_future->is_ready;
+ my $len = sysread($fh, $$rb, 1024, length($$rb));
+ my $err = defined($len) ? undef : ": $!";
+ if (defined($len) and $len > 0) {
while ($$rb =~ s/^(.*)\n//) {
if ($ready) {
$self->_receive($1);
my $line = $1;
die "New remote container did not send Shere - got ${line}"
unless $line eq "Shere";
- $self->_set_is_ready($ready = 1);
+ $self->ready_future->done;
}
}
} else {
on_read_ready => 1
);
my $outstanding = $self->outstanding_futures;
- $_->fail("Connection lost") for values %$outstanding;
+ $_->fail("Connection lost${err}") for values %$outstanding;
%$outstanding = ();
$self->on_close->done();
}