diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-11-21 14:48:21 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-11-22 13:13:55 +0100 |
commit | 2b242f93932e1c4ab8b45dd0f628dd4fe063699b (patch) | |
tree | 379f4a2daca264c09f12b6f7fd592243aa05202c /tun/wintun | |
parent | 4cdf805b29b1aaca1fab317ca4fce54c7fd69bf6 (diff) |
wintun: manage ring memory manually
It's large and Go's garbage collector doesn't deal with it especially
well.
Diffstat (limited to 'tun/wintun')
-rw-r--r-- | tun/wintun/ring_windows.go | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/tun/wintun/ring_windows.go b/tun/wintun/ring_windows.go index 8f46bc9..8e6b375 100644 --- a/tun/wintun/ring_windows.go +++ b/tun/wintun/ring_windows.go @@ -6,6 +6,7 @@ package wintun import ( + "runtime" "unsafe" "golang.org/x/sys/windows" @@ -53,25 +54,44 @@ func PacketAlign(size uint32) uint32 { return (size + (PacketAlignment - 1)) &^ (PacketAlignment - 1) } -func (descriptor *RingDescriptor) Init() (err error) { +func NewRingDescriptor() (descriptor *RingDescriptor, err error) { + descriptor = new(RingDescriptor) + allocatedRegion, err := windows.VirtualAlloc(0, unsafe.Sizeof(Ring{})*2, windows.MEM_COMMIT|windows.MEM_RESERVE, windows.PAGE_READWRITE) + if err != nil { + return + } + defer func() { + if err != nil { + descriptor.free() + descriptor = nil + } + }() descriptor.Send.Size = uint32(unsafe.Sizeof(Ring{})) - descriptor.Send.Ring = &Ring{} + descriptor.Send.Ring = (*Ring)(unsafe.Pointer(allocatedRegion)) descriptor.Send.TailMoved, err = windows.CreateEvent(nil, 0, 0, nil) if err != nil { return } descriptor.Receive.Size = uint32(unsafe.Sizeof(Ring{})) - descriptor.Receive.Ring = &Ring{} + descriptor.Receive.Ring = (*Ring)(unsafe.Pointer(allocatedRegion + unsafe.Sizeof(Ring{}))) descriptor.Receive.TailMoved, err = windows.CreateEvent(nil, 0, 0, nil) if err != nil { windows.CloseHandle(descriptor.Send.TailMoved) return } - + runtime.SetFinalizer(descriptor, func(d *RingDescriptor) { d.free() }) return } +func (descriptor *RingDescriptor) free() { + if descriptor.Send.Ring != nil { + windows.VirtualFree(uintptr(unsafe.Pointer(descriptor.Send.Ring)), 0, windows.MEM_RELEASE) + descriptor.Send.Ring = nil + descriptor.Receive.Ring = nil + } +} + func (descriptor *RingDescriptor) Close() { if descriptor.Send.TailMoved != 0 { windows.CloseHandle(descriptor.Send.TailMoved) |