X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2820d5bd17fcaa7b9d2f6e14bf0f1820b7ea8107..90ce981c11ba7812f722727d6d06225b91b7b9f9:/services/keepstore/count.go

diff --git a/services/keepstore/count.go b/services/keepstore/count.go
index 272b5017cb..51434a803e 100644
--- a/services/keepstore/count.go
+++ b/services/keepstore/count.go
@@ -8,20 +8,24 @@ import (
 	"io"
 )
 
-func NewCountingWriter(w io.Writer, f func(uint64)) io.WriteCloser {
+func newCountingWriter(w io.Writer, f func(uint64)) io.WriteCloser {
 	return &countingReadWriter{
 		writer:  w,
 		counter: f,
 	}
 }
 
-func NewCountingReader(r io.Reader, f func(uint64)) io.ReadCloser {
+func newCountingReader(r io.Reader, f func(uint64)) io.ReadCloser {
 	return &countingReadWriter{
 		reader:  r,
 		counter: f,
 	}
 }
 
+func newCountingReaderAtSeeker(r readerAtSeeker, f func(uint64)) *countingReaderAtSeeker {
+	return &countingReaderAtSeeker{readerAtSeeker: r, counter: f}
+}
+
 type countingReadWriter struct {
 	reader  io.Reader
 	writer  io.Writer
@@ -46,3 +50,25 @@ func (crw *countingReadWriter) Close() error {
 	}
 	return nil
 }
+
+type readerAtSeeker interface {
+	io.ReadSeeker
+	io.ReaderAt
+}
+
+type countingReaderAtSeeker struct {
+	readerAtSeeker
+	counter func(uint64)
+}
+
+func (crw *countingReaderAtSeeker) Read(buf []byte) (int, error) {
+	n, err := crw.readerAtSeeker.Read(buf)
+	crw.counter(uint64(n))
+	return n, err
+}
+
+func (crw *countingReaderAtSeeker) ReadAt(buf []byte, off int64) (int, error) {
+	n, err := crw.readerAtSeeker.ReadAt(buf, off)
+	crw.counter(uint64(n))
+	return n, err
+}