diff options
| author | Michael Pratt <mpratt@google.com> | 2025-05-13 13:12:47 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2025-05-19 12:47:30 -0700 |
| commit | db956262ac4125693cffb517ea7aebf6ab04ec35 (patch) | |
| tree | 3c93816c3dc43f4e273c84f7eb0c3f5b8896ccbb /src/runtime/proc.go | |
| parent | 76e7bfbb4e3a6114a33c7dba666fdd26698bedc5 (diff) | |
| download | go-db956262ac4125693cffb517ea7aebf6ab04ec35.tar.xz | |
runtime: rename ncpu to numCPUStartup
ncpu is the total logical CPU count at startup. It is never updated. For
#73193, we will start using updated CPU counts for updated GOMAXPROCS,
making the ncpu name a bit ambiguous. Change to a less ambiguous name.
While we're at it, give the OS specific lookup functions a common name,
so it can be used outside of osinit later.
For #73193.
Change-Id: I6a6a636cf21cc60de36b211f3c374080849fc667
Reviewed-on: https://go-review.googlesource.com/c/go/+/672277
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
Diffstat (limited to 'src/runtime/proc.go')
| -rw-r--r-- | src/runtime/proc.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 5d3e4e4953..f48373fe7c 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -900,7 +900,7 @@ func schedinit() { lock(&sched.lock) sched.lastpoll.Store(nanotime()) - procs := ncpu + procs := numCPUStartup if n, ok := strconv.Atoi32(gogetenv("GOMAXPROCS")); ok && n > 0 { procs = n } @@ -7230,7 +7230,7 @@ func internal_sync_runtime_canSpin(i int) bool { // GOMAXPROCS>1 and there is at least one other running P and local runq is empty. // As opposed to runtime mutex we don't do passive spinning here, // because there can be work on global runq or on other Ps. - if i >= active_spin || ncpu <= 1 || gomaxprocs <= sched.npidle.Load()+sched.nmspinning.Load()+1 { + if i >= active_spin || numCPUStartup <= 1 || gomaxprocs <= sched.npidle.Load()+sched.nmspinning.Load()+1 { return false } if p := getg().m.p.ptr(); !runqempty(p) { |