octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-05 08:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/scanner: Remove unused field, move WaitGroup.Add out of loop (#7323)

Browse Source
This commit is contained in:
greatroar 2021-02-03 14:25:24 +01:00 committed by GitHub
parent 1522cf74bc
commit 42917d707d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/scanner/blockqueue.go
View File

@ -63,7 +63,6 @@ func HashFile(ctx context.Context, fs fs.Filesystem, path string, blockSize int,
// is closed and all items handled. // is closed and all items handled.
type parallelHasher struct { type parallelHasher struct {
fs fs.Filesystem fs fs.Filesystem
workers int
outbox chan<- ScanResult outbox chan<- ScanResult
inbox <-chan protocol.FileInfo inbox <-chan protocol.FileInfo
counter Counter counter Counter
@ -74,7 +73,6 @@ type parallelHasher struct {
func newParallelHasher(ctx context.Context, fs fs.Filesystem, workers int, outbox chan<- ScanResult, inbox <-chan protocol.FileInfo, counter Counter, done chan<- struct{}) { func newParallelHasher(ctx context.Context, fs fs.Filesystem, workers int, outbox chan<- ScanResult, inbox <-chan protocol.FileInfo, counter Counter, done chan<- struct{}) {
ph := &parallelHasher{ ph := &parallelHasher{
fs: fs, fs: fs,
workers: workers,
outbox: outbox, outbox: outbox,
inbox: inbox, inbox: inbox,
counter: counter, counter: counter,
@ -82,8 +80,8 @@ func newParallelHasher(ctx context.Context, fs fs.Filesystem, workers int, outbo
wg: sync.NewWaitGroup(), wg: sync.NewWaitGroup(),
} }
ph.wg.Add(workers)
for i := 0; i < workers; i++ { for i := 0; i < workers; i++ {
ph.wg.Add(1)
go ph.hashFiles(ctx) go ph.hashFiles(ctx)
} }