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

Attach the payload from ping frame to ping ack

Browse Source
This commit is contained in:
iamqizhao
2015-11-06 13:57:51 -08:00
parent 0be6721c85
commit bcd6f37972
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
transport/control.go
View File

@ -86,7 +86,8 @@ func (flushIO) isItem() bool {
} }
type ping struct { type ping struct {
ack bool ack bool
data [8]byte
} }
func (ping) isItem() bool { func (ping) isItem() bool {

8
transport/http2_client.go
View File

@ -646,7 +646,9 @@ func (t *http2Client) handleSettings(f *http2.SettingsFrame) {
} }
func (t *http2Client) handlePing(f *http2.PingFrame) { func (t *http2Client) handlePing(f *http2.PingFrame) {
t.controlBuf.put(&ping{true}) pingAck := &ping{ack: true}
copy(pingAck.data[:], f.Data[:])
t.controlBuf.put(pingAck)
} }
func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) { func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
@ -827,9 +829,7 @@ func (t *http2Client) controller() {
case *flushIO: case *flushIO:
t.framer.flushWrite() t.framer.flushWrite()
case *ping: case *ping:
// TODO(zhaoq): Ack with all-0 data now. will change to some t.framer.writePing(true, i.ack, i.data)
// meaningful content when this is actually in use.
t.framer.writePing(true, i.ack, [8]byte{})
default: default:
grpclog.Printf("transport: http2Client.controller got unexpected item type %v\n", i) grpclog.Printf("transport: http2Client.controller got unexpected item type %v\n", i)
} }

8
transport/http2_server.go
View File

@ -377,7 +377,9 @@ func (t *http2Server) handleSettings(f *http2.SettingsFrame) {
} }
func (t *http2Server) handlePing(f *http2.PingFrame) { func (t *http2Server) handlePing(f *http2.PingFrame) {
t.controlBuf.put(&ping{true}) pingAck := &ping{ack: true}
copy(pingAck.data[:], f.Data[:])
t.controlBuf.put(pingAck)
} }
func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) { func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) {
@ -628,9 +630,7 @@ func (t *http2Server) controller() {
case *flushIO: case *flushIO:
t.framer.flushWrite() t.framer.flushWrite()
case *ping: case *ping:
// TODO(zhaoq): Ack with all-0 data now. will change to some t.framer.writePing(true, i.ack, i.data)
// meaningful content when this is actually in use.
t.framer.writePing(true, i.ack, [8]byte{})
default: default:
grpclog.Printf("transport: http2Server.controller got unexpected item type %v\n", i) grpclog.Printf("transport: http2Server.controller got unexpected item type %v\n", i)
} }

12
transport/transport_test.go
View File

@ -483,12 +483,12 @@ func TestServerContextCanceledOnClosedConnection(t *testing.T) {
} }
cc.Close() cc.Close()
select { select {
case <-ss.Context().Done(): case <-ss.Context().Done():
if ss.Context().Err() != context.Canceled { if ss.Context().Err() != context.Canceled {
t.Fatalf("ss.Context().Err() got %v, want %v", ss.Context().Err(), context.Canceled) t.Fatalf("ss.Context().Err() got %v, want %v", ss.Context().Err(), context.Canceled)
} }
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.Fatalf("Failed to cancel the context of the sever side stream.") t.Fatalf("Failed to cancel the context of the sever side stream.")
} }
} }