opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-14 01:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27105 from markjdb/main

Browse Source 
A couple of minor stats improvements for FreeBSD
This commit is contained in:
openshift-merge-bot[bot]
2025-09-19 14:07:22 +00:00
committed by GitHub
parent 0215832852 a0238fb19f
commit 1671029517
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/stats_freebsd.go
View File

@ -11,6 +11,7 @@ import (
"github.com/containers/podman/v5/pkg/rctl" "github.com/containers/podman/v5/pkg/rctl"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"go.podman.io/storage/pkg/system" "go.podman.io/storage/pkg/system"
"golang.org/x/sys/unix"
) )
// getPlatformContainerStats gets the platform-specific running stats // getPlatformContainerStats gets the platform-specific running stats
@ -127,5 +128,9 @@ func calculateCPUPercent(currentCPU, previousCPU, now, previousSystem uint64) fl
} }
func getOnlineCPUs(container *Container) (int, error) { func getOnlineCPUs(container *Container) (int, error) {
return 0, nil if container.state.State != define.ContainerStateRunning {
return -1, fmt.Errorf("container %s is not running: %w", container.ID(), define.ErrCtrStopped)
}
n, err := unix.SysctlUint32("hw.ncpu")
return int(n), err
} }

2
pkg/api/handlers/compat/containers_stats_freebsd.go
View File

@ -30,7 +30,7 @@ func statsContainerJSON(ctnr *libpod.Container, stats *define.ContainerStats, pr
TotalUsage: stats.CPUNano, TotalUsage: stats.CPUNano,
}, },
CPU: stats.CPU, CPU: stats.CPU,
OnlineCPUs: 0, OnlineCPUs: uint32(onlineCPUs),
ThrottlingData: container.ThrottlingData{}, ThrottlingData: container.ThrottlingData{},
}, },
PreCPUStats: preCPUStats, PreCPUStats: preCPUStats,