qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 03:07:56 -07:00
Code Releases Activity

runtime: fix GOMAXPROCS vs garbage collection bug

Browse Source 
Fixes #1715.

R=golang-dev, rsc1, rsc
CC=golang-dev
https://golang.org/cl/4434053
This commit is contained in:
Dmitriy Vyukov 2011-04-21 12:09:25 -04:00 committed by Russ Cox
parent bad5673c8f
commit 29d78f1243
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/runtime/proc.c
View File

@ -1196,6 +1196,12 @@ runtime·gomaxprocsfunc(int32 n)
if (n <= 0) if (n <= 0)
n = ret; n = ret;
runtime·gomaxprocs = n; runtime·gomaxprocs = n;
if (runtime·gcwaiting != 0) {
if (runtime·sched.mcpumax != 1)
runtime·throw("invalid runtime·sched.mcpumax during gc");
schedunlock();
return ret;
}
runtime·sched.mcpumax = n; runtime·sched.mcpumax = n;
// handle fewer procs? // handle fewer procs?
if(runtime·sched.mcpu > runtime·sched.mcpumax) { if(runtime·sched.mcpu > runtime·sched.mcpumax) {

32
src/pkg/runtime/proc_test.go Normal file
View File

@ -0,0 +1,32 @@
// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package runtime_test
import (
"runtime"
"testing"
)
func perpetuumMobile() {
go perpetuumMobile()
}
func TestStopTheWorldDeadlock(t *testing.T) {
runtime.GOMAXPROCS(3)
compl := make(chan int, 1)
go func() {
for i := 0; i != 1000; i += 1 {
runtime.GC()
}
compl <- 0
}()
go func() {
for i := 0; i != 1000; i += 1 {
runtime.GOMAXPROCS(3)
}
}()
go perpetuumMobile()
<-compl
}