fuse: reimplement BufferPool using sync.Pool.

fuse/bufferpool.go

 package fuse
 
 import (
-	"fmt"
-	"strings"
 	"sync"
-	"unsafe"
 )
 
 var paranoia bool
@@ -20,9 +17,6 @@ type BufferPool interface {
 	// AllocBuffer.  It is not an error to call FreeBuffer() on a slice
 	// obtained elsewhere.
 	FreeBuffer(slice []byte)
-
-	// Return debug information.
-	String() string
 }
 
 type gcBufferPool struct {
@@ -33,10 +27,6 @@ func NewGcBufferPool() BufferPool {
 	return &gcBufferPool{}
 }
 
-func (p *gcBufferPool) String() string {
-	return "gc"
-}
-
 func (p *gcBufferPool) AllocBuffer(size uint32) []byte {
 	return make([]byte, size)
 }
@@ -48,14 +38,7 @@ type bufferPoolImpl struct {
 	lock sync.Mutex
 
 	// For each page size multiple a list of slice pointers.
-	buffersBySize [][][]byte
-
-	// start of slice => true
-	outstandingBuffers map[uintptr]bool
-
-	// Total count of created buffers.  Handy for finding memory
-	// leaks.
-	createdBuffers int
+	buffersBySize []*sync.Pool
 }
 
 // NewBufferPool returns a BufferPool implementation that that returns
@@ -65,44 +48,22 @@ type bufferPoolImpl struct {
 // buffers beyond the handler's return.
 func NewBufferPool() BufferPool {
 	bp := new(bufferPoolImpl)
-	bp.buffersBySize = make([][][]byte, 0, 32)
-	bp.outstandingBuffers = make(map[uintptr]bool)
 	return bp
 }
 
-func (p *bufferPoolImpl) String() string {
+func (p *bufferPoolImpl) getPool(pageCount int) *sync.Pool {
 	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	result := []string{}
-	for exp, bufs := range p.buffersBySize {
-		if len(bufs) > 0 {
-			result = append(result, fmt.Sprintf("%d=%d", exp, len(bufs)))
+	for len(p.buffersBySize) < pageCount+1 {
+		p.buffersBySize = append(p.buffersBySize, nil)
 	}
+	if p.buffersBySize[pageCount] == nil {
+		p.buffersBySize[pageCount] = &sync.Pool{
+			New: func() interface{} { return make([]byte, PAGESIZE*pageCount) },
 		}
-	return fmt.Sprintf("created: %d, outstanding %d. Sizes: %s",
-		p.createdBuffers, len(p.outstandingBuffers),
-		strings.Join(result, ", "))
-}
-
-func (p *bufferPoolImpl) getBuffer(pageCount int) []byte {
-	for ; pageCount < len(p.buffersBySize); pageCount++ {
-		bufferList := p.buffersBySize[pageCount]
-		if len(bufferList) > 0 {
-			result := bufferList[len(bufferList)-1]
-			p.buffersBySize[pageCount] = p.buffersBySize[pageCount][:len(bufferList)-1]
-			return result
-		}
-	}
-
-	return nil
-}
-
-func (p *bufferPoolImpl) addBuffer(slice []byte, pages int) {
-	for len(p.buffersBySize) <= int(pages) {
-		p.buffersBySize = append(p.buffersBySize, make([][]byte, 0))
 	}
-	p.buffersBySize[pages] = append(p.buffersBySize[pages], slice)
+	pool := p.buffersBySize[pageCount]
+	p.lock.Unlock()
+	return pool
 }
 
 func (p *bufferPoolImpl) AllocBuffer(size uint32) []byte {
@@ -114,27 +75,9 @@ func (p *bufferPoolImpl) AllocBuffer(size uint32) []byte {
 	if sz%PAGESIZE != 0 {
 		sz += PAGESIZE
 	}
-	psz := sz / PAGESIZE
-
-	p.lock.Lock()
-	var b []byte
-
-	b = p.getBuffer(psz)
-	if b == nil {
-		p.createdBuffers++
-		b = make([]byte, size, psz*PAGESIZE)
-	} else {
-		b = b[:size]
-	}
-
-	p.outstandingBuffers[uintptr(unsafe.Pointer(&b[0]))] = true
-
-	// For testing should not have more than 20 buffers outstanding.
-	if paranoia && (p.createdBuffers > 50 || len(p.outstandingBuffers) > 50) {
-		panic("Leaking buffers")
-	}
-	p.lock.Unlock()
+	pages := sz / PAGESIZE
 
+	b := p.getPool(pages).Get().([]byte)
 	return b
 }
 
@@ -145,15 +88,8 @@ func (p *bufferPoolImpl) FreeBuffer(slice []byte) {
 	if cap(slice)%PAGESIZE != 0 || cap(slice) == 0 {
 		return
 	}
-	psz := cap(slice) / PAGESIZE
-	slice = slice[:psz]
-	key := uintptr(unsafe.Pointer(&slice[0]))
+	pages := cap(slice) / PAGESIZE
+	slice = slice[:cap(slice)]
 
-	p.lock.Lock()
-	ok := p.outstandingBuffers[key]
-	if ok {
-		p.addBuffer(slice, psz)
-		delete(p.outstandingBuffers, key)
-	}
-	p.lock.Unlock()
+	p.getPool(pages).Put(slice)
 }

fuse/bufferpool_test.go

-package fuse
-
-import (
-	"testing"
-)
-
-func TestBufferPool(t *testing.T) {
-	bp := NewBufferPool()
-
-	b1 := bp.AllocBuffer(PAGESIZE)
-	_ = bp.AllocBuffer(2 * PAGESIZE)
-	bp.FreeBuffer(b1)
-
-	b1_2 := bp.AllocBuffer(PAGESIZE)
-	if &b1[0] != &b1_2[0] {
-		t.Error("bp 0")
-	}
-
-}
-
-func TestFreeBufferEmpty(t *testing.T) {
-	bp := NewBufferPool()
-	c := make([]byte, 0, 2*PAGESIZE)
-	bp.FreeBuffer(c)
-}

fuse/server.go

@@ -182,15 +182,12 @@ func NewServer(fs RawFileSystem, mountPoint string, opts *MountOptions) (*Server
 // DebugData returns internal status information for debugging
 // purposes.
 func (ms *Server) DebugData() string {
-	s := ms.opts.Buffers.String()
-
 	var r int
 	ms.reqMu.Lock()
 	r = ms.reqReaders
 	ms.reqMu.Unlock()
 
-	s += fmt.Sprintf(" readers: %d", r)
-	return s
+	return fmt.Sprintf("readers: %d", r)
 }
 
 // What is a good number?  Maybe the number of CPUs?