opt: rename eventloop.closeConn to eventloop.close

Author: panjf2000

connection_bsd.go

@@ -26,7 +26,7 @@ import (
 func (c *conn) handleEvents(_ int, filter int16) (err error) {
 	switch filter {
 	case netpoll.EVFilterSock:
-		err = c.loop.closeConn(c, unix.ECONNRESET)
+		err = c.loop.close(c, unix.ECONNRESET)
 	case netpoll.EVFilterWrite:
 		if !c.outboundBuffer.IsEmpty() {
 			err = c.loop.write(c)

connection_unix.go

@@ -134,7 +134,7 @@ func (c *conn) write(data []byte) (n int, err error) {
 			err = c.loop.poller.ModReadWrite(&c.pollAttachment)
 			return
 		}
-		if err := c.loop.closeConn(c, os.NewSyscallError("write", err)); err != nil {
+		if err := c.loop.close(c, os.NewSyscallError("write", err)); err != nil {
 			logging.Errorf("failed to close connection(fd=%d,peer=%+v) on conn.write: %v",
 				c.fd, c.remoteAddr, err)
 		}
@@ -168,7 +168,7 @@ func (c *conn) writev(bs [][]byte) (n int, err error) {
 			err = c.loop.poller.ModReadWrite(&c.pollAttachment)
 			return
 		}
-		if err := c.loop.closeConn(c, os.NewSyscallError("writev", err)); err != nil {
+		if err := c.loop.close(c, os.NewSyscallError("writev", err)); err != nil {
 			logging.Errorf("failed to close connection(fd=%d,peer=%+v) on conn.writev: %v",
 				c.fd, c.remoteAddr, err)
 		}
@@ -467,7 +467,7 @@ func (c *conn) Wake(callback AsyncCallback) error {
 
 func (c *conn) CloseWithCallback(callback AsyncCallback) error {
 	return c.loop.poller.Trigger(func(_ interface{}) (err error) {
-		err = c.loop.closeConn(c, nil)
+		err = c.loop.close(c, nil)
 		if callback != nil {
 			_ = callback(c, err)
 		}
@@ -477,7 +477,7 @@ func (c *conn) CloseWithCallback(callback AsyncCallback) error {
 
 func (c *conn) Close() error {
 	return c.loop.poller.Trigger(func(_ interface{}) (err error) {
-		err = c.loop.closeConn(c, nil)
+		err = c.loop.close(c, nil)
 		return
 	}, nil)
 }

eventloop_unix.go

@@ -56,7 +56,7 @@ func (el *eventloop) countConn() int32 {
 func (el *eventloop) closeConns() {
 	// Close loops and all outstanding connections
 	el.connections.iterate(func(c *conn) bool {
-		_ = el.closeConn(c, nil)
+		_ = el.close(c, nil)
 		return true
 	})
 }
@@ -105,15 +105,15 @@ func (el *eventloop) read(c *conn) error {
 		if n == 0 {
 			err = unix.ECONNRESET
 		}
-		return el.closeConn(c, os.NewSyscallError("read", err))
+		return el.close(c, os.NewSyscallError("read", err))
 	}
 
 	c.buffer = el.buffer[:n]
 	action := el.eventHandler.OnTraffic(c)
 	switch action {
 	case None:
 	case Close:
-		return el.closeConn(c, nil)
+		return el.close(c, nil)
 	case Shutdown:
 		return gerrors.ErrEngineShutdown
 	}
@@ -144,7 +144,7 @@ func (el *eventloop) write(c *conn) error {
 	case unix.EAGAIN:
 		return nil
 	default:
-		return el.closeConn(c, os.NewSyscallError("write", err))
+		return el.close(c, os.NewSyscallError("write", err))
 	}
 
 	// All data have been drained, it's no need to monitor the writable events,
@@ -156,7 +156,7 @@ func (el *eventloop) write(c *conn) error {
 	return nil
 }
 
-func (el *eventloop) closeConn(c *conn, err error) (rerr error) {
+func (el *eventloop) close(c *conn, err error) (rerr error) {
 	if addr := c.localAddr; addr != nil && strings.HasPrefix(c.localAddr.Network(), "udp") {
 		rerr = el.poller.Delete(c.fd)
 		if c.fd != el.ln.fd {
@@ -182,7 +182,7 @@ func (el *eventloop) closeConn(c *conn, err error) (rerr error) {
 				iov = iov[:iovMax]
 			}
 			if n, e := io.Writev(c.fd, iov); e != nil {
-				el.getLogger().Warnf("closeConn: error occurs when sending data back to peer, %v", e)
+				el.getLogger().Warnf("close: error occurs when sending data back to peer, %v", e)
 				break
 			} else { //nolint:revive
 				_, _ = c.outboundBuffer.Discard(n)
@@ -263,7 +263,7 @@ func (el *eventloop) handleAction(c *conn, action Action) error {
 	case None:
 		return nil
 	case Close:
-		return el.closeConn(c, nil)
+		return el.close(c, nil)
 	case Shutdown:
 		return gerrors.ErrEngineShutdown
 	default:
@@ -313,7 +313,7 @@ func (el *eventloop) execCmd(itf interface{}) (err error) {
 
 	switch cmd.typ {
 	case asyncCmdClose:
-		return el.closeConn(c, nil)
+		return el.close(c, nil)
 	case asyncCmdWake:
 		return el.wake(c)
 	case asyncCmdWrite:

reactor_default_bsd.go

@@ -56,7 +56,7 @@ func (el *eventloop) activateSubReactor() error {
 		if c := el.connections.getConn(fd); c != nil {
 			switch filter {
 			case netpoll.EVFilterSock:
-				err = el.closeConn(c, unix.ECONNRESET)
+				err = el.close(c, unix.ECONNRESET)
 			case netpoll.EVFilterWrite:
 				if !c.outboundBuffer.IsEmpty() {
 					err = el.write(c)
@@ -90,7 +90,7 @@ func (el *eventloop) run() error {
 		if c := el.connections.getConn(fd); c != nil {
 			switch filter {
 			case netpoll.EVFilterSock:
-				err = el.closeConn(c, unix.ECONNRESET)
+				err = el.close(c, unix.ECONNRESET)
 			case netpoll.EVFilterWrite:
 				if !c.outboundBuffer.IsEmpty() {
 					err = el.write(c)