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

lib/model: Correct lock taking order in ConnectionStats (fixes #3596)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3597
This commit is contained in:
Jakob Borg 2016-09-14 19:38:55 +00:00 committed by Audrius Butkevicius
parent 139e9b144e
commit da0b7cc7f2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/model.go
View File

@ -396,8 +396,8 @@ func (info ConnectionInfo) MarshalJSON() ([]byte, error) {
// ConnectionStats returns a map with connection statistics for each device. // ConnectionStats returns a map with connection statistics for each device.
func (m *Model) ConnectionStats() map[string]interface{} { func (m *Model) ConnectionStats() map[string]interface{} {
m.pmut.RLock()
m.fmut.RLock() m.fmut.RLock()
m.pmut.RLock()
res := make(map[string]interface{}) res := make(map[string]interface{})
devs := m.cfg.Devices() devs := m.cfg.Devices()
@ -426,8 +426,8 @@ func (m *Model) ConnectionStats() map[string]interface{} {
res["connections"] = conns res["connections"] = conns
m.fmut.RUnlock()
m.pmut.RUnlock() m.pmut.RUnlock()
m.fmut.RUnlock()
in, out := protocol.TotalInOut() in, out := protocol.TotalInOut()
res["total"] = ConnectionInfo{ res["total"] = ConnectionInfo{