Merge pull request #653 from xiaobo55x:dev
PiperOrigin-RevId: 262402929
This commit is contained in:
commit
2e45d1696e
|
@ -10,5 +10,8 @@ go_library(
|
||||||
],
|
],
|
||||||
importpath = "gvisor.dev/gvisor/pkg/fdnotifier",
|
importpath = "gvisor.dev/gvisor/pkg/fdnotifier",
|
||||||
visibility = ["//:sandbox"],
|
visibility = ["//:sandbox"],
|
||||||
deps = ["//pkg/waiter"],
|
deps = [
|
||||||
|
"//pkg/waiter",
|
||||||
|
"@org_golang_x_sys//unix:go_default_library",
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,6 +25,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
"gvisor.dev/gvisor/pkg/waiter"
|
"gvisor.dev/gvisor/pkg/waiter"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -72,7 +73,7 @@ func (n *notifier) waitFD(fd int32, fi *fdInfo, mask waiter.EventMask) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
e := syscall.EpollEvent{
|
e := syscall.EpollEvent{
|
||||||
Events: mask.ToLinux() | -syscall.EPOLLET,
|
Events: mask.ToLinux() | unix.EPOLLET,
|
||||||
Fd: fd,
|
Fd: fd,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,11 @@ go_library(
|
||||||
name = "notifier",
|
name = "notifier",
|
||||||
srcs = ["notifier.go"],
|
srcs = ["notifier.go"],
|
||||||
importpath = "gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/notifier",
|
importpath = "gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/notifier",
|
||||||
visibility = ["//pkg/sentry:internal"],
|
visibility = ["//:sandbox"],
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/sentry/socket/rpcinet:syscall_rpc_go_proto",
|
"//pkg/sentry/socket/rpcinet:syscall_rpc_go_proto",
|
||||||
"//pkg/sentry/socket/rpcinet/conn",
|
"//pkg/sentry/socket/rpcinet/conn",
|
||||||
"//pkg/waiter",
|
"//pkg/waiter",
|
||||||
|
"@org_golang_x_sys//unix:go_default_library",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,6 +20,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
"gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/conn"
|
"gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/conn"
|
||||||
pb "gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/syscall_rpc_go_proto"
|
pb "gvisor.dev/gvisor/pkg/sentry/socket/rpcinet/syscall_rpc_go_proto"
|
||||||
"gvisor.dev/gvisor/pkg/waiter"
|
"gvisor.dev/gvisor/pkg/waiter"
|
||||||
|
@ -76,7 +77,7 @@ func (n *Notifier) waitFD(fd uint32, fi *fdInfo, mask waiter.EventMask) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
e := pb.EpollEvent{
|
e := pb.EpollEvent{
|
||||||
Events: mask.ToLinux() | -syscall.EPOLLET,
|
Events: mask.ToLinux() | unix.EPOLLET,
|
||||||
Fd: fd,
|
Fd: fd,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue