* [PATCH 2/8] drop GNU nproc(1) support in favor of getconf(1)
2023-09-18 10:15 5% [PATCH 0/8] portability odds and ends Eric Wong
@ 2023-09-18 10:15 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-09-18 10:15 UTC (permalink / raw)
To: meta
`getconf NPROCESSORS_ONLN' will succeed on GNU/Linux systems
anyways; and the non-underscore-prefixed invocation works fine
on all BSD flavors tested.
Thus the `nproc' and `gnproc' attempts will never be reached.
The only downside is we lose the ability to account for CPU
affinity, but that's probably not an issue since CPU affinity
(AFAIK) isn't a commonly-used feature.
---
Makefile.PL | 4 ++--
ci/run.sh | 2 +-
lib/PublicInbox/IPC.pm | 11 ++++-------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/Makefile.PL b/Makefile.PL
index 5b7914dc..97e00395 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -199,8 +199,8 @@ WriteMakefile(
);
sub MY::postamble {
- my $N = (`{ getconf _NPROCESSORS_ONLN || getconf NPROCESSORS_ONLN ||
- gnproc || nproc; } 2>/dev/null` || 1);
+ my $N = (`{ getconf _NPROCESSORS_ONLN ||
+ getconf NPROCESSORS_ONLN; } 2>/dev/null` || 1);
$N += 1; # account for sleeps in some tests (and makes an IV)
<<EOF;
PROVE = prove
diff --git a/ci/run.sh b/ci/run.sh
index 93790269..bd1d8a4d 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -12,7 +12,7 @@ then
$DO $MAKE clean >/dev/null
fi
NPROC=${NPROC-$({ getconf _NPROCESSORS_ONLN || getconf NPROCESSORS_ONLN ||
- gnproc || nproc || echo 2; } 2>/dev/null)}
+ echo 2; } 2>/dev/null)}
TEST_JOBS=${TEST_JOBS-1}
$PERL -w ci/profiles.perl | while read args
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 39021f42..fa084795 100644
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -464,16 +464,13 @@ sub detect_nproc () {
my $n = $NPROCESSORS_ONLN{$^O};
return POSIX::sysconf($n) if defined $n;
- # getconf(1) is POSIX, but *NPROCESSORS* vars are not
+ # getconf(1) is POSIX, but *NPROCESSORS* vars are not even if
+ # glibc, {Free,Net,Open}BSD all support them.
for (qw(_NPROCESSORS_ONLN NPROCESSORS_ONLN)) {
`getconf $_ 2>/dev/null` =~ /^(\d+)$/ and return $1;
}
- for my $nproc (qw(nproc gnproc)) { # GNU coreutils nproc
- `$nproc 2>/dev/null` =~ /^(\d+)$/ and return $1;
- }
-
- # should we bother with `sysctl hw.ncpu`? Those only give
- # us total processor count, not online processor count.
+ # note: GNU nproc(1) checks CPU affinity, which is nice but
+ # isn't remotely portable
undef
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/8] portability odds and ends
@ 2023-09-18 10:15 5% Eric Wong
2023-09-18 10:15 7% ` [PATCH 2/8] drop GNU nproc(1) support in favor of getconf(1) Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-09-18 10:15 UTC (permalink / raw)
To: meta
Nothing major, just a few things I noticed while working
on various *BSDs.
Eric Wong (8):
ci/run: favor `make check' as the default target
drop GNU nproc(1) support in favor of getconf(1)
ipc: assume SOCK_SEQPACKET exists
rename t/run.perl to xt/check-run
makefile: avoid needless use of double-colon rules
pop3d: split @FLOCK into $FLOCK_TMPL and @FLOCK_ORDER
install/deps: more fixes
makefile: avoid non-POSIX which(1)
Documentation/include.mk | 10 ++++++----
MANIFEST | 2 +-
Makefile.PL | 31 +++++++++++++++++--------------
ci/run.sh | 5 +++--
install/deps.perl | 17 ++++++++++++-----
lib/PublicInbox/IPC.pm | 22 +++++++++-------------
lib/PublicInbox/POP3D.pm | 16 ++++++++--------
t/nntpd.t | 2 +-
t/run.perl => xt/check-run.t | 4 ++--
9 files changed, 59 insertions(+), 50 deletions(-)
rename t/run.perl => xt/check-run.t (98%)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-09-18 10:15 5% [PATCH 0/8] portability odds and ends Eric Wong
2023-09-18 10:15 7% ` [PATCH 2/8] drop GNU nproc(1) support in favor of getconf(1) Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).