Move fdnotifier package to reduce internal confusion.

PiperOrigin-RevId: 225632398
Change-Id: I909e7e2925aa369adc28e844c284d9a6108e85ce
This commit is contained in:
Adin Scannell
2018-12-14 18:05:01 -08:00
committed by Shentubot
parent 3cf84e3bef
commit 5d8cf31346
16 changed files with 16 additions and 16 deletions
@@ -8,7 +8,7 @@ go_library(
"fdnotifier.go",
"poll_unsafe.go",
],
importpath = "gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier",
importpath = "gvisor.googlesource.com/gvisor/pkg/fdnotifier",
visibility = ["//:sandbox"],
deps = ["//pkg/waiter"],
)
+2 -2
View File
@@ -14,6 +14,7 @@ go_library(
visibility = ["//pkg/sentry:internal"],
deps = [
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/log",
"//pkg/secio",
"//pkg/sentry/context",
@@ -23,7 +24,6 @@ go_library(
"//pkg/sentry/usermem",
"//pkg/syserror",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
@@ -37,12 +37,12 @@ go_test(
embed = [":fdpipe"],
deps = [
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/sentry/context",
"//pkg/sentry/context/contexttest",
"//pkg/sentry/fs",
"//pkg/sentry/usermem",
"//pkg/syserror",
"//pkg/waiter/fdnotifier",
"@com_github_google_uuid//:go_default_library",
],
)
+1 -1
View File
@@ -21,6 +21,7 @@ import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/fd"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/log"
"gvisor.googlesource.com/gvisor/pkg/secio"
"gvisor.googlesource.com/gvisor/pkg/sentry/context"
@@ -30,7 +31,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
"gvisor.googlesource.com/gvisor/pkg/syserror"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
// pipeOperations are the fs.FileOperations of a host pipe.
+1 -1
View File
@@ -22,11 +22,11 @@ import (
"testing"
"gvisor.googlesource.com/gvisor/pkg/fd"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/sentry/context/contexttest"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs"
"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
"gvisor.googlesource.com/gvisor/pkg/syserror"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
func singlePipeFD() (int, error) {
+2 -2
View File
@@ -27,6 +27,7 @@ go_library(
deps = [
"//pkg/abi/linux",
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/log",
"//pkg/refs",
"//pkg/secio",
@@ -51,7 +52,6 @@ go_library(
"//pkg/tcpip",
"//pkg/unet",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
@@ -68,6 +68,7 @@ go_test(
embed = [":host"],
deps = [
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/sentry/context",
"//pkg/sentry/context/contexttest",
"//pkg/sentry/fs",
@@ -78,6 +79,5 @@ go_test(
"//pkg/syserr",
"//pkg/tcpip",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
+1 -1
View File
@@ -19,9 +19,9 @@ import (
"path"
"syscall"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/log"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
// descriptor wraps a host fd.
+1 -1
View File
@@ -20,8 +20,8 @@ import (
"syscall"
"testing"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
func TestDescriptorRelease(t *testing.T) {
+1 -1
View File
@@ -19,6 +19,7 @@ import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/fd"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/log"
"gvisor.googlesource.com/gvisor/pkg/secio"
"gvisor.googlesource.com/gvisor/pkg/sentry/context"
@@ -29,7 +30,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
"gvisor.googlesource.com/gvisor/pkg/syserror"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
// fileOperations implements fs.FileOperations for a host file descriptor.
+1 -1
View File
@@ -19,6 +19,7 @@ import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/fd"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/log"
"gvisor.googlesource.com/gvisor/pkg/refs"
"gvisor.googlesource.com/gvisor/pkg/sentry/context"
@@ -32,7 +33,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/tcpip"
"gvisor.googlesource.com/gvisor/pkg/unet"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
// maxSendBufferSize is the maximum host send buffer size allowed for endpoint.
+1 -1
View File
@@ -20,6 +20,7 @@ import (
"testing"
"gvisor.googlesource.com/gvisor/pkg/fd"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/sentry/context/contexttest"
ktime "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/time"
"gvisor.googlesource.com/gvisor/pkg/sentry/socket"
@@ -28,7 +29,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/syserr"
"gvisor.googlesource.com/gvisor/pkg/tcpip"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
var (
+1 -1
View File
@@ -9,6 +9,7 @@ go_library(
visibility = ["//pkg/sentry:internal"],
deps = [
"//pkg/abi/linux",
"//pkg/fdnotifier",
"//pkg/sentry/context",
"//pkg/sentry/fs",
"//pkg/sentry/fs/anon",
@@ -16,7 +17,6 @@ go_library(
"//pkg/sentry/usermem",
"//pkg/syserror",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
+1 -1
View File
@@ -22,6 +22,7 @@ import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/abi/linux"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/sentry/context"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs/anon"
@@ -29,7 +30,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
"gvisor.googlesource.com/gvisor/pkg/syserror"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
// EventOperations represents an event with the semantics of Linux's file-based event
+1 -1
View File
@@ -17,6 +17,7 @@ go_library(
deps = [
"//pkg/abi/linux",
"//pkg/binary",
"//pkg/fdnotifier",
"//pkg/log",
"//pkg/sentry/arch",
"//pkg/sentry/context",
@@ -34,6 +35,5 @@ go_library(
"//pkg/syserr",
"//pkg/syserror",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
+1 -1
View File
@@ -19,6 +19,7 @@ import (
"syscall"
"gvisor.googlesource.com/gvisor/pkg/abi/linux"
"gvisor.googlesource.com/gvisor/pkg/fdnotifier"
"gvisor.googlesource.com/gvisor/pkg/sentry/context"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs/fsutil"
@@ -32,7 +33,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/syserr"
"gvisor.googlesource.com/gvisor/pkg/syserror"
"gvisor.googlesource.com/gvisor/pkg/waiter"
"gvisor.googlesource.com/gvisor/pkg/waiter/fdnotifier"
)
const (