small optimizations

mojolicious · May 4, 2013 · 1f76807 · 1f76807
1 parent 03f6d26
commit 1f76807
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-3.98  2013-05-04
+3.98  2013-05-05
   - Added is_empty method to Mojo::Transaction::HTTP.
   - Added close_gracefully method to Mojo::IOLoop::Stream.
   - Removed deprecated after_static_dispatch hook.

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -50,15 +50,34 @@ sub is_writing {
 
 sub start {
   my $self = shift;
-  return $self->_startup unless $self->{startup}++;
-  return unless delete $self->{paused};
-  $self->reactor->watch($self->{handle}, 1, $self->is_writing);
+
+  my $reactor = $self->reactor;
+  unless ($self->{timer}) {
+
+    # Timeout (ignore 0 timeout)
+    weaken $self;
+    $self->{timer} = $reactor->recurring(
+      1 => sub {
+        return unless my $timeout = $self->timeout;
+        my $diff = steady_time - $self->{active};
+        $self->emit_safe('timeout')->close if $diff >= $timeout;
+      }
+    );
+
+    $self->{active} = steady_time;
+    $reactor->io($self->{handle},
+      sub { pop() ? $self->_write : $self->_read });
+  }
+
+  # Resume
+  $reactor->watch($self->{handle}, 1, $self->is_writing)
+    if delete $self->{paused};
 }
 
 sub stop {
   my $self = shift;
-  return if $self->{paused}++;
-  $self->reactor->watch($self->{handle}, 0, $self->is_writing);
+  $self->reactor->watch($self->{handle}, 0, $self->is_writing)
+    unless $self->{paused}++;
 }
 
 sub steal_handle {
@@ -101,24 +120,6 @@ sub _read {
   $self->emit_safe(read => $buffer)->{active} = steady_time;
 }
 
-sub _startup {
-  my $self = shift;
-
-  # Timeout (ignore 0 timeout)
-  my $reactor = $self->reactor;
-  weaken $self;
-  $self->{timer} = $reactor->recurring(
-    1 => sub {
-      return unless my $timeout = $self->timeout;
-      $self->emit_safe('timeout')->close
-        if (steady_time - $self->{active}) >= $timeout;
-    }
-  );
-
-  $self->{active} = steady_time;
-  $reactor->io($self->{handle}, sub { pop() ? $self->_write : $self->_read });
-}
-
 sub _write {
   my $self = shift;
 

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -332,8 +332,9 @@ sub _handle {
   my ($self, $id, $close) = @_;
 
   # Remove request timeout
+  return unless my $loop = $self->_loop;
   my $c = $self->{connections}{$id};
-  $self->_loop->remove($c->{timeout}) if $c->{timeout};
+  $loop->remove($c->{timeout}) if $c->{timeout};
 
   # Finish WebSocket
   my $old = $c->{tx};