Skip to content

A couple of minor stats improvements for FreeBSD #27105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2025
Merged

A couple of minor stats improvements for FreeBSD #27105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602ba41
libpod: Implement getOnlineCPUs() on FreeBSD
markjdb Sep 16, 2025
a0238fb
libpod: Fill out OnlineCPUs in the FreeBSD stats handler
markjdb Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libpod/stats_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion pkg/api/handlers/compat/containers_stats_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down