chore:

Author: guonaihong

conn.go

@@ -66,10 +66,10 @@ func newConn(fd int, safeConns *core.SafeConns[Conn],
 func (c *Conn) Close() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
-	c.close()
+	c.closeNoLock()
 }
 
-func (c *Conn) close() {
+func (c *Conn) closeNoLock() {
 	if atomic.LoadInt64(&c.fd) == -1 {
 		return
 	}
@@ -220,14 +220,14 @@ func (c *Conn) Write(data []byte) (int, error) {
 			}
 			// 把剩余数据放到缓冲区
 			if err := c.handlePartialWrite(&data, n, true); err != nil {
-				c.close()
+				c.closeNoLock()
 				return 0, err
 			}
 			return len(data), nil
 		}
 
 		// 发生严重错误
-		c.close()
+		c.closeNoLock()
 		return n, err
 	}
 
@@ -248,7 +248,7 @@ func (c *Conn) Write(data []byte) (int, error) {
 			}
 			// 移动剩余数据到缓冲区开始位置
 			if err := c.handlePartialWrite(wbuf, n, false); err != nil {
-				c.close()
+				c.closeNoLock()
 				return 0, err
 			}
 
@@ -258,7 +258,7 @@ func (c *Conn) Write(data []byte) (int, error) {
 			return len(data), nil
 		}
 
-		c.close()
+		c.closeNoLock()
 		return n, err
 	}
 
@@ -372,15 +372,15 @@ func (c *Conn) setReadDeadlineCore(t time.Time) error {
 	// Create new timer
 	duration := time.Until(t)
 	if duration <= 0 {
-		c.close()
+		c.closeNoLock()
 		return nil
 	}
 
 	c.readTimer = time.AfterFunc(duration, func() {
 		c.mu.Lock()
 		defer c.mu.Unlock()
 		if atomic.LoadInt64(&c.fd) != -1 {
-			c.close()
+			c.closeNoLock()
 		}
 	})
 
@@ -413,15 +413,15 @@ func (c *Conn) setWriteDeadlineCore(t time.Time) error {
 	// Create new timer
 	duration := time.Until(t)
 	if duration <= 0 {
-		c.close()
+		c.closeNoLock()
 		return nil
 	}
 
 	c.writeTimer = time.AfterFunc(duration, func() {
 		c.mu.Lock()
 		defer c.mu.Unlock()
 		if atomic.LoadInt64(&c.fd) != -1 {
-			c.close()
+			c.closeNoLock()
 		}
 	})
 

conn_test.go

@@ -157,7 +157,7 @@ func TestConn_SetDeadline(t *testing.T) {
 		readBufferSize: 4096,
 		safeConns:      &core.SafeConns[Conn]{},
 	}
-	conn.close()
+	conn.closeNoLock()
 	err = conn.SetDeadline(time.Now().Add(time.Second))
 	if err == nil {
 		t.Error("SetDeadline() should return error when connection is closed")
@@ -250,7 +250,7 @@ func TestConn_SetReadDeadline(t *testing.T) {
 		readBufferSize: 4096,
 		safeConns:      &core.SafeConns[Conn]{},
 	}
-	conn.close()
+	conn.closeNoLock()
 	err = conn.SetReadDeadline(time.Now().Add(time.Second))
 	if err == nil {
 		t.Error("SetReadDeadline() should return error when connection is closed")
@@ -343,7 +343,7 @@ func TestConn_SetWriteDeadline(t *testing.T) {
 		readBufferSize: 4096,
 		safeConns:      &core.SafeConns[Conn]{},
 	}
-	conn.close()
+	conn.closeNoLock()
 	err = conn.SetWriteDeadline(time.Now().Add(time.Second))
 	if err == nil {
 		t.Error("SetWriteDeadline() should return error when connection is closed")