eburet-oss/wireguard-go-awg2-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

device: fix data race in peer.timersActive

Browse source 
Found by the race detector and existing tests.

To avoid introducing a lock into this hot path,
calculate and cache whether any peers exist.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2020-12-15 17:44:21 -08:00 • committed by Jason A. Donenfeld
parent 70861686d3
commit f7bbdc31a0
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
device/device.go
View file

@ -49,8 +49,9 @@ type Device struct {
}
peers struct {
sync.RWMutex
keyMap map[NoisePublicKey]*Peer
empty AtomicBool // empty reports whether len(keyMap) == 0
sync.RWMutex // protects keyMap
keyMap map[NoisePublicKey]*Peer
}
// unprotected / "self-synchronising resources"
@ -129,6 +130,7 @@ func unsafeRemovePeer(device *Device, peer *Peer, key NoisePublicKey) {
// remove from peer map
delete(device.peers.keyMap, key)
device.peers.empty.Set(len(device.peers.keyMap) == 0)
}
func deviceUpdateState(device *Device) {