Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "runtime: bound defer pools"

Browse source 
This reverts commit 8059071153.

Conflicts:
	src/runtime/proc1.go (resolved by hand)

Change-Id: Ic62e3e802f0007ff9012b37bc5fd41fcafc153d0
Reviewed-on: https://go-review.googlesource.com/3885
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
This commit is contained in:
Russ Cox 2015-02-04 11:56:34 -05:00
parent 1f2d7bf44f
commit 7505cd8b23
4 changed files with 18 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/runtime/panic.go
View file

@ -166,20 +166,9 @@ func newdefer(siz int32) *_defer {
mp := acquirem()
if sc < uintptr(len(p{}.deferpool)) {
pp := mp.p
if len(pp.deferpool[sc]) == 0 {
lock(&sched.deferlock)
for len(pp.deferpool[sc]) < cap(pp.deferpool[sc])/2 && sched.deferpool[sc] != nil {
d := sched.deferpool[sc]
sched.deferpool[sc] = d.link
d.link = nil
pp.deferpool[sc] = append(pp.deferpool[sc], d)
}
unlock(&sched.deferlock)
}
if ln := len(pp.deferpool[sc]); ln > 0 {
d = pp.deferpool[sc][ln-1]
pp.deferpool[sc][ln-1] = nil
pp.deferpool[sc] = pp.deferpool[sc][:ln-1]
d = pp.deferpool[sc]
if d != nil {
pp.deferpool[sc] = d.link
}
}
if d == nil {
@ -225,28 +214,9 @@ func freedefer(d *_defer) {
if sc < uintptr(len(p{}.deferpool)) {
mp := acquirem()
pp := mp.p
if len(pp.deferpool[sc]) == cap(pp.deferpool[sc]) {
// Transfer half of local cache to the central cache.
var first, last *_defer
for len(pp.deferpool[sc]) > cap(pp.deferpool[sc])/2 {
ln := len(pp.deferpool[sc])
d := pp.deferpool[sc][ln-1]
pp.deferpool[sc][ln-1] = nil
pp.deferpool[sc] = pp.deferpool[sc][:ln-1]
if first == nil {
first = d
} else {
last.link = d
}
last = d
}
lock(&sched.deferlock)
last.link = sched.deferpool[sc]
sched.deferpool[sc] = first
unlock(&sched.deferlock)
}
*d = _defer{}
pp.deferpool[sc] = append(pp.deferpool[sc], d)
d.link = pp.deferpool[sc]
pp.deferpool[sc] = d
releasem(mp)
}
}