fixed data race in flag propagation

dundee · Feb 16, 2021 · 3d47ab6 · 3d47ab6
1 parent 629c9cc
commit 3d47ab6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/analyze/dir.go b/analyze/dir.go
@@ -87,16 +87,7 @@ func processDir(path string, progress *CurrentProgress, concurrencyLimitChannel
 				subdir.Parent = &dir
 
 				mutex.Lock()
-
 				dir.Files = append(dir.Files, subdir)
-
-				switch subdir.Flag {
-				case '!', '.':
-					if dir.Flag != '!' {
-						dir.Flag = '.'
-					}
-				}
-
 				mutex.Unlock()
 
 				<-concurrencyLimitChannel

diff --git a/analyze/file.go b/analyze/file.go
@@ -66,6 +66,13 @@ func (f *File) UpdateStats(links AlreadyCountedHardlinks) {
 			entry.UpdateStats(links)
 		}
 
+		switch entry.Flag {
+		case '!', '.':
+			if f.Flag != '!' {
+				f.Flag = '.'
+			}
+		}
+
 		itemCount += entry.ItemCount
 
 		if entry.MutliLinkInode > 0 {