TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

hostinfo: cache device model to speed up init

Browse Source 
This was causing a relatively consistent ~10ms of delay on Linux.

Signed-off-by: Kyle Carberry <kyle@carberry.com>
This commit is contained in:
Kyle Carberry 2024-04-01 16:26:20 -04:00 committed by Brad Fitzpatrick
parent ec87e219ae
commit 27038ee3c2
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hostinfo/hostinfo.go
View File

@ -52,7 +52,7 @@ func New() *tailcfg.Hostinfo {
GoArchVar: lazyGoArchVar.Get(), GoArchVar: lazyGoArchVar.Get(),
GoVersion: runtime.Version(), GoVersion: runtime.Version(),
Machine: condCall(unameMachine), Machine: condCall(unameMachine),
DeviceModel: deviceModel(), DeviceModel: deviceModelCached(),
Cloud: string(cloudenv.Get()), Cloud: string(cloudenv.Get()),
NoLogsNoSupport: envknob.NoLogsNoSupport(), NoLogsNoSupport: envknob.NoLogsNoSupport(),
AllowsUpdate: envknob.AllowsRemoteUpdate(), AllowsUpdate: envknob.AllowsRemoteUpdate(),
@ -68,6 +68,7 @@ var (
distroVersion func() string distroVersion func() string
distroCodeName func() string distroCodeName func() string
unameMachine func() string unameMachine func() string
deviceModel func() string
) )
func condCall[T any](fn func() T) T { func condCall[T any](fn func() T) T {
@ -176,6 +177,20 @@ var (
// SetDeviceModel sets the device model for use in Hostinfo updates. // SetDeviceModel sets the device model for use in Hostinfo updates.
func SetDeviceModel(model string) { deviceModelAtomic.Store(model) } func SetDeviceModel(model string) { deviceModelAtomic.Store(model) }
func deviceModelCached() string {
if v, _ := deviceModelAtomic.Load().(string); v != "" {
return v
}
if deviceModel == nil {
return ""
}
v := deviceModel()
if v != "" {
deviceModelAtomic.Store(v)
}
return v
}
// SetOSVersion sets the OS version. // SetOSVersion sets the OS version.
func SetOSVersion(v string) { osVersionAtomic.Store(v) } func SetOSVersion(v string) { osVersionAtomic.Store(v) }
@ -193,11 +208,6 @@ func SetPackage(v string) { packagingType.Store(v) }
// and "k8s-operator". // and "k8s-operator".
func SetApp(v string) { appType.Store(v) } func SetApp(v string) { appType.Store(v) }
func deviceModel() string {
s, _ := deviceModelAtomic.Load().(string)
return s
}
// FirewallMode returns the firewall mode for the app. // FirewallMode returns the firewall mode for the app.
// It is empty if unset. // It is empty if unset.
func FirewallMode() string { func FirewallMode() string {

6
hostinfo/hostinfo_linux.go
View File

@ -22,9 +22,7 @@ func init() {
distroName = distroNameLinux distroName = distroNameLinux
distroVersion = distroVersionLinux distroVersion = distroVersionLinux
distroCodeName = distroCodeNameLinux distroCodeName = distroCodeNameLinux
if v := linuxDeviceModel(); v != "" { deviceModel = deviceModelLinux
SetDeviceModel(v)
}
} }
var ( var (
@ -50,7 +48,7 @@ func distroCodeNameLinux() string {
return lazyVersionMeta.Get().DistroCodeName return lazyVersionMeta.Get().DistroCodeName
} }
func linuxDeviceModel() string { func deviceModelLinux() string {
for _, path := range []string{ for _, path := range []string{
// First try the Synology-specific location. // First try the Synology-specific location.
// Example: "DS916+-j" // Example: "DS916+-j"