Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cl/_testgo/select/expect.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
100
ch1
ch2
;
16 changes: 16 additions & 0 deletions cl/compile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@ func TestRunFromTestgo(t *testing.T) {
cltest.RunFromDir(t, "", "./_testgo", nil)
}

func TestRunFromTestgoSelectAllowsKnownInterleavings(t *testing.T) {
output, err := cltest.RunAndCapture("./_testgo/select", "")
if err != nil {
t.Fatalf("run failed: %v\noutput: %s", err, string(output))
}
got := string(output)
allowed := map[string]struct{}{
"100\nch1\nch2\n": {},
"100\nexit\nch1\n": {},
"200\nexit\nexit\n": {},
}
if _, ok := allowed[got]; !ok {
t.Fatalf("unexpected select output:\n%s", got)
}
}

func TestFromTestpy(t *testing.T) {
cltest.FromDir(t, "", "./_testpy")
}
Expand Down
5 changes: 5 additions & 0 deletions runtime/internal/runtime/z_chan.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ func ChanSend(p *Chan, v unsafe.Pointer, eltSize int) bool {
if n == 0 {
for p.getp != chanHasRecv && !p.close {
p.sends++
// A blocked unbuffered send must wake select-based receivers so they can
// retry ChanTryRecv after observing that a sender is now waiting.
if p.sends == 1 {
notifyOps(p)
}
p.cond.Wait(&p.mutex)
p.sends--
}
Expand Down
54 changes: 54 additions & 0 deletions test/select_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package test

import (
"testing"
"time"
)

func TestSelectRecvWakesForBlockedUnbufferedSend(t *testing.T) {
for i := 0; i < 50; i++ {
res := make(chan struct{})
done := make(chan struct{})
started := make(chan struct{})
received := make(chan struct{})
sendDone := make(chan struct{})

go func() {
close(started)
select {
case <-res:
close(received)
case <-done:
}
}()

<-started
// Give the goroutine a brief chance to reach the blocking select path so
// this regression exercises select wakeups rather than a direct recv fast path.
time.Sleep(time.Millisecond)

go func() {
select {
case res <- struct{}{}:
close(sendDone)
case <-done:
}
}()

select {
case <-sendDone:
case <-time.After(200 * time.Millisecond):
close(done)
t.Fatalf("iteration %d: unbuffered send did not wake select receiver", i)
}

select {
case <-received:
case <-time.After(200 * time.Millisecond):
close(done)
t.Fatalf("iteration %d: select receiver did not receive sent value", i)
}

close(done)
}
}
Loading