improved Mojo::IOLoop::Client not to start timers before the event lo…

…op is running
mojolicious · Jan 9, 2015 · 2628b2a · 2628b2a
1 parent b5bd406
commit 2628b2a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 34 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
-5.72  2015-01-08
+5.72  2015-01-09
   - Improved Mojo::Reactor::EV performance slightly.
+  - Improved Mojo::IOLoop::Client not to start timers before the event loop
+    is running.
 
 5.71  2015-01-01
   - Updated Net::DNS::Native requirement to 0.15 for some important bug fixes.

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -32,36 +32,9 @@ has reactor => sub { Mojo::IOLoop->singleton->reactor };
 sub DESTROY { shift->_cleanup }
 
 sub connect {
-  my $self = shift;
-  my $args = ref $_[0] ? $_[0] : {@_};
-
-  # Timeout
+  my ($self, $args) = (shift, ref $_[0] ? $_[0] : {@_});
   weaken $self;
-  my $reactor = $self->reactor;
-  $self->{timer} = $reactor->timer($args->{timeout} || 10,
-    sub { $self->emit(error => 'Connect timeout') });
-
-  # Blocking name resolution
-  $_ && s/[[\]]//g for @$args{qw(address socks_address)};
-  my $address = $args->{socks_address} || ($args->{address} ||= '127.0.0.1');
-  return $reactor->next_tick(sub { $self && $self->_connect($args) })
-    if !NDN || $args->{handle};
-
-  # Non-blocking name resolution
-  my $handle = $self->{dns} = $NDN->getaddrinfo($address, _port($args),
-    {protocol => IPPROTO_TCP, socktype => SOCK_STREAM});
-  $reactor->io(
-    $handle => sub {
-      my $reactor = shift;
-
-      $reactor->remove($self->{dns});
-      my ($err, @res) = $NDN->get_result(delete $self->{dns});
-      return $self->emit(error => "Can't resolve: $err") if $err;
-
-      $args->{addr_info} = \@res;
-      $self->_connect($args);
-    }
-  )->watch($handle, 1, 0);
+  $self->reactor->next_tick(sub { $self && $self->_resolve($args) });
 }
 
 sub _cleanup {
@@ -110,6 +83,37 @@ sub _ready {
   $self->_try_socks($args);
 }
 
+sub _resolve {
+  my ($self, $args) = @_;
+
+  # Timeout
+  weaken $self;
+  my $reactor = $self->reactor;
+  $self->{timer} = $reactor->timer($args->{timeout} || 10,
+    sub { $self->emit(error => 'Connect timeout') });
+
+  # Blocking name resolution
+  $_ && s/[[\]]//g for @$args{qw(address socks_address)};
+  my $address = $args->{socks_address} || ($args->{address} ||= '127.0.0.1');
+  return $self->_connect($args) if !NDN || $args->{handle};
+
+  # Non-blocking name resolution
+  my $handle = $self->{dns} = $NDN->getaddrinfo($address, _port($args),
+    {protocol => IPPROTO_TCP, socktype => SOCK_STREAM});
+  $reactor->io(
+    $handle => sub {
+      my $reactor = shift;
+
+      $reactor->remove($self->{dns});
+      my ($err, @res) = $NDN->get_result(delete $self->{dns});
+      return $self->emit(error => "Can't resolve: $err") if $err;
+
+      $args->{addr_info} = \@res;
+      $self->_connect($args);
+    }
+  )->watch($handle, 1, 0);
+}
+
 sub _socks {
   my ($self, $args) = @_;
 

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -39,8 +39,7 @@ sub generate_port {
 sub handle { shift->{handle} }
 
 sub listen {
-  my $self = shift;
-  my $args = ref $_[0] ? $_[0] : {@_};
+  my ($self, $args) = (shift, ref $_[0] ? $_[0] : {@_});
 
   # Look for reusable file descriptor
   my $address = $args->{address} || '0.0.0.0';

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -211,8 +211,7 @@ sub req { shift->tx->req }
 sub res { shift->tx->res }
 
 sub respond_to {
-  my $self = shift;
-  my $args = ref $_[0] ? $_[0] : {@_};
+  my ($self, $args) = (shift, ref $_[0] ? $_[0] : {@_});
 
   # Find target
   my $target;