mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: fix deadlock in parallel for test 

The deadlock occurs when another goroutine requests GC
during the test. When wait=true the test expects physical parallelism,
that is, that P goroutines are all active at the same time.
If GC is requested, then part of the goroutines are not scheduled,
so other goroutines deadlock.
With wait=false, goroutines finish parallel for w/o waiting for all
other goroutines.
Fixes #3954.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6820098
This commit is contained in:
Dmitriy Vyukov 2012-11-06 20:11:16 +04:00
parent d6b9a03b7f
commit 6ae448e8df
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pkg/runtime/parfor_test.go
View File

@ -109,14 +109,21 @@ func TestParForParallel(t *testing.T) {
data[i] = i data[i] = i
} }
P := GOMAXPROCS(-1) P := GOMAXPROCS(-1)
c := make(chan bool, P)
desc := NewParFor(uint32(P)) desc := NewParFor(uint32(P))
ParForSetup(desc, uint32(P), uint32(N), nil, true, func(desc *ParFor, i uint32) { ParForSetup(desc, uint32(P), uint32(N), nil, false, func(desc *ParFor, i uint32) {
data[i] = data[i]*data[i] + 1 data[i] = data[i]*data[i] + 1
}) })
for p := 1; p < P; p++ { for p := 1; p < P; p++ {
go ParForDo(desc) go func() {
ParForDo(desc)
c <- true
}()
} }
ParForDo(desc) ParForDo(desc)
for p := 1; p < P; p++ {
<-c
}
for i := uint64(0); i < N; i++ { for i := uint64(0); i < N; i++ {
if data[i] != i*i+1 { if data[i] != i*i+1 {
t.Fatalf("Wrong element %d: %d", i, data[i]) t.Fatalf("Wrong element %d: %d", i, data[i])