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=7e673ca5c623f1c9d9c5ac4d05c2c90cc664555e;hp=463ca79515b4f572f8ad63084d4d6f8bc590b1df;hb=bef36e73e4257b2ba8e59eb55661ffc51d8a620a;hpb=37efeb68748dd589455d8ae58d39e74700abdd67

diff --git a/lib/Object/Remote/MiniLoop.pm b/lib/Object/Remote/MiniLoop.pm
index 463ca79..7e673ca 100644
--- a/lib/Object/Remote/MiniLoop.pm
+++ b/lib/Object/Remote/MiniLoop.pm
@@ -2,9 +2,15 @@ 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;
 
+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,
@@ -40,7 +46,7 @@ sub watch_io {
   my ($self, %watch) = @_;
   my $fh = $watch{handle};
   Dlog_debug { "Adding IO watch for $_" } $fh;
-  
+
   if (my $cb = $watch{on_read_ready}) {
     log_trace { "IO watcher is registering with select for reading" };
     $self->_read_select->add($fh);
@@ -73,41 +79,41 @@ sub unwatch_io {
 
 sub _sort_timers {
   my ($self, @new) = @_;
-  my $timers = $self->_timers; 
-  
+  my $timers = $self->_timers;
+
   log_trace { "Sorting timers" };
-  
+
   @{$timers} = sort { $a->[0] <=> $b->[0] } @{$timers}, @new;
-  return;   
+  return;
 }
 
 sub watch_time {
   my ($self, %watch) = @_;
-  my $at; 
-  
+  my $at;
+
   Dlog_trace { "watch_time() invoked with $_" } \%watch;
- 
+
   if (exists($watch{every})) {
     $at = time() + $watch{every};
   } elsif (exists($watch{after})) {
-    $at = time() + $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 code" unless my $code = $watch{code};
   my $timers = $self->_timers;
   my $new = [ $at => $code, $watch{every} ];
-  $self->_sort_timers($new); 
+  $self->_sort_timers($new);
   log_debug { "Created new timer with id '$new' that expires at '$at'" };
   return "$new";
 }
 
 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;
 }
@@ -116,36 +122,37 @@ sub _next_timer_expires_delay {
   my ($self) = @_;
   my $timers = $self->_timers;
   my $delay_max = $self->block_duration;
-    
+
   return $delay_max unless @$timers;
   my $duration = $timers->[0]->[0] - time;
 
-  log_trace { "next timer fires in '$duration' seconds " };
-  
+  log_trace { "next timer fires in '$duration' seconds" };
+
   if ($duration < 0) {
-    $duration = 0; 
+    $duration = 0;
   } elsif (defined $delay_max && $duration > $delay_max) {
     $duration = $delay_max;
   }
-  
-  return $duration; 
+
+  return $duration;
 }
 
 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 $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
-  ); 
-  log_trace { 
+  );
+  log_trace {
     my $readable_count = defined $readable ? scalar(@$readable) : 0;
     my $writable_count = defined $writeable ? scalar(@$writeable) : 0;
     "Run loop: select returned readable:$readable_count writeable:$writable_count";
@@ -154,54 +161,55 @@ sub loop_once {
   # differentiate between an error and a timeout.
   #   -- no, love, mst.
 
-  local $Loop_Entered;
-
-  log_trace { "Reading from all ready filehandles" };
+  log_trace { "Reading from 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" };
+  log_trace { "Writing to 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();
   log_trace { "Checking timers" };
   while (@$timers and $timers->[0][0] <= $now) {
-    my $active = $timers->[0]; 
+    my $active = $timers->[0];
     Dlog_trace { "Found timer that needs to be executed: '$active'" };
-     
+
     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);    
+      #it doesn't repeat again so get rid of it
+      shift(@$timers);
     }
 
     #execute the timer
     $active->[1]->();
-     
-    last if $Loop_Entered;
   }
-  
+
   log_trace { "Run loop: single loop is completed" };
   return;
 }
 
 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};
 }
 
@@ -217,7 +225,7 @@ sub want_stop {
   my ($self) = @_;
   if (! $self->{want_running}) {
     log_debug { "Run loop: want_stop() was called but want_running was not true" };
-    return; 
+    return;
   }
   Dlog_debug { "Run loop: decrimenting want_running, is now $_" }
     --$self->{want_running};