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

clean up server code in tutorial

Browse Source 
R=rsc
DELTA=15  (1 added, 0 deleted, 14 changed)
OCL=23889
CL=23889
This commit is contained in:
Rob Pike 2009-01-30 10:18:58 -08:00
parent 391425ae55
commit 96777ea2a7
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/go_tutorial.txt
View File

@ -755,7 +755,7 @@ With channels, it's possible to serve multiple independent client goroutines wit
writing an actual multiplexer. The trick is to send the server a channel in the message,
which it will then use to reply to the original sender.
A realistic client-server program is a lot of code, so here is a very simple substitute
to illustrate the idea. It starts by defining a "Request" type, which embeds a channel
to illustrate the idea. It starts by defining a "request" type, which embeds a channel
that will be used for the reply.
--PROG progs/server.go /type.request/ /^}/

3
doc/progs/run
View File

@ -68,7 +68,8 @@ testit print_string "" "77 Sunset Strip"
testitpipe sieve "sed 10q" "2 3 5 7 11 13 17 19 23 29"
testitpipe sieve "sed 10q" "2 3 5 7 11 13 17 19 23 29"
# server hangs; don't run it
# server hangs; don't run it, just compile it
6g server.go
testit server1 "" ""
rm -f 6.out *.6

18
doc/progs/server.go
View File

@ -11,21 +11,21 @@ type request struct {
type binOp (a, b int) int;
func run(op *BinOp, request *Request) {
result := op(request.a, request.b);
request.replyc <- result;
func run(op *binOp, req *request) {
result := op(req.a, req.b);
req.replyc <- result;
}
func server(op *BinOp, service chan *Request) {
func server(op *binOp, service chan *request) {
for {
request := <-service;
go run(op, request); // don't wait for it
req := <-service;
go run(op, req); // don't wait for it
}
}
func startServer(op *BinOp) chan *Request {
req := make(chan *Request);
go Server(op, req);
func startServer(op *binOp) chan *request {
req := make(chan *request);
go server(op, req);
return req;
}

6
doc/progs/server1.go
View File

@ -11,9 +11,9 @@ type request struct {
type binOp (a, b int) int;
func run(op *binOp, request *request) {
result := op(request.a, request.b);
request.replyc <- result;
func run(op *binOp, req *request) {
result := op(req.a, req.b);
req.replyc <- result;
}
func server(op *binOp, service chan *request, quit chan bool) {