diff options
author | Dan Willemsen <dwillemsen@google.com> | 2019-12-27 09:35:42 -0800 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-01-04 10:42:19 +0100 |
commit | b911055f07b215f684229410a5a5698248635225 (patch) | |
tree | 6abf463b7be19070f8b7e9498ba4ce844a77e30c | |
parent | 490cbce3ab38ea1acb8d80dd6cfc40f0d975e276 (diff) | |
download | build_soong-b911055f07b215f684229410a5a5698248635225.tar.gz build_soong-b911055f07b215f684229410a5a5698248635225.tar.bz2 build_soong-b911055f07b215f684229410a5a5698248635225.zip |
Add TotalRAM detection
Colin originally wrote this for the highmem pool:
https://android-review.googlesource.com/c/platform/build/soong/+/1168271
But while that's a larger change, this is useful to just be in the logs,
and for use in multiproduct_kati to better limit the number of
concurrent jobs.
Test: check soong.log on linux and mac
Change-Id: I0518d303a220d775f8d78dba9f660b2954e68e3e
-rw-r--r-- | ui/build/Android.bp | 2 | ||||
-rw-r--r-- | ui/build/build.go | 1 | ||||
-rw-r--r-- | ui/build/config.go | 9 | ||||
-rw-r--r-- | ui/build/config_darwin.go | 40 | ||||
-rw-r--r-- | ui/build/config_linux.go | 28 |
5 files changed, 80 insertions, 0 deletions
diff --git a/ui/build/Android.bp b/ui/build/Android.bp index 1ddaf68a..b9e7f8d4 100644 --- a/ui/build/Android.bp +++ b/ui/build/Android.bp @@ -65,11 +65,13 @@ bootstrap_go_package { ], darwin: { srcs: [ + "config_darwin.go", "sandbox_darwin.go", ], }, linux: { srcs: [ + "config_linux.go", "sandbox_linux.go", ], }, diff --git a/ui/build/build.go b/ui/build/build.go index 0ae06d61..6adccc69 100644 --- a/ui/build/build.go +++ b/ui/build/build.go @@ -128,6 +128,7 @@ func help(ctx Context, config Config, what int) { func Build(ctx Context, config Config, what int) { ctx.Verboseln("Starting build with args:", config.Arguments()) ctx.Verboseln("Environment:", config.Environment().Environ()) + ctx.Verbosef("Total RAM: %dGB", config.TotalRAM()/1024/1024/1024) if config.SkipMake() { ctx.Verboseln("Skipping Make/Kati as requested") diff --git a/ui/build/config.go b/ui/build/config.go index 954454bc..0dbd8165 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -50,6 +50,9 @@ type configImpl struct { targetDevice string targetDeviceDir string + // Autodetected + totalRAM uint64 + pdkBuild bool brokenDupRules bool @@ -97,6 +100,8 @@ func NewConfig(ctx Context, args ...string) Config { ret.parallel = runtime.NumCPU() + 2 ret.keepGoing = 1 + ret.totalRAM = detectTotalRAM(ctx) + ret.parseArgs(ctx, args) // Make sure OUT_DIR is set appropriately @@ -709,6 +714,10 @@ func (c *configImpl) Parallel() int { return c.parallel } +func (c *configImpl) TotalRAM() uint64 { + return c.totalRAM +} + func (c *configImpl) UseGoma() bool { if v, ok := c.environ.Get("USE_GOMA"); ok { v = strings.TrimSpace(v) diff --git a/ui/build/config_darwin.go b/ui/build/config_darwin.go new file mode 100644 index 00000000..480d8d1f --- /dev/null +++ b/ui/build/config_darwin.go @@ -0,0 +1,40 @@ +// Copyright 2019 Google Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package build + +import ( + "encoding/binary" + "syscall" +) + +func detectTotalRAM(ctx Context) uint64 { + s, err := syscall.Sysctl("hw.memsize") + if err != nil { + ctx.Printf("Failed to get system memory size: %s") + return 0 + } + + // syscall.Sysctl assumes that the return value is a string and trims the last byte if it is 0. + if len(s) == 7 { + s += "\x00" + } + + if len(s) != 8 { + ctx.Printf("Failed to get system memory size, returned %d bytes, 8", len(s)) + return 0 + } + + return binary.LittleEndian.Uint64([]byte(s)) +} diff --git a/ui/build/config_linux.go b/ui/build/config_linux.go new file mode 100644 index 00000000..9e1bdc7f --- /dev/null +++ b/ui/build/config_linux.go @@ -0,0 +1,28 @@ +// Copyright 2019 Google Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package build + +import "syscall" + +func detectTotalRAM(ctx Context) uint64 { + var info syscall.Sysinfo_t + err := syscall.Sysinfo(&info) + if err != nil { + ctx.Printf("Failed to get system memory size: %s") + return 0 + } + memBytes := uint64(info.Totalram) * uint64(info.Unit) + return memBytes +} |