544e4a700b
This PR changes metrics collection to actually measure the time interval between collections, rather than assume 3 seconds. I did some ad hoc profiling, and on slower hardware (eg, my Raspberry Pi 4) I routinely saw intervals between 3.3 - 3.5 seconds, with some being as high as 4.5 seconds. This will generally cause the CPU gauge readings to be too high, and in some cases can cause impossibly large values for the CPU load metrics (eg. greater than 400 for a 4 core CPU). --------- Co-authored-by: Felix Lange <fjl@twurst.com>
45 lines
1.5 KiB
Go
45 lines
1.5 KiB
Go
// Copyright 2020 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//go:build !ios && !js
|
|
// +build !ios,!js
|
|
|
|
package metrics
|
|
|
|
import (
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/shirou/gopsutil/cpu"
|
|
)
|
|
|
|
// ReadCPUStats retrieves the current CPU stats.
|
|
func ReadCPUStats(stats *CPUStats) {
|
|
// passing false to request all cpu times
|
|
timeStats, err := cpu.Times(false)
|
|
if err != nil {
|
|
log.Error("Could not read cpu stats", "err", err)
|
|
return
|
|
}
|
|
if len(timeStats) == 0 {
|
|
log.Error("Empty cpu stats")
|
|
return
|
|
}
|
|
// requesting all cpu times will always return an array with only one time stats entry
|
|
timeStat := timeStats[0]
|
|
stats.GlobalTime = timeStat.User + timeStat.Nice + timeStat.System
|
|
stats.GlobalWait = timeStat.Iowait
|
|
stats.LocalTime = getProcessCPUTime()
|
|
}
|