summaryrefslogtreecommitdiffhomepage
path: root/pkg/unet
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-07-30 01:42:34 +0000
committergVisor bot <gvisor-bot@google.com>2019-07-30 01:42:34 +0000
commitbaba7b441d5c018b5dc6c03528fc921052fc0da1 (patch)
treea979de4927b9b021c6aabaf75579d42505a912e9 /pkg/unet
parent536fe8db7f0d9289d009f41fb6c9017a9b175672 (diff)
parentb765eb45894ea426d2c6d167b6ceb662db6ff4d2 (diff)
Merge b765eb45 (automated)
Diffstat (limited to 'pkg/unet')
-rw-r--r--pkg/unet/unet_unsafe.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/unet/unet_unsafe.go b/pkg/unet/unet_unsafe.go
index f8a42c914..614448954 100644
--- a/pkg/unet/unet_unsafe.go
+++ b/pkg/unet/unet_unsafe.go
@@ -21,7 +21,7 @@ import (
"syscall"
"unsafe"
- "gvisor.dev/gvisor/pkg/abi/linux"
+ "golang.org/x/sys/unix"
)
// wait blocks until the socket FD is ready for reading or writing, depending
@@ -37,20 +37,20 @@ func (s *Socket) wait(write bool) error {
return errClosing
}
- events := []linux.PollFD{
+ events := []unix.PollFd{
{
// The actual socket FD.
- FD: fd,
- Events: linux.POLLIN,
+ Fd: fd,
+ Events: unix.POLLIN,
},
{
// The eventfd, signaled when we are closing.
- FD: int32(s.efd),
- Events: linux.POLLIN,
+ Fd: int32(s.efd),
+ Events: unix.POLLIN,
},
}
if write {
- events[0].Events = linux.POLLOUT
+ events[0].Events = unix.POLLOUT
}
_, _, e := syscall.Syscall(syscall.SYS_POLL, uintptr(unsafe.Pointer(&events[0])), 2, uintptr(math.MaxUint64))
@@ -61,7 +61,7 @@ func (s *Socket) wait(write bool) error {
return e
}
- if events[1].REvents&linux.POLLIN == linux.POLLIN {
+ if events[1].Revents&unix.POLLIN == unix.POLLIN {
// eventfd signaled, we're closing.
return errClosing
}