opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #352 from iamqizhao/master

Browse Source 
remove a dead member var
This commit is contained in:
Qi Zhao
2015-09-22 16:17:28 -07:00
parent dd992b3748 ecf8201c7c
commit 64295baed1
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clientconn.go
View File

@ -246,10 +246,6 @@ type ClientConn struct {
// ready is closed and becomes nil when a new transport is up or failed // ready is closed and becomes nil when a new transport is up or failed
// due to timeout. // due to timeout.
ready chan struct{} ready chan struct{}
// Every time a new transport is created, this is incremented by 1. Used
// to avoid trying to recreate a transport while the new one is already
// under construction.
transportSeq int
transport transport.ClientTransport transport transport.ClientTransport
} }
@ -297,11 +293,6 @@ func (cc *ClientConn) WaitForStateChange(timeout time.Duration, sourceState Conn
func (cc *ClientConn) resetTransport(closeTransport bool) error { func (cc *ClientConn) resetTransport(closeTransport bool) error {
var retries int var retries int
start := time.Now() start := time.Now()
cc.mu.Lock()
ts := cc.transportSeq
// Avoid wait() picking up a dying transport unnecessarily.
cc.transportSeq = 0
cc.mu.Unlock()
for { for {
cc.mu.Lock() cc.mu.Lock()
cc.state = Connecting cc.state = Connecting
@ -368,7 +359,6 @@ func (cc *ClientConn) resetTransport(closeTransport bool) error {
cc.state = Ready cc.state = Ready
cc.stateCV.Broadcast() cc.stateCV.Broadcast()
cc.transport = newTransport cc.transport = newTransport
cc.transportSeq = ts + 1
if cc.ready != nil { if cc.ready != nil {
close(cc.ready) close(cc.ready)
cc.ready = nil cc.ready = nil