X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ae34fb3db3c082d529a3e9a75698094409d70321..9d706659aa362728270f02b7d18d12b1f68f3e36:/services/keepstore/bufferpool.go

diff --git a/services/keepstore/bufferpool.go b/services/keepstore/bufferpool.go
index 0b216d76bf..b4cc5d38e1 100644
--- a/services/keepstore/bufferpool.go
+++ b/services/keepstore/bufferpool.go
@@ -1,21 +1,31 @@
-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package keepstore
 
 import (
-	"log"
 	"sync"
+	"sync/atomic"
 	"time"
+
+	"github.com/sirupsen/logrus"
 )
 
 type bufferPool struct {
+	log logrus.FieldLogger
 	// limiter has a "true" placeholder for each in-use buffer.
 	limiter chan bool
+	// allocated is the number of bytes currently allocated to buffers.
+	allocated uint64
 	// Pool has unused buffers.
 	sync.Pool
 }
 
-func newBufferPool(count int, bufSize int) *bufferPool {
-	p := bufferPool{}
-	p.New = func() interface{} {
+func newBufferPool(log logrus.FieldLogger, count int, bufSize int) *bufferPool {
+	p := bufferPool{log: log}
+	p.Pool.New = func() interface{} {
+		atomic.AddUint64(&p.allocated, uint64(bufSize))
 		return make([]byte, bufSize)
 	}
 	p.limiter = make(chan bool, count)
@@ -27,20 +37,33 @@ func (p *bufferPool) Get(size int) []byte {
 	case p.limiter <- true:
 	default:
 		t0 := time.Now()
-		log.Printf("reached max buffers (%d), waiting", cap(p.limiter))
+		p.log.Printf("reached max buffers (%d), waiting", cap(p.limiter))
 		p.limiter <- true
-		log.Printf("waited %v for a buffer", time.Since(t0))
+		p.log.Printf("waited %v for a buffer", time.Since(t0))
 	}
 	buf := p.Pool.Get().([]byte)
 	if cap(buf) < size {
-		log.Fatalf("bufferPool Get(size=%d) but max=%d", size, cap(buf))
+		p.log.Fatalf("bufferPool Get(size=%d) but max=%d", size, cap(buf))
 	}
 	return buf[:size]
 }
 
 func (p *bufferPool) Put(buf []byte) {
-	if buf != nil {
-		p.Pool.Put(buf)
-		<-p.limiter
-	}
+	p.Pool.Put(buf)
+	<-p.limiter
+}
+
+// Alloc returns the number of bytes allocated to buffers.
+func (p *bufferPool) Alloc() uint64 {
+	return atomic.LoadUint64(&p.allocated)
+}
+
+// Cap returns the maximum number of buffers allowed.
+func (p *bufferPool) Cap() int {
+	return cap(p.limiter)
+}
+
+// Len returns the number of buffers in use right now.
+func (p *bufferPool) Len() int {
+	return len(p.limiter)
 }