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

lib/model: Fix a few more problematic locks (ref #5929) (#5944)

Browse Source
This commit is contained in:
Simon Frei
2019-08-13 09:04:43 +02:00
committed by Jakob Borg
parent 86e35f1879
commit 6fa02d5081
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/model/folder.go
View File

@@ -685,10 +685,11 @@ func (f *folder) setWatchError(err error) {
// scanOnWatchErr schedules a full scan immediately if an error occurred while watching. // scanOnWatchErr schedules a full scan immediately if an error occurred while watching.
func (f *folder) scanOnWatchErr() { func (f *folder) scanOnWatchErr() {
f.watchMut.Lock() f.watchMut.Lock()
if f.watchErr != nil { err := f.watchErr
f.watchMut.Unlock()
if err != nil {
f.Delay(0) f.Delay(0)
} }
f.watchMut.Unlock()
} }
func (f *folder) setError(err error) { func (f *folder) setError(err error) {

39
lib/model/model.go
View File

@@ -765,8 +765,9 @@ func addSizeOfFile(s *db.Counts, f db.FileIntf) {
// files in the global model. // files in the global model.
func (m *model) GlobalSize(folder string) db.Counts { func (m *model) GlobalSize(folder string) db.Counts {
m.fmut.RLock() m.fmut.RLock()
defer m.fmut.RUnlock() rf, ok := m.folderFiles[folder]
if rf, ok := m.folderFiles[folder]; ok { m.fmut.RUnlock()
if ok {
return rf.GlobalSize() return rf.GlobalSize()
} }
return db.Counts{} return db.Counts{}
@@ -776,8 +777,9 @@ func (m *model) GlobalSize(folder string) db.Counts {
// files in the local folder. // files in the local folder.
func (m *model) LocalSize(folder string) db.Counts { func (m *model) LocalSize(folder string) db.Counts {
m.fmut.RLock() m.fmut.RLock()
defer m.fmut.RUnlock() rf, ok := m.folderFiles[folder]
if rf, ok := m.folderFiles[folder]; ok { m.fmut.RUnlock()
if ok {
return rf.LocalSize() return rf.LocalSize()
} }
return db.Counts{} return db.Counts{}
@@ -788,8 +790,9 @@ func (m *model) LocalSize(folder string) db.Counts {
// folder. // folder.
func (m *model) ReceiveOnlyChangedSize(folder string) db.Counts { func (m *model) ReceiveOnlyChangedSize(folder string) db.Counts {
m.fmut.RLock() m.fmut.RLock()
defer m.fmut.RUnlock() rf, ok := m.folderFiles[folder]
if rf, ok := m.folderFiles[folder]; ok { m.fmut.RUnlock()
if ok {
return rf.ReceiveOnlyChangedSize() return rf.ReceiveOnlyChangedSize()
} }
return db.Counts{} return db.Counts{}
@@ -1006,8 +1009,9 @@ func (m *model) handleIndex(deviceID protocol.DeviceID, folder string, fs []prot
} }
m.pmut.RLock() m.pmut.RLock()
m.deviceDownloads[deviceID].Update(folder, makeForgetUpdate(fs)) downloads := m.deviceDownloads[deviceID]
m.pmut.RUnlock() m.pmut.RUnlock()
downloads.Update(folder, makeForgetUpdate(fs))
if !update { if !update {
files.Drop(deviceID) files.Drop(deviceID)
@@ -1885,9 +1889,10 @@ func (m *model) DownloadProgress(device protocol.DeviceID, folder string, update
} }
m.pmut.RLock() m.pmut.RLock()
m.deviceDownloads[device].Update(folder, updates) downloads := m.deviceDownloads[device]
state := m.deviceDownloads[device].GetBlockCounts(folder)
m.pmut.RUnlock() m.pmut.RUnlock()
downloads.Update(folder, updates)
state := downloads.GetBlockCounts(folder)
events.Default.Log(events.RemoteDownloadProgress, map[string]interface{}{ events.Default.Log(events.RemoteDownloadProgress, map[string]interface{}{
"device": device.String(), "device": device.String(),
@@ -2227,20 +2232,24 @@ func (m *model) State(folder string) (string, time.Time, error) {
func (m *model) FolderErrors(folder string) ([]FileError, error) { func (m *model) FolderErrors(folder string) ([]FileError, error) {
m.fmut.RLock() m.fmut.RLock()
defer m.fmut.RUnlock() err := m.checkFolderRunningLocked(folder)
if err := m.checkFolderRunningLocked(folder); err != nil { runner := m.folderRunners[folder]
m.fmut.RUnlock()
if err != nil {
return nil, err return nil, err
} }
return m.folderRunners[folder].Errors(), nil return runner.Errors(), nil
} }
func (m *model) WatchError(folder string) error { func (m *model) WatchError(folder string) error {
m.fmut.RLock() m.fmut.RLock()
defer m.fmut.RUnlock() err := m.checkFolderRunningLocked(folder)
if err := m.checkFolderRunningLocked(folder); err != nil { runner := m.folderRunners[folder]
m.fmut.RUnlock()
if err != nil {
return nil // If the folder isn't running, there's no error to report. return nil // If the folder isn't running, there's no error to report.
} }
return m.folderRunners[folder].WatchError() return runner.WatchError()
} }
func (m *model) Override(folder string) { func (m *model) Override(folder string) {