aboutsummaryrefslogtreecommitdiff
path: root/buildos
diff options
context:
space:
mode:
Diffstat (limited to 'buildos')
-rwxr-xr-xbuildos41
1 files changed, 25 insertions, 16 deletions
diff --git a/buildos b/buildos
index 96cf209..dc4cd55 100755
--- a/buildos
+++ b/buildos
@@ -262,14 +262,19 @@ fi
cpu_total="$(lscpu | sed -n -re 's/^CPU\(s\): *([0-9]+)$/\1/p')"
+# RAM reserved to the host.
+#
if [ -z "$ram_reserved" ]; then
ram_reserved=4
fi
ram_reserved=$(($ram_reserved * 1024 * 1024))
-if [ -z "$ram_overcommit" ]; then
- ram_overcommit=1
+# RAM reserved for auxiliary machines.
+#
+if [ -z "$ram_auxiliary" ]; then
+ ram_auxiliary=0
fi
+ram_auxiliary=$(($ram_auxiliary * 1024 * 1024))
if [ -z "$cpu_reserved" ]; then
cpu_reserved=0
@@ -279,11 +284,13 @@ if [ -z "$cpu_overcommit" ]; then
cpu_overcommit=1
fi
-ram_slice=$(($ram_total - $ram_reserved))
+ram_build_slice=$(($ram_total - $ram_reserved - $ram_auxiliary))
+ram_auxil_slice=$ram_auxiliary
cpu_slice=$(($cpu_total - $cpu_reserved))
if [ "$instances" -gt 1 ]; then
- ram_slice=$(($ram_slice * $ram_overcommit / $instances))
+ ram_build_slice=$(($ram_build_slice / $instances))
+ ram_auxil_slice=$(($ram_auxil_slice / $instances))
cpu_slice=$(($cpu_slice * $cpu_overcommit / $instances))
if [ "$cpu_slice" -eq 0 ]; then
@@ -295,23 +302,24 @@ fi
#
function print ()
{
- echo "cpu_total: $cpu_total"
- echo "cpu_reserved: $cpu_reserved"
- echo "cpu_overcommit: $cpu_overcommit"
- echo "cpu_slice: $cpu_slice"
+ echo "cpu_total: $cpu_total"
+ echo "cpu_reserved: $cpu_reserved"
+ echo "cpu_overcommit: $cpu_overcommit"
+ echo "cpu_slice: $cpu_slice"
if [ -n "$cpu_affinity" ]; then
- echo "cpu_affinity: $cpu_affinity"
+ echo "cpu_affinity: $cpu_affinity"
fi
echo
- echo "ram_total: $ram_total KB"
- echo "ram_reserved: $ram_reserved KB"
- echo "ram_overcommit: $ram_overcommit"
- echo "ram_slice: $ram_slice KB"
+ echo "ram_total: $ram_total KiB"
+ echo "ram_reserved: $ram_reserved KiB"
+ echo "ram_auxiliary: $ram_auxiliary KiB"
+ echo "ram_build_slice: $ram_build_slice KiB"
+ echo "ram_auxil_slice: $ram_auxil_slice KiB"
echo
- echo "buildid: $buildid"
- echo "buildid_url: $buildid_url"
+ echo "buildid: $buildid"
+ echo "buildid_url: $buildid_url"
echo
local n i tn tp tu tt
@@ -936,7 +944,8 @@ function bbot_start () # <toolchain-name> <toolchain-index>
sed -i -r \
-e "s#%I#$tn/%I#g" \
-e "s/^(Environment=CPU)=.*/\1=$cpu_slice/" \
- -e "s/^(Environment=RAM)=.*/\1=$ram_slice/" \
+ -e "s/^(Environment=RAM_BUILD)=.*/\1=$ram_build_slice/" \
+ -e "s/^(Environment=RAM_AUXIL)=.*/\1=$ram_auxil_slice/" \
-e "s/^(Environment=BRIDGE)=.*/\1=$tb/" \
-e "s#^(Environment=AUTH_KEY)=.*#\1=/state/etc/host-key.pem#" \
-e "s/^(Environment=INTERACTIVE)=.*/\1=$ta/" \