修改tls的CloseWrite到最后进行，以避免线程安全问题

luyu6056 · Oct 27, 2020 · 89b857a · 89b857a
1 parent 00bb0de
commit 89b857a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -136,9 +136,7 @@ func (lp *eventloop) loopIn(c *conn) error {
 func (lp *eventloop) loopCloseConn(c *conn, err error) error {
 	if atomic.CompareAndSwapInt32(&c.opened, connStateCloseReady, connStateCloseLazyout) {
 		c.loop.eventHandler.OnClosed(c, err)
-		if c.tlsconn != nil {
-			c.tlsconn.CloseWrite()
-		}
+
 		c.loop.connections[c.fd/lp.svr.subLoopGroup.len()] = nil
 		lp.lazyChan <- c //进行最后的输出
 	}

diff --git a/server_unix.go b/server_unix.go
@@ -616,6 +616,9 @@ func (o *out) write() {
 }
 func (c *conn) lazywrite() {
 	if c.opened != connStateCloseOk {
+		if c.opened == connStateCloseLazyout && c.tlsconn != nil { //关闭前通知tls关闭
+			c.tlsconn.CloseWrite()
+		}
 		for c.outboundBuffer.Len() > 0 {
 			n, err := unix.Write(c.fd, c.outboundBuffer.Bytes())
 			if n <= 0 || err != nil {
@@ -632,6 +635,7 @@ func (c *conn) lazywrite() {
 		if c.opened == connStateCloseLazyout { //彻底删除close的c
 
 			c.opened = connStateCloseOk
+
 			unix.Close(c.fd)
 			c.loop.poller.Delete(c.fd)
 			c.releaseTCP()