Hesham/wireguard-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tun: windows: spin for a bit before falling back to event object

Browse Source
This commit is contained in:
Jason A. Donenfeld 2019-07-17 09:06:34 +02:00
parent 2e24e7dcae
commit 9ea9a92117
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tun/tun_windows.go
View File

@ -267,6 +267,9 @@ func (tun *NativeTun) ForceMTU(mtu int) {
tun.forcedMTU = mtu tun.forcedMTU = mtu
} }
//go:linkname procyield runtime.procyield
func procyield(cycles uint32)
// Note: Read() and Write() assume the caller comes only from a single thread; there's no locking. // Note: Read() and Write() assume the caller comes only from a single thread; there's no locking.
func (tun *NativeTun) Read(buff []byte, offset int) (int, error) { func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
@ -277,6 +280,7 @@ func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
} }
retries := maybeRetry(1000) retries := maybeRetry(1000)
top:
for !tun.close { for !tun.close {
_, err := tun.getTUN() _, err := tun.getTUN()
if err != nil { if err != nil {
@ -288,10 +292,21 @@ func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
return 0, errors.New("send ring head out of bounds") return 0, errors.New("send ring head out of bounds")
} }
buffTail := atomic.LoadUint32(&tun.rings.send.ring.tail) start := time.Now()
if buffHead == buffTail { var buffTail uint32
windows.WaitForSingleObject(tun.rings.send.tailMoved, windows.INFINITE) for {
continue buffTail = atomic.LoadUint32(&tun.rings.send.ring.tail)
if buffHead != buffTail {
break
}
if tun.close {
return 0, os.ErrClosed
}
if time.Since(start) >= time.Millisecond*50 {
windows.WaitForSingleObject(tun.rings.send.tailMoved, windows.INFINITE)
continue top
}
procyield(1)
} }
if buffTail >= packetCapacity { if buffTail >= packetCapacity {
if retries > 0 { if retries > 0 {