Skip to content

Commit

Permalink
Move fdnotifier package to reduce internal confusion.
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 225632398
Change-Id: I909e7e2925aa369adc28e844c284d9a6108e85ce
  • Loading branch information
@amscanne @shentubot
amscanne authored and shentubot committed Dec 15, 2018
1 parent 3cf84e3 commit 5d8cf31
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion pkg/waiter/fdnotifier/BUILD → pkg/fdnotifier/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
0 pkg/waiter/fdnotifier/fdnotifier.go → pkg/fdnotifier/fdnotifier.go
View file
File renamed without changes.
0 pkg/waiter/fdnotifier/poll_unsafe.go → pkg/fdnotifier/poll_unsafe.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/sentry/fs/fdpipe/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ go_library(
visibility = ["//pkg/sentry:internal"],
deps = [
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/log",
"//pkg/secio",
"//pkg/sentry/context",
Expand All @@ -23,7 +24,6 @@ go_library(
"//pkg/sentry/usermem",
"//pkg/syserror",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)

Expand All @@ -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",
],
)
2 changes: 1 addition & 1 deletion pkg/sentry/fs/fdpipe/pipe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/fs/fdpipe/pipe_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/sentry/fs/host/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ go_library(
deps = [
"//pkg/abi/linux",
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/log",
"//pkg/refs",
"//pkg/secio",
Expand All @@ -51,7 +52,6 @@ go_library(
"//pkg/tcpip",
"//pkg/unet",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)

Expand All @@ -68,6 +68,7 @@ go_test(
embed = [":host"],
deps = [
"//pkg/fd",
"//pkg/fdnotifier",
"//pkg/sentry/context",
"//pkg/sentry/context/contexttest",
"//pkg/sentry/fs",
Expand All @@ -78,6 +79,5 @@ go_test(
"//pkg/syserr",
"//pkg/tcpip",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
2 changes: 1 addition & 1 deletion pkg/sentry/fs/host/descriptor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/fs/host/descriptor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/fs/host/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/fs/host/socket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/fs/host/socket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/kernel/eventfd/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ go_library(
visibility = ["//pkg/sentry:internal"],
deps = [
"//pkg/abi/linux",
"//pkg/fdnotifier",
"//pkg/sentry/context",
"//pkg/sentry/fs",
"//pkg/sentry/fs/anon",
"//pkg/sentry/fs/fsutil",
"//pkg/sentry/usermem",
"//pkg/syserror",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/kernel/eventfd/eventfd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ 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"
"gvisor.googlesource.com/gvisor/pkg/sentry/fs/fsutil"
"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
Expand Down
2 changes: 1 addition & 1 deletion pkg/sentry/socket/hostinet/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ go_library(
deps = [
"//pkg/abi/linux",
"//pkg/binary",
"//pkg/fdnotifier",
"//pkg/log",
"//pkg/sentry/arch",
"//pkg/sentry/context",
Expand All @@ -34,6 +35,5 @@ go_library(
"//pkg/syserr",
"//pkg/syserror",
"//pkg/waiter",
"//pkg/waiter/fdnotifier",
],
)
2 changes: 1 addition & 1 deletion pkg/sentry/socket/hostinet/socket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down

0 comments on commit 5d8cf31

Please sign in to comment.