soypat/lneto
1
0
Fork 0
mirror of https://github.com/soypat/lneto.git synced 2026-08-16 12:53:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Stack backoff rework (#83)

Browse Source 
* huge Stack backoff rework

* lneto bump: huge Stack backoff rework
This commit is contained in:
Pat Whittingslow
2026-04-14 21:05:02 -03:00
committed by GitHub
parent 75a812a8d7
commit 16c2c3de36
13 changed files with 153 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/xnet/stack-blocking.go
+62 -32
View File
@@ -8,6 +8,7 @@ import (
"github.com/soypat/lneto"
"github.com/soypat/lneto/dhcpv4"
"github.com/soypat/lneto/internal"
"github.com/soypat/lneto/tcp"
)
@@ -19,22 +20,16 @@ var (
errDeadlineExceed = errors.New("cywnet: deadline exceeded")
)
func (s *StackAsync) StackBlocking(loopSleep time.Duration) StackBlocking {
if loopSleep < 0 {
panic("invalid sleep")
} else if loopSleep > 3*time.Second {
// loopSleep should be a very small amount of time for stack to remain responsive.
panic("StackBlocking sleep too large")
}
func (s *StackAsync) StackBlocking(stackProtoBackoff lneto.BackoffStrategy) StackBlocking {
return StackBlocking{
async: s,
loopSleep: loopSleep,
async: s,
_backoff: stackProtoBackoff,
}
}
type StackBlocking struct {
async *StackAsync
loopSleep time.Duration
async *StackAsync
_backoff lneto.BackoffStrategy
}
func (s StackBlocking) DoDHCPv4(reqAddr [4]byte, timeout time.Duration) (*DHCPResults, error) {
@@ -42,20 +37,31 @@ func (s StackBlocking) DoDHCPv4(reqAddr [4]byte, timeout time.Duration) (*DHCPRe
if err != nil {
return nil, err
}
sleep := s.loopSleep
var backoffs uint
deadline := time.Now().Add(timeout)
requested := false
var lastState dhcpv4.ClientState
for i := 0; i < maxIter; i++ {
s.async.mu.Lock()
state := s.async.dhcp.State()
requested = requested || state > dhcpv4.StateInit
if requested && state == dhcpv4.StateInit {
return nil, errors.New("DHCP NACK")
} else if state == dhcpv4.StateBound {
break // DHCP done succesfully.
} else if err = s.checkDeadline(deadline); err != nil {
return nil, err
s.async.mu.Unlock()
if state == lastState {
if err = s.checkDeadline(deadline); err != nil {
return nil, err
}
s.backoff(backoffs)
backoffs++
} else {
// State change indicates something happened.
backoffs = 0
lastState = state
requested = requested || state > dhcpv4.StateInit
if requested && state == dhcpv4.StateInit {
return nil, errors.New("DHCP NACK")
} else if state == dhcpv4.StateBound {
break // DHCP done succesfully.
}
}
time.Sleep(sleep)
}
return s.async.ResultDHCP()
}
@@ -65,24 +71,30 @@ func (s StackBlocking) DoPing(hostAddr netip.Addr, timeout time.Duration) (round
return 0, lneto.ErrInvalidAddr
}
var buf [16]byte
s.async.mu.Lock()
s.async.prandRead(buf[:])
key, err := s.async.icmp.PingStart(hostAddr.As4(), buf[:], 56) // size=56 so ICMP size is 64, like linux.
s.async.mu.Unlock()
if err != nil {
return 0, err
}
start := time.Now()
sleep := timeout / maxIter
var backoffs uint
for i := 0; i < maxIter; i++ {
time.Sleep(sleep)
elapsed := time.Since(start)
s.async.mu.Lock()
completed, exists := s.async.icmp.PingPop(key)
s.async.mu.Unlock()
if !exists {
return 0, net.ErrClosed // lneto.ErrAborted
} else if completed {
}
elapsed := time.Since(start)
if completed {
return elapsed, nil
} else if elapsed > timeout {
break
}
s.backoff(backoffs)
backoffs++
}
return 0, errDeadlineExceed
}
@@ -92,9 +104,10 @@ func (s StackBlocking) DoNTP(hostAddr netip.Addr, timeout time.Duration) (offset
if err != nil {
return -1, err
}
sleep := s.loopSleep
deadline := time.Now().Add(timeout)
var done bool
var backoffs uint
for i := 0; i < maxIter; i++ {
offset, done = s.async.ResultNTPOffset()
if done {
@@ -102,7 +115,8 @@ func (s StackBlocking) DoNTP(hostAddr netip.Addr, timeout time.Duration) (offset
} else if err = s.checkDeadline(deadline); err != nil {
return -1, err
}
time.Sleep(sleep)
s.backoff(backoffs)
backoffs++
}
return -1, errDeadlineExceed
}
@@ -112,7 +126,7 @@ func (s StackBlocking) DoResolveHardwareAddress6(addr netip.Addr, timeout time.D
if err != nil {
return hw, err
}
sleep := s.loopSleep
var backoffs uint
deadline := time.Now().Add(timeout)
for i := 0; i < maxIter; i++ {
hw, err = s.async.ResultResolveHardwareAddress6(addr)
@@ -121,7 +135,8 @@ func (s StackBlocking) DoResolveHardwareAddress6(addr netip.Addr, timeout time.D
} else if err = s.checkDeadline(deadline); err != nil {
break
}
time.Sleep(sleep)
s.backoff(backoffs)
backoffs++
err = errDeadlineExceed // Ensure that if iterations done error is returned.
}
ip4 := addr.As4()
@@ -134,8 +149,9 @@ func (s StackBlocking) DoLookupIP(host string, timeout time.Duration) (addrs []n
if err != nil {
return nil, err
}
sleep := s.loopSleep
deadline := time.Now().Add(timeout)
var backoffs uint
for i := 0; i < maxIter; i++ {
addrs, completed, err := s.async.ResultLookupIP(host)
if completed {
@@ -143,7 +159,8 @@ func (s StackBlocking) DoLookupIP(host string, timeout time.Duration) (addrs []n
} else if err = s.checkDeadline(deadline); err != nil {
return nil, err
}
time.Sleep(sleep)
s.backoff(backoffs)
backoffs++
}
return nil, errDeadlineExceed
}
@@ -155,8 +172,8 @@ func (s StackBlocking) DoDialTCP(conn *tcp.Conn, localPort uint16, addrp netip.A
if err != nil {
return err
}
sleep := s.loopSleep
deadline := time.Now().Add(timeout)
var backoffs uint
for i := 0; i < maxIter; i++ {
state := conn.State()
if state == tcp.StateEstablished {
@@ -166,12 +183,13 @@ func (s StackBlocking) DoDialTCP(conn *tcp.Conn, localPort uint16, addrp netip.A
conn.Abort()
return err
}
time.Sleep(sleep)
} else {
// Unexpected state, abort and terminate connection.
conn.Abort()
return errTCPFailedToConnect
}
s.backoff(backoffs)
backoffs++
}
return errDeadlineExceed
}
@@ -182,3 +200,15 @@ func (s StackBlocking) checkDeadline(deadline time.Time) error {
}
return nil
}
func (s StackBlocking) backoff(consecutiveBackoffs uint) {
backoff(s._backoff, consecutiveBackoffs)
}
func backoff(bo lneto.BackoffStrategy, consecutiveBackoffs uint) {
if bo != nil {
bo.Do(consecutiveBackoffs)
} else {
internal.BackoffStackProto(consecutiveBackoffs)
}
}
x/xnet/stack-go.go
+11 -7
View File
@@ -5,7 +5,6 @@ import (
"net"
"net/netip"
"syscall"
"time"
"github.com/soypat/lneto"
"github.com/soypat/lneto/tcp"
@@ -22,8 +21,8 @@ type StackGoConfig struct {
ListenerPoolConfig TCPPoolConfig
}
func (s *StackAsync) StackGo(loopSleep time.Duration, cfg StackGoConfig) StackGo {
return s.StackBlocking(loopSleep).StackGo(cfg)
func (s *StackAsync) StackGo(stackProtoBackoff lneto.BackoffStrategy, cfg StackGoConfig) StackGo {
return s.StackBlocking(stackProtoBackoff).StackGo(cfg)
}
func (s StackBlocking) StackGo(cfg StackGoConfig) StackGo {
@@ -131,8 +130,10 @@ func (s StackGo) SocketNetip(ctx context.Context, network string, family, sotype
if err != nil {
return nil, err
}
var backoffs uint
for {
time.Sleep(s.blk.loopSleep)
s.blk.backoff(backoffs)
backoffs++
state := conn.State()
if state == tcp.StateEstablished {
tc := tcpconn{
@@ -159,7 +160,7 @@ func (s StackGo) SocketNetip(ctx context.Context, network string, family, sotype
}
var l tcplistener
l.localAddr = net.TCPAddrFromAddrPort(laddr)
l.sleep = s.blk.loopSleep
l.sleep = s.blk._backoff
err = l.l.Reset(laddr.Port(), pool)
if err != nil {
return nil, err
@@ -177,7 +178,7 @@ func (s StackGo) SocketNetip(ctx context.Context, network string, family, sotype
type tcplistener struct {
l tcp.Listener
closed bool
sleep time.Duration
sleep lneto.BackoffStrategy
localAddr net.Addr
}
@@ -191,12 +192,15 @@ func (l *tcplistener) Accept() (net.Conn, error) {
if l.closed {
return nil, net.ErrClosed
}
var backoffs uint
for {
n := l.l.NumberOfReadyToAccept()
if n == 0 {
time.Sleep(l.sleep)
backoff(l.sleep, backoffs)
backoffs++
continue
}
backoffs = 0
c, _, err := l.l.TryAccept()
if err != nil {
return nil, err
x/xnet/stack-retrying.go
+3 -2
View File
@@ -5,12 +5,13 @@ import (
"net/netip"
"time"
"github.com/soypat/lneto"
"github.com/soypat/lneto/tcp"
)
func (s *StackAsync) StackRetrying(loopSleep time.Duration) StackRetrying {
func (s *StackAsync) StackRetrying(stackProtoBackoff lneto.BackoffStrategy) StackRetrying {
return StackRetrying{
block: s.StackBlocking(loopSleep),
block: s.StackBlocking(stackProtoBackoff),
}
}
x/xnet/xnet_concurrent_test.go
+1 -1
View File
@@ -432,6 +432,6 @@ func testCloseTransmitsPending(tst *tester, s1, s2 *StackAsync, c1, c2 *tcp.Conn
}
func backoffGosched(consecutiveBackoffs int) (sleep time.Duration) {
func backoffGosched(consecutiveBackoffs uint) (sleep time.Duration) {
return lneto.BackoffFlagGosched
}