octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock asshattery that snuck in somehow

Browse Source
This commit is contained in:
Jakob Borg 2014-04-14 13:01:21 +02:00
parent 70fa5ffa06
commit bc8e033eb5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/syncthing/model.go
View File

@ -428,7 +428,9 @@ func (m *Model) AddConnection(rawConn io.Closer, protoConn protocol.Connection)
repos := m.nodeRepos[nodeID] repos := m.nodeRepos[nodeID]
m.rmut.RUnlock() m.rmut.RUnlock()
for _, repo := range repos { for _, repo := range repos {
idx := m.ProtocolIndex(repo) m.rmut.RLock()
idx := m.protocolIndex(repo)
m.rmut.RUnlock()
if debugNet { if debugNet {
dlog.Printf("IDX(out/initial): %s: %q: %d files", nodeID, repo, len(idx)) dlog.Printf("IDX(out/initial): %s: %q: %d files", nodeID, repo, len(idx))
} }
@ -437,14 +439,11 @@ func (m *Model) AddConnection(rawConn io.Closer, protoConn protocol.Connection)
}() }()
} }
// ProtocolIndex returns the current local index in protocol data types. // protocolIndex returns the current local index in protocol data types.
// Must be called with the read lock held. func (m *Model) protocolIndex(repo string) []protocol.FileInfo {
func (m *Model) ProtocolIndex(repo string) []protocol.FileInfo {
var index []protocol.FileInfo var index []protocol.FileInfo
m.rmut.RLock()
fs := m.repoFiles[repo].Have(cid.LocalID) fs := m.repoFiles[repo].Have(cid.LocalID)
m.rmut.RUnlock()
for _, f := range fs { for _, f := range fs {
mf := fileInfoFromFile(f) mf := fileInfoFromFile(f)
@ -498,7 +497,7 @@ func (m *Model) broadcastIndexLoop() {
} }
lastChange[repo] = c lastChange[repo] = c
idx := m.ProtocolIndex(repo) idx := m.protocolIndex(repo)
m.saveIndex(repo, confDir, idx) m.saveIndex(repo, confDir, idx)
var indexWg sync.WaitGroup var indexWg sync.WaitGroup
@ -579,7 +578,7 @@ func (m *Model) ScanRepo(repo string) {
func (m *Model) SaveIndexes(dir string) { func (m *Model) SaveIndexes(dir string) {
m.rmut.RLock() m.rmut.RLock()
for repo := range m.repoDirs { for repo := range m.repoDirs {
fs := m.ProtocolIndex(repo) fs := m.protocolIndex(repo)
m.saveIndex(repo, dir, fs) m.saveIndex(repo, dir, fs)
} }
m.rmut.RUnlock() m.rmut.RUnlock()