separation of dynamic and static buffer pools

lxzan · Sep 1, 2023 · dcb010b · dcb010b
1 parent cba6bef
commit dcb010b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/benchmark_test.go b/benchmark_test.go
@@ -77,7 +77,7 @@ func BenchmarkConn_ReadMessage(b *testing.B) {
 			handler:  upgrader.eventHandler,
 		}
 		for i := 0; i < b.N; i++ {
-			internal.ResetBuffer(reader, buf.Bytes())
+			internal.BufferReset(reader, buf.Bytes())
 			conn2.br.Reset(reader)
 			_ = conn2.readMessage()
 		}
@@ -108,7 +108,7 @@ func BenchmarkConn_ReadMessage(b *testing.B) {
 			decompressor:    config.decompressors.Select(),
 		}
 		for i := 0; i < b.N; i++ {
-			internal.ResetBuffer(reader, buf.Bytes())
+			internal.BufferReset(reader, buf.Bytes())
 			conn2.br.Reset(reader)
 			_ = conn2.readMessage()
 		}
@@ -150,7 +150,7 @@ func BenchmarkStdDeCompress(b *testing.B) {
 	fr := flate.NewReader(nil)
 	src := bytes.NewBuffer(nil)
 	for i := 0; i < b.N; i++ {
-		internal.ResetBuffer(src, buffer.Bytes())
+		internal.BufferReset(src, buffer.Bytes())
 		_, _ = src.Write(internal.FlateTail)
 		resetter := fr.(flate.Resetter)
 		_ = resetter.Reset(src, nil)
@@ -168,7 +168,7 @@ func BenchmarkKlauspostDeCompress(b *testing.B) {
 	fr := klauspost.NewReader(nil)
 	src := bytes.NewBuffer(nil)
 	for i := 0; i < b.N; i++ {
-		internal.ResetBuffer(src, buffer.Bytes())
+		internal.BufferReset(src, buffer.Bytes())
 		_, _ = src.Write(internal.FlateTail)
 		resetter := fr.(klauspost.Resetter)
 		_ = resetter.Reset(src, nil)

diff --git a/internal/utils.go b/internal/utils.go
@@ -206,7 +206,9 @@ type Buffer struct {
 }
 
 //go:nosplit
-func ResetBuffer(b *bytes.Buffer, p []byte) {
+func BufferReset(b *bytes.Buffer, p []byte) {
 	buffer := (*Buffer)(unsafe.Pointer(b))
 	buffer.buf = p
+	buffer.off = 0
+	buffer.lastRead = 0
 }
diff --git a/internal/utils_test.go b/internal/utils_test.go
@@ -215,6 +215,6 @@ func TestResetBuffer(t *testing.T) {
 	var buf = bytes.NewBufferString("hello")
 	var p = buf.Bytes()
 	p = append(p, "world"...)
-	ResetBuffer(buf, p)
+	BufferReset(buf, p)
 	assert.Equal(t, "helloworld", buf.String())
 }
diff --git a/reader.go b/reader.go
@@ -108,7 +108,7 @@ func (c *Conn) readMessage() error {
 	}
 
 	if fin && opcode != OpcodeContinuation {
-		internal.ResetBuffer(buf, p)
+		internal.BufferReset(buf, p)
 		return c.emitMessage(&Message{index: index, Opcode: opcode, Data: buf, compressed: compressed})
 	}