Skip to content
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

{stdenv,ninja}: add support for NIX_LOAD_LIMIT #328677

Draft
wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft

{stdenv,ninja}: add support for NIX_LOAD_LIMIT #328677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions pkgs/by-name/ni/ninja/setup-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ninjaBuildPhase() {

local flagsArray=(
-j$buildCores
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From ninja --help:

-l N     do not start new jobs if the load average is greater than N

$ninjaFlags "${ninjaFlagsArray[@]}"
)

Expand Down Expand Up @@ -39,6 +40,7 @@ ninjaCheckPhase() {

local flagsArray=(
-j$buildCores
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
$ninjaFlags "${ninjaFlagsArray[@]}"
$checkTarget
)
Expand All @@ -63,6 +65,7 @@ ninjaInstallPhase() {
# shellcheck disable=SC2086
local flagsArray=(
-j$buildCores
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
$ninjaFlags "${ninjaFlagsArray[@]}"
${installTargets:-install}
)
Expand Down
28 changes: 22 additions & 6 deletions pkgs/stdenv/generic/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,16 +858,28 @@ unset _HOST_PATH
unset _XDG_DATA_DIRS


# Normalize the NIX_BUILD_CORES variable. The value might be 0, which
# means that we're supposed to try and auto-detect the number of
# available CPU cores at run-time.
# Normalize the NIX_BUILD_CORES and NIX_LOAD_LIMIT variables. The value
# might be 0, which means that we're supposed to try and auto-detect
# the number of available CPU cores at run-time.

_guessCores() {
guess=$(nproc 2>/dev/null || true)
if test "$guess" -le 0; then
printf 1
else
printf '%d' "$guess"
fi
}

NIX_BUILD_CORES="${NIX_BUILD_CORES:-1}"
if ((NIX_BUILD_CORES <= 0)); then
guess=$(nproc 2>/dev/null || true)
((NIX_BUILD_CORES = guess <= 0 ? 1 : guess))
if test "$NIX_BUILD_CORES" -le 0; then
Comment on lines 874 to +875
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can combine these two lines like you've done with NIX_LOAD_LIMIT.

NIX_BUILD_CORES=$(_guessCores)
fi
if test "${NIX_LOAD_LIMIT:-1}" -le 0; then
NIX_LOAD_LIMIT=$(_guessCores)
fi
export NIX_BUILD_CORES
export NIX_LOAD_LIMIT


# Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly.
Expand Down Expand Up @@ -1391,6 +1403,7 @@ buildPhase() {
local flagsArray=(
${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
SHELL="$SHELL"
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From make --help:

  -l [N], --load-average[=N], --max-load[=N]
                              Don't start multiple jobs unless load is below N.

)
_accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray

Expand Down Expand Up @@ -1429,6 +1442,7 @@ checkPhase() {
local flagsArray=(
${enableParallelChecking:+-j${NIX_BUILD_CORES}}
SHELL="$SHELL"
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
)

_accumFlagsArray makeFlags makeFlagsArray
Expand Down Expand Up @@ -1472,6 +1486,7 @@ installPhase() {
local flagsArray=(
${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
SHELL="$SHELL"
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
)
_accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray
if [ -n "$__structuredAttrs" ]; then
Expand Down Expand Up @@ -1560,6 +1575,7 @@ installCheckPhase() {
local flagsArray=(
${enableParallelChecking:+-j${NIX_BUILD_CORES}}
SHELL="$SHELL"
${NIX_LOAD_LIMIT:+-l${NIX_LOAD_LIMIT}}
)

_accumFlagsArray makeFlags makeFlagsArray \
Expand Down