octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-31 22:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/scanner: Don't stop byte counter ticks before scan is done

Browse Source
This commit is contained in:
Jakob Borg 2017-01-03 15:03:18 +01:00
parent 79dd6918f2
commit 2ebd6ad77f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/verboseservice.go
View File

@ -154,7 +154,7 @@ func (s *verboseService) formatEvent(ev events.Event) string {
if total > 0 { if total > 0 {
pct = 100 * current / total pct = 100 * current / total
} }
return fmt.Sprintf("Scanning folder %q, %d%% done (%.01f MB/s)", folder, pct, rate) return fmt.Sprintf("Scanning folder %q, %d%% done (%.01f MiB/s)", folder, pct, rate)
case events.DevicePaused: case events.DevicePaused:
data := ev.Data.(map[string]string) data := ev.Data.(map[string]string)

5
lib/scanner/walk.go
View File

@ -169,13 +169,14 @@ func (w *walker) walk() (chan protocol.FileInfo, error) {
realToHashChan := make(chan protocol.FileInfo) realToHashChan := make(chan protocol.FileInfo)
done := make(chan struct{}) done := make(chan struct{})
progress := newByteCounter() progress := newByteCounter()
defer progress.Close()
newParallelHasher(w.Dir, w.BlockSize, w.Hashers, finishedChan, realToHashChan, progress, done, w.Cancel) newParallelHasher(w.Dir, w.BlockSize, w.Hashers, finishedChan, realToHashChan, progress, done, w.Cancel)
// A routine which actually emits the FolderScanProgress events // A routine which actually emits the FolderScanProgress events
// every w.ProgressTicker ticks, until the hasher routines terminate. // every w.ProgressTicker ticks, until the hasher routines terminate.
go func() { go func() {
defer progress.Close()
for { for {
select { select {
case <-done: case <-done:
@ -185,7 +186,7 @@ func (w *walker) walk() (chan protocol.FileInfo, error) {
case <-ticker.C: case <-ticker.C:
current := progress.Total() current := progress.Total()
rate := progress.Rate() rate := progress.Rate()
l.Debugf("Walk %s %s current progress %d/%d at %.01f MB/s (%d%%)", w.Dir, w.Subs, current, total, rate/1024/1024, current*100/total) l.Debugf("Walk %s %s current progress %d/%d at %.01f MiB/s (%d%%)", w.Dir, w.Subs, current, total, rate/1024/1024, current*100/total)
events.Default.Log(events.FolderScanProgress, map[string]interface{}{ events.Default.Log(events.FolderScanProgress, map[string]interface{}{
"folder": w.Folder, "folder": w.Folder,
"current": current, "current": current,