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

Merge pull request #418 from iamqizhao/master

Browse Source 
put ctx cancel into the right place
This commit is contained in:
Qi Zhao
2015-10-29 11:12:25 -07:00
parent 1f1a4999ca 054d03a130
commit bba8442c8e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
transport/http2_client.go
View File

@ -383,6 +383,11 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
if updateStreams { if updateStreams {
t.streamsQuota.add(1) t.streamsQuota.add(1)
} }
// In case stream sending and receiving are invoked in separate
// goroutines (e.g., bi-directional streaming), the caller needs
// to call cancel on the stream to interrupt the blocking on
// other goroutines.
s.cancel()
s.mu.Lock() s.mu.Lock()
if q := s.fc.restoreConn(); q > 0 { if q := s.fc.restoreConn(); q > 0 {
t.controlBuf.put(&windowUpdate{0, q}) t.controlBuf.put(&windowUpdate{0, q})
@ -397,11 +402,6 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
} }
s.state = streamDone s.state = streamDone
s.mu.Unlock() s.mu.Unlock()
// In case stream sending and receiving are invoked in separate
// goroutines (e.g., bi-directional streaming), the caller needs
// to call cancel on the stream to interrupt the blocking on
// other goroutines.
s.cancel()
if _, ok := err.(StreamError); ok { if _, ok := err.(StreamError); ok {
t.controlBuf.put(&resetStream{s.id, http2.ErrCodeCancel}) t.controlBuf.put(&resetStream{s.id, http2.ErrCodeCancel})
} }