SagerNet/sing-tun
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-tun.git synced 2025-04-05 12:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1295820ee3 into c034cafbc9

Browse source
This commit is contained in:
Zxneric 2024-10-10 01:23:12 +03:00 • committed by GitHub
commit f3df0d9545
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tun_windows.go
View file

@ -8,6 +8,7 @@ import (
"net" "net"
"net/netip" "net/netip"
"os" "os"
"runtime"
"sync" "sync"
"time" "time"
"unsafe" "unsafe"
@ -350,7 +351,7 @@ retry:
if t.close.Load() == 1 { if t.close.Load() == 1 {
return nil, nil, os.ErrClosed return nil, nil, os.ErrClosed
} }
start := nanotime() start := time.Now().UnixNano()
shouldSpin := t.rate.current.Load() >= spinloopRateThreshold && uint64(start-t.rate.nextStartTime.Load()) <= rateMeasurementGranularity*2 shouldSpin := t.rate.current.Load() >= spinloopRateThreshold && uint64(start-t.rate.nextStartTime.Load()) <= rateMeasurementGranularity*2
for { for {
if t.close.Load() == 1 { if t.close.Load() == 1 {
@ -363,11 +364,11 @@ retry:
t.rate.update(uint64(packetSize)) t.rate.update(uint64(packetSize))
return packet, func() { t.session.ReleaseReceivePacket(packet) }, nil return packet, func() { t.session.ReleaseReceivePacket(packet) }, nil
case windows.ERROR_NO_MORE_ITEMS: case windows.ERROR_NO_MORE_ITEMS:
if !shouldSpin || uint64(nanotime()-start) >= spinloopDuration { if !shouldSpin || uint64(time.Now().UnixNano()-start) >= spinloopDuration {
windows.WaitForSingleObject(t.readWait, windows.INFINITE) windows.WaitForSingleObject(t.readWait, windows.INFINITE)
goto retry goto retry
} }
procyield(1) runtime.Gosched()
continue continue
case windows.ERROR_HANDLE_EOF: case windows.ERROR_HANDLE_EOF:
return nil, nil, os.ErrClosed return nil, nil, os.ErrClosed
@ -385,7 +386,7 @@ retry:
if t.close.Load() == 1 { if t.close.Load() == 1 {
return os.ErrClosed return os.ErrClosed
} }
start := nanotime() start := time.Now().UnixNano()
shouldSpin := t.rate.current.Load() >= spinloopRateThreshold && uint64(start-t.rate.nextStartTime.Load()) <= rateMeasurementGranularity*2 shouldSpin := t.rate.current.Load() >= spinloopRateThreshold && uint64(start-t.rate.nextStartTime.Load()) <= rateMeasurementGranularity*2
for { for {
if t.close.Load() == 1 { if t.close.Load() == 1 {
@ -400,11 +401,11 @@ retry:
t.rate.update(uint64(packetSize)) t.rate.update(uint64(packetSize))
return nil return nil
case windows.ERROR_NO_MORE_ITEMS: case windows.ERROR_NO_MORE_ITEMS:
if !shouldSpin || uint64(nanotime()-start) >= spinloopDuration { if !shouldSpin || uint64(time.Now().UnixNano()-start) >= spinloopDuration {
windows.WaitForSingleObject(t.readWait, windows.INFINITE) windows.WaitForSingleObject(t.readWait, windows.INFINITE)
goto retry goto retry
} }
procyield(1) runtime.Gosched()
continue continue
case windows.ERROR_HANDLE_EOF: case windows.ERROR_HANDLE_EOF:
return os.ErrClosed return os.ErrClosed
@ -497,12 +498,6 @@ func generateGUIDByDeviceName(name string) *windows.GUID {
return (*windows.GUID)(unsafe.Pointer(&sum[0])) return (*windows.GUID)(unsafe.Pointer(&sum[0]))
} }
//go:linkname procyield runtime.procyield
func procyield(cycles uint32)
//go:linkname nanotime runtime.nanotime
func nanotime() int64
type rateJuggler struct { type rateJuggler struct {
current atomic.Uint64 current atomic.Uint64
nextByteCount atomic.Uint64 nextByteCount atomic.Uint64
@ -511,7 +506,7 @@ type rateJuggler struct {
} }
func (rate *rateJuggler) update(packetLen uint64) { func (rate *rateJuggler) update(packetLen uint64) {
now := nanotime() now := time.Now().UnixNano()
total := rate.nextByteCount.Add(packetLen) total := rate.nextByteCount.Add(packetLen)
period := uint64(now - rate.nextStartTime.Load()) period := uint64(now - rate.nextStartTime.Load())
if period >= rateMeasurementGranularity { if period >= rateMeasurementGranularity {