chore(scanner): reduce memory pressure by using pools inside hasher (#10222)
This commit is contained in:
+19
-2
@@ -10,7 +10,9 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
|
"hash"
|
||||||
"io"
|
"io"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/syncthing/syncthing/lib/protocol"
|
"github.com/syncthing/syncthing/lib/protocol"
|
||||||
)
|
)
|
||||||
@@ -21,13 +23,25 @@ type Counter interface {
|
|||||||
Update(bytes int64)
|
Update(bytes int64)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var bufPool = sync.Pool{
|
||||||
|
New: func() any {
|
||||||
|
return make([]byte, 32<<10) // 32k buffer
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var hashPool = sync.Pool{
|
||||||
|
New: func() any {
|
||||||
|
return sha256.New()
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
// Blocks returns the blockwise hash of the reader.
|
// Blocks returns the blockwise hash of the reader.
|
||||||
func Blocks(ctx context.Context, r io.Reader, blocksize int, sizehint int64, counter Counter) ([]protocol.BlockInfo, error) {
|
func Blocks(ctx context.Context, r io.Reader, blocksize int, sizehint int64, counter Counter) ([]protocol.BlockInfo, error) {
|
||||||
if counter == nil {
|
if counter == nil {
|
||||||
counter = &noopCounter{}
|
counter = &noopCounter{}
|
||||||
}
|
}
|
||||||
|
|
||||||
hf := sha256.New()
|
hf := hashPool.Get().(hash.Hash) //nolint:forcetypeassert
|
||||||
const hashLength = sha256.Size
|
const hashLength = sha256.Size
|
||||||
|
|
||||||
var blocks []protocol.BlockInfo
|
var blocks []protocol.BlockInfo
|
||||||
@@ -47,7 +61,7 @@ func Blocks(ctx context.Context, r io.Reader, blocksize int, sizehint int64, cou
|
|||||||
}
|
}
|
||||||
|
|
||||||
// A 32k buffer is used for copying into the hash function.
|
// A 32k buffer is used for copying into the hash function.
|
||||||
buf := make([]byte, 32<<10)
|
buf := bufPool.Get().([]byte) //nolint:forcetypeassert
|
||||||
|
|
||||||
var offset int64
|
var offset int64
|
||||||
lr := io.LimitReader(r, int64(blocksize)).(*io.LimitedReader)
|
lr := io.LimitReader(r, int64(blocksize)).(*io.LimitedReader)
|
||||||
@@ -86,6 +100,9 @@ func Blocks(ctx context.Context, r io.Reader, blocksize int, sizehint int64, cou
|
|||||||
|
|
||||||
hf.Reset()
|
hf.Reset()
|
||||||
}
|
}
|
||||||
|
bufPool.Put(buf)
|
||||||
|
hf.Reset()
|
||||||
|
hashPool.Put(hf)
|
||||||
|
|
||||||
if len(blocks) == 0 {
|
if len(blocks) == 0 {
|
||||||
// Empty file
|
// Empty file
|
||||||
|
|||||||
Reference in New Issue
Block a user