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

Data race: deviceActivity methods with value receiver :(

Browse Source
This commit is contained in:
Jakob Borg
2014-11-29 22:22:50 +01:00
parent 4fdecc9b85
commit a918aa97d9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/model/deviceactivity.go
View File

@@ -35,7 +35,7 @@ func newDeviceActivity() *deviceActivity {
} }
} }
func (m deviceActivity) leastBusy(availability []protocol.DeviceID) protocol.DeviceID { func (m *deviceActivity) leastBusy(availability []protocol.DeviceID) protocol.DeviceID {
m.mut.Lock() m.mut.Lock()
var low int = 2<<30 - 1 var low int = 2<<30 - 1
var selected protocol.DeviceID var selected protocol.DeviceID
@@ -49,14 +49,14 @@ func (m deviceActivity) leastBusy(availability []protocol.DeviceID) protocol.Dev
return selected return selected
} }
func (m deviceActivity) using(device protocol.DeviceID) { func (m *deviceActivity) using(device protocol.DeviceID) {
m.mut.Lock() m.mut.Lock()
defer m.mut.Unlock()
m.act[device]++ m.act[device]++
m.mut.Unlock()
} }
func (m deviceActivity) done(device protocol.DeviceID) { func (m *deviceActivity) done(device protocol.DeviceID) {
m.mut.Lock() m.mut.Lock()
defer m.mut.Unlock()
m.act[device]-- m.act[device]--
m.mut.Unlock()
} }