improved accept performance of the standalone daemon with EV backend …

…by up to 1000%
mojolicious · Sep 24, 2011 · 0a59916 · 0a59916
1 parent e077135
commit 0a59916
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 40 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,6 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-1.99    2011-09-22 00:00:00
+1.99    2011-09-24 00:00:00
         - Deprecated direct hash access to the flash in
           Mojolicious::Controller.
         - Added EXPERIMENTAL group function to Mojolicious::Lite.
@@ -11,6 +11,8 @@ This file documents the revision history for Perl extension Mojolicious.
         - Updated WebSocket implementation to ietf-15.
         - Improved documentation.
         - Improved CSS of some built-in templates.
+        - Improved accept performance of the standalone daemon with EV
+          backend by up to 1000%.
         - Fixed CSS of built-in exception template.
         - Fixed close event bug in Mojo::IOLoop.
         - Fixed small redirect_to bug. (judofyr, sri)

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -21,9 +21,7 @@ has iowatcher       => sub {
 };
 has max_accepts     => 0;
 has max_connections => 1000;
-has [qw/on_lock on_unlock/] => sub {
-  sub {1}
-};
+has [qw/on_lock on_unlock/];
 has resolver => sub {
   my $resolver = Mojo::IOLoop::Resolver->new(ioloop => shift);
   weaken $resolver->{ioloop};
@@ -392,7 +390,7 @@ sub _listening {
   return unless keys %$servers;
   my $i = keys %{$self->{connections}};
   return unless $i < $self->max_connections;
-  return unless $self->on_lock->($self, !$i);
+  if (my $cb = $self->on_lock) { return unless $self->$cb(!$i) }
 
   # Start listening
   $_->resume for values %$servers;
@@ -404,7 +402,8 @@ sub _not_listening {
 
   # Check if we are listening
   return unless delete $self->{listening};
-  $self->on_unlock->($self);
+  return unless my $cb = $self->on_unlock;
+  $self->$cb();
 
   # Stop listening
   $_->pause for values %{$self->{servers} || {}};

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -125,26 +125,23 @@ sub listen {
   $self->{handle} = $handle;
 
   # TLS
-  if ($args->{tls}) {
-
-    # No TLS support
-    croak "IO::Socket::SSL 1.43 required for TLS support" unless TLS;
-
-    # Options
-    my %options = (
-      SSL_startHandshake => 0,
-      SSL_cert_file      => $args->{tls_cert} || $self->_cert_file,
-      SSL_key_file       => $args->{tls_key} || $self->_key_file,
-    );
-    %options = (
-      SSL_verify_callback => $args->{tls_verify},
-      SSL_ca_file         => -T $args->{tls_ca} ? $args->{tls_ca} : undef,
-      SSL_ca_path         => -d $args->{tls_ca} ? $args->{tls_ca} : undef,
-      SSL_verify_mode     => $args->{tls_ca} ? 0x03 : undef,
-      %options
-    ) if $args->{tls_ca};
-    $self->{tls} = {%options, %{$args->{tls_args} || {}}};
-  }
+  return unless $args->{tls};
+  croak "IO::Socket::SSL 1.43 required for TLS support" unless TLS;
+
+  # Options
+  my %options = (
+    SSL_startHandshake => 0,
+    SSL_cert_file      => $args->{tls_cert} || $self->_cert_file,
+    SSL_key_file       => $args->{tls_key} || $self->_key_file,
+  );
+  %options = (
+    SSL_verify_callback => $args->{tls_verify},
+    SSL_ca_file         => -T $args->{tls_ca} ? $args->{tls_ca} : undef,
+    SSL_ca_path         => -d $args->{tls_ca} ? $args->{tls_ca} : undef,
+    SSL_verify_mode     => $args->{tls_ca} ? 0x03 : undef,
+    %options
+  ) if $args->{tls_ca};
+  $self->{tls} = {%options, %{$args->{tls_args} || {}}};
 }
 
 sub generate_port {

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -27,7 +27,6 @@ sub DESTROY {
 sub new {
   my $self = shift->SUPER::new;
   $self->{handle} = shift;
-  $self->{handle}->blocking(0);
   $self->{buffer} = '';
   return $self;
 }

diff --git a/lib/Mojo/IOWatcher.pm b/lib/Mojo/IOWatcher.pm
@@ -51,13 +51,9 @@ sub is_readable {
 
 sub not_writing {
   my ($self, $handle) = @_;
-
-  # Make sure we only watch for readable events
   my $poll = $self->_poll;
-  $poll->remove($handle)
-    if delete $self->{handles}->{fileno $handle}->{writing};
+  $poll->remove($handle);
   $poll->mask($handle, POLLIN);
-
   return $self;
 }
 
@@ -112,12 +108,9 @@ sub timer { shift->_timer(pop, after => pop, started => time) }
 
 sub writing {
   my ($self, $handle) = @_;
-
   my $poll = $self->_poll;
   $poll->remove($handle);
   $poll->mask($handle, POLLIN | POLLOUT);
-  $self->{handles}->{fileno $handle}->{writing} = 1;
-
   return $self;
 }
 

diff --git a/lib/Mojo/IOWatcher/EV.pm b/lib/Mojo/IOWatcher/EV.pm
@@ -16,8 +16,7 @@ sub not_writing {
 
   my $fd = fileno $handle;
   my $h  = $self->{handles}->{$fd};
-  my $w  = $h->{watcher};
-  if ($w) { $w->set($fd, EV::READ) if delete $h->{writing} }
+  if (my $w = $h->{watcher}) { $w->set($fd, EV::READ) }
   else {
     weaken $self;
     $h->{watcher} = EV::io($fd, EV::READ, sub { $self->_io($fd, @_) });
@@ -50,14 +49,12 @@ sub writing {
 
   my $fd = fileno $handle;
   my $h  = $self->{handles}->{$fd};
-  my $w  = $h->{watcher};
-  if ($w) { $w->set($fd, EV::WRITE | EV::READ) }
+  if (my $w = $h->{watcher}) { $w->set($fd, EV::WRITE | EV::READ) }
   else {
     weaken $self;
     $h->{watcher} =
       EV::io($fd, EV::WRITE | EV::READ, sub { $self->_io($fd, @_) });
   }
-  $h->{writing} = 1;
 
   return $self;
 }