X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FMiniLoop.pm;h=9686bde3e76cc4c7a4671e8123e6a15628c2351d;hp=a4a835c0b791cb5bd70416a802fc080e1ded3187;hb=572a9a00cec239943f92157ec39c44398aad137f;hpb=b7a853b30e7397854a813f6a5878e50703a20079

diff --git a/lib/Object/Remote/MiniLoop.pm b/lib/Object/Remote/MiniLoop.pm
index a4a835c..9686bde 100644
--- a/lib/Object/Remote/MiniLoop.pm
+++ b/lib/Object/Remote/MiniLoop.pm
@@ -2,12 +2,20 @@ package Object::Remote::MiniLoop;
 
 use IO::Select;
 use Time::HiRes qw(time);
-use Object::Remote::Logging qw( :log :dlog );
+use Object::Remote::Logging qw( :log :dlog router );
 use Moo;
 
-# this is ro because we only actually set it using local in sub run
+BEGIN { 
+  $SIG{PIPE} = sub { log_debug { "Got a PIPE signal" } };
+  
+  router()->exclude_forwarding
+}
 
+# this is ro because we only actually set it using local in sub run
 has is_running => (is => 'ro', clearer => 'stop');
+#maximum duration that select() will block - undef means indefinite,
+#0 means no blocking, otherwise maximum time in seconds
+has block_duration => ( is => 'rw' );
 
 has _read_watches => (is => 'ro', default => sub { {} });
 has _read_select => (is => 'ro', default => sub { IO::Select->new });
@@ -38,19 +46,6 @@ sub watch_io {
   my ($self, %watch) = @_;
   my $fh = $watch{handle};
   Dlog_debug { "Adding IO watch for $_" } $fh;
-
-  #TODO if this works out non-blocking support
-  #will need to be integrated in a way that
-  #is compatible with Windows which has no
-  #non-blocking support - see also ::ReadChannel
-  if (0) {
-    Dlog_warn { "setting file handle to be non-blocking: $_" } $fh;
-    use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
-    my $flags = fcntl($fh, F_GETFL, 0)
-      or die "Can't get flags for the socket: $!\n";
-    $flags = fcntl($fh, F_SETFL, $flags | O_NONBLOCK)
-      or die "Can't set flags for the socket: $!\n"; 
-  }
   
   if (my $cb = $watch{on_read_ready}) {
     log_trace { "IO watcher is registering with select for reading" };
@@ -103,9 +98,9 @@ sub watch_time {
   } elsif (exists($watch{after})) {
     $at = time() + $watch{after}; 
   } elsif (exists($watch{at})) {
-      $at = $watch{at}; 
+    $at = $watch{at}; 
   } else {
-      die "watch_time requires every, after or at";
+    die "watch_time requires every, after or at";
   }
   
   die "watch_time requires code" unless my $code = $watch{code};
@@ -118,7 +113,7 @@ sub watch_time {
 
 sub unwatch_time {
   my ($self, $id) = @_;
-  log_debug { "Removing timer with id of '$id'" };
+  log_trace { "Removing timer with id of '$id'" };
   @$_ = grep !($_ eq $id), @$_ for $self->_timers;
   return;
 }
@@ -126,12 +121,7 @@ sub unwatch_time {
 sub _next_timer_expires_delay {
   my ($self) = @_;
   my $timers = $self->_timers;
-  #undef means no timeout, select only returns
-  #when data is ready - when the system
-  #deadlocks the chatter from the timeout in
-  #select clogs up the logs
-  #TODO should make this an attribute
-  my $delay_max = undef;
+  my $delay_max = $self->block_duration;
     
   return $delay_max unless @$timers;
   my $duration = $timers->[0]->[0] - time;
@@ -151,13 +141,14 @@ sub loop_once {
   my ($self) = @_;
   my $read = $self->_read_watches;
   my $write = $self->_write_watches;
-  our $Loop_Entered = 1; 
   my $read_count = 0;
   my $write_count = 0; 
   my @c = caller;
   my $wait_time = $self->_next_timer_expires_delay;
-  log_trace {  sprintf("Run loop: loop_once() has been invoked by $c[1]:$c[2] with read:%i write:%i select timeout:%s",
-      scalar(keys(%$read)), scalar(keys(%$write)), defined $wait_time ? $wait_time : 'indefinite' ) };
+  log_trace {
+    sprintf("Run loop: loop_once() has been invoked by $c[1]:$c[2] with read:%i write:%i select timeout:%s",
+      scalar(keys(%$read)), scalar(keys(%$write)), defined $wait_time ? $wait_time : 'indefinite' )
+  };
   my ($readable, $writeable) = IO::Select->select(
     $self->_read_select, $self->_write_select, undef, $wait_time
   ); 
@@ -170,23 +161,26 @@ sub loop_once {
   # differentiate between an error and a timeout.
   #   -- no, love, mst.
 
-  local $Loop_Entered;
-
   log_trace { "Reading from all ready filehandles" };
   foreach my $fh (@$readable) {
     next unless $read->{$fh};
     $read_count++;
     $read->{$fh}();
-    last if $Loop_Entered;
+    #FIXME this is a rough workaround for race conditions that can cause deadlocks
+    #under load
+    last;
   }
   log_trace { "Writing to all ready filehandles" };
   foreach my $fh (@$writeable) {
     next unless $write->{$fh};
     $write_count++;
     $write->{$fh}();
-    last if $Loop_Entered;
+    #FIXME this is a rough workaround for race conditions that can cause deadlocks
+    #under load
+    last;
   }
   
+  #moving the timers above the read() section exposes a deadlock
   log_trace { "Read from $read_count filehandles; wrote to $write_count filehandles" };
   my $timers = $self->_timers;
   my $now = time();
@@ -197,18 +191,16 @@ sub loop_once {
      
     if (defined($active->[2])) {
       #handle the case of an 'every' timer
-      $active->[0] = time() + $active->[2]; 
+      $active->[0] = time() + $active->[2];
       Dlog_trace { "scheduling timer for repeat execution at $_"} $active->[0];
       $self->_sort_timers;
     } else {
       #it doesn't repeat again so get rid of it  
-      shift(@$timers);    
+      shift(@$timers);
     }
 
     #execute the timer
     $active->[1]->();
-     
-    last if $Loop_Entered;
   }
   
   log_trace { "Run loop: single loop is completed" };
@@ -217,7 +209,7 @@ sub loop_once {
 
 sub want_run {
   my ($self) = @_;
-  Dlog_debug { "Run loop: Incrimenting want_running, is now $_" }
+  Dlog_debug { "Run loop: Incremeting want_running, is now $_" }
     ++$self->{want_running};
 }