qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 02:10:21 -07:00
Code Releases Activity

test and fix non-blocking chan ops on buffered chans

Browse Source 
R=ken
DELTA=68  (19 added, 0 deleted, 49 changed)
OCL=15966
CL=15969
This commit is contained in:
Russ Cox 2008-09-26 11:47:04 -07:00
parent c3d841f5d4
commit d448d18cb4
2 changed files with 76 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/runtime/chan.c
View File

@ -198,12 +198,18 @@ sendchan(Hchan *c, byte *ep, bool *pres)
sg = g->param;
freesg(c, sg);
unlock(&chanlock);
if(pres != nil)
*pres = true;
return;
asynch:
//prints("\nasend\n");
while(c->qcount >= c->dataqsiz) {
// (rsc) should check for pres != nil
if(pres != nil) {
unlock(&chanlock);
*pres = false;
return;
}
sg = allocsg(c);
g->status = Gwaiting;
enqueue(&c->sendq, sg);
@ -227,6 +233,8 @@ asynch:
ready(gp);
} else
unlock(&chanlock);
if(pres != nil)
*pres = true;
}
static void
@ -277,10 +285,17 @@ chanrecv(Hchan* c, byte *ep, bool* pres)
c->elemalg->copy(c->elemsize, ep, sg->elem);
freesg(c, sg);
unlock(&chanlock);
if(pres != nil)
*pres = true;
return;
asynch:
while(c->qcount <= 0) {
if(pres != nil) {
unlock(&chanlock);
*pres = false;
return;
}
sg = allocsg(c);
g->status = Gwaiting;
enqueue(&c->recvq, sg);
@ -300,6 +315,8 @@ asynch:
ready(gp);
} else
unlock(&chanlock);
if(pres != nil)
*pres = true;
}
// chansend1(hchan *chan any, elem any);

114
test/chan/nonblock.go
View File

@ -52,61 +52,63 @@ func main() {
var s string;
var ok bool;
c32 := new(chan int32);
c64 := new(chan int64);
cb := new(chan bool);
cs := new(chan string);
i32, ok = <-c32;
if ok { panic("blocked i32sender") }
i64, ok = <-c64;
if ok { panic("blocked i64sender") }
b, ok = <-cb;
if ok { panic("blocked bsender") }
s, ok = <-cs;
if ok { panic("blocked ssender") }
go i32receiver(c32);
pause();
ok = c32 <- 123;
if !ok { panic("i32receiver") }
go i32sender(c32);
pause();
i32, ok = <-c32;
if !ok { panic("i32sender") }
if i32 != 234 { panic("i32sender value") }
go i64receiver(c64);
pause();
ok = c64 <- 123456;
if !ok { panic("i64receiver") }
go i64sender(c64);
pause();
i64, ok = <-c64;
if !ok { panic("i64sender") }
if i64 != 234567 { panic("i64sender value") }
go breceiver(cb);
pause();
ok = cb <- true;
if !ok { panic("breceiver") }
go bsender(cb);
pause();
b, ok = <-cb;
if !ok { panic("bsender") }
if !b{ panic("bsender value") }
go sreceiver(cs);
pause();
ok = cs <- "hello";
if !ok { panic("sreceiver") }
go ssender(cs);
pause();
s, ok = <-cs;
if !ok { panic("ssender") }
if s != "hello again" { panic("ssender value") }
for buffer := 0; buffer < 2; buffer++ {
c32 := new(chan int32, buffer);
c64 := new(chan int64, buffer);
cb := new(chan bool, buffer);
cs := new(chan string, buffer);
i32, ok = <-c32;
if ok { panic("blocked i32sender") }
i64, ok = <-c64;
if ok { panic("blocked i64sender") }
b, ok = <-cb;
if ok { panic("blocked bsender") }
s, ok = <-cs;
if ok { panic("blocked ssender") }
go i32receiver(c32);
pause();
ok = c32 <- 123;
if !ok { panic("i32receiver") }
go i32sender(c32);
pause();
i32, ok = <-c32;
if !ok { panic("i32sender") }
if i32 != 234 { panic("i32sender value") }
go i64receiver(c64);
pause();
ok = c64 <- 123456;
if !ok { panic("i64receiver") }
go i64sender(c64);
pause();
i64, ok = <-c64;
if !ok { panic("i64sender") }
if i64 != 234567 { panic("i64sender value") }
go breceiver(cb);
pause();
ok = cb <- true;
if !ok { panic("breceiver") }
go bsender(cb);
pause();
b, ok = <-cb;
if !ok { panic("bsender") }
if !b{ panic("bsender value") }
go sreceiver(cs);
pause();
ok = cs <- "hello";
if !ok { panic("sreceiver") }
go ssender(cs);
pause();
s, ok = <-cs;
if !ok { panic("ssender") }
if s != "hello again" { panic("ssender value") }
}
print("PASS\n")
}