Skip to content

Fix FreeBSD build: replace cpuset_getdomain with cpuset_getaffinity for NUMA domain CPU lookup #1003

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
rdementi merged 2 commits into from
Feb 21, 2026
+4 −5
Merged

Fix FreeBSD build: replace cpuset_getdomain with cpuset_getaffinity for NUMA domain CPU lookup #1003

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b1a925
Initial plan
Copilot Feb 21, 2026
d490c24
Fix FreeBSD compilation error: use cpuset_getaffinity instead of cpus…
Copilot Feb 21, 2026
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
9 changes: 4 additions & 5 deletions src/cpucounters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <sys/ioccom.h>
#include <sys/cpuctl.h>
#include <machine/cpufunc.h>
#include <sys/domainset.h>
#endif

#ifdef _MSC_VER
Expand Down Expand Up @@ -7493,9 +7492,9 @@ int32 PCM::mapNUMANodeToSocket(uint32 numa_node_id) const
cpuset_t cpuset;
CPU_ZERO(&cpuset);

// cpuset_getdomain returns the cpuset for a specific domain
if (cpuset_getdomain(CPU_LEVEL_WHICH, CPU_WHICH_DOMAIN, numa_node_id,
sizeof(cpuset), &cpuset, DOMAINSET_POLICY_PREFER) == 0)
// cpuset_getaffinity with CPU_WHICH_DOMAIN returns the cpuset for a specific NUMA domain
if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_DOMAIN, numa_node_id,
sizeof(cpuset), &cpuset) == 0)
{
// Find the first CPU in this domain's cpuset
for (size_t cpu = 0; cpu < topology.size(); ++cpu)
Expand All @@ -7510,7 +7509,7 @@ int32 PCM::mapNUMANodeToSocket(uint32 numa_node_id) const
}
else
{
DBG(2, "cpuset_getdomain failed for domain ", numa_node_id);
DBG(2, "cpuset_getaffinity failed for domain ", numa_node_id);
}
#endif

Expand Down