diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-20 11:48:08 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-20 11:48:08 -0500 |
| commit | 4a674f45d109048fcef7cd9f2b876e270625c8ed (patch) | |
| tree | 3015eab80ef343dda34fb968843c8b2d28987f05 /src/runtime/select.go | |
| parent | fbd764146d71d8929edadc4abd51e89932742000 (diff) | |
| parent | 1ac4b754e58ba42944de03808fb96210b065e4c4 (diff) | |
| download | go-4a674f45d109048fcef7cd9f2b876e270625c8ed.tar.gz | |
[dev.cc] all: merge default (e4ab8f908aac) into dev.cc
TBR=austin
CC=golang-codereviews
https://codereview.appspot.com/179040044
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 f735a71e2..6717b9395 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) |