From cffe8fc50b0df1f9d8b5904accb3ba96ad359eb3 Mon Sep 17 00:00:00 2001 From: zhanghan Date: Wed, 8 Dec 2021 10:48:03 +0800 Subject: [PATCH 1/2] add to get cpu info --- pkg/utils/os/cpu.go | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/pkg/utils/os/cpu.go b/pkg/utils/os/cpu.go index cf1f67e0..58425e2f 100644 --- a/pkg/utils/os/cpu.go +++ b/pkg/utils/os/cpu.go @@ -1 +1,50 @@ package os + +import ( + "bytes" + "encoding/json" + "fmt" + "strconv" + "strings" + + "openeluer.org/PilotGo/PilotGo/pkg/utils" +) + +// TODO: 通过 /proc/cpuinfo来获取CPU型号 +type CPUInfo struct { + CpuName string + CpuNum int +} + +func (cpu *CPUInfo) String() string { + b, err := json.Marshal(*cpu) + if err != nil { + return fmt.Sprintf("%+v", *cpu) + } + var out bytes.Buffer + err = json.Indent(&out, b, "", " ") + if err != nil { + return fmt.Sprintf("%+v", *cpu) + } + return out.String() +} + +// TODO: 获取CPU型号 +func GetCPUName() string { + cpuname, _ := utils.RunCommand("cat /proc/cpuinfo | grep name | sort | uniq") + cpuname = strings.Replace(cpuname, "\n", "", -1) + str := len("model name : ") + cpuname = cpuname[str:] + return cpuname +} + +// TODO: 获取物理CPU个数 +func GetPhysicalCPU() int { + num, _ := utils.RunCommand("cat /proc/cpuinfo| grep 'physical id'| sort| uniq| wc -l") + num = strings.Replace(num, "\n", "", -1) + cpunum, err := strconv.Atoi(num) + if err != nil { + fmt.Println("获取cpu个数失败！") + } + return cpunum +} -- Gitee From 12bae967ce8d32f4864ab90b54056f7905d3da2c Mon Sep 17 00:00:00 2001 From: zhanghan Date: Wed, 8 Dec 2021 15:39:40 +0800 Subject: [PATCH 2/2] Add to get cpu info --- pkg/utils/os/cpu.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/utils/os/cpu.go b/pkg/utils/os/cpu.go index 58425e2f..1823b234 100644 --- a/pkg/utils/os/cpu.go +++ b/pkg/utils/os/cpu.go @@ -10,7 +10,7 @@ import ( "openeluer.org/PilotGo/PilotGo/pkg/utils" ) -// TODO: 通过 /proc/cpuinfo来获取CPU型号 +// 通过 /proc/cpuinfo来获取CPU型号 type CPUInfo struct { CpuName string CpuNum int @@ -29,7 +29,7 @@ func (cpu *CPUInfo) String() string { return out.String() } -// TODO: 获取CPU型号 +// 获取CPU型号 func GetCPUName() string { cpuname, _ := utils.RunCommand("cat /proc/cpuinfo | grep name | sort | uniq") cpuname = strings.Replace(cpuname, "\n", "", -1) @@ -38,7 +38,7 @@ func GetCPUName() string { return cpuname } -// TODO: 获取物理CPU个数 +// 获取物理CPU个数 func GetPhysicalCPU() int { num, _ := utils.RunCommand("cat /proc/cpuinfo| grep 'physical id'| sort| uniq| wc -l") num = strings.Replace(num, "\n", "", -1) -- Gitee