Merge pull request #27105 from markjdb/main

openshift-merge-bot[bot] · web-flow · commit 167102951749 · 2025-09-19T14:07:22.000Z
A couple of minor stats improvements for FreeBSD
diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go
@@ -11,6 +11,7 @@ import (
 	"github.com/containers/podman/v5/pkg/rctl"
 	"github.com/sirupsen/logrus"
 	"go.podman.io/storage/pkg/system"
+	"golang.org/x/sys/unix"
 )
 
 // 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) {
-	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
 }
diff --git a/pkg/api/handlers/compat/containers_stats_freebsd.go b/pkg/api/handlers/compat/containers_stats_freebsd.go
@@ -30,7 +30,7 @@ func statsContainerJSON(ctnr *libpod.Container, stats *define.ContainerStats, pr
 					TotalUsage: stats.CPUNano,
 				},
 				CPU:            stats.CPU,
-				OnlineCPUs:     0,
+				OnlineCPUs:     uint32(onlineCPUs),
 				ThrottlingData: container.ThrottlingData{},
 			},
 			PreCPUStats: preCPUStats,

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