aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-02-12 20:35:50 -0800
committerIan Lance Taylor <iant@golang.org>2020-02-15 09:12:18 -0800
commit17edb3310d8ce9d5f6c9e53f6c1f7d611c2a5a41 (patch)
tree3979912a6fd0b36187ca8367874dbe8b299b310d
parent5599262661af219726dccba200459671ed7bba8a (diff)
downloadgcc-17edb3310d8ce9d5f6c9e53f6c1f7d611c2a5a41.zip
gcc-17edb3310d8ce9d5f6c9e53f6c1f7d611c2a5a41.tar.gz
gcc-17edb3310d8ce9d5f6c9e53f6c1f7d611c2a5a41.tar.bz2
runtime: on 32-bit systems, limit default GOMAXPROCS to 32
Otherwise we can easily run out of stack space for threads. The user can still override by setting GOMAXPROCS. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/219278
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/runtime/proc.go8
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 27f4ce3..9916b02 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c94637ad6fd38d4814fb02d094a1a73f19323d71
+3e46519cee5c916a9b39480fbac13f4ffc6a93b0
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/runtime/proc.go b/libgo/go/runtime/proc.go
index c0e8577..e3f934a 100644
--- a/libgo/go/runtime/proc.go
+++ b/libgo/go/runtime/proc.go
@@ -563,6 +563,14 @@ func schedinit() {
sched.lastpoll = uint64(nanotime())
procs := ncpu
+
+ // In 32-bit mode, we can burn a lot of memory on thread stacks.
+ // Try to avoid this by limiting the number of threads we run
+ // by default.
+ if sys.PtrSize == 4 && procs > 32 {
+ procs = 32
+ }
+
if n, ok := atoi32(gogetenv("GOMAXPROCS")); ok && n > 0 {
procs = n
}