cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 23:53:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/http: revert h2_bundle.go formatting change from CL 368254

Browse Source 
h2_bundle.go is automatically generated from x/net/http2. Any
formatting changes within that file need to be first made upstream.

This brings the contents of h2_bundle.go back in line with the
upstream generator, fixing the cmd/internal/moddeps test that is
currently failing on the longtest builders.

For #49884

Change-Id: I5757240b77e250e0026b8a52a0e867e1578ec2d4
Reviewed-on: https://go-review.googlesource.com/c/go/+/371297
Trust: Bryan Mills <bcmills@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Bryan C. Mills 2021-12-13 16:12:50 -05:00 committed by Bryan Mills
parent 7bdbc73be1
commit 9e85dc5f18
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/net/http/h2_bundle.go
View File

@ -1049,11 +1049,11 @@ var (
16 << 10, 16 << 10,
} }
http2dataChunkPools = [...]sync.Pool{ http2dataChunkPools = [...]sync.Pool{
{New: func() any { return make([]byte, 1<<10) }}, {New: func() interface{} { return make([]byte, 1<<10) }},
{New: func() any { return make([]byte, 2<<10) }}, {New: func() interface{} { return make([]byte, 2<<10) }},
{New: func() any { return make([]byte, 4<<10) }}, {New: func() interface{} { return make([]byte, 4<<10) }},
{New: func() any { return make([]byte, 8<<10) }}, {New: func() interface{} { return make([]byte, 8<<10) }},
{New: func() any { return make([]byte, 16<<10) }}, {New: func() interface{} { return make([]byte, 16<<10) }},
} }
) )
@ -1548,7 +1548,7 @@ func (h *http2FrameHeader) invalidate() { h.valid = false }
// frame header bytes. // frame header bytes.
// Used only by ReadFrameHeader. // Used only by ReadFrameHeader.
var http2fhBytes = sync.Pool{ var http2fhBytes = sync.Pool{
New: func() any { New: func() interface{} {
buf := make([]byte, http2frameHeaderLen) buf := make([]byte, http2frameHeaderLen)
return &buf return &buf
}, },
@ -1655,8 +1655,8 @@ type http2Framer struct {
debugFramer *http2Framer // only use for logging written writes debugFramer *http2Framer // only use for logging written writes
debugFramerBuf *bytes.Buffer debugFramerBuf *bytes.Buffer
debugReadLoggerf func(string, ...any) debugReadLoggerf func(string, ...interface{})
debugWriteLoggerf func(string, ...any) debugWriteLoggerf func(string, ...interface{})
frameCache *http2frameCache // nil if frames aren't reused (default) frameCache *http2frameCache // nil if frames aren't reused (default)
} }
@ -3061,7 +3061,7 @@ func http2curGoroutineID() uint64 {
} }
var http2littleBuf = sync.Pool{ var http2littleBuf = sync.Pool{
New: func() any { New: func() interface{} {
buf := make([]byte, 64) buf := make([]byte, 64)
return &buf return &buf
}, },
@ -3468,7 +3468,7 @@ func http2newBufferedWriter(w io.Writer) *http2bufferedWriter {
const http2bufWriterPoolBufferSize = 4 << 10 const http2bufWriterPoolBufferSize = 4 << 10
var http2bufWriterPool = sync.Pool{ var http2bufWriterPool = sync.Pool{
New: func() any { New: func() interface{} {
return bufio.NewWriterSize(nil, http2bufWriterPoolBufferSize) return bufio.NewWriterSize(nil, http2bufWriterPoolBufferSize)
}, },
} }
@ -3540,7 +3540,7 @@ type http2connectionStater interface {
ConnectionState() tls.ConnectionState ConnectionState() tls.ConnectionState
} }
var http2sorterPool = sync.Pool{New: func() any { return new(http2sorter) }} var http2sorterPool = sync.Pool{New: func() interface{} { return new(http2sorter) }}
type http2sorter struct { type http2sorter struct {
v []string // owned by sorter v []string // owned by sorter
@ -3781,7 +3781,7 @@ var (
) )
var http2responseWriterStatePool = sync.Pool{ var http2responseWriterStatePool = sync.Pool{
New: func() any { New: func() interface{} {
rws := &http2responseWriterState{} rws := &http2responseWriterState{}
rws.bw = bufio.NewWriterSize(http2chunkWriter{rws}, http2handlerChunkWriteSize) rws.bw = bufio.NewWriterSize(http2chunkWriter{rws}, http2handlerChunkWriteSize)
return rws return rws
@ -3793,7 +3793,7 @@ var (
http2testHookOnConn func() http2testHookOnConn func()
http2testHookGetServerConn func(*http2serverConn) http2testHookGetServerConn func(*http2serverConn)
http2testHookOnPanicMu *sync.Mutex // nil except in tests http2testHookOnPanicMu *sync.Mutex // nil except in tests
http2testHookOnPanic func(sc *http2serverConn, panicVal any) (rePanic bool) http2testHookOnPanic func(sc *http2serverConn, panicVal interface{}) (rePanic bool)
) )
// Server is an HTTP/2 server. // Server is an HTTP/2 server.
@ -4086,7 +4086,7 @@ func (s *http2Server) ServeConn(c net.Conn, opts *http2ServeConnOpts) {
streams: make(map[uint32]*http2stream), streams: make(map[uint32]*http2stream),
readFrameCh: make(chan http2readFrameResult), readFrameCh: make(chan http2readFrameResult),
wantWriteFrameCh: make(chan http2FrameWriteRequest, 8), wantWriteFrameCh: make(chan http2FrameWriteRequest, 8),
serveMsgCh: make(chan any, 8), serveMsgCh: make(chan interface{}, 8),
wroteFrameCh: make(chan http2frameWriteResult, 1), // buffered; one send in writeFrameAsync wroteFrameCh: make(chan http2frameWriteResult, 1), // buffered; one send in writeFrameAsync
bodyReadCh: make(chan http2bodyReadMsg), // buffering doesn't matter either way bodyReadCh: make(chan http2bodyReadMsg), // buffering doesn't matter either way
doneServing: make(chan struct{}), doneServing: make(chan struct{}),
@ -4216,7 +4216,7 @@ type http2serverConn struct {
wantWriteFrameCh chan http2FrameWriteRequest // from handlers -> serve wantWriteFrameCh chan http2FrameWriteRequest // from handlers -> serve
wroteFrameCh chan http2frameWriteResult // from writeFrameAsync -> serve, tickles more frame writes wroteFrameCh chan http2frameWriteResult // from writeFrameAsync -> serve, tickles more frame writes
bodyReadCh chan http2bodyReadMsg // from handlers -> serve bodyReadCh chan http2bodyReadMsg // from handlers -> serve
serveMsgCh chan any // misc messages & code to send to / run on the serve loop serveMsgCh chan interface{} // misc messages & code to send to / run on the serve loop
flow http2flow // conn-wide (not stream-specific) outbound flow control flow http2flow // conn-wide (not stream-specific) outbound flow control
inflow http2flow // conn-wide inbound flow control inflow http2flow // conn-wide inbound flow control
tlsState *tls.ConnectionState // shared by all handlers, like net/http tlsState *tls.ConnectionState // shared by all handlers, like net/http
@ -4351,13 +4351,13 @@ func (sc *http2serverConn) setConnState(state ConnState) {
} }
} }
func (sc *http2serverConn) vlogf(format string, args ...any) { func (sc *http2serverConn) vlogf(format string, args ...interface{}) {
if http2VerboseLogs { if http2VerboseLogs {
sc.logf(format, args...) sc.logf(format, args...)
} }
} }
func (sc *http2serverConn) logf(format string, args ...any) { func (sc *http2serverConn) logf(format string, args ...interface{}) {
if lg := sc.hs.ErrorLog; lg != nil { if lg := sc.hs.ErrorLog; lg != nil {
lg.Printf(format, args...) lg.Printf(format, args...)
} else { } else {
@ -4409,7 +4409,7 @@ func http2isClosedConnError(err error) bool {
return false return false
} }
func (sc *http2serverConn) condlogf(err error, format string, args ...any) { func (sc *http2serverConn) condlogf(err error, format string, args ...interface{}) {
if err == nil { if err == nil {
return return
} }
@ -4679,7 +4679,7 @@ func (sc *http2serverConn) onIdleTimer() { sc.sendServeMsg(http2idleTimerMsg) }
func (sc *http2serverConn) onShutdownTimer() { sc.sendServeMsg(http2shutdownTimerMsg) } func (sc *http2serverConn) onShutdownTimer() { sc.sendServeMsg(http2shutdownTimerMsg) }
func (sc *http2serverConn) sendServeMsg(msg any) { func (sc *http2serverConn) sendServeMsg(msg interface{}) {
sc.serveG.checkNotOn() // NOT sc.serveG.checkNotOn() // NOT
select { select {
case sc.serveMsgCh <- msg: case sc.serveMsgCh <- msg:
@ -4721,11 +4721,11 @@ func (sc *http2serverConn) readPreface() error {
} }
var http2errChanPool = sync.Pool{ var http2errChanPool = sync.Pool{
New: func() any { return make(chan error, 1) }, New: func() interface{} { return make(chan error, 1) },
} }
var http2writeDataPool = sync.Pool{ var http2writeDataPool = sync.Pool{
New: func() any { return new(http2writeData) }, New: func() interface{} { return new(http2writeData) },
} }
// writeDataFromHandler writes DATA response frames from a handler on // writeDataFromHandler writes DATA response frames from a handler on
@ -6712,7 +6712,7 @@ func http2new400Handler(err error) HandlerFunc {
// disabled. See comments on h1ServerShutdownChan above for why // disabled. See comments on h1ServerShutdownChan above for why
// the code is written this way. // the code is written this way.
func http2h1ServerKeepAlivesDisabled(hs *Server) bool { func http2h1ServerKeepAlivesDisabled(hs *Server) bool {
var x any = hs var x interface{} = hs
type I interface { type I interface {
doKeepAlives() bool doKeepAlives() bool
} }
@ -9577,21 +9577,21 @@ var (
http2errRequestHeaderListSize = errors.New("http2: request header list larger than peer's advertised limit") http2errRequestHeaderListSize = errors.New("http2: request header list larger than peer's advertised limit")
) )
func (cc *http2ClientConn) logf(format string, args ...any) { func (cc *http2ClientConn) logf(format string, args ...interface{}) {
cc.t.logf(format, args...) cc.t.logf(format, args...)
} }
func (cc *http2ClientConn) vlogf(format string, args ...any) { func (cc *http2ClientConn) vlogf(format string, args ...interface{}) {
cc.t.vlogf(format, args...) cc.t.vlogf(format, args...)
} }
func (t *http2Transport) vlogf(format string, args ...any) { func (t *http2Transport) vlogf(format string, args ...interface{}) {
if http2VerboseLogs { if http2VerboseLogs {
t.logf(format, args...) t.logf(format, args...)
} }
} }
func (t *http2Transport) logf(format string, args ...any) { func (t *http2Transport) logf(format string, args ...interface{}) {
log.Printf(format, args...) log.Printf(format, args...)
} }