fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-27 06:10:26 +08:00
Code Activity

feat(tcp): skip to keep busy sub conn

Browse Source
This commit is contained in:
源文雨
2025-02-21 23:08:41 +09:00
parent 3377d87d7a
commit 5c65302d67
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gold/p2p/tcp/tcp.go
View File

@@ -95,6 +95,7 @@ type connrecv struct {
type subconn struct { type subconn struct {
cplk sync.Mutex cplk sync.Mutex
last time.Time // last active time
conn *net.TCPConn conn *net.TCPConn
} }
@@ -187,7 +188,7 @@ func (conn *Conn) receive(tcpconn *net.TCPConn, hasvalidated bool) {
} }
if issub { if issub {
conn.sblk.Lock() conn.sblk.Lock()
conn.subs = append(conn.subs, &subconn{conn: tcpconn}) conn.subs = append(conn.subs, &subconn{conn: tcpconn, last: time.Now()})
conn.sblk.Unlock() conn.sblk.Unlock()
} else { } else {
if conn.peers == nil { if conn.peers == nil {
@@ -200,7 +201,8 @@ func (conn *Conn) receive(tcpconn *net.TCPConn, hasvalidated bool) {
if issub { if issub {
defer func() { defer func() {
conn.sblk.Lock() conn.sblk.Lock()
for i, sub := range conn.subs { subs := conn.subs
for i, sub := range subs {
if sub.conn == tcpconn { if sub.conn == tcpconn {
conn.subs = delsubs(i, conn.subs) conn.subs = delsubs(i, conn.subs)
break break
@@ -283,8 +285,8 @@ func (conn *Conn) receive(tcpconn *net.TCPConn, hasvalidated bool) {
func (conn *Conn) keep(ep *EndPoint) { func (conn *Conn) keep(ep *EndPoint) {
keepinterval := ep.keepinterval keepinterval := ep.keepinterval
if keepinterval < time.Second*4 { if keepinterval < time.Second*10 {
keepinterval = time.Second * 4 keepinterval = time.Second * 10
} }
t := time.NewTicker(keepinterval) t := time.NewTicker(keepinterval)
defer t.Stop() defer t.Stop()
@@ -299,23 +301,33 @@ func (conn *Conn) keep(ep *EndPoint) {
return return
} }
if err != nil { if err != nil {
logrus.Warnln("[tcp] keep main conn alive to", ep, "err:", err) logrus.Warnln("[tcp] keep main conn alive from", conn, "to", ep, "err:", err)
conn.peers.Delete(ep.String()) conn.peers.Delete(ep.String())
} else if config.ShowDebugLog { } else if config.ShowDebugLog {
logrus.Debugln("[tcp] keep main conn alive to", ep) logrus.Debugln("[tcp] keep main conn alive from", conn, "to", ep)
} }
} }
conn.sblk.RLock() conn.sblk.RLock()
for i, sub := range conn.subs { subs := conn.subs
for i, sub := range subs {
if time.Since(sub.last) < keepinterval {
if config.ShowDebugLog {
logrus.Debugln("[tcp] skip to keep busy sub conn from", conn, "to", ep)
}
continue
}
_, err := io.Copy(sub.conn, &packet{typ: packetTypeSubKeepAlive}) _, err := io.Copy(sub.conn, &packet{typ: packetTypeSubKeepAlive})
if conn.addr == nil { if conn.addr == nil {
return return
} }
if err != nil { if err != nil {
logrus.Warnln("[tcp] keep sub conn alive to", sub.conn.RemoteAddr(), "err:", err) logrus.Warnln("[tcp] keep sub conn alive from", conn, "to", sub.conn.RemoteAddr(), "err:", err)
conn.subs = delsubs(i, conn.subs) // del 1 link at once conn.subs = delsubs(i, conn.subs) // del 1 link at once
break break
} }
if config.ShowDebugLog {
logrus.Debugln("[tcp] keep sub conn alive from", conn, "to", ep)
}
} }
conn.sblk.RUnlock() conn.sblk.RUnlock()
} }
@@ -431,7 +443,7 @@ RECONNECT:
conn.peers.Set(tcpep.String(), tcpconn) conn.peers.Set(tcpep.String(), tcpconn)
} else { } else {
conn.sblk.Lock() conn.sblk.Lock()
conn.subs = append(conn.subs, &subconn{conn: tcpconn}) conn.subs = append(conn.subs, &subconn{conn: tcpconn, last: time.Now()})
conn.sblk.Unlock() conn.sblk.Unlock()
} }
go conn.receive(tcpconn, true) go conn.receive(tcpconn, true)
@@ -448,7 +460,8 @@ RECONNECT:
conn.peers.Delete(tcpep.String()) conn.peers.Delete(tcpep.String())
} else { } else {
conn.sblk.Lock() conn.sblk.Lock()
for i, sub := range conn.subs { subs := conn.subs
for i, sub := range subs {
if sub == subc { if sub == subc {
conn.subs = delsubs(i, conn.subs) conn.subs = delsubs(i, conn.subs)
break break
@@ -464,6 +477,7 @@ RECONNECT:
} }
} }
if subc != nil { if subc != nil {
subc.last = time.Now()
subc.cplk.Unlock() subc.cplk.Unlock()
} }
return int(cnt) - 3, err return int(cnt) - 3, err