Merge pull request #273 from CAFxX/cafxx-buffer-opts

Make Buffer.Append{String,Bytes} inlineable

buffer/pool.go

@@ -113,6 +113,14 @@ func (b *Buffer) AppendByte(data byte) {
 
 // AppendBytes appends a byte slice to buffer.
 func (b *Buffer) AppendBytes(data []byte) {
+	if len(data) <= cap(b.Buf)-len(b.Buf) {
+		b.Buf = append(b.Buf, data...) // fast path
+	} else {
+		b.appendBytesSlow(data)
+	}
+}
+
+func (b *Buffer) appendBytesSlow(data []byte) {
 	for len(data) > 0 {
 		if cap(b.Buf) == len(b.Buf) { // EnsureSpace won't be inlined.
 			b.EnsureSpace(1)
@@ -128,8 +136,16 @@ func (b *Buffer) AppendBytes(data []byte) {
 	}
 }
 
-// AppendBytes appends a string to buffer.
+// AppendString appends a string to buffer.
 func (b *Buffer) AppendString(data string) {
+	if len(data) <= cap(b.Buf)-len(b.Buf) {
+		b.Buf = append(b.Buf, data...) // fast path
+	} else {
+		b.appendStringSlow(data)
+	}
+}
+
+func (b *Buffer) appendStringSlow(data string) {
 	for len(data) > 0 {
 		if cap(b.Buf) == len(b.Buf) { // EnsureSpace won't be inlined.
 			b.EnsureSpace(1)

buffer/pool_test.go

@@ -42,7 +42,7 @@ func TestAppendString(t *testing.T) {
 
 	s := "test"
 	for i := 0; i < 1000; i++ {
-		b.AppendBytes([]byte(s))
+		b.AppendString(s)
 		want = append(want, s...)
 	}