webnet
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipn/ipnlocal, engine: avoid runtime/pprof with two usages of ts_omit_debug

Browse Source 
Saves 258 KB.

Updates #12614

Change-Id: I37c2f7f916480e3534883f338de4c64d08f7ef2b
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
main
Brad Fitzpatrick 7 months ago committed by Brad Fitzpatrick
parent f7afb9b6ca
commit 5b09913d64
7 changed files with 14 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      cmd/tailscaled/depaware-min.txt
  2. 5
      cmd/tailscaled/depaware-minbox.txt
  3. 1
      cmd/tailscaled/deps_test.go
  4. 2
      ipn/ipnlocal/c2n_pprof.go
  5. 2
      wgengine/watchdog.go
  6. 17
      wgengine/watchdog_js.go
  7. 8
      wgengine/watchdog_omit.go

4
cmd/tailscaled/depaware-min.txt
Unescape View File

@ -345,7 +345,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
internal/nettrace from net+
internal/oserror from io/fs+
internal/poll from net+
internal/profilerecord from runtime+
internal/profilerecord from runtime
internal/race from internal/runtime/maps+
internal/reflectlite from context+
internal/runtime/atomic from internal/runtime/exithook+
@ -398,7 +398,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
reflect from crypto/x509+
runtime from crypto/internal/fips140+
runtime/debug from github.com/klauspost/compress/zstd+
runtime/pprof from tailscale.com/ipn/ipnlocal+
slices from crypto/tls+
sort from compress/flate+
strconv from compress/flate+
@ -406,7 +405,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
sync from compress/flate+
sync/atomic from context+
syscall from crypto/internal/sysrand+
text/tabwriter from runtime/pprof
time from compress/gzip+
unicode from bytes+
unicode/utf16 from crypto/x509+

5
cmd/tailscaled/depaware-minbox.txt
Unescape View File

@ -378,7 +378,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
internal/nettrace from net+
internal/oserror from io/fs+
internal/poll from net+
internal/profilerecord from runtime+
internal/profilerecord from runtime
internal/race from internal/runtime/maps+
internal/reflectlite from context+
internal/runtime/atomic from internal/runtime/exithook+
@ -435,7 +435,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
regexp/syntax from regexp
runtime from crypto/internal/fips140+
runtime/debug from github.com/klauspost/compress/zstd+
runtime/pprof from tailscale.com/ipn/ipnlocal+
slices from crypto/tls+
sort from compress/flate+
strconv from compress/flate+
@ -443,7 +442,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
sync from compress/flate+
sync/atomic from context+
syscall from crypto/internal/sysrand+
text/tabwriter from runtime/pprof+
text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+
time from compress/gzip+
unicode from bytes+
unicode/utf16 from crypto/x509+

1
cmd/tailscaled/deps_test.go
Unescape View File

@ -256,6 +256,7 @@ func TestMinTailscaledWithCLI(t *testing.T) {
badSubstrs := []string{
"cbor",
"hujson",
"pprof",
}
deptest.DepChecker{
GOOS: "linux",

2
ipn/ipnlocal/c2n_pprof.go
Unescape View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause
//go:build !js && !wasm
//go:build !js && !wasm && !ts_omit_debug
package ipnlocal

2
wgengine/watchdog.go
Unescape View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause
//go:build !js
//go:build !js && !ts_omit_debug
package wgengine

17
wgengine/watchdog_js.go
Unescape View File

@ -1,17 +0,0 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause
//go:build js
package wgengine
import "tailscale.com/net/dns/resolver"
type watchdogEngine struct {
Engine
wrap Engine
}
func (e *watchdogEngine) GetResolver() (r *resolver.Resolver, ok bool) {
return nil, false
}

8
wgengine/watchdog_omit.go
Unescape View File

@ -0,0 +1,8 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause
//go:build js || ts_omit_debug
package wgengine
func NewWatchdog(e Engine) Engine { return e }
Write Preview
Loading…
Cancel
Save