diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-15 08:00:38 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-15 08:00:38 -0500 |
| commit | 8b46a22b652d6e7a4a69b9523d57aff12f9dc945 (patch) | |
| tree | 8f1c3f2d7e06daa3a9ad5721658a31b63519d748 /src/runtime/select.go | |
| parent | 66fbfa707147ff58e13beed2d4a957a06bede869 (diff) | |
| parent | 0b7f128e76956367ddb4f9ddbee4477d3b462e96 (diff) | |
| download | go-8b46a22b652d6e7a4a69b9523d57aff12f9dc945.tar.gz | |
[dev.garbage] all: merge dev.cc into dev.garbage
The garbage collector is now written in Go.
There is plenty to clean up (just like on dev.cc).
all.bash passes on darwin/amd64, darwin/386, linux/amd64, linux/386.
TBR=rlh
R=austin, rlh, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/173250043
Diffstat (limited to 'src/runtime/select.go')
| -rw-r--r-- | src/runtime/select.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/select.go b/src/runtime/select.go index d703e1d79..e918b734a 100644 --- a/src/runtime/select.go +++ b/src/runtime/select.go @@ -167,8 +167,8 @@ func selunlock(sel *_select) { } } -func selparkcommit(gp *g, sel *_select) bool { - selunlock(sel) +func selparkcommit(gp *g, sel unsafe.Pointer) bool { + selunlock((*_select)(sel)) return true } @@ -363,7 +363,7 @@ loop: // wait for someone to wake us up gp.param = nil - gopark(unsafe.Pointer(funcPC(selparkcommit)), unsafe.Pointer(sel), "select") + gopark(selparkcommit, unsafe.Pointer(sel), "select") // someone woke us up sellock(sel) |