mirror of
https://github.com/golang/net.git
synced 2026-03-31 18:37:08 +09:00
Eliminate bounds checks and eschews UTF-8 decoding in ValidHeaderFieldName,
thereby doubling its speed without introducing any allocations.
Also eliminate bounds checks in IsTokenRune.
Add tests and benchmarks for both ValidHeaderFieldName and IsTokenRune.
goos: darwin
goarch: amd64
pkg: golang.org/x/net/http/httpguts
cpu: Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz
│ before │ after │
│ sec/op │ sec/op vs base │
IsTokenRune-8 315.2n ± 0% 316.2n ± 1% ~ (p=0.245 n=20)
ValidHeaderFieldName-8 62.77n ± 0% 29.16n ± 0% -53.55% (p=0.000 n=20)
geomean 140.7n 96.02n -31.73%
│ before │ after │
│ B/op │ B/op vs base │
IsTokenRune-8 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=20)
ValidHeaderFieldName-8 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=20)
geomean ² +0.00%
│ before │ after │
│ allocs/op │ allocs/op vs base │
IsTokenRune-8 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=20)
ValidHeaderFieldName-8 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=20)
geomean ² +0.00%
Fixes golang/go#66700
Change-Id: Ia3ea80e5f0d173e3a69eb7429023587fd7bc5933
GitHub-Last-Rev: 1f1d25d1ec
GitHub-Pull-Request: golang/net#207
Reviewed-on: https://go-review.googlesource.com/c/net/+/578075
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
167 lines
3.1 KiB
Go
167 lines
3.1 KiB
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package httpguts
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
func isChar(c rune) bool { return c <= 127 }
|
|
|
|
func isCtl(c rune) bool { return c <= 31 || c == 127 }
|
|
|
|
func isSeparator(c rune) bool {
|
|
switch c {
|
|
case '(', ')', '<', '>', '@', ',', ';', ':', '\\', '"', '/', '[', ']', '?', '=', '{', '}', ' ', '\t':
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func TestIsTokenRune(t *testing.T) {
|
|
for i := 0; i <= 130; i++ {
|
|
r := rune(i)
|
|
expected := isChar(r) && !isCtl(r) && !isSeparator(r)
|
|
if IsTokenRune(r) != expected {
|
|
t.Errorf("isToken(0x%x) = %v", r, !expected)
|
|
}
|
|
}
|
|
}
|
|
|
|
func BenchmarkIsTokenRune(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
var r rune
|
|
for ; r < 1024; r++ {
|
|
IsTokenRune(r)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestHeaderValuesContainsToken(t *testing.T) {
|
|
tests := []struct {
|
|
vals []string
|
|
token string
|
|
want bool
|
|
}{
|
|
{
|
|
vals: []string{"foo"},
|
|
token: "foo",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"bar", "foo"},
|
|
token: "foo",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"foo"},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"foo"},
|
|
token: "bar",
|
|
want: false,
|
|
},
|
|
{
|
|
vals: []string{" foo "},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"foo,bar"},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"bar,foo,bar"},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"bar , foo"},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"foo ,bar "},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"bar, foo ,bar"},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
{
|
|
vals: []string{"bar , foo"},
|
|
token: "FOO",
|
|
want: true,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
got := HeaderValuesContainsToken(tt.vals, tt.token)
|
|
if got != tt.want {
|
|
t.Errorf("headerValuesContainsToken(%q, %q) = %v; want %v", tt.vals, tt.token, got, tt.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidHeaderFieldName(t *testing.T) {
|
|
tests := []struct {
|
|
in string
|
|
want bool
|
|
}{
|
|
{"", false},
|
|
{"Accept Charset", false},
|
|
{"Accept-Charset", true},
|
|
{"AccepT-EncodinG", true},
|
|
{"CONNECTION", true},
|
|
{"résumé", false},
|
|
}
|
|
for _, tt := range tests {
|
|
got := ValidHeaderFieldName(tt.in)
|
|
if tt.want != got {
|
|
t.Errorf("ValidHeaderFieldName(%q) = %t; want %t", tt.in, got, tt.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func BenchmarkValidHeaderFieldName(b *testing.B) {
|
|
names := []string{
|
|
"",
|
|
"Accept Charset",
|
|
"Accept-Charset",
|
|
"AccepT-EncodinG",
|
|
"CONNECTION",
|
|
"résumé",
|
|
}
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
for i := 0; i < b.N; i++ {
|
|
for _, name := range names {
|
|
ValidHeaderFieldName(name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPunycodeHostPort(t *testing.T) {
|
|
tests := []struct {
|
|
in, want string
|
|
}{
|
|
{"www.google.com", "www.google.com"},
|
|
{"гофер.рф", "xn--c1ae0ajs.xn--p1ai"},
|
|
{"bücher.de", "xn--bcher-kva.de"},
|
|
{"bücher.de:8080", "xn--bcher-kva.de:8080"},
|
|
{"[1::6]:8080", "[1::6]:8080"},
|
|
}
|
|
for _, tt := range tests {
|
|
got, err := PunycodeHostPort(tt.in)
|
|
if tt.want != got || err != nil {
|
|
t.Errorf("PunycodeHostPort(%q) = %q, %v, want %q, nil", tt.in, got, err, tt.want)
|
|
}
|
|
}
|
|
}
|