switch from CPS::Future to Future

[scpubgit/Object-Remote.git] / lib / Object / Remote / ReadChannel.pm

diff --git a/lib/Object/Remote/ReadChannel.pm b/lib/Object/Remote/ReadChannel.pm
index 5de5bf1..d2008db 100644 (file)
--- a/lib/Object/Remote/ReadChannel.pm
+++ b/lib/Object/Remote/ReadChannel.pm
@@ -1,10 +1,11 @@
 package Object::Remote::ReadChannel;
 
-use CPS::Future;
-use Scalar::Util qw(weaken);
-use Object::Remote::Logging qw(:log);
+use Scalar::Util qw(weaken openhandle);
+use Object::Remote::Logging qw(:log :dlog router );
 use Moo;
 
+BEGIN { router()->exclude_forwarding }
+
 has fh => (
   is => 'ro', required => 1,
   trigger => sub {
@@ -29,10 +30,10 @@ has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
 
 sub _receive_data_from {
   my ($self, $fh) = @_;
-  log_trace { "Preparing to read data" };
+  Dlog_trace { "Preparing to read data from $_" } $fh;
   my $rb = $self->_receive_data_buffer;
-  my $len = sysread($fh, $$rb, 1024, length($$rb));
-  my $err = defined($len) ? '' : ": $!";
+  my $len = sysread($fh, $$rb, 32768, length($$rb));
+  my $err = defined($len) ? 'eof' : ": $!";
   if (defined($len) and $len > 0) {
     log_trace { "Read $len bytes of data" };
     while (my $cb = $self->on_line_call and $$rb =~ s/^(.*)\n//) {
@@ -45,6 +46,7 @@ sub _receive_data_from {
                       handle => $self->fh,
                       on_read_ready => 1
                     );
+    log_trace { "Invoking on_close_call() for dead read channel" };
     $self->on_close_call->($err);
   }
 }
@@ -53,6 +55,7 @@ sub DEMOLISH {
   my ($self, $gd) = @_;
   return if $gd;
   log_trace { "read channel is being demolished" };
+
   Object::Remote->current_loop
                 ->unwatch_io(
                     handle => $self->fh,