d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nproc: denote an incompatiblity with Linux

Browse Source 
On Linux _NPROCESSORS_CONF reports CPU threads disabled by the kernel,
while it does not on FreeBSD.

Flip _NPROCESSORS_ONLN to _NPROCESSORS_CONF. While it keeps reporting
the same value, it will automagically unbreak should someone change the
above.
This commit is contained in:
Mateusz Guzik 2023-02-15 20:17:27 +00:00
parent 5dd48f7184
commit 059320b8c8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/nproc/nproc.1
View File

@ -3,7 +3,7 @@
.\"
.\" * SPDX-License-Identifier: BSD-2-Clause
.\"
.Dd February 5, 2023
.Dd February 15, 2023
.Dt NPROC 1
.Os
.Sh NAME
@ -40,6 +40,11 @@ Print usage information and exit.
.El
.Sh COMPATIBILITY
This program is intended to be compatible with nproc as found in GNU coreutils.
.Sh BUGS
If HyperThreading is enabled in BIOS and disabled in the kernel, the
.Fl -all
option on Linux will still report all possible CPU threads.
On FreeBSD only active threads will be reported.
.Sh SEE ALSO
.Xr cpuset 1
.Sh HISTORY

2
bin/nproc/nproc.c
View File

@ -110,7 +110,7 @@ main(int argc, char *argv[])
usage();
if (all_flag) {
cpus = sysconf(_SC_NPROCESSORS_ONLN);
cpus = sysconf(_SC_NPROCESSORS_CONF);
if (cpus == -1)
err(1, "sysconf");
} else {