X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FMiniLoop.pm;h=89453760c0e4b5f49718ffa17c7e0c3833ee643a;hb=5ccce2d5c1fb651f83c73c811069003e4a591a53;hp=07744f84f97e6846d0a57a5daee8225c14a7eac5;hpb=8f43bcd9596b298f867bc3daf5b207d774973af7;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/MiniLoop.pm b/lib/Object/Remote/MiniLoop.pm
index 07744f8..8945376 100644
--- a/lib/Object/Remote/MiniLoop.pm
+++ b/lib/Object/Remote/MiniLoop.pm
@@ -126,7 +126,7 @@ sub _next_timer_expires_delay {
   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; 
@@ -141,7 +141,6 @@ 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;
@@ -162,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" };
+  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();
@@ -189,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" };
@@ -209,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};
 }