mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ipn: use *Prefs rather than Prefs throughout.

Browse Source 
Prefs has become a heavy object with non-memcpy copy
semantics. We should not pass such a thing by value.

Signed-off-by: David Anderson <dave@natulte.net>
This commit is contained in:
David Anderson
2020-02-20 11:07:00 -08:00
committed by Dave Anderson
parent 0c55777fed
commit c47f907a27
9 changed files with 69 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ipn/handle.go
View File

@ -23,7 +23,7 @@ type Handle struct {
netmapCache *NetworkMap
engineStatusCache EngineStatus
stateCache State
prefsCache Prefs
prefsCache *Prefs
}
func NewHandle(b Backend, logf logger.Logf, opts Options) (*Handle, error) {
@ -47,7 +47,7 @@ func (h *Handle) Start(opts Options) error {
h.engineStatusCache = EngineStatus{}
h.stateCache = NoState
if opts.Prefs != nil {
h.prefsCache = *opts.Prefs
h.prefsCache = opts.Prefs.Copy()
}
xopts := opts
xopts.Notify = h.notify
@ -69,7 +69,7 @@ func (h *Handle) notify(n Notify) {
h.stateCache = *n.State
}
if n.Prefs != nil {
h.prefsCache = *n.Prefs
h.prefsCache = n.Prefs.Copy()
}
if n.NetMap != nil {
h.netmapCache = n.NetMap
@ -85,18 +85,19 @@ func (h *Handle) notify(n Notify) {
}
}
func (h *Handle) Prefs() Prefs {
func (h *Handle) Prefs() *Prefs {
h.mu.Lock()
defer h.mu.Unlock()
return h.prefsCache
return h.prefsCache.Copy()
}
func (h *Handle) UpdatePrefs(updateFn func(old Prefs) (new Prefs)) {
func (h *Handle) UpdatePrefs(updateFn func(p *Prefs)) {
h.mu.Lock()
defer h.mu.Unlock()
new := updateFn(h.prefsCache)
new := h.prefsCache.Copy()
updateFn(new)
h.prefsCache = new
h.b.SetPrefs(new)
}