From: Tyler Riddle <t.riddle@shadowcat.co.uk>
Date: Mon, 17 Dec 2012 17:43:04 +0000 (-0800)
Subject: cleanup and put comments on the deadlock workaround in miniloop
X-Git-Tag: v0.003001_01~28
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=commitdiff_plain;h=67028d62e9e368d475e3381d134ffe01b40c3561;hp=a577b9530c7c091e6800bca9dca4fd03c37ce039

cleanup and put comments on the deadlock workaround in miniloop
---

diff --git a/lib/Object/Remote/MiniLoop.pm b/lib/Object/Remote/MiniLoop.pm
index faa4a38..ee1f544 100644
--- a/lib/Object/Remote/MiniLoop.pm
+++ b/lib/Object/Remote/MiniLoop.pm
@@ -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,21 +161,23 @@ 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;
   }
   
   log_trace { "Read from $read_count filehandles; wrote to $write_count filehandles" };
@@ -189,18 +190,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" };