mirror of https://github.com/tailscale/tailscale/
net/packet: use netaddr AppendTo methods
This lets us remote the types/strbuilder package, which had only a single user. And it's faster. name old time/op new time/op delta String/tcp4-8 175ns ± 0% 58ns ± 1% -66.95% (p=0.000 n=10+9) String/tcp6-8 226ns ± 1% 136ns ± 1% -39.85% (p=0.000 n=10+10) String/udp4-8 175ns ± 1% 58ns ± 1% -67.01% (p=0.000 n=10+9) String/udp6-8 230ns ± 1% 140ns ± 0% -39.32% (p=0.000 n=10+9) String/icmp4-8 164ns ± 0% 50ns ± 1% -69.89% (p=0.000 n=10+10) String/icmp6-8 217ns ± 1% 129ns ± 0% -40.46% (p=0.000 n=10+10) String/igmp-8 196ns ± 0% 56ns ± 1% -71.32% (p=0.000 n=10+10) String/unknown-8 2.06ns ± 1% 2.06ns ± 2% ~ (p=0.985 n=10+10) name old alloc/op new alloc/op delta String/tcp4-8 32.0B ± 0% 32.0B ± 0% ~ (all equal) String/tcp6-8 168B ± 0% 96B ± 0% -42.86% (p=0.000 n=10+10) String/udp4-8 32.0B ± 0% 32.0B ± 0% ~ (all equal) String/udp6-8 168B ± 0% 96B ± 0% -42.86% (p=0.000 n=10+10) String/icmp4-8 32.0B ± 0% 32.0B ± 0% ~ (all equal) String/icmp6-8 104B ± 0% 64B ± 0% -38.46% (p=0.000 n=10+10) String/igmp-8 48.0B ± 0% 48.0B ± 0% ~ (all equal) String/unknown-8 0.00B 0.00B ~ (all equal) name old allocs/op new allocs/op delta String/tcp4-8 1.00 ± 0% 1.00 ± 0% ~ (all equal) String/tcp6-8 3.00 ± 0% 1.00 ± 0% -66.67% (p=0.000 n=10+10) String/udp4-8 1.00 ± 0% 1.00 ± 0% ~ (all equal) String/udp6-8 3.00 ± 0% 1.00 ± 0% -66.67% (p=0.000 n=10+10) String/icmp4-8 1.00 ± 0% 1.00 ± 0% ~ (all equal) String/icmp6-8 3.00 ± 0% 1.00 ± 0% -66.67% (p=0.000 n=10+10) String/igmp-8 1.00 ± 0% 1.00 ± 0% ~ (all equal) String/unknown-8 0.00 0.00 ~ (all equal) Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>pull/1978/head
Josh Bleecher Snyder
4 years ago
committed by
Josh Bleecher Snyder
parent
d6d1951897
commit
5666663370
@ -1,74 +0,0 @@
|
|||||||
// Copyright (c) 2020 Tailscale Inc & 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 strbuilder defines a string builder type that allocates
|
|
||||||
// less than the standard library's strings.Builder by using a
|
|
||||||
// sync.Pool, so it doesn't matter if the compiler can't prove that
|
|
||||||
// the builder doesn't escape into the fmt package, etc.
|
|
||||||
package strbuilder
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"strconv"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
var pool = sync.Pool{
|
|
||||||
New: func() interface{} { return new(Builder) },
|
|
||||||
}
|
|
||||||
|
|
||||||
type Builder struct {
|
|
||||||
bb bytes.Buffer
|
|
||||||
scratch [20]byte // long enough for MinInt64, MaxUint64
|
|
||||||
locked bool // in pool, not for use
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get returns a new or reused string Builder.
|
|
||||||
func Get() *Builder {
|
|
||||||
b := pool.Get().(*Builder)
|
|
||||||
b.bb.Reset()
|
|
||||||
b.locked = false
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
// String both returns the Builder's string, and returns the builder
|
|
||||||
// to the pool.
|
|
||||||
func (b *Builder) String() string {
|
|
||||||
if b.locked {
|
|
||||||
panic("String called twiced on Builder")
|
|
||||||
}
|
|
||||||
s := b.bb.String()
|
|
||||||
b.locked = true
|
|
||||||
pool.Put(b)
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Builder) WriteByte(v byte) error {
|
|
||||||
return b.bb.WriteByte(v)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Builder) WriteString(s string) (int, error) {
|
|
||||||
return b.bb.WriteString(s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Builder) Write(p []byte) (int, error) {
|
|
||||||
return b.bb.Write(p)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Builder) WriteInt(v int64) {
|
|
||||||
b.Write(strconv.AppendInt(b.scratch[:0], v, 10))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Builder) WriteUint(v uint64) {
|
|
||||||
b.Write(strconv.AppendUint(b.scratch[:0], v, 10))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Grow grows the buffer's capacity, if necessary, to guarantee space
|
|
||||||
// for another n bytes. After Grow(n), at least n bytes can be written
|
|
||||||
// to the buffer without another allocation. If n is negative, Grow
|
|
||||||
// will panic. If the buffer can't grow it will panic with
|
|
||||||
// ErrTooLarge.
|
|
||||||
func (b *Builder) Grow(n int) {
|
|
||||||
b.bb.Grow(n)
|
|
||||||
}
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
// Copyright (c) 2020 Tailscale Inc & 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 strbuilder
|
|
||||||
|
|
||||||
import (
|
|
||||||
"math"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestBuilder(t *testing.T) {
|
|
||||||
const want = "Hello, world 123 -456!"
|
|
||||||
bang := []byte("!")
|
|
||||||
var got string
|
|
||||||
allocs := testing.AllocsPerRun(1000, func() {
|
|
||||||
sb := Get()
|
|
||||||
sb.WriteString("Hello, world ")
|
|
||||||
sb.WriteUint(123)
|
|
||||||
sb.WriteByte(' ')
|
|
||||||
sb.WriteInt(-456)
|
|
||||||
sb.Write(bang)
|
|
||||||
got = sb.String()
|
|
||||||
})
|
|
||||||
if got != want {
|
|
||||||
t.Errorf("got %q; want %q", got, want)
|
|
||||||
}
|
|
||||||
if allocs != 1 {
|
|
||||||
t.Errorf("allocs = %v; want 1", allocs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verifies scratch buf is large enough.
|
|
||||||
func TestIntBounds(t *testing.T) {
|
|
||||||
const want = "-9223372036854775808 9223372036854775807 18446744073709551615"
|
|
||||||
var got string
|
|
||||||
allocs := testing.AllocsPerRun(1000, func() {
|
|
||||||
sb := Get()
|
|
||||||
sb.WriteInt(math.MinInt64)
|
|
||||||
sb.WriteByte(' ')
|
|
||||||
sb.WriteInt(math.MaxInt64)
|
|
||||||
sb.WriteByte(' ')
|
|
||||||
sb.WriteUint(math.MaxUint64)
|
|
||||||
got = sb.String()
|
|
||||||
})
|
|
||||||
if got != want {
|
|
||||||
t.Errorf("got %q; want %q", got, want)
|
|
||||||
}
|
|
||||||
if allocs != 1 {
|
|
||||||
t.Errorf("allocs = %v; want 1", allocs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue