X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FMiniLoop.pm;h=3951bf9d3eb4701f9e8b6cc708706da121072775;hb=1a2d795fd41e8560892ba92d1088f2bc81b01d21;hp=c5025f3d9181d93e38402a7aa947363e9eec39c8;hpb=9e72f0cf54e92bccdba71eb75037f1cfe4f69f36;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/MiniLoop.pm b/lib/Object/Remote/MiniLoop.pm
index c5025f3..3951bf9 100644
--- a/lib/Object/Remote/MiniLoop.pm
+++ b/lib/Object/Remote/MiniLoop.pm
@@ -1,6 +1,7 @@
 package Object::Remote::MiniLoop;
 
 use IO::Select;
+use Time::HiRes qw(time);
 use Moo;
 
 # this is ro because we only actually set it using local in sub run
@@ -10,6 +11,11 @@ has is_running => (is => 'ro', clearer => 'stop');
 has _read_watches => (is => 'ro', default => sub { {} });
 has _read_select => (is => 'ro', default => sub { IO::Select->new });
 
+has _write_watches => (is => 'ro', default => sub { {} });
+has _write_select => (is => 'ro', default => sub { IO::Select->new });
+
+has _timers => (is => 'ro', default => sub { [] });
+
 sub pass_watches_to {
   my ($self, $new_loop) = @_;
   foreach my $fh ($self->_read_select->handles) {
@@ -18,6 +24,12 @@ sub pass_watches_to {
       on_read_ready => $self->_read_watches->{$fh}
     );
   }
+  foreach my $fh ($self->_write_select->handles) {
+    $new_loop->watch_io(
+      handle => $fh,
+      on_write_ready => $self->_write_watches->{$fh}
+    );
+  }
 }
 
 sub watch_io {
@@ -27,6 +39,11 @@ sub watch_io {
     $self->_read_select->add($fh);
     $self->_read_watches->{$fh} = $cb;
   }
+  if (my $cb = $watch{on_write_ready}) {
+    $self->_write_select->add($fh);
+    $self->_write_watches->{$fh} = $cb;
+  }
+  return;
 }
 
 sub unwatch_io {
@@ -36,18 +53,70 @@ sub unwatch_io {
     $self->_read_select->remove($fh);
     delete $self->_read_watches->{$fh};
   }
+  if ($watch{on_write_ready}) {
+    $self->_write_select->remove($fh);
+    delete $self->_write_watches->{$fh};
+  }
+  return;
+}
+
+sub watch_time {
+  my ($self, %watch) = @_;
+  my $at = $watch{at} || do {
+    die "watch_time requires at or after" unless my $after = $watch{after};
+    time() + $after;
+  };
+  die "watch_time requires code" unless my $code = $watch{code};
+  my $timers = $self->_timers;
+  my $new = [ $at => $code ];
+  @{$timers} = sort { $a->[0] <=> $b->[0] } @{$timers}, $new;
+  return "$new";
+}
+
+sub unwatch_time {
+  my ($self, $id) = @_;
+  @$_ = grep !($_ eq $id), @$_ for $self->_timers;
+  return;
 }
 
 sub loop_once {
   my ($self) = @_;
   my $read = $self->_read_watches;
-  my ($readable) = IO::Select->select($self->_read_select, undef, undef, 0.5);
+  my $write = $self->_write_watches;
+  my ($readable, $writeable) = IO::Select->select(
+    $self->_read_select, $self->_write_select, undef, 0.5
+  );
   # I would love to trap errors in the select call but IO::Select doesn't
   # differentiate between an error and a timeout.
   #   -- no, love, mst.
   foreach my $fh (@$readable) {
-    $read->{$fh}();
+    $read->{$fh}() if $read->{$fh};
+  }
+  foreach my $fh (@$writeable) {
+    $write->{$fh}() if $write->{$fh};
+  }
+  my $timers = $self->_timers;
+  my $now = time();
+  while (@$timers and $timers->[0][0] <= $now) {
+    (shift @$timers)->[1]->();
   }
+  return;
+}
+
+sub want_run {
+  my ($self) = @_;
+  $self->{want_running}++;
+}
+
+sub run_while_wanted {
+  my ($self) = @_;
+  $self->loop_once while $self->{want_running};
+  return;
+}
+
+sub want_stop {
+  my ($self) = @_;
+  $self->{want_running}-- if $self->{want_running};
 }
 
 sub run {
@@ -56,6 +125,7 @@ sub run {
   while ($self->is_running) {
     $self->loop_once;
   }
+  return;
 }
 
 1;