small optimizations

mojolicious · Jan 20, 2013 · cf6b807 · cf6b807
1 parent 54df770
commit cf6b807
Show file tree

Hide file tree

Showing 44 changed files with 53 additions and 173 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-3.83  2013-01-19
+3.83  2013-01-20
   - Improved documentation.
 
 3.82  2013-01-18

diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -145,8 +145,6 @@ sub parse {
       $self->_uncompress($chunk);
       $self->{size} += length $chunk;
     }
-
-    # Finished
     $self->{state} = 'finished' if $len <= $self->progress;
   }
 
@@ -169,43 +167,31 @@ sub progress {
 sub write {
   my ($self, $chunk, $cb) = @_;
 
-  # Dynamic content
+  # Buffer chunk
   $self->{dynamic} = 1;
-
-  # Add chunk
   if (defined $chunk) { $self->{body_buffer} .= $chunk }
 
   # Delay
   else { $self->{delay} = 1 }
 
   # Drain
   $self->once(drain => $cb) if $cb;
-
-  # Finish
   $self->{eof} = 1 if defined $chunk && $chunk eq '';
 
   return $self;
 }
 
 sub write_chunk {
   my ($self, $chunk, $cb) = @_;
-
-  # Chunked transfer encoding
   $self->headers->transfer_encoding('chunked') unless $self->is_chunked;
-
-  # Write
   $self->write(defined $chunk ? $self->_build_chunk($chunk) : $chunk, $cb);
-
-  # Finish
   $self->{eof} = 1 if defined $chunk && $chunk eq '';
-
   return $self;
 }
 
 sub _build {
   my ($self, $method) = @_;
 
-  # Build part from chunks
   my $buffer = '';
   my $offset = 0;
   while (1) {
@@ -216,7 +202,6 @@ sub _build {
     # End of part
     last unless my $len = length $chunk;
 
-    # Part
     $offset += $len;
     $buffer .= $chunk;
   }
@@ -302,7 +287,7 @@ sub _parse_headers {
 sub _parse_until_body {
   my ($self, $chunk) = @_;
 
-  # Add chunk
+  # Buffer chunk
   $self->{raw_size} += length($chunk //= '');
   $self->{pre_buffer} .= $chunk;
 

diff --git a/lib/Mojo/Content/MultiPart.pm b/lib/Mojo/Content/MultiPart.pm
@@ -150,8 +150,6 @@ sub _parse_multipart_boundary {
   my $end = "\x0d\x0a--$boundary--";
   if ((index $self->{multipart}, $end) == 0) {
     substr $self->{multipart}, 0, length $end, '';
-
-    # Finished
     $self->{multi_state} = 'finished';
   }
 

diff --git a/lib/Mojo/Content/Single.pm b/lib/Mojo/Content/Single.pm
@@ -30,11 +30,7 @@ sub clone {
 
 sub get_body_chunk {
   my ($self, $offset) = @_;
-
-  # Body generator
   return $self->generate_body_chunk($offset) if $self->{dynamic};
-
-  # Normal content
   return $self->asset->get_chunk($offset);
 }
 

diff --git a/lib/Mojo/Cookie.pm b/lib/Mojo/Cookie.pm
@@ -30,8 +30,6 @@ sub _tokenize {
     # Value
     my $value;
     $value = unquote $1 if $string =~ s/^("(?:\\\\|\\"|[^"])+"|[^;,]+)\s*//;
-
-    # Token
     push @token, [$name, $value];
 
     # Separator

diff --git a/lib/Mojo/Cookie/Request.pm b/lib/Mojo/Cookie/Request.pm
@@ -6,7 +6,6 @@ use Mojo::Util 'quote';
 sub parse {
   my ($self, $string) = @_;
 
-  # Walk tree
   my @cookies;
   for my $token (map {@$_} $self->_tokenize($string)) {
     my ($name, $value) = @$token;

diff --git a/lib/Mojo/Cookie/Response.pm b/lib/Mojo/Cookie/Response.pm
@@ -15,8 +15,6 @@ sub expires {
     ? Mojo::Date->new($self->{expires})
     : $self->{expires}
     unless @_;
-
-  # New expires value
   $self->{expires} = shift;
 
   return $self;

diff --git a/lib/Mojo/DOM/CSS.pm b/lib/Mojo/DOM/CSS.pm
@@ -36,13 +36,11 @@ my $TOKEN_RE        = qr/
 sub select {
   my $self = shift;
 
-  # Compile selectors
-  my $pattern = $self->_compile(shift);
-
-  # Walk tree
+  # Compile selectors and walk tree
   my @results;
-  my $tree  = $self->tree;
-  my @queue = ($tree);
+  my $pattern = $self->_compile(shift);
+  my $tree    = $self->tree;
+  my @queue   = ($tree);
   while (my $current = shift @queue) {
     my $type = $current->[0];
 

diff --git a/lib/Mojo/DOM/HTML.pm b/lib/Mojo/DOM/HTML.pm
@@ -269,14 +269,10 @@ sub _render {
   # Processing instruction
   return "<?" . $tree->[1] . "?>" if $e eq 'pi';
 
-  # Offset
-  my $start = $e eq 'root' ? 1 : 2;
-
   # Start tag
+  my $start = $e eq 'root' ? 1 : 2;
   my $content = '';
   if ($e eq 'tag') {
-
-    # Offset
     $start = 4;
 
     # Open tag

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -134,7 +134,6 @@ sub remove {
 sub to_hash {
   my ($self, $multi) = @_;
 
-  # Build
   my %hash;
   for my $header (@{$self->names}) {
     my @headers = $self->header($header);

diff --git a/lib/Mojo/IOLoop/Stream.pm b/lib/Mojo/IOLoop/Stream.pm
@@ -65,10 +65,8 @@ sub steal_handle {
 sub write {
   my ($self, $chunk, $cb) = @_;
 
-  # Prepare chunk for writing
-  $self->{buffer} .= $chunk;
-
   # Write with roundtrip
+  $self->{buffer} .= $chunk;
   if ($cb) { $self->once(drain => $cb) }
   else     { return $self unless length $self->{buffer} }
 
@@ -82,10 +80,7 @@ sub write {
 sub _read {
   my $self = shift;
 
-  # Read
   my $read = $self->{handle}->sysread(my $buffer, 131072, 0);
-
-  # Error
   unless (defined $read) {
 
     # Retry
@@ -101,7 +96,6 @@ sub _read {
   # EOF
   return $self->close if $read == 0;
 
-  # Handle read
   $self->emit_safe(read => $buffer)->{active} = time;
 }
 
@@ -129,8 +123,6 @@ sub _write {
   my $handle = $self->{handle};
   if (length $self->{buffer}) {
     my $written = $handle->syswrite($self->{buffer});
-
-    # Error
     unless (defined $written) {
 
       # Retry
@@ -148,7 +140,7 @@ sub _write {
     $self->{active} = time;
   }
 
-  # Handle drain
+  # Drain
   $self->emit_safe('drain') if !length $self->{buffer};
 
   # Stop writing

diff --git a/lib/Mojo/JSON.pm b/lib/Mojo/JSON.pm
@@ -43,7 +43,7 @@ my $WHITESPACE_RE = qr/[\x20\x09\x0a\x0d]*/;
 sub decode {
   my ($self, $bytes) = @_;
 
-  # Cleanup
+  # Clean start
   $self->error(undef);
 
   # Missing input
@@ -256,22 +256,14 @@ sub _encode_array {
 
 sub _encode_object {
   my $object = shift;
-
-  # Encode pairs
   my @pairs = map { _encode_string($_) . ':' . _encode_values($object->{$_}) }
     keys %$object;
-
-  # Stringify
   return '{' . join(',', @pairs) . '}';
 }
 
 sub _encode_string {
   my $string = shift;
-
-  # Escape string
   $string =~ s!([\x00-\x1F\x7F\x{2028}\x{2029}\\"/\b\f\n\r\t])!$REVERSE{$1}!gs;
-
-  # Stringify
   return "\"$string\"";
 }
 
@@ -322,7 +314,6 @@ sub _exception {
     $context .= ' at line ' . @lines . ', offset ' . length(pop @lines || '');
   }
 
-  # Throw
   die "$context\n";
 }
 

diff --git a/lib/Mojo/Loader.pm b/lib/Mojo/Loader.pm
@@ -69,7 +69,7 @@ sub _all {
   # Ignore everything after __END__
   $content =~ s/\n__END__\r?\n.*$/\n/s;
 
-  # Split
+  # Split files
   my @data = split /^@@\s*(.+?)\s*\r?\n/m, $content;
   shift @data;
 

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -42,8 +42,6 @@ sub body {
 
 sub body_params {
   my $self = shift;
-
-  # Cached
   return $self->{body_params} if $self->{body_params};
 
   # Charset
@@ -59,15 +57,9 @@ sub body_params {
   # "multipart/formdata"
   elsif ($type =~ m!multipart/form-data!i) {
     my $formdata = $self->_parse_formdata;
-
-    # Formdata
     for my $data (@$formdata) {
       my ($name, $filename, $value) = @$data;
-
-      # File
       next if defined $filename;
-
-      # Form value
       $params->append($name, $value);
     }
   }
@@ -143,14 +135,9 @@ sub fix_headers {
 sub get_body_chunk {
   my ($self, $offset) = @_;
 
-  # Progress
   $self->emit('progress', 'body', $offset);
-
-  # Chunk
   my $chunk = $self->content->get_body_chunk($offset);
   return $chunk if !defined $chunk || length $chunk;
-
-  # Finish
   $self->finish;
 
   return $chunk;
@@ -227,7 +214,6 @@ sub parse {
   return $self->error('Maximum buffer size exceeded', 400)
     if $self->content->is_limit_exceeded;
 
-  # Progress
   return $self->emit('progress')->content->is_finished ? $self->finish : $self;
 }
 
@@ -280,7 +266,6 @@ sub write_chunk { shift->_write(write_chunk => @_) }
 sub _build {
   my ($self, $method) = @_;
 
-  # Build part from chunks
   my $buffer = '';
   my $offset = 0;
   while (1) {
@@ -291,7 +276,6 @@ sub _build {
     # End of part
     last unless my $len = length $chunk;
 
-    # Part
     $offset += $len;
     $buffer .= $chunk;
   }
@@ -329,7 +313,7 @@ sub _parse_formdata {
   return \@formdata unless $content->is_multipart;
   my $charset = $content->charset || $self->default_charset;
 
-  # Walk the tree
+  # Walk tree
   my @parts;
   push @parts, $content;
   while (my $part = shift @parts) {

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -100,7 +100,7 @@ sub fix_headers {
 sub get_start_line_chunk {
   my ($self, $offset) = @_;
 
-  # Request line
+  # Prepare request line
   unless (defined $self->{start_buffer}) {
 
     # Path
@@ -128,10 +128,7 @@ sub get_start_line_chunk {
     $self->{start_buffer} = "$method $path HTTP/@{[$self->version]}\x0d\x0a";
   }
 
-  # Progress
   $self->emit(progress => 'start_line', $offset);
-
-  # Chunk
   return substr $self->{start_buffer}, $offset, 131072;
 }
 

diff --git a/lib/Mojo/Message/Response.pm b/lib/Mojo/Message/Response.pm
@@ -116,17 +116,14 @@ sub fix_headers {
 sub get_start_line_chunk {
   my ($self, $offset) = @_;
 
-  # Status line
+  # Prepare status line
   unless (defined $self->{start_buffer}) {
     my $code = $self->code    || 404;
     my $msg  = $self->message || $self->default_message;
     $self->{start_buffer} = "HTTP/@{[$self->version]} $code $msg\x0d\x0a";
   }
 
-  # Progress
   $self->emit(progress => 'start_line', $offset);
-
-  # Chunk
   return substr $self->{start_buffer}, $offset, 131072;
 }