summaryrefslogtreecommitdiffhomepage
path: root/ipn/ipnlocal/peerapi.go
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2022-08-03 21:51:02 -0700
committerBrad Fitzpatrick <bradfitz@tailscale.com>2022-08-03 21:51:42 -0700
commit698defd54b4128eaa8278ff4ef1e15370682f1fe (patch)
treedb4eadf5e0cacc3176ee4e26511a3ef28a8dbd38 /ipn/ipnlocal/peerapi.go
parentc378a9900c56b33b6f7174894d8261d189e97185 (diff)
downloadtailscale-bradfitz/appendf.tar.xz
tailscale-bradfitz/appendf.zip
syncs, all: move to using Go's new atomic types instead of oursbradfitz/appendf
Fixes #5185 Change-Id: I850dd532559af78c3895e2924f8237ccc328449d Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'ipn/ipnlocal/peerapi.go')
-rw-r--r--ipn/ipnlocal/peerapi.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipn/ipnlocal/peerapi.go b/ipn/ipnlocal/peerapi.go
index 6c12862d0..05a638667 100644
--- a/ipn/ipnlocal/peerapi.go
+++ b/ipn/ipnlocal/peerapi.go
@@ -26,6 +26,7 @@ import (
"strconv"
"strings"
"sync"
+ "sync/atomic"
"time"
"unicode"
"unicode/utf8"
@@ -41,7 +42,6 @@ import (
"tailscale.com/net/interfaces"
"tailscale.com/net/netaddr"
"tailscale.com/net/netutil"
- "tailscale.com/syncs"
"tailscale.com/tailcfg"
"tailscale.com/util/clientmetric"
"tailscale.com/wgengine"
@@ -58,7 +58,7 @@ type peerAPIServer struct {
b *LocalBackend
rootDir string // empty means file receiving unavailable
selfNode *tailcfg.Node
- knownEmpty syncs.AtomicBool
+ knownEmpty atomic.Bool
resolver *resolver.Resolver
// directFileMode is whether we're writing files directly to a
@@ -144,7 +144,7 @@ func (s *peerAPIServer) hasFilesWaiting() bool {
if s == nil || s.rootDir == "" || s.directFileMode {
return false
}
- if s.knownEmpty.Get() {
+ if s.knownEmpty.Load() {
// Optimization: this is usually empty, so avoid opening
// the directory and checking. We can't cache the actual
// has-files-or-not values as the macOS/iOS client might
@@ -185,7 +185,7 @@ func (s *peerAPIServer) hasFilesWaiting() bool {
}
}
if err == io.EOF {
- s.knownEmpty.Set(true)
+ s.knownEmpty.Store(true)
}
if err != nil {
break
@@ -808,7 +808,7 @@ func (h *peerAPIHandler) handlePeerPut(w http.ResponseWriter, r *http.Request) {
// TODO: some real response
success = true
io.WriteString(w, "{}\n")
- h.ps.knownEmpty.Set(false)
+ h.ps.knownEmpty.Store(false)
h.ps.b.sendFileNotify()
}