diff options
| author | Bhasker Hariharan <bhaskerh@google.com> | 2021-03-24 12:08:24 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-24 12:11:44 -0700 |
| commit | e7ca2a51a89a8ff2c9f5adfdfa5b51be1b3faeb3 (patch) | |
| tree | 1abf748d2755526978f560abb67f29b6f83496c7 /pkg/waiter/waiter.go | |
| parent | 72ff6a1cac6ab35132b4f79b1149590e103e5291 (diff) | |
Add POLLRDNORM/POLLWRNORM support.
On Linux these are meant to be equivalent to POLLIN/POLLOUT. Rather
than hack these on in sys_poll etc it felt cleaner to just cleanup
the call sites to notify for both events. This is what linux does
as well.
Fixes #5544
PiperOrigin-RevId: 364859977
Diffstat (limited to 'pkg/waiter/waiter.go')
| -rw-r--r-- | pkg/waiter/waiter.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkg/waiter/waiter.go b/pkg/waiter/waiter.go index 83d4f893a..4ea067cb7 100644 --- a/pkg/waiter/waiter.go +++ b/pkg/waiter/waiter.go @@ -67,13 +67,17 @@ type EventMask uint64 // Events that waiters can wait on. The meaning is the same as those in the // poll() syscall. const ( - EventIn EventMask = 0x01 // POLLIN - EventPri EventMask = 0x02 // POLLPRI - EventOut EventMask = 0x04 // POLLOUT - EventErr EventMask = 0x08 // POLLERR - EventHUp EventMask = 0x10 // POLLHUP - - allEvents EventMask = 0x1f + EventIn EventMask = 0x01 // POLLIN + EventPri EventMask = 0x02 // POLLPRI + EventOut EventMask = 0x04 // POLLOUT + EventErr EventMask = 0x08 // POLLERR + EventHUp EventMask = 0x10 // POLLHUP + EventRdNorm EventMask = 0x0040 // POLLRDNORM + EventWrNorm EventMask = 0x0100 // POLLWRNORM + + allEvents EventMask = 0x1f | EventRdNorm | EventWrNorm + ReadableEvents EventMask = EventIn | EventRdNorm + WritableEvents EventMask = EventOut | EventWrNorm ) // EventMaskFromLinux returns an EventMask representing the supported events |