small optimizations

mojolicious · Jan 22, 2013 · 81ce848 · 81ce848
1 parent 8696a62
commit 81ce848
Show file tree

Hide file tree

Showing 59 changed files with 49 additions and 240 deletions.
diff --git a/lib/Mojo/Asset/File.pm b/lib/Mojo/Asset/File.pm
@@ -59,7 +59,6 @@ sub add_chunk {
 sub contains {
   my ($self, $string) = @_;
 
-  # Seek to start
   my $handle = $self->handle;
   $handle->sysseek($self->start_range, SEEK_SET);
 
@@ -95,12 +94,10 @@ sub contains {
 sub get_chunk {
   my ($self, $start) = @_;
 
-  # Seek to start
   $start += $self->start_range;
   my $handle = $self->handle;
   $handle->sysseek($start, SEEK_SET);
 
-  # Range support
   my $buffer;
   if (defined(my $end = $self->end_range)) {
     my $chunk = $end + 1 - $start;

diff --git a/lib/Mojo/Base.pm b/lib/Mojo/Base.pm
@@ -2,8 +2,6 @@ package Mojo::Base;
 
 use strict;
 use warnings;
-
-# Mojo modules are modern!
 use utf8;
 use feature ();
 
@@ -16,8 +14,6 @@ use IO::Handle ();
 sub import {
   my $class = shift;
   return unless my $flag = shift;
-
-  # No limits!
   no strict 'refs';
 
   # Base
@@ -37,8 +33,6 @@ sub import {
   if ($flag) {
     my $caller = caller;
     push @{"${caller}::ISA"}, $flag;
-
-    # Can haz?
     *{"${caller}::has"} = sub { attr($caller, @_) };
   }
 
@@ -61,11 +55,10 @@ sub attr {
   my ($class, $attrs, $default) = @_;
   return unless ($class = ref $class || $class) && $attrs;
 
-  # Check default
   Carp::croak('Default has to be a code reference or constant value')
     if ref $default && ref $default ne 'CODE';
 
-  # Create attributes
+  # Compile attributes
   for my $attr (@{ref $attrs eq 'ARRAY' ? $attrs : [$attrs]}) {
     Carp::croak(qq{Attribute "$attr" invalid})
       unless $attr =~ /^[a-zA-Z_]\w*$/;

diff --git a/lib/Mojo/Cache.pm b/lib/Mojo/Cache.pm
@@ -8,7 +8,6 @@ sub get { (shift->{cache} || {})->{shift()} }
 sub set {
   my ($self, $key, $value) = @_;
 
-  # Cache with size limit
   my $cache = $self->{cache} ||= {};
   my $queue = $self->{queue} ||= [];
   delete $cache->{shift @$queue} if @$queue >= $self->max_keys;

diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -40,14 +40,9 @@ sub clone {
 sub generate_body_chunk {
   my ($self, $offset) = @_;
 
-  # Drain
   $self->emit(drain => $offset)
     if !delete $self->{delay} && !length($self->{body_buffer} // '');
-
-  # Empty buffer
   my $chunk = delete $self->{body_buffer} // '';
-
-  # EOF or delay
   return $self->{eof} ? '' : undef unless length $chunk;
 
   return $chunk;
@@ -287,17 +282,13 @@ sub _parse_headers {
 sub _parse_until_body {
   my ($self, $chunk) = @_;
 
-  # Buffer chunk
   $self->{raw_size} += length($chunk //= '');
   $self->{pre_buffer} .= $chunk;
 
-  # Parser started
   unless ($self->{state}) {
     $self->{header_size} = $self->{raw_size} - length $self->{pre_buffer};
     $self->{state}       = 'headers';
   }
-
-  # Parse headers
   $self->_parse_headers if ($self->{state} // '') eq 'headers';
 }
 

diff --git a/lib/Mojo/Content/MultiPart.pm b/lib/Mojo/Content/MultiPart.pm
@@ -23,7 +23,7 @@ sub body_contains {
 sub body_size {
   my $self = shift;
 
-  # Check for Content-Lenght header
+  # Check for existing Content-Lenght header
   my $content_len = $self->headers->content_length;
   return $content_len if $content_len;
 
@@ -172,7 +172,6 @@ sub _parse_multipart_preamble {
 sub _read {
   my ($self, $chunk) = @_;
 
-  # Buffer chunk and parse multipart content
   $self->{multipart} .= $chunk;
   my $boundary = $self->boundary;
   until (($self->{multi_state} //= 'multipart_preamble') eq 'finished') {

diff --git a/lib/Mojo/DOM.pm b/lib/Mojo/DOM.pm
@@ -106,7 +106,6 @@ sub content_xml {
 sub find {
   my ($self, $selector) = @_;
 
-  # Match selector against tree and upgrade results
   my $charset = $self->charset;
   my $xml     = $self->xml;
   return Mojo::Collection->new(
@@ -197,7 +196,6 @@ sub replace_content {
 sub root {
   my $self = shift;
 
-  # Find root
   my $root = $self->tree;
   while ($root->[0] eq 'tag') {
     last unless my $parent = $root->[3];

diff --git a/lib/Mojo/DOM/CSS.pm b/lib/Mojo/DOM/CSS.pm
@@ -36,7 +36,6 @@ my $TOKEN_RE        = qr/
 sub select {
   my $self = shift;
 
-  # Compile selectors and walk tree
   my @results;
   my $pattern = $self->_compile(shift);
   my $tree    = $self->tree;
@@ -121,7 +120,6 @@ sub _combinator {
 sub _compile {
   my ($self, $css) = @_;
 
-  # Tokenize
   my $pattern = [[]];
   while ($css =~ /$TOKEN_RE/g) {
     my ($separator, $element, $pc, $attrs, $combinator)
@@ -319,7 +317,6 @@ sub _regex {
 sub _selector {
   my ($self, $selector, $current) = @_;
 
-  # Selectors
   for my $s (@$selector[1 .. $#$selector]) {
     my $type = $s->[0];
 
@@ -346,7 +343,6 @@ sub _selector {
 sub _sibling {
   my ($self, $selectors, $current, $tree, $immediate) = @_;
 
-  # Find preceding elements
   my $parent = $current->[3];
   my $found;
   my $start = $parent->[0] eq 'root' ? 1 : 4;

diff --git a/lib/Mojo/DOM/HTML.pm b/lib/Mojo/DOM/HTML.pm
@@ -76,11 +76,9 @@ my %INLINE = map { $_ => 1 } (
 sub parse {
   my ($self, $html) = @_;
 
-  # Try to decode
   my $charset = $self->charset;
   $html = decode($charset, $html) // return $self->charset(undef) if $charset;
 
-  # Tokenize
   my $tree    = ['root'];
   my $current = $tree;
   while ($html =~ m/\G$TOKEN_RE/gcs) {
@@ -358,7 +356,7 @@ sub _start {
     }
   }
 
-  # New
+  # New tag
   my $new = ['tag', $start, $attrs, $$current];
   weaken $new->[3];
   push @$$current, $new;

diff --git a/lib/Mojo/Date.pm b/lib/Mojo/Date.pm
@@ -9,7 +9,6 @@ use Time::Local 'timegm';
 
 has 'epoch';
 
-# Days and months
 my @DAYS   = qw(Sun Mon Tue Wed Thu Fri Sat);
 my @MONTHS = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 my %MONTHS;

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -162,7 +162,6 @@ sub to_string {
     push @headers, "$name: " . join("\x0d\x0a ", @$_) for $self->header($name);
   }
 
-  # Format headers
   return join "\x0d\x0a", @headers;
 }
 

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -42,7 +42,7 @@ sub acceptor {
   # Make sure connection manager is running
   $self->_manager;
 
-  # New acceptor
+  # Connect acceptor with reactor
   my $id = $self->_id;
   $self->{acceptors}{$id} = $acceptor;
   weaken $acceptor->reactor($self->reactor)->{reactor};
@@ -61,13 +61,11 @@ sub client {
   # Make sure connection manager is running
   $self->_manager;
 
-  # New client
   my $id     = $self->_id;
   my $c      = $self->{connections}{$id} ||= {};
   my $client = $c->{client} = Mojo::IOLoop::Client->new;
   weaken $client->reactor($self->reactor)->{reactor};
 
-  # Connect
   weaken $self;
   $client->on(
     connect => sub {
@@ -128,7 +126,6 @@ sub server {
   my ($self, $cb) = (shift, pop);
   $self = $self->singleton unless ref $self;
 
-  # New server
   my $server = Mojo::IOLoop::Server->new;
   weaken $self;
   $server->on(
@@ -213,7 +210,7 @@ sub _id {
 sub _manage {
   my $self = shift;
 
-  # Start accepting if possible
+  # Try to acquire accept mutex
   $self->_accepting;
 
   # Close connections gracefully
@@ -242,7 +239,6 @@ sub _not_accepting {
   return unless my $cb = $self->unlock;
   $self->$cb;
 
-  # Stop accepting
   $_->stop for values %{$self->{acceptors} || {}};
 }
 

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -115,7 +115,6 @@ sub stop { $_[0]->reactor->remove($_[0]->{handle}) }
 sub _accept {
   my $self = shift;
 
-  # Accept
   return unless my $handle = $self->{handle}->accept;
   $handle->blocking(0);
 

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -135,12 +135,10 @@ sub _write {
       return $self->emit_safe(error => $!)->close;
     }
 
-    # Remove written chunk from buffer
     $self->emit_safe(write => substr($self->{buffer}, 0, $written, ''));
     $self->{active} = time;
   }
 
-  # Drain
   $self->emit_safe('drain') if !length $self->{buffer};
 
   # Stop writing

diff --git a/lib/Mojo/JSON/Pointer.pm b/lib/Mojo/JSON/Pointer.pm
@@ -10,7 +10,6 @@ sub get      { shift->_pointer(0, @_) }
 sub _pointer {
   my ($self, $contains, $data, $pointer) = @_;
 
-  # Parse pointer and walk data structure
   $pointer = decode('UTF-8', url_unescape $pointer);
   return $data unless $pointer =~ s!^/!!;
   for my $p (split '/', $pointer) {

diff --git a/lib/Mojo/Loader.pm b/lib/Mojo/Loader.pm
@@ -6,7 +6,6 @@ use File::Spec::Functions qw(catdir catfile splitdir);
 use Mojo::Exception;
 use Mojo::Util qw(b64_decode class_to_path);
 
-# Cache
 my %CACHE;
 
 sub data {
@@ -34,7 +33,6 @@ sub load {
 sub search {
   my ($self, $namespace) = @_;
 
-  # Check all directories
   my (@modules, %found);
   for my $directory (@INC) {
     next unless -d (my $path = catdir $directory, split(/::|'/, $namespace));
@@ -43,8 +41,6 @@ sub search {
     opendir(my $dir, $path);
     for my $file (grep /\.pm$/, readdir $dir) {
       next if -d catfile splitdir($path), $file;
-
-      # Module found
       my $class = "${namespace}::" . fileparse $file, qr/\.pm/;
       push @modules, $class unless $found{$class}++;
     }

diff --git a/lib/Mojo/Log.pm b/lib/Mojo/Log.pm
@@ -59,10 +59,8 @@ sub warn { shift->log(warn => @_) }
 sub _message {
   my ($self, $level, @lines) = @_;
 
-  # Check level
   return unless $self->is_level($level) && (my $handle = $self->handle);
 
-  # Format lines and write to handle
   flock $handle, LOCK_EX;
   croak "Can't write to log: $!"
     unless defined $handle->syswrite($self->format($level, @lines));

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -42,9 +42,8 @@ sub body {
 
 sub body_params {
   my $self = shift;
-  return $self->{body_params} if $self->{body_params};
 
-  # Detect charset
+  return $self->{body_params} if $self->{body_params};
   my $params = $self->{body_params} = Mojo::Parameters->new;
   $params->charset($self->content->charset || $self->default_charset);
 

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -100,7 +100,6 @@ sub fix_headers {
 sub get_start_line_chunk {
   my ($self, $offset) = @_;
 
-  # Prepare request line
   unless (defined $self->{start_buffer}) {
 
     # Path

diff --git a/lib/Mojo/Message/Response.pm b/lib/Mojo/Message/Response.pm
@@ -116,7 +116,6 @@ sub fix_headers {
 sub get_start_line_chunk {
   my ($self, $offset) = @_;
 
-  # Prepare status line
   unless (defined $self->{start_buffer}) {
     my $code = $self->code    || 404;
     my $msg  = $self->message || $self->default_message;

diff --git a/lib/Mojo/Parameters.pm b/lib/Mojo/Parameters.pm
@@ -134,7 +134,6 @@ sub remove {
 sub to_hash {
   my $self = shift;
 
-  # Format
   my $params = $self->params;
   my %hash;
   for (my $i = 0; $i < @$params; $i += 2) {

diff --git a/lib/Mojo/Path.pm b/lib/Mojo/Path.pm
@@ -16,7 +16,6 @@ sub new { shift->SUPER::new->parse(@_) }
 sub canonicalize {
   my $self = shift;
 
-  # Resolve path
   my @parts;
   for my $part (@{$self->parts}) {
 

diff --git a/lib/Mojo/Reactor/Poll.pm b/lib/Mojo/Reactor/Poll.pm
@@ -17,7 +17,7 @@ sub is_running { !!shift->{running} }
 sub one_tick {
   my $self = shift;
 
-  # Remember state
+  # Remember state for later
   my $running = $self->{running};
   $self->{running} = 1;
 
@@ -56,7 +56,6 @@ sub one_tick {
       # Normal timer
       else { $self->remove($id) }
 
-      # Handle timer
       ++$i and $self->_sandbox("Timer $id", $t->{cb}) if $t->{cb};
     }
   }

diff --git a/lib/Mojo/Server/CGI.pm b/lib/Mojo/Server/CGI.pm
@@ -6,7 +6,6 @@ has 'nph';
 sub run {
   my $self = shift;
 
-  # Prepare transaction and store connection information
   my $tx  = $self->build_tx;
   my $req = $tx->req->parse(\%ENV);
   $tx->local_port($ENV{SERVER_PORT})->remote_address($ENV{REMOTE_ADDR});