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

runtime: fix bug in preemption checks; was causing "lock count" panics

Browse Source 
R=r
CC=golang-dev
https://golang.org/cl/186078
This commit is contained in:
Russ Cox 2010-01-12 10:03:02 -08:00
parent 9d4d7d8f99
commit 711088106e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/runtime/malloc.cgo
View File

@ -27,7 +27,7 @@ mallocgc(uintptr size, uint32 refflag, int32 dogc)
void *v; void *v;
uint32 *ref; uint32 *ref;
if(gcwaiting && g != m->g0) if(gcwaiting && g != m->g0 && m->locks == 0)
gosched(); gosched();
if(m->mallocing) if(m->mallocing)
throw("malloc/free - deadlock"); throw("malloc/free - deadlock");

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

@ -523,6 +523,8 @@ scheduler(void)
void void
gosched(void) gosched(void)
{ {
if(m->locks != 0)
throw("gosched holding locks");
if(g == m->g0) if(g == m->g0)
throw("gosched of g0"); throw("gosched of g0");
if(gosave(&g->sched) == 0) if(gosave(&g->sched) == 0)