perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid deadlock during initial scan (fixes #389)

Browse Source
This commit is contained in:
Jakob Borg
2014-07-02 07:40:27 +02:00
parent 5353659f9f
commit 0aa067a726
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
model/model.go
View File

@@ -454,19 +454,6 @@ func (m *Model) ReplaceLocal(repo string, fs []scanner.File) {
m.rmut.RUnlock() m.rmut.RUnlock()
} }
func (m *Model) SeedLocal(repo string, fs []protocol.FileInfo) {
var sfs = make([]scanner.File, len(fs))
for i := 0; i < len(fs); i++ {
lamport.Default.Tick(fs[i].Version)
sfs[i] = fileFromFileInfo(fs[i])
sfs[i].Suppressed = false // we might have saved an index with files that were suppressed; the should not be on startup
}
m.rmut.RLock()
m.repoFiles[repo].Replace(cid.LocalID, sfs)
m.rmut.RUnlock()
}
func (m *Model) CurrentRepoFile(repo string, file string) scanner.File { func (m *Model) CurrentRepoFile(repo string, file string) scanner.File {
m.rmut.RLock() m.rmut.RLock()
f := m.repoFiles[repo].Get(cid.LocalID, file) f := m.repoFiles[repo].Get(cid.LocalID, file)
@@ -736,7 +723,15 @@ func (m *Model) LoadIndexes(dir string) {
m.rmut.RLock() m.rmut.RLock()
for repo := range m.repoCfgs { for repo := range m.repoCfgs {
fs := m.loadIndex(repo, dir) fs := m.loadIndex(repo, dir)
m.SeedLocal(repo, fs)
var sfs = make([]scanner.File, len(fs))
for i := 0; i < len(fs); i++ {
lamport.Default.Tick(fs[i].Version)
sfs[i] = fileFromFileInfo(fs[i])
sfs[i].Suppressed = false // we might have saved an index with files that were suppressed; the should not be on startup
}
m.repoFiles[repo].Replace(cid.LocalID, sfs)
} }
m.rmut.RUnlock() m.rmut.RUnlock()
} }