KJZH001/nezhahq-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make atomicStoreFloat64 safe (#29)

Browse Source
This commit is contained in:
UUBulb 2024-06-23 15:58:39 +08:00 committed by GitHub
parent 136b3801c7
commit 804364e6c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/monitor/monitor.go
View File

@ -10,7 +10,6 @@ import (
"sync/atomic" "sync/atomic"
"syscall" "syscall"
"time" "time"
"unsafe"
"github.com/dean2021/goss" "github.com/dean2021/goss"
"github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/cpu"
@ -40,7 +39,7 @@ var (
var ( var (
netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdateNetStats uint64 netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdateNetStats uint64
cachedBootTime time.Time cachedBootTime time.Time
gpuStat float64 gpuStat uint64
temperatureStat []model.SensorTemperature temperatureStat []model.SensorTemperature
) )
@ -221,7 +220,7 @@ func GetState(agentConfig *model.AgentConfig, skipConnectionCount bool, skipProc
ret.Temperatures = temperatureStat ret.Temperatures = temperatureStat
go updateGPUStat(agentConfig, &gpuStat) go updateGPUStat(agentConfig, &gpuStat)
ret.GPU = gpuStat ret.GPU = math.Float64frombits(gpuStat)
ret.NetInTransfer, ret.NetOutTransfer = netInTransfer, netOutTransfer ret.NetInTransfer, ret.NetOutTransfer = netInTransfer, netOutTransfer
ret.NetInSpeed, ret.NetOutSpeed = netInSpeed, netOutSpeed ret.NetInSpeed, ret.NetOutSpeed = netInSpeed, netOutSpeed
@ -313,7 +312,7 @@ func getDiskTotalAndUsed(agentConfig *model.AgentConfig) (total uint64, used uin
return return
} }
func updateGPUStat(agentConfig *model.AgentConfig, gpuStat *float64) { func updateGPUStat(agentConfig *model.AgentConfig, gpuStat *uint64) {
if !atomic.CompareAndSwapInt32(&updateGPUStatus, 0, 1) { if !atomic.CompareAndSwapInt32(&updateGPUStatus, 0, 1) {
return return
} }
@ -369,6 +368,6 @@ func println(v ...interface{}) {
fmt.Println(v...) fmt.Println(v...)
} }
func atomicStoreFloat64(x *float64, v float64) { func atomicStoreFloat64(x *uint64, v float64) {
atomic.StoreUint64((*uint64)(unsafe.Pointer(x)), math.Float64bits(v)) atomic.StoreUint64(x, math.Float64bits(v))
} }