gee-rpc client move call.Seq = seq to registerCall

geektutu · geektutu · commit 3c89baa3a4d1 · 2020-10-07T18:20:08.000+08:00
diff --git a/gee-rpc/day1-codec/main/main.go b/gee-rpc/day1-codec/main/main.go
@@ -22,6 +22,7 @@ func startServer(addr chan string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	addr := make(chan string)
 	go startServer(addr)
 
diff --git a/gee-rpc/day2-client/client.go b/gee-rpc/day2-client/client.go
@@ -73,10 +73,10 @@ func (client *Client) registerCall(call *Call) (uint64, error) {
 	if client.closing || client.shutdown {
 		return 0, ErrShutdown
 	}
-	seq := client.seq
-	client.pending[seq] = call
+	call.Seq = client.seq
+	client.pending[call.Seq] = call
 	client.seq++
-	return seq, nil
+	return call.Seq, nil
 }
 
 func (client *Client) removeCall(seq uint64) *Call {
@@ -106,7 +106,6 @@ func (client *Client) send(call *Call) {
 
 	// register this call.
 	seq, err := client.registerCall(call)
-	call.Seq = seq
 	if err != nil {
 		call.Error = err
 		call.done()
diff --git a/gee-rpc/day2-client/main/main.go b/gee-rpc/day2-client/main/main.go
@@ -21,6 +21,7 @@ func startServer(addr chan string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	addr := make(chan string)
 	go startServer(addr)
 	client, _ := geerpc.Dial("tcp", <-addr)
diff --git a/gee-rpc/day3-service/client.go b/gee-rpc/day3-service/client.go
@@ -73,10 +73,10 @@ func (client *Client) registerCall(call *Call) (uint64, error) {
 	if client.closing || client.shutdown {
 		return 0, ErrShutdown
 	}
-	seq := client.seq
-	client.pending[seq] = call
+	call.Seq = client.seq
+	client.pending[call.Seq] = call
 	client.seq++
-	return seq, nil
+	return call.Seq, nil
 }
 
 func (client *Client) removeCall(seq uint64) *Call {
@@ -106,7 +106,6 @@ func (client *Client) send(call *Call) {
 
 	// register this call.
 	seq, err := client.registerCall(call)
-	call.Seq = seq
 	if err != nil {
 		call.Error = err
 		call.done()
diff --git a/gee-rpc/day3-service/main/main.go b/gee-rpc/day3-service/main/main.go
@@ -33,6 +33,7 @@ func startServer(addr chan string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	addr := make(chan string)
 	go startServer(addr)
 	client, _ := geerpc.Dial("tcp", <-addr)
diff --git a/gee-rpc/day4-timeout/client.go b/gee-rpc/day4-timeout/client.go
@@ -75,10 +75,10 @@ func (client *Client) registerCall(call *Call) (uint64, error) {
 	if client.closing || client.shutdown {
 		return 0, ErrShutdown
 	}
-	seq := client.seq
-	client.pending[seq] = call
+	call.Seq = client.seq
+	client.pending[call.Seq] = call
 	client.seq++
-	return seq, nil
+	return call.Seq, nil
 }
 
 func (client *Client) removeCall(seq uint64) *Call {
@@ -108,7 +108,6 @@ func (client *Client) send(call *Call) {
 
 	// register this call.
 	seq, err := client.registerCall(call)
-	call.Seq = seq
 	if err != nil {
 		call.Error = err
 		call.done()
diff --git a/gee-rpc/day4-timeout/main/main.go b/gee-rpc/day4-timeout/main/main.go
@@ -34,6 +34,7 @@ func startServer(addr chan string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	addr := make(chan string)
 	go startServer(addr)
 	client, _ := geerpc.Dial("tcp", <-addr)
diff --git a/gee-rpc/day5-http-debug/client.go b/gee-rpc/day5-http-debug/client.go
@@ -78,10 +78,10 @@ func (client *Client) registerCall(call *Call) (uint64, error) {
 	if client.closing || client.shutdown {
 		return 0, ErrShutdown
 	}
-	seq := client.seq
-	client.pending[seq] = call
+	call.Seq = client.seq
+	client.pending[call.Seq] = call
 	client.seq++
-	return seq, nil
+	return call.Seq, nil
 }
 
 func (client *Client) removeCall(seq uint64) *Call {
@@ -111,7 +111,6 @@ func (client *Client) send(call *Call) {
 
 	// register this call.
 	seq, err := client.registerCall(call)
-	call.Seq = seq
 	if err != nil {
 		call.Error = err
 		call.done()
diff --git a/gee-rpc/day5-http-debug/main/main.go b/gee-rpc/day5-http-debug/main/main.go
@@ -51,6 +51,7 @@ func call(addrCh chan string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	ch := make(chan string)
 	go call(ch)
 	startServer(ch)
diff --git a/gee-rpc/day6-load-balance/client.go b/gee-rpc/day6-load-balance/client.go
@@ -78,10 +78,10 @@ func (client *Client) registerCall(call *Call) (uint64, error) {
 	if client.closing || client.shutdown {
 		return 0, ErrShutdown
 	}
-	seq := client.seq
-	client.pending[seq] = call
+	call.Seq = client.seq
+	client.pending[call.Seq] = call
 	client.seq++
-	return seq, nil
+	return call.Seq, nil
 }
 
 func (client *Client) removeCall(seq uint64) *Call {
@@ -111,7 +111,6 @@ func (client *Client) send(call *Call) {
 
 	// register this call.
 	seq, err := client.registerCall(call)
-	call.Seq = seq
 	if err != nil {
 		call.Error = err
 		call.done()
diff --git a/gee-rpc/day6-load-balance/main/main.go b/gee-rpc/day6-load-balance/main/main.go
@@ -84,6 +84,7 @@ func broadcast(addr1, addr2 string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	ch1 := make(chan string)
 	ch2 := make(chan string)
 	// start two servers
diff --git a/gee-rpc/day7-registry/client.go b/gee-rpc/day7-registry/client.go
@@ -78,10 +78,10 @@ func (client *Client) registerCall(call *Call) (uint64, error) {
 	if client.closing || client.shutdown {
 		return 0, ErrShutdown
 	}
-	seq := client.seq
-	client.pending[seq] = call
+	call.Seq = client.seq
+	client.pending[call.Seq] = call
 	client.seq++
-	return seq, nil
+	return call.Seq, nil
 }
 
 func (client *Client) removeCall(seq uint64) *Call {
@@ -111,7 +111,6 @@ func (client *Client) send(call *Call) {
 
 	// register this call.
 	seq, err := client.registerCall(call)
-	call.Seq = seq
 	if err != nil {
 		call.Error = err
 		call.done()
diff --git a/gee-rpc/day7-registry/main/main.go b/gee-rpc/day7-registry/main/main.go
@@ -94,6 +94,7 @@ func broadcast(registry string) {
 }
 
 func main() {
+	log.SetFlags(0)
 	registryAddr := "http://localhost:9999/_geerpc_/registry"
 	var wg sync.WaitGroup
 	wg.Add(1)
diff --git a/gee-rpc/doc/geerpc-day1.md b/gee-rpc/doc/geerpc-day1.md
diff --git a/gee-rpc/doc/geerpc-day2.md b/gee-rpc/doc/geerpc-day2.md
diff --git a/gee-rpc/doc/geerpc.md b/gee-rpc/doc/geerpc.md

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ func startServer(addr chan string) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func main() {`
	`25`	`+ log.SetFlags(0)`
`25`	`26`	`addr := make(chan string)`
`26`	`27`	`go startServer(addr)`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ func startServer(addr chan string) {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func main() {`
	`24`	`+ log.SetFlags(0)`
`24`	`25`	`addr := make(chan string)`
`25`	`26`	`go startServer(addr)`
`26`	`27`	`client, _ := geerpc.Dial("tcp", <-addr)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ func startServer(addr chan string) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func main() {`
	`36`	`+ log.SetFlags(0)`
`36`	`37`	`addr := make(chan string)`
`37`	`38`	`go startServer(addr)`
`38`	`39`	`client, _ := geerpc.Dial("tcp", <-addr)`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ func startServer(addr chan string) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func main() {`
	`37`	`+ log.SetFlags(0)`
`37`	`38`	`addr := make(chan string)`
`38`	`39`	`go startServer(addr)`
`39`	`40`	`client, _ := geerpc.Dial("tcp", <-addr)`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func call(addrCh chan string) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func main() {`
	`54`	`+ log.SetFlags(0)`
`54`	`55`	`ch := make(chan string)`
`55`	`56`	`go call(ch)`
`56`	`57`	`startServer(ch)`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ func broadcast(addr1, addr2 string) {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`func main() {`
	`87`	`+ log.SetFlags(0)`
`87`	`88`	`ch1 := make(chan string)`
`88`	`89`	`ch2 := make(chan string)`
`89`	`90`	`// start two servers`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ func broadcast(registry string) {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`func main() {`
	`97`	`+ log.SetFlags(0)`
`97`	`98`	`registryAddr := "http://localhost:9999/_geerpc_/registry"`
`98`	`99`	`var wg sync.WaitGroup`
`99`	`100`	`wg.Add(1)`