make Mojo::Reactor::Poll a little faster and reliable

mojolicious · Feb 11, 2015 · f3a06f3 · f3a06f3 · jamadam · Feb 12, 2015
1 parent 577d17c
commit f3a06f3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@
   - Replaced expires method in Mojo::Cookie::Response with an attribute.
   - Added split_cookie_header function to Mojo::Util.
   - Relaxed RFC 822/1123 and RFC 850/1036 handling in Mojo::Date.
+  - Improved Mojo::Reactor::Poll performance.
   - Improved design of built-in templates.
   - Fixed bug in Mojo::DOM that made parsing a requirement.
   - Fixed warnings in Mojo::URL.

diff --git a/lib/Mojo/Reactor.pm b/lib/Mojo/Reactor.pm
@@ -14,7 +14,7 @@ sub detect {
 
 sub io { croak 'Method "io" not implemented by subclass' }
 
-# This may break at some point in the future, but is worth it for performance
+# This may break in the future, but is worth it for performance
 sub is_readable {
   !(IO::Poll::_poll(0, fileno(pop), my $dummy = POLLIN | POLLPRI) == 0);
 }

diff --git a/lib/Mojo/Reactor/Poll.pm b/lib/Mojo/Reactor/Poll.pm
@@ -28,7 +28,6 @@ sub one_tick {
 
   # Wait for one event
   my $i;
-  my $poll = $self->_poll;
   until ($i) {
 
     # Stop automatically if there is nothing to watch
@@ -41,14 +40,21 @@ sub one_tick {
 
     # I/O
     if (keys %{$self->{io}}) {
-      $poll->poll($timeout);
-      for my $handle ($poll->handles(POLLIN | POLLPRI | POLLHUP | POLLERR)) {
-        next unless my $io = $self->{io}{fileno $handle};
-        ++$i and $self->_sandbox('Read', $io->{cb}, 0);
-      }
-      for my $handle ($poll->handles(POLLOUT)) {
-        next unless my $io = $self->{io}{fileno $handle};
-        ++$i and $self->_sandbox('Write', $io->{cb}, 1);
+      my @poll = map { $_ => $self->{io}{$_}{mode} } keys %{$self->{io}};
+
+      # This may break in the future, but is worth it for performance
+      if (IO::Poll::_poll($timeout, @poll) > 0) {
+        while (@poll) {
+          my ($fd, $mode) = (shift(@poll), shift(@poll));
+          if ($mode & (POLLIN | POLLPRI | POLLHUP | POLLERR)) {
+            next unless my $io = $self->{io}{$fd};
+            ++$i and $self->_sandbox('Read', $io->{cb}, 0);
+          }
+          if ($mode & POLLOUT) {
+            next unless my $io = $self->{io}{$fd};
+            ++$i and $self->_sandbox('Write', $io->{cb}, 1);
+          }
+        }
       }
     }
 
@@ -80,7 +86,6 @@ sub recurring { shift->_timer(1, @_) }
 sub remove {
   my ($self, $remove) = @_;
   return !!delete $self->{timers}{$remove} unless ref $remove;
-  $self->_poll->remove($remove);
   return !!delete $self->{io}{fileno $remove};
 }
 
@@ -102,10 +107,7 @@ sub watch {
   my $mode = 0;
   $mode |= POLLIN | POLLPRI if $read;
   $mode |= POLLOUT if $write;
-
-  my $poll = $self->_poll;
-  $poll->remove($handle);
-  $poll->mask($handle, $mode) if $mode != 0;
+  $self->{io}{fileno $handle}{mode} = $mode;
 
   return $self;
 }
@@ -117,8 +119,6 @@ sub _id {
   return $id;
 }
 
-sub _poll { shift->{poll} ||= IO::Poll->new }
-
 sub _sandbox {
   my ($self, $event, $cb) = (shift, shift, shift);
   eval { $self->$cb(@_); 1 } or $self->emit(error => "$event failed: $@");