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

use Note sched.stopped correctly

Browse Source 
R=r
DELTA=6  (5 added, 0 deleted, 1 changed)
OCL=20777
CL=20779
This commit is contained in:
Russ Cox 2008-12-08 17:14:08 -08:00
parent 4d6bccb0f1
commit be629138ab
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/proc.c
View File

@ -59,6 +59,7 @@ struct Sched {
int32 predawn; // running initialization, don't run new gs. int32 predawn; // running initialization, don't run new gs.
Note stopped; // one g can wait here for ms to stop Note stopped; // one g can wait here for ms to stop
int32 waitstop; // after setting this flag
}; };
Sched sched; Sched sched;
@ -352,7 +353,10 @@ nextgandunlock(void)
throw("all goroutines are asleep - deadlock!"); throw("all goroutines are asleep - deadlock!");
m->nextg = nil; m->nextg = nil;
noteclear(&m->havenextg); noteclear(&m->havenextg);
notewakeup(&sched.stopped); if(sched.waitstop) {
sched.waitstop = 0;
notewakeup(&sched.stopped);
}
unlock(&sched); unlock(&sched);
notesleep(&m->havenextg); notesleep(&m->havenextg);
@ -376,6 +380,7 @@ stoptheworld(void)
sched.mcpumax = 1; sched.mcpumax = 1;
while(sched.mcpu > 1) { while(sched.mcpu > 1) {
noteclear(&sched.stopped); noteclear(&sched.stopped);
sched.waitstop = 1;
unlock(&sched); unlock(&sched);
notesleep(&sched.stopped); notesleep(&sched.stopped);
lock(&sched); lock(&sched);