From fd89ca3095fc93f503d0cff6e0c380b2b67502f4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 9 Jan 2023 14:35:41 -0700
Subject: diskio: BufferedFile: Add a buffer pool to avoid allocations
---
lib/diskio/file_blockbuf.go | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
(limited to 'lib/diskio')
diff --git a/lib/diskio/file_blockbuf.go b/lib/diskio/file_blockbuf.go
index 15ae13b..3db3105 100644
--- a/lib/diskio/file_blockbuf.go
+++ b/lib/diskio/file_blockbuf.go
@@ -7,6 +7,8 @@ package diskio
import (
"sync"
+ "git.lukeshu.com/go/typedsync"
+
"git.lukeshu.com/btrfs-progs-ng/lib/containers"
)
@@ -20,18 +22,28 @@ type bufferedFile[A ~int64] struct {
mu sync.RWMutex
blockSize A
blockCache containers.ARCache[A, bufferedBlock]
+ blockPool typedsync.Pool[[]byte]
}
var _ File[assertAddr] = (*bufferedFile[assertAddr])(nil)
func NewBufferedFile[A ~int64](file File[A], blockSize A, cacheSize int) *bufferedFile[A] {
- return &bufferedFile[A]{
+ ret := &bufferedFile[A]{
inner: file,
blockSize: blockSize,
blockCache: containers.ARCache[A, bufferedBlock]{
MaxLen: cacheSize,
},
+ blockPool: typedsync.Pool[[]byte]{
+ New: func() []byte {
+ return make([]byte, blockSize)
+ },
+ },
+ }
+ ret.blockCache.OnRemove = func(_ A, buf bufferedBlock) {
+ ret.blockPool.Put(buf.Dat)
}
+ return ret
}
func (bf *bufferedFile[A]) Name() string { return bf.inner.Name() }
@@ -57,7 +69,7 @@ func (bf *bufferedFile[A]) maybeShortReadAt(dat []byte, off A) (n int, err error
blockOffset := off - offsetWithinBlock
cachedBlock, ok := bf.blockCache.Load(blockOffset)
if !ok {
- cachedBlock.Dat = make([]byte, bf.blockSize)
+ cachedBlock.Dat, _ = bf.blockPool.Get()
n, err := bf.inner.ReadAt(cachedBlock.Dat, blockOffset)
cachedBlock.Dat = cachedBlock.Dat[:n]
cachedBlock.Err = err
--
cgit v1.2.3-2-g168b