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

geektutu · Oct 7, 2020 · 3c89baa · 3c89baa
1 parent e094f10
commit 3c89baa
Show file tree

Hide file tree

Showing 16 changed files with 863 additions and 25 deletions.
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)