go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-04-17 12:06:49 +02:00
Code Issues Releases Activity

fix possible cpus

Browse Source
This commit is contained in:
longXboy 2019-10-12 12:22:28 +08:00
parent 9313c5bd95
commit 01783b26f7
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -23,6 +23,7 @@ require (
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/leodido/go-urn v1.1.0 // indirect github.com/leodido/go-urn v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.2 // indirect github.com/mattn/go-colorable v0.1.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/montanaflynn/stats v0.5.0 github.com/montanaflynn/stats v0.5.0
github.com/openzipkin/zipkin-go v0.2.1 github.com/openzipkin/zipkin-go v0.2.1
github.com/otokaze/mock v0.0.0-20190125081256-8282b7a7c7c3 github.com/otokaze/mock v0.0.0-20190125081256-8282b7a7c7c3

5
pkg/stat/sys/cpu/cgroup.go
View File

@ -56,7 +56,10 @@ func (c *cgroup) CPUAcctUsagePerCPU() ([]uint64, error) {
if u, err = parseUint(v); err != nil { if u, err = parseUint(v); err != nil {
return nil, err return nil, err
} }
usage = append(usage, u) // fix possible_cpu:https://www.ibm.com/support/knowledgecenter/en/linuxonibm/com.ibm.linux.z.lgdd/lgdd_r_posscpusparm.html
if u != 0 {
usage = append(usage, u)
}
} }
return usage, nil return usage, nil
} }

19
pkg/stat/sys/cpu/cgroupCPU.go
View File

@ -8,6 +8,7 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
pscpu "github.com/shirou/gopsutil/cpu"
) )
type cgroupCPU struct { type cgroupCPU struct {
@ -21,12 +22,17 @@ type cgroupCPU struct {
} }
func newCgroupCPU() (cpu *cgroupCPU, err error) { func newCgroupCPU() (cpu *cgroupCPU, err error) {
cpus, err := perCPUUsage() var cores int
if err != nil { cores, err = pscpu.Counts(true)
err = errors.Errorf("perCPUUsage() failed!err:=%v", err) if err != nil || cores == 0 {
return var cpus []uint64
cpus, err = perCPUUsage()
if err != nil {
err = errors.Errorf("perCPUUsage() failed!err:=%v", err)
return
}
cores = len(cpus)
} }
cores := uint64(len(cpus))
sets, err := cpuSets() sets, err := cpuSets()
if err != nil { if err != nil {
@ -61,10 +67,11 @@ func newCgroupCPU() (cpu *cgroupCPU, err error) {
cpu = &cgroupCPU{ cpu = &cgroupCPU{
frequency: maxFreq, frequency: maxFreq,
quota: quota, quota: quota,
cores: cores, cores: uint64(cores),
preSystem: preSystem, preSystem: preSystem,
preTotal: preTotal, preTotal: preTotal,
} }
fmt.Printf("get cpu info:%+v \n", cpu)
return return
} }