From ed9aed1c9d7dd340006f22b96e1ee4476582b874 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 17 Aug 2023 15:44:20 -0400 Subject: [PATCH] internal/sysinfo: implement CPUName on bsd systems sysctl machdep.cpu.brand_string seems to be standard across the BSDs. There does not seem to be a standard way to get the CPU frequency. Change-Id: Ic986d6c81dd54e1b84544317f2a53ce16801319b Reviewed-on: https://go-review.googlesource.com/c/go/+/520636 Auto-Submit: Russ Cox TryBot-Bypass: Russ Cox Reviewed-by: Ian Lance Taylor Reviewed-by: Michael Knyszek --- src/internal/sysinfo/cpuinfo_bsd.go | 14 ++++++++++++++ src/internal/sysinfo/cpuinfo_stub.go | 2 +- src/internal/sysinfo/export_test.go | 7 +++++++ src/internal/sysinfo/sysinfo_test.go | 15 +++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/internal/sysinfo/cpuinfo_bsd.go create mode 100644 src/internal/sysinfo/export_test.go create mode 100644 src/internal/sysinfo/sysinfo_test.go diff --git a/src/internal/sysinfo/cpuinfo_bsd.go b/src/internal/sysinfo/cpuinfo_bsd.go new file mode 100644 index 0000000000..2c04c8f7d6 --- /dev/null +++ b/src/internal/sysinfo/cpuinfo_bsd.go @@ -0,0 +1,14 @@ +// Copyright 2023 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +//go:build darwin || freebsd || netbsd || openbsd + +package sysinfo + +import "syscall" + +func osCpuInfoName() string { + cpu, _ := syscall.Sysctl("machdep.cpu.brand_string") + return cpu +} diff --git a/src/internal/sysinfo/cpuinfo_stub.go b/src/internal/sysinfo/cpuinfo_stub.go index 5dcfed1137..273166ee61 100644 --- a/src/internal/sysinfo/cpuinfo_stub.go +++ b/src/internal/sysinfo/cpuinfo_stub.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !linux +//go:build !(darwin || freebsd || linux || netbsd || openbsd) package sysinfo diff --git a/src/internal/sysinfo/export_test.go b/src/internal/sysinfo/export_test.go new file mode 100644 index 0000000000..1c668d9c79 --- /dev/null +++ b/src/internal/sysinfo/export_test.go @@ -0,0 +1,7 @@ +// Copyright 2023 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package sysinfo + +var XosCpuInfoName = osCpuInfoName diff --git a/src/internal/sysinfo/sysinfo_test.go b/src/internal/sysinfo/sysinfo_test.go new file mode 100644 index 0000000000..c2f1dd298e --- /dev/null +++ b/src/internal/sysinfo/sysinfo_test.go @@ -0,0 +1,15 @@ +// Copyright 2023 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package sysinfo_test + +import ( + . "internal/sysinfo" + "testing" +) + +func TestCPUName(t *testing.T) { + t.Logf("CPUName: %s", CPUName()) + t.Logf("osCpuInfoName: %s", XosCpuInfoName()) +}