优化网络底层写超时

network/tcp_server.go

@@ -7,10 +7,21 @@ import (
 	"time"
 )
 
+const Default_ReadDeadline = 30  //30s
+const Default_WriteDeadline = 30 //30s
+const Default_MaxConnNum = 3000
+const Default_PendingWriteNum = 10000
+const Default_LittleEndian = false
+const Default_MinMsgLen = 2
+const Default_MaxMsgLen = 65535
+
+
 type TCPServer struct {
 	Addr            string
 	MaxConnNum      int
 	PendingWriteNum int
+	ReadDeadline    time.Duration
+	WriteDeadline 	time.Duration
 	NewAgent        func(*TCPConn) Agent
 	ln              net.Listener
 	conns           ConnSet
@@ -18,6 +29,7 @@ type TCPServer struct {
 	wgLn            sync.WaitGroup
 	wgConns         sync.WaitGroup
 
+
 	// msg parser
 	LenMsgLen    int
 	MinMsgLen    uint32
@@ -39,13 +51,33 @@ func (server *TCPServer) init() {
 	}
 
 	if server.MaxConnNum <= 0 {
-		server.MaxConnNum = 100
+		server.MaxConnNum = Default_MaxConnNum
 		log.SRelease("invalid MaxConnNum, reset to ", server.MaxConnNum)
 	}
 	if server.PendingWriteNum <= 0 {
-		server.PendingWriteNum = 100
+		server.PendingWriteNum = Default_PendingWriteNum
 		log.SRelease("invalid PendingWriteNum, reset to ", server.PendingWriteNum)
 	}
+
+	if server.MinMsgLen <= 0 {
+		server.MinMsgLen = Default_MinMsgLen
+		log.SRelease("invalid MinMsgLen, reset to ", server.MinMsgLen)
+	}
+
+	if server.MaxMsgLen <= 0 {
+		server.MaxMsgLen = Default_MaxMsgLen
+		log.SRelease("invalid MaxMsgLen, reset to ", server.MaxMsgLen)
+	}
+
+	if server.WriteDeadline == 0 {
+		server.WriteDeadline = time.Second*Default_WriteDeadline
+		log.SRelease("invalid WriteDeadline, reset to ", server.WriteDeadline.Seconds(),"s")
+	}
+	if server.ReadDeadline == 0 {
+		server.ReadDeadline = time.Second*Default_ReadDeadline
+		log.SRelease("invalid ReadDeadline, reset to ", server.ReadDeadline.Seconds(),"s")
+	}
+
 	if server.NewAgent == nil {
 		log.SFatal("NewAgent must not be nil")
 	}
@@ -110,7 +142,7 @@ func (server *TCPServer) run() {
 
 		server.wgConns.Add(1)
 
-		tcpConn := newTCPConn(conn, server.PendingWriteNum, server.msgParser)
+		tcpConn := newTCPConn(conn, server.PendingWriteNum, server.msgParser,server.WriteDeadline)
 		agent := server.NewAgent(tcpConn)
 		go func() {
 			agent.Run()