use Object::Remote::Null;
use Object::Remote::Handle;
use Object::Remote::CodeContainer;
+use Object::Remote::GlobProxy;
+use Object::Remote::GlobContainer;
use Object::Remote;
+use Symbol;
use IO::Handle;
use Module::Runtime qw(use_module);
use Scalar::Util qw(weaken blessed refaddr);
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 => {
my $code_container = $self->_id_to_remote_object(@_);
sub { $code_container->call(@_) };
}
+ )->filter_json_single_key_object(
+ __scalar_ref__ => sub {
+ my $value = shift;
+ return \$value;
+ }
+ )->filter_json_single_key_object(
+ __glob_ref__ => sub {
+ my $glob_container = $self->_id_to_remote_object(@_);
+ my $handle = Symbol::gensym;
+ tie *$handle, 'Object::Remote::GlobProxy', $glob_container;
+ return $handle;
+ }
);
}
sub connect {
my ($self, $to) = @_;
- return await_future($self->send(
- class_call => 'Object::Remote', 0, connect => $to
- ));
+ return await_future(
+ $self->send_class_call(0, 'Object::Remote', connect => $to)
+ );
}
sub remote_sub {
my ($self, $sub) = @_;
my ($pkg, $name) = $sub =~ m/^(.*)::([^:]+)$/;
- return await_future($self->send(class_call => $pkg, 0, can => $name));
+ return await_future($self->send_class_call(0, $pkg, can => $name));
+}
+
+sub send_class_call {
+ my ($self, $ctx, @call) = @_;
+ $self->send(call => class_call_handler => $ctx => call => @call);
+}
+
+sub register_class_call_handler {
+ my ($self) = @_;
+ $self->local_objects_by_id->{'class_call_handler'} ||= do {
+ my $o = $self->new_class_call_handler;
+ $self->_local_object_to_id($o);
+ $o;
+ };
+}
+
+sub new_class_call_handler {
+ Object::Remote::CodeContainer->new(
+ code => sub {
+ my ($class, $method) = (shift, shift);
+ use_module($class)->$method(@_);
+ }
+ );
}
sub register_remote {
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, $type, @call) = @_;
- unshift @call, $type => my $future = CPS::Future->new;
+ my $future = CPS::Future->new;
+ my $remote = $self->remote_objects_by_id->{$call[0]};
+
+ unshift @call, $type => $self->_local_object_to_id($future);
my $outstanding = $self->outstanding_futures;
$outstanding->{$future} = $future;
- $future->on_ready(sub { delete $outstanding->{$future} });
+ $future->on_ready(sub {
+ undef($remote);
+ delete $outstanding->{$future}
+ });
$self->_send(\@call);
sub send_discard {
my ($self, $type, @call) = @_;
- unshift @call, $type => { __remote_object__ => 'NULL' };
+ unshift @call, $type => 'NULL';
$self->_send(\@call);
}
sub _send {
my ($self, $to_send) = @_;
- $self->await_ready;
-
print { $self->send_to_fh } $self->_serialize($to_send)."\n";
}
sub _serialize {
my ($self, $data) = @_;
- local our @New_Ids;
+ local our @New_Ids = (-1);
return eval {
my $flat = $self->_encode($self->_deobjectify($data));
warn "$$ >>> ${flat}\n" if $DEBUG;
my ($self, $object) = @_;
my $id = refaddr($object);
$self->local_objects_by_id->{$id} ||= do {
- push our(@New_Ids), $id;
+ push our(@New_Ids), $id if @New_Ids;
$object;
};
return $id;
Object::Remote::CodeContainer->new(code => $data)
);
return +{ __remote_code__ => $id };
+ } elsif ($ref eq 'SCALAR') {
+ return +{ __scalar_ref__ => $$data };
+ } elsif ($ref eq 'GLOB') {
+ return +{ __glob_ref__ => $self->_local_object_to_id(
+ Object::Remote::GlobContainer->new(handle => $data)
+ ) };
} else {
die "Can't collapse reftype $ref";
}
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) ? undef : ": $!";
- 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;
}
sub receive_call {
- my ($self, $future, $id, @rest) = @_;
+ my ($self, $future_id, $id, @rest) = @_;
+ my $future = $self->_id_to_remote_object($future_id);
$future->{method} = 'call_discard_free';
my $local = $self->local_objects_by_id->{$id}
or do { $future->fail("No such object $id"); return };
$self->receive_free($id);
}
-sub receive_class_call {
- my ($self, $future, $class, @rest) = @_;
- $future->{method} = 'call_discard_free';
- eval { use_module($class) }
- or do { $future->fail("Error loading ${class}: $@"); return };
- $self->_invoke($future, $class, @rest);
-}
-
sub _invoke {
my ($self, $future, $local, $ctx, $method, @args) = @_;
if ($method =~ /^start::/) {
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
+
+Object::Remote::Connection - An underlying connection for L<Object::Remote>
+
+=head1 LAME
+
+Shipping prioritised over writing this part up. Blame mst.
+
+=cut
projects / scpubgit/Object-Remote.git / blobdiff