opt: eliminate the inuse conn.inboundBuffer for idle connections

panjf2000 · Nov 16, 2024 · adcbdd2 · adcbdd2
1 parent 1eb5e77
commit adcbdd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/connection_unix.go b/connection_unix.go
@@ -291,6 +291,7 @@ func (c *conn) sendTo(buf []byte) error {
 func (c *conn) resetBuffer() {
 	c.buffer = c.buffer[:0]
 	c.inboundBuffer.Reset()
+	c.inboundBuffer.Done()
 }
 
 func (c *conn) Read(p []byte) (n int, err error) {
@@ -361,18 +362,18 @@ func (c *conn) Peek(n int) (buf []byte, err error) {
 }
 
 func (c *conn) Discard(n int) (int, error) {
+	if len(c.cache) > 0 {
+		bsPool.Put(c.cache)
+		c.cache = nil
+	}
+
 	inBufferLen := c.inboundBuffer.Buffered()
 	tempBufferLen := len(c.buffer)
 	if inBufferLen+tempBufferLen < n || n <= 0 {
 		c.resetBuffer()
 		return inBufferLen + tempBufferLen, nil
 	}
 
-	if len(c.cache) > 0 {
-		bsPool.Put(c.cache)
-		c.cache = nil
-	}
-
 	if c.inboundBuffer.IsEmpty() {
 		c.buffer = c.buffer[n:]
 		return n, nil

diff --git a/connection_windows.go b/connection_windows.go
@@ -118,6 +118,7 @@ func newUDPConn(el *eventloop, pc net.PacketConn, localAddr, remoteAddr net.Addr
 func (c *conn) resetBuffer() {
 	c.buffer.Reset()
 	c.inboundBuffer.Reset()
+	c.inboundBuffer.Done()
 }
 
 func (c *conn) Read(p []byte) (n int, err error) {