Merge pull request #555 from matheusd/switch-to-zeropool

bufferpool: Switch to zeropool
capnproto · Jun 1, 2024 · 2d1c565 · 2d1c565
2 parents e31b23c + d2c5fcb
commit 2d1c565
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/exp/bufferpool/pool.go b/exp/bufferpool/pool.go
@@ -3,6 +3,8 @@ package bufferpool
 
 import (
 	"sync"
+
+	"github.com/colega/zeropool"
 )
 
 const (
@@ -90,20 +92,20 @@ func (p *Pool) init() {
 				// still maximizing reuse of buffers allocated by Get.
 				// Note that we cannot simply use n.buckets[idx].New,
 				// as this would side-step pooling.
-				p.buckets[i].New = p.buckets[idx].Get
+				p.buckets[i] = zeropool.New(p.buckets[idx].Get)
 			} else {
-				p.buckets[i].New = newAllocFunc(i)
+				p.buckets[i] = zeropool.New(newAllocFunc(i))
 			}
 		}
 	})
 }
 
-type bucketSlice []sync.Pool
+type bucketSlice []zeropool.Pool[[]byte]
 
 func (bs bucketSlice) Get(size int) []byte {
 	for i := range bs {
 		if 1<<i >= size {
-			return bs[i].Get().([]byte)
+			return bs[i].Get()
 		}
 	}
 
@@ -119,8 +121,8 @@ func (bs bucketSlice) Put(buf []byte) {
 	}
 }
 
-func newAllocFunc(i int) func() any {
-	return func() any {
+func newAllocFunc(i int) func() []byte {
+	return func() []byte {
 		return make([]byte, 1<<i)
 	}
 }
diff --git a/exp/bufferpool/pool_test.go b/exp/bufferpool/pool_test.go
@@ -68,8 +68,17 @@ func TestPut(t *testing.T) {
 }
 
 func BenchmarkPool(b *testing.B) {
+	var pool bufferpool.Pool
+	const size = 32
+
+	// Make cache hot.
+	buf := pool.Get(size)
+	pool.Put(buf)
+
+	b.ResetTimer()
+	b.ReportAllocs()
 	for i := 0; i < b.N; i++ {
-		buf := bufferpool.Default.Get(32)
-		bufferpool.Default.Put(buf)
+		buf := pool.Get(size)
+		pool.Put(buf)
 	}
 }
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module capnproto.org/go/capnp/v3
 go 1.19
 
 require (
+	github.com/colega/zeropool v0.0.0-20230505084239-6fb4a4f75381
 	github.com/kylelemons/godebug v1.1.0
 	github.com/stretchr/testify v1.8.2
 	github.com/tinylib/msgp v1.1.5

diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/colega/zeropool v0.0.0-20230505084239-6fb4a4f75381 h1:d5EKgQfRQvO97jnISfR89AiCCCJMwMFoSxUiU0OGCRU=
+github.com/colega/zeropool v0.0.0-20230505084239-6fb4a4f75381/go.mod h1:OU76gHeRo8xrzGJU3F3I1CqX1ekM8dfJw0+wPeMwnp0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=