From e23347e5b5d57eda8864b1404421cefab5209e78 Mon Sep 17 00:00:00 2001 From: Jamie Liu Date: Wed, 6 Nov 2024 18:08:21 -0800 Subject: [PATCH] Move //pkg/sentry/kernel/time to //pkg/sentry/ktime. This avoids needing to rename it everywhere it's imported. PiperOrigin-RevId: 693930089 --- pkg/sentry/contexttest/BUILD | 2 +- pkg/sentry/contexttest/contexttest.go | 2 +- pkg/sentry/control/BUILD | 4 ++-- pkg/sentry/control/proc.go | 2 +- pkg/sentry/control/proc_test.go | 2 +- pkg/sentry/fsimpl/fuse/BUILD | 6 +++--- pkg/sentry/fsimpl/fuse/fusefs.go | 6 +++--- pkg/sentry/fsimpl/fuse/inode.go | 16 ++++++++-------- pkg/sentry/fsimpl/gofer/BUILD | 4 ++-- pkg/sentry/fsimpl/gofer/gofer.go | 2 +- pkg/sentry/fsimpl/gofer/gofer_test.go | 4 ++-- pkg/sentry/fsimpl/kernfs/BUILD | 2 +- pkg/sentry/fsimpl/kernfs/inode_impl_util.go | 2 +- pkg/sentry/fsimpl/nsfs/BUILD | 2 +- pkg/sentry/fsimpl/pipefs/BUILD | 2 +- pkg/sentry/fsimpl/pipefs/pipefs.go | 2 +- pkg/sentry/fsimpl/proc/BUILD | 2 +- pkg/sentry/fsimpl/proc/tasks_files.go | 4 ++-- pkg/sentry/fsimpl/timerfd/BUILD | 2 +- pkg/sentry/fsimpl/timerfd/timerfd.go | 2 +- pkg/sentry/fsimpl/tmpfs/BUILD | 2 +- pkg/sentry/fsimpl/tmpfs/tmpfs.go | 6 +++--- pkg/sentry/fsutil/BUILD | 2 +- pkg/sentry/kernel/BUILD | 2 +- pkg/sentry/kernel/kernel.go | 2 +- pkg/sentry/kernel/msgqueue/BUILD | 2 +- pkg/sentry/kernel/msgqueue/msgqueue.go | 2 +- pkg/sentry/kernel/posixtimer.go | 2 +- pkg/sentry/kernel/semaphore/BUILD | 2 +- pkg/sentry/kernel/semaphore/semaphore.go | 2 +- pkg/sentry/kernel/shm/BUILD | 2 +- pkg/sentry/kernel/shm/shm.go | 2 +- pkg/sentry/kernel/task.go | 2 +- pkg/sentry/kernel/task_acct.go | 2 +- pkg/sentry/kernel/task_block.go | 2 +- pkg/sentry/kernel/task_context.go | 2 +- pkg/sentry/kernel/task_run.go | 2 +- pkg/sentry/kernel/task_sched.go | 2 +- pkg/sentry/kernel/thread_group.go | 2 +- pkg/sentry/kernel/timekeeper.go | 2 +- pkg/sentry/{kernel/time => ktime}/BUILD | 6 +++--- pkg/sentry/{kernel/time => ktime}/context.go | 2 +- .../{kernel/time/time.go => ktime/ktime.go} | 4 ++-- pkg/sentry/{kernel/time => ktime}/util.go | 2 +- pkg/sentry/seccheck/BUILD | 2 +- pkg/sentry/socket/BUILD | 2 +- pkg/sentry/socket/hostinet/BUILD | 2 +- pkg/sentry/socket/hostinet/socket.go | 2 +- pkg/sentry/socket/netlink/BUILD | 2 +- pkg/sentry/socket/netlink/socket.go | 2 +- pkg/sentry/socket/netstack/BUILD | 2 +- pkg/sentry/socket/netstack/netstack.go | 2 +- pkg/sentry/socket/plugin/stack/BUILD | 2 +- pkg/sentry/socket/plugin/stack/socket.go | 2 +- pkg/sentry/socket/socket.go | 2 +- pkg/sentry/socket/unix/BUILD | 2 +- pkg/sentry/socket/unix/unix.go | 2 +- pkg/sentry/syscalls/linux/BUILD | 2 +- pkg/sentry/syscalls/linux/sys_aio.go | 2 +- pkg/sentry/syscalls/linux/sys_epoll.go | 2 +- pkg/sentry/syscalls/linux/sys_futex.go | 2 +- pkg/sentry/syscalls/linux/sys_poll.go | 2 +- pkg/sentry/syscalls/linux/sys_read_write.go | 2 +- pkg/sentry/syscalls/linux/sys_rusage.go | 2 +- pkg/sentry/syscalls/linux/sys_socket.go | 2 +- pkg/sentry/syscalls/linux/sys_time.go | 2 +- pkg/sentry/syscalls/linux/sys_timerfd.go | 2 +- pkg/sentry/vfs/BUILD | 2 +- pkg/sentry/watchdog/BUILD | 2 +- pkg/sentry/watchdog/watchdog.go | 2 +- 70 files changed, 90 insertions(+), 90 deletions(-) rename pkg/sentry/{kernel/time => ktime}/BUILD (92%) rename pkg/sentry/{kernel/time => ktime}/context.go (98%) rename pkg/sentry/{kernel/time/time.go => ktime/ktime.go} (99%) rename pkg/sentry/{kernel/time => ktime}/util.go (99%) diff --git a/pkg/sentry/contexttest/BUILD b/pkg/sentry/contexttest/BUILD index a1dbf488f..677abfe1e 100644 --- a/pkg/sentry/contexttest/BUILD +++ b/pkg/sentry/contexttest/BUILD @@ -15,7 +15,7 @@ go_library( "//pkg/context", "//pkg/memutil", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/limits", "//pkg/sentry/pgalloc", "//pkg/sentry/platform", diff --git a/pkg/sentry/contexttest/contexttest.go b/pkg/sentry/contexttest/contexttest.go index aba96d5ce..fab40e9cd 100644 --- a/pkg/sentry/contexttest/contexttest.go +++ b/pkg/sentry/contexttest/contexttest.go @@ -24,7 +24,7 @@ import ( "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/memutil" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/pgalloc" "gvisor.dev/gvisor/pkg/sentry/platform" diff --git a/pkg/sentry/control/BUILD b/pkg/sentry/control/BUILD index cdfd13c47..79eed9f55 100644 --- a/pkg/sentry/control/BUILD +++ b/pkg/sentry/control/BUILD @@ -49,7 +49,7 @@ go_library( "//pkg/sentry/fsmetric", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/limits", "//pkg/sentry/pgalloc", "//pkg/sentry/state", @@ -73,7 +73,7 @@ go_test( library = ":control", deps = [ "//pkg/log", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/usage", ], ) diff --git a/pkg/sentry/control/proc.go b/pkg/sentry/control/proc.go index 94e84cd4c..1674d01cd 100644 --- a/pkg/sentry/control/proc.go +++ b/pkg/sentry/control/proc.go @@ -32,7 +32,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/user" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/vfs" diff --git a/pkg/sentry/control/proc_test.go b/pkg/sentry/control/proc_test.go index 0a88459b2..1374c8c5a 100644 --- a/pkg/sentry/control/proc_test.go +++ b/pkg/sentry/control/proc_test.go @@ -18,7 +18,7 @@ import ( "testing" "gvisor.dev/gvisor/pkg/log" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/usage" ) diff --git a/pkg/sentry/fsimpl/fuse/BUILD b/pkg/sentry/fsimpl/fuse/BUILD index 85c73af5d..877305fed 100644 --- a/pkg/sentry/fsimpl/fuse/BUILD +++ b/pkg/sentry/fsimpl/fuse/BUILD @@ -32,13 +32,13 @@ go_template_instance( name = "seqatomic_time", out = "seqatomic_time_unsafe.go", imports = { - "time": "gvisor.dev/gvisor/pkg/sentry/kernel/time", + "ktime": "gvisor.dev/gvisor/pkg/sentry/ktime", }, package = "fuse", suffix = "Time", template = "//pkg/sync/seqatomic:generic_seqatomic", types = { - "Value": "time.Time", + "Value": "ktime.Time", }, ) @@ -80,7 +80,7 @@ go_library( "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/pipe", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/memmap", "//pkg/sentry/vfs", "//pkg/sync", diff --git a/pkg/sentry/fsimpl/fuse/fusefs.go b/pkg/sentry/fsimpl/fuse/fusefs.go index 31269705c..f3790dbf8 100644 --- a/pkg/sentry/fsimpl/fuse/fusefs.go +++ b/pkg/sentry/fsimpl/fuse/fusefs.go @@ -26,7 +26,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" ) @@ -95,7 +95,7 @@ type filesystem struct { opts *filesystemOptions // clock is a real-time clock used to set timestamps in file operations. - clock time.Clock + clock ktime.Clock } // Name implements vfs.FilesystemType.Name. @@ -271,7 +271,7 @@ func newFUSEFilesystem(ctx context.Context, vfsObj *vfs.VirtualFilesystem, fsTyp devMinor: devMinor, opts: opts, conn: fuseFD.conn, - clock: time.RealtimeClockFromContext(ctx), + clock: ktime.RealtimeClockFromContext(ctx), } fs.VFSFilesystem().Init(vfsObj, fsType, fs) return fs, nil diff --git a/pkg/sentry/fsimpl/fuse/inode.go b/pkg/sentry/fsimpl/fuse/inode.go index 0f9c15c7a..09c74a5b6 100644 --- a/pkg/sentry/fsimpl/fuse/inode.go +++ b/pkg/sentry/fsimpl/fuse/inode.go @@ -15,7 +15,7 @@ package fuse import ( - gotime "time" + "time" "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/atomicbitops" @@ -28,7 +28,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/sync" ) @@ -65,13 +65,13 @@ type inode struct { // that attrMu is locked. Writing entryTime requires that attrMu is locked // and that entryTimeSeq is in a writer critical section. entryTimeSeq sync.SeqCount `state:"nosave"` - entryTime time.Time + entryTime ktime.Time // attrVersion is the version of the last attribute change. attrVersion atomicbitops.Uint64 // attrTime is the time at which the attributes become invalid. - attrTime time.Time + attrTime ktime.Time // link is result of following a symbolic link. link string @@ -189,7 +189,7 @@ func (i *inode) init(creds *auth.Credentials, devMajor, devMinor uint32, nodeid // +checklocks:i.attrMu func (i *inode) updateEntryTime(entrySec, entryNSec int64) { - entryTime := time.FromTimespec(linux.Timespec{Sec: entrySec, Nsec: entryNSec}) + entryTime := ktime.FromTimespec(linux.Timespec{Sec: entrySec, Nsec: entryNSec}) SeqAtomicStoreTime(&i.entryTimeSeq, &i.entryTime, i.fs.clock.Now().AddTime(entryTime)) } @@ -595,7 +595,7 @@ func (i *inode) Readlink(ctx context.Context, mnt *vfs.Mount) (string, error) { } i.link = string(res.data[res.hdr.SizeBytes():]) if !mnt.Options().ReadOnly { - i.attrTime = time.ZeroTime + i.attrTime = ktime.ZeroTime } } return i.link, nil @@ -605,7 +605,7 @@ func (i *inode) Readlink(ctx context.Context, mnt *vfs.Mount) (string, error) { // // +checklocks:i.attrMu func (i *inode) getFUSEAttr() linux.FUSEAttr { - ns := gotime.Second.Nanoseconds() + ns := time.Second.Nanoseconds() return linux.FUSEAttr{ Ino: i.nodeID, UID: i.uid.Load(), @@ -869,7 +869,7 @@ func (i *inode) updateAttrs(attr linux.FUSEAttr, validSec, validNSec int64) { i.fs.conn.mu.Lock() i.attrVersion.Store(i.fs.conn.attributeVersion.Add(1)) i.fs.conn.mu.Unlock() - i.attrTime = i.fs.clock.Now().AddTime(time.FromTimespec(linux.Timespec{Sec: validSec, Nsec: validNSec})) + i.attrTime = i.fs.clock.Now().AddTime(ktime.FromTimespec(linux.Timespec{Sec: validSec, Nsec: validNSec})) i.ino.Store(attr.Ino) diff --git a/pkg/sentry/fsimpl/gofer/BUILD b/pkg/sentry/fsimpl/gofer/BUILD index 01c5b41c0..8ea15112b 100644 --- a/pkg/sentry/fsimpl/gofer/BUILD +++ b/pkg/sentry/fsimpl/gofer/BUILD @@ -102,7 +102,7 @@ go_library( "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/pipe", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/memmap", "//pkg/sentry/pgalloc", "//pkg/sentry/platform", @@ -128,7 +128,7 @@ go_test( "//pkg/abi/linux", "//pkg/lisafs", "//pkg/sentry/contexttest", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/pgalloc", ], ) diff --git a/pkg/sentry/fsimpl/gofer/gofer.go b/pkg/sentry/fsimpl/gofer/gofer.go index 84863131b..297e983ba 100644 --- a/pkg/sentry/fsimpl/gofer/gofer.go +++ b/pkg/sentry/fsimpl/gofer/gofer.go @@ -60,7 +60,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsutil" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/pipe" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/pgalloc" "gvisor.dev/gvisor/pkg/sentry/socket/unix/transport" diff --git a/pkg/sentry/fsimpl/gofer/gofer_test.go b/pkg/sentry/fsimpl/gofer/gofer_test.go index 60e5097f1..d3c072814 100644 --- a/pkg/sentry/fsimpl/gofer/gofer_test.go +++ b/pkg/sentry/fsimpl/gofer/gofer_test.go @@ -20,7 +20,7 @@ import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/lisafs" "gvisor.dev/gvisor/pkg/sentry/contexttest" - "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/pgalloc" ) @@ -29,7 +29,7 @@ func TestDestroyIdempotent(t *testing.T) { fs := filesystem{ mf: pgalloc.MemoryFileFromContext(ctx), inoByKey: make(map[inoKey]uint64), - clock: time.RealtimeClockFromContext(ctx), + clock: ktime.RealtimeClockFromContext(ctx), // Test relies on no dentry being held in the cache. dentryCache: &dentryCache{maxCachedDentries: 0}, client: &lisafs.Client{}, diff --git a/pkg/sentry/fsimpl/kernfs/BUILD b/pkg/sentry/fsimpl/kernfs/BUILD index daab49e1c..29f7453e4 100644 --- a/pkg/sentry/fsimpl/kernfs/BUILD +++ b/pkg/sentry/fsimpl/kernfs/BUILD @@ -133,7 +133,7 @@ go_library( "//pkg/sentry/fsimpl/lock", "//pkg/sentry/fsutil", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/memmap", "//pkg/sentry/socket/unix/transport", "//pkg/sentry/vfs", diff --git a/pkg/sentry/fsimpl/kernfs/inode_impl_util.go b/pkg/sentry/fsimpl/kernfs/inode_impl_util.go index a378280e8..3ec38cb82 100644 --- a/pkg/sentry/fsimpl/kernfs/inode_impl_util.go +++ b/pkg/sentry/fsimpl/kernfs/inode_impl_util.go @@ -23,7 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/sync" ) diff --git a/pkg/sentry/fsimpl/nsfs/BUILD b/pkg/sentry/fsimpl/nsfs/BUILD index 07f20d601..4f86ffbfd 100644 --- a/pkg/sentry/fsimpl/nsfs/BUILD +++ b/pkg/sentry/fsimpl/nsfs/BUILD @@ -32,7 +32,7 @@ go_library( "//pkg/refs", "//pkg/sentry/fsimpl/kernfs", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/vfs", "//pkg/sync", ], diff --git a/pkg/sentry/fsimpl/pipefs/BUILD b/pkg/sentry/fsimpl/pipefs/BUILD index ff0c9ef54..d9ec61a45 100644 --- a/pkg/sentry/fsimpl/pipefs/BUILD +++ b/pkg/sentry/fsimpl/pipefs/BUILD @@ -17,7 +17,7 @@ go_library( "//pkg/sentry/fsimpl/kernfs", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/pipe", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/vfs", "//pkg/sync", ], diff --git a/pkg/sentry/fsimpl/pipefs/pipefs.go b/pkg/sentry/fsimpl/pipefs/pipefs.go index bca179375..73e85654f 100644 --- a/pkg/sentry/fsimpl/pipefs/pipefs.go +++ b/pkg/sentry/fsimpl/pipefs/pipefs.go @@ -27,7 +27,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/pipe" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/sync" ) diff --git a/pkg/sentry/fsimpl/proc/BUILD b/pkg/sentry/fsimpl/proc/BUILD index 96cb6f178..794779d92 100644 --- a/pkg/sentry/fsimpl/proc/BUILD +++ b/pkg/sentry/fsimpl/proc/BUILD @@ -97,7 +97,7 @@ go_library( "//pkg/sentry/inet", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/limits", "//pkg/sentry/mm", "//pkg/sentry/socket", diff --git a/pkg/sentry/fsimpl/proc/tasks_files.go b/pkg/sentry/fsimpl/proc/tasks_files.go index 37bcff1f2..97eef2917 100644 --- a/pkg/sentry/fsimpl/proc/tasks_files.go +++ b/pkg/sentry/fsimpl/proc/tasks_files.go @@ -27,7 +27,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/vfs" ) @@ -322,7 +322,7 @@ var _ dynamicInode = (*uptimeData)(nil) // Generate implements vfs.DynamicBytesSource.Generate. func (*uptimeData) Generate(ctx context.Context, buf *bytes.Buffer) error { k := kernel.KernelFromContext(ctx) - now := time.NowFromContext(ctx) + now := ktime.NowFromContext(ctx) // Pretend that we've spent zero time sleeping (second number). fmt.Fprintf(buf, "%.2f 0.00\n", now.Sub(k.Timekeeper().BootTime()).Seconds()) diff --git a/pkg/sentry/fsimpl/timerfd/BUILD b/pkg/sentry/fsimpl/timerfd/BUILD index 60a2b43eb..3097d21f1 100644 --- a/pkg/sentry/fsimpl/timerfd/BUILD +++ b/pkg/sentry/fsimpl/timerfd/BUILD @@ -13,7 +13,7 @@ go_library( "//pkg/context", "//pkg/errors/linuxerr", "//pkg/hostarch", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/vfs", "//pkg/usermem", "//pkg/waiter", diff --git a/pkg/sentry/fsimpl/timerfd/timerfd.go b/pkg/sentry/fsimpl/timerfd/timerfd.go index afea7e637..7e8627165 100644 --- a/pkg/sentry/fsimpl/timerfd/timerfd.go +++ b/pkg/sentry/fsimpl/timerfd/timerfd.go @@ -20,7 +20,7 @@ import ( "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/hostarch" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/usermem" "gvisor.dev/gvisor/pkg/waiter" diff --git a/pkg/sentry/fsimpl/tmpfs/BUILD b/pkg/sentry/fsimpl/tmpfs/BUILD index f0e9cabf7..b08cf3a15 100644 --- a/pkg/sentry/fsimpl/tmpfs/BUILD +++ b/pkg/sentry/fsimpl/tmpfs/BUILD @@ -107,7 +107,7 @@ go_library( "//pkg/sentry/hostfd", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/pipe", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/memmap", "//pkg/sentry/pgalloc", "//pkg/sentry/platform", diff --git a/pkg/sentry/fsimpl/tmpfs/tmpfs.go b/pkg/sentry/fsimpl/tmpfs/tmpfs.go index 3d3c22a43..b46456017 100644 --- a/pkg/sentry/fsimpl/tmpfs/tmpfs.go +++ b/pkg/sentry/fsimpl/tmpfs/tmpfs.go @@ -41,7 +41,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/pgalloc" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/vfs" @@ -67,7 +67,7 @@ type filesystem struct { mf *pgalloc.MemoryFile `state:".(string)"` // clock is a realtime clock used to set timestamps in file operations. - clock time.Clock + clock ktime.Clock // devMinor is the filesystem's minor device number. devMinor is immutable. devMinor uint32 @@ -279,7 +279,7 @@ func (fstype FilesystemType) GetFilesystem(ctx context.Context, vfsObj *vfs.Virt if err != nil { return nil, nil, err } - clock := time.RealtimeClockFromContext(ctx) + clock := ktime.RealtimeClockFromContext(ctx) memUsage := usage.Tmpfs if tmpfsOpts.Usage != nil { memUsage = *tmpfsOpts.Usage diff --git a/pkg/sentry/fsutil/BUILD b/pkg/sentry/fsutil/BUILD index e4c1fdf64..9bfa3a063 100644 --- a/pkg/sentry/fsutil/BUILD +++ b/pkg/sentry/fsutil/BUILD @@ -136,7 +136,7 @@ go_library( "//pkg/log", "//pkg/safemem", "//pkg/sentry/arch", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/memmap", "//pkg/sentry/mm", "//pkg/sentry/pgalloc", diff --git a/pkg/sentry/kernel/BUILD b/pkg/sentry/kernel/BUILD index 2d31c94bc..a9495ed31 100644 --- a/pkg/sentry/kernel/BUILD +++ b/pkg/sentry/kernel/BUILD @@ -370,7 +370,7 @@ go_library( "//pkg/sentry/kernel/sched", "//pkg/sentry/kernel/semaphore", "//pkg/sentry/kernel/shm", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/limits", "//pkg/sentry/loader", "//pkg/sentry/memmap", diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go index a92915d36..bd646c9fc 100644 --- a/pkg/sentry/kernel/kernel.go +++ b/pkg/sentry/kernel/kernel.go @@ -63,7 +63,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel/futex" "gvisor.dev/gvisor/pkg/sentry/kernel/ipc" "gvisor.dev/gvisor/pkg/sentry/kernel/sched" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/loader" "gvisor.dev/gvisor/pkg/sentry/mm" diff --git a/pkg/sentry/kernel/msgqueue/BUILD b/pkg/sentry/kernel/msgqueue/BUILD index a4a8ffeee..9974639e7 100644 --- a/pkg/sentry/kernel/msgqueue/BUILD +++ b/pkg/sentry/kernel/msgqueue/BUILD @@ -31,7 +31,7 @@ go_library( "//pkg/errors/linuxerr", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/ipc", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/vfs", "//pkg/sync", "//pkg/waiter", diff --git a/pkg/sentry/kernel/msgqueue/msgqueue.go b/pkg/sentry/kernel/msgqueue/msgqueue.go index 206ceb0d6..27307c3ab 100644 --- a/pkg/sentry/kernel/msgqueue/msgqueue.go +++ b/pkg/sentry/kernel/msgqueue/msgqueue.go @@ -21,7 +21,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/ipc" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/waiter" diff --git a/pkg/sentry/kernel/posixtimer.go b/pkg/sentry/kernel/posixtimer.go index c95748967..21a9de041 100644 --- a/pkg/sentry/kernel/posixtimer.go +++ b/pkg/sentry/kernel/posixtimer.go @@ -19,7 +19,7 @@ import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/errors/linuxerr" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" ) // IntervalTimer represents a POSIX interval timer as described by diff --git a/pkg/sentry/kernel/semaphore/BUILD b/pkg/sentry/kernel/semaphore/BUILD index b8215869b..642b5ef55 100644 --- a/pkg/sentry/kernel/semaphore/BUILD +++ b/pkg/sentry/kernel/semaphore/BUILD @@ -31,7 +31,7 @@ go_library( "//pkg/errors/linuxerr", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/ipc", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/vfs", "//pkg/sync", ], diff --git a/pkg/sentry/kernel/semaphore/semaphore.go b/pkg/sentry/kernel/semaphore/semaphore.go index f5e873409..1e9ecb8f1 100644 --- a/pkg/sentry/kernel/semaphore/semaphore.go +++ b/pkg/sentry/kernel/semaphore/semaphore.go @@ -23,7 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/ipc" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/sync" ) diff --git a/pkg/sentry/kernel/shm/BUILD b/pkg/sentry/kernel/shm/BUILD index 9e17ce939..59a66dcda 100644 --- a/pkg/sentry/kernel/shm/BUILD +++ b/pkg/sentry/kernel/shm/BUILD @@ -38,7 +38,7 @@ go_library( "//pkg/refs", "//pkg/sentry/kernel/auth", "//pkg/sentry/kernel/ipc", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/memmap", "//pkg/sentry/pgalloc", "//pkg/sentry/usage", diff --git a/pkg/sentry/kernel/shm/shm.go b/pkg/sentry/kernel/shm/shm.go index c6e9c2440..3eaaea75a 100644 --- a/pkg/sentry/kernel/shm/shm.go +++ b/pkg/sentry/kernel/shm/shm.go @@ -44,7 +44,7 @@ import ( "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/ipc" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/pgalloc" "gvisor.dev/gvisor/pkg/sentry/usage" diff --git a/pkg/sentry/kernel/task.go b/pkg/sentry/kernel/task.go index 0ebc15759..11161ab17 100644 --- a/pkg/sentry/kernel/task.go +++ b/pkg/sentry/kernel/task.go @@ -28,7 +28,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/futex" "gvisor.dev/gvisor/pkg/sentry/kernel/sched" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/platform" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/vfs" diff --git a/pkg/sentry/kernel/task_acct.go b/pkg/sentry/kernel/task_acct.go index f23fb1cd9..11dc12a4f 100644 --- a/pkg/sentry/kernel/task_acct.go +++ b/pkg/sentry/kernel/task_acct.go @@ -19,7 +19,7 @@ package kernel import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/errors/linuxerr" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/usage" ) diff --git a/pkg/sentry/kernel/task_block.go b/pkg/sentry/kernel/task_block.go index e51e84ece..e838c3c87 100644 --- a/pkg/sentry/kernel/task_block.go +++ b/pkg/sentry/kernel/task_block.go @@ -20,7 +20,7 @@ import ( "time" "gvisor.dev/gvisor/pkg/errors/linuxerr" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/waiter" ) diff --git a/pkg/sentry/kernel/task_context.go b/pkg/sentry/kernel/task_context.go index 5206a269d..2fef06440 100644 --- a/pkg/sentry/kernel/task_context.go +++ b/pkg/sentry/kernel/task_context.go @@ -25,7 +25,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/kernel/ipc" "gvisor.dev/gvisor/pkg/sentry/kernel/shm" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/pgalloc" "gvisor.dev/gvisor/pkg/sentry/platform" diff --git a/pkg/sentry/kernel/task_run.go b/pkg/sentry/kernel/task_run.go index 10b616f02..1d169b74d 100644 --- a/pkg/sentry/kernel/task_run.go +++ b/pkg/sentry/kernel/task_run.go @@ -25,7 +25,7 @@ import ( "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/refs" "gvisor.dev/gvisor/pkg/sentry/hostcpu" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/platform" ) diff --git a/pkg/sentry/kernel/task_sched.go b/pkg/sentry/kernel/task_sched.go index 3a63e64cb..e041ddfd0 100644 --- a/pkg/sentry/kernel/task_sched.go +++ b/pkg/sentry/kernel/task_sched.go @@ -25,7 +25,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/hostcpu" "gvisor.dev/gvisor/pkg/sentry/kernel/sched" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/usage" ) diff --git a/pkg/sentry/kernel/thread_group.go b/pkg/sentry/kernel/thread_group.go index 9597a8543..cddeb21d4 100644 --- a/pkg/sentry/kernel/thread_group.go +++ b/pkg/sentry/kernel/thread_group.go @@ -23,7 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sync" diff --git a/pkg/sentry/kernel/timekeeper.go b/pkg/sentry/kernel/timekeeper.go index 23a3c2595..12ae7b53b 100644 --- a/pkg/sentry/kernel/timekeeper.go +++ b/pkg/sentry/kernel/timekeeper.go @@ -20,7 +20,7 @@ import ( "gvisor.dev/gvisor/pkg/atomicbitops" "gvisor.dev/gvisor/pkg/log" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" sentrytime "gvisor.dev/gvisor/pkg/sentry/time" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/tcpip" diff --git a/pkg/sentry/kernel/time/BUILD b/pkg/sentry/ktime/BUILD similarity index 92% rename from pkg/sentry/kernel/time/BUILD rename to pkg/sentry/ktime/BUILD index b74e9643d..c52ea7e32 100644 --- a/pkg/sentry/kernel/time/BUILD +++ b/pkg/sentry/ktime/BUILD @@ -9,7 +9,7 @@ package( go_template_instance( name = "seqatomic_clock", out = "seqatomic_clock_unsafe.go", - package = "time", + package = "ktime", suffix = "Clock", template = "//pkg/sync/seqatomic:generic_seqatomic", types = { @@ -18,11 +18,11 @@ go_template_instance( ) go_library( - name = "time", + name = "ktime", srcs = [ "context.go", + "ktime.go", "seqatomic_clock_unsafe.go", - "time.go", "util.go", ], visibility = ["//pkg/sentry:internal"], diff --git a/pkg/sentry/kernel/time/context.go b/pkg/sentry/ktime/context.go similarity index 98% rename from pkg/sentry/kernel/time/context.go rename to pkg/sentry/ktime/context.go index 00b729d88..202e5d0cd 100644 --- a/pkg/sentry/kernel/time/context.go +++ b/pkg/sentry/ktime/context.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package time +package ktime import ( "gvisor.dev/gvisor/pkg/context" diff --git a/pkg/sentry/kernel/time/time.go b/pkg/sentry/ktime/ktime.go similarity index 99% rename from pkg/sentry/kernel/time/time.go rename to pkg/sentry/ktime/ktime.go index 242b2b7b4..4d22e2a6d 100644 --- a/pkg/sentry/kernel/time/time.go +++ b/pkg/sentry/ktime/ktime.go @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package time defines the Timer type, which provides a periodic timer that +// Package ktime defines the Timer type, which provides a periodic timer that // works by sampling a user-provided clock. -package time +package ktime import ( "fmt" diff --git a/pkg/sentry/kernel/time/util.go b/pkg/sentry/ktime/util.go similarity index 99% rename from pkg/sentry/kernel/time/util.go rename to pkg/sentry/ktime/util.go index 3e487235f..bd78f8677 100644 --- a/pkg/sentry/kernel/time/util.go +++ b/pkg/sentry/ktime/util.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package time +package ktime import ( "sync" diff --git a/pkg/sentry/seccheck/BUILD b/pkg/sentry/seccheck/BUILD index e8faf0410..cd9d2368a 100644 --- a/pkg/sentry/seccheck/BUILD +++ b/pkg/sentry/seccheck/BUILD @@ -39,7 +39,7 @@ go_library( "//pkg/log", "//pkg/metric", "//pkg/sentry/arch", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/seccheck/points:points_go_proto", "//pkg/sync", "@org_golang_google_protobuf//proto:go_default_library", diff --git a/pkg/sentry/socket/BUILD b/pkg/sentry/socket/BUILD index e427d2e21..80878c32e 100644 --- a/pkg/sentry/socket/BUILD +++ b/pkg/sentry/socket/BUILD @@ -19,7 +19,7 @@ go_library( "//pkg/hostarch", "//pkg/marshal", "//pkg/sentry/kernel", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/socket/unix/transport", "//pkg/sentry/vfs", "//pkg/syserr", diff --git a/pkg/sentry/socket/hostinet/BUILD b/pkg/sentry/socket/hostinet/BUILD index 5ac214e28..153c2c27e 100644 --- a/pkg/sentry/socket/hostinet/BUILD +++ b/pkg/sentry/socket/hostinet/BUILD @@ -36,7 +36,7 @@ go_library( "//pkg/sentry/inet", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/socket", "//pkg/sentry/socket/control", "//pkg/sentry/socket/netlink/nlmsg", diff --git a/pkg/sentry/socket/hostinet/socket.go b/pkg/sentry/socket/hostinet/socket.go index 084c681fe..17fda417b 100644 --- a/pkg/sentry/socket/hostinet/socket.go +++ b/pkg/sentry/socket/hostinet/socket.go @@ -31,7 +31,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/hostfd" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/control" "gvisor.dev/gvisor/pkg/sentry/vfs" diff --git a/pkg/sentry/socket/netlink/BUILD b/pkg/sentry/socket/netlink/BUILD index c47556a23..997e43728 100644 --- a/pkg/sentry/socket/netlink/BUILD +++ b/pkg/sentry/socket/netlink/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/sentry/inet", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/socket", "//pkg/sentry/socket/netlink/nlmsg", "//pkg/sentry/socket/netlink/port", diff --git a/pkg/sentry/socket/netlink/socket.go b/pkg/sentry/socket/netlink/socket.go index fd7fd3e96..ff889be06 100644 --- a/pkg/sentry/socket/netlink/socket.go +++ b/pkg/sentry/socket/netlink/socket.go @@ -31,7 +31,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/netlink/nlmsg" "gvisor.dev/gvisor/pkg/sentry/socket/netlink/port" diff --git a/pkg/sentry/socket/netstack/BUILD b/pkg/sentry/socket/netstack/BUILD index 02efa96e0..ce61fe80d 100644 --- a/pkg/sentry/socket/netstack/BUILD +++ b/pkg/sentry/socket/netstack/BUILD @@ -39,7 +39,7 @@ go_library( "//pkg/sentry/inet", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/socket", "//pkg/sentry/socket/netfilter", "//pkg/sentry/socket/netlink/nlmsg", diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index d808aafac..9c319009a 100644 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -50,7 +50,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/netfilter" epb "gvisor.dev/gvisor/pkg/sentry/socket/netstack/events_go_proto" diff --git a/pkg/sentry/socket/plugin/stack/BUILD b/pkg/sentry/socket/plugin/stack/BUILD index 1cf18170a..423908e0c 100644 --- a/pkg/sentry/socket/plugin/stack/BUILD +++ b/pkg/sentry/socket/plugin/stack/BUILD @@ -31,7 +31,7 @@ go_library( "//pkg/sentry/inet", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/socket", "//pkg/sentry/socket/plugin", "//pkg/sentry/socket/plugin/cgo", diff --git a/pkg/sentry/socket/plugin/stack/socket.go b/pkg/sentry/socket/plugin/stack/socket.go index b424d8bc5..665966958 100644 --- a/pkg/sentry/socket/plugin/stack/socket.go +++ b/pkg/sentry/socket/plugin/stack/socket.go @@ -30,7 +30,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/sockfs" "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/plugin" "gvisor.dev/gvisor/pkg/sentry/socket/plugin/cgo" diff --git a/pkg/sentry/socket/socket.go b/pkg/sentry/socket/socket.go index 37c866576..ac7c2e131 100644 --- a/pkg/sentry/socket/socket.go +++ b/pkg/sentry/socket/socket.go @@ -29,7 +29,7 @@ import ( "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/marshal" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket/unix/transport" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/syserr" diff --git a/pkg/sentry/socket/unix/BUILD b/pkg/sentry/socket/unix/BUILD index ca2516d65..ad0fef609 100644 --- a/pkg/sentry/socket/unix/BUILD +++ b/pkg/sentry/socket/unix/BUILD @@ -42,7 +42,7 @@ go_library( "//pkg/sentry/fsutil", "//pkg/sentry/inet", "//pkg/sentry/kernel", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/socket", "//pkg/sentry/socket/control", "//pkg/sentry/socket/netstack", diff --git a/pkg/sentry/socket/unix/unix.go b/pkg/sentry/socket/unix/unix.go index 7b38191f0..e0c6686c9 100644 --- a/pkg/sentry/socket/unix/unix.go +++ b/pkg/sentry/socket/unix/unix.go @@ -32,7 +32,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/sockfs" "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/control" "gvisor.dev/gvisor/pkg/sentry/socket/netstack" diff --git a/pkg/sentry/syscalls/linux/BUILD b/pkg/sentry/syscalls/linux/BUILD index 86117d91f..ed76e21ac 100644 --- a/pkg/sentry/syscalls/linux/BUILD +++ b/pkg/sentry/syscalls/linux/BUILD @@ -102,7 +102,7 @@ go_library( "//pkg/sentry/kernel/pipe", "//pkg/sentry/kernel/sched", "//pkg/sentry/kernel/shm", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/limits", "//pkg/sentry/loader", "//pkg/sentry/memmap", diff --git a/pkg/sentry/syscalls/linux/sys_aio.go b/pkg/sentry/syscalls/linux/sys_aio.go index 7e696f1d8..caa655d31 100644 --- a/pkg/sentry/syscalls/linux/sys_aio.go +++ b/pkg/sentry/syscalls/linux/sys_aio.go @@ -23,7 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/fsimpl/eventfd" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/mm" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/usermem" diff --git a/pkg/sentry/syscalls/linux/sys_epoll.go b/pkg/sentry/syscalls/linux/sys_epoll.go index 98ba6ce8c..29e1d3c3c 100644 --- a/pkg/sentry/syscalls/linux/sys_epoll.go +++ b/pkg/sentry/syscalls/linux/sys_epoll.go @@ -23,7 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/waiter" ) diff --git a/pkg/sentry/syscalls/linux/sys_futex.go b/pkg/sentry/syscalls/linux/sys_futex.go index bdff515c5..f406359bf 100644 --- a/pkg/sentry/syscalls/linux/sys_futex.go +++ b/pkg/sentry/syscalls/linux/sys_futex.go @@ -22,7 +22,7 @@ import ( "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" ) // futexWaitRestartBlock encapsulates the state required to restart futex(2) diff --git a/pkg/sentry/syscalls/linux/sys_poll.go b/pkg/sentry/syscalls/linux/sys_poll.go index d658655aa..06cb48697 100644 --- a/pkg/sentry/syscalls/linux/sys_poll.go +++ b/pkg/sentry/syscalls/linux/sys_poll.go @@ -23,7 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/waiter" diff --git a/pkg/sentry/syscalls/linux/sys_read_write.go b/pkg/sentry/syscalls/linux/sys_read_write.go index fd0f25ad9..1d0e37fb7 100644 --- a/pkg/sentry/syscalls/linux/sys_read_write.go +++ b/pkg/sentry/syscalls/linux/sys_read_write.go @@ -21,7 +21,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/usermem" diff --git a/pkg/sentry/syscalls/linux/sys_rusage.go b/pkg/sentry/syscalls/linux/sys_rusage.go index 88e930b86..1aea68ee0 100644 --- a/pkg/sentry/syscalls/linux/sys_rusage.go +++ b/pkg/sentry/syscalls/linux/sys_rusage.go @@ -19,7 +19,7 @@ import ( "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/usage" ) diff --git a/pkg/sentry/syscalls/linux/sys_socket.go b/pkg/sentry/syscalls/linux/sys_socket.go index 7dc814267..275a9b75a 100644 --- a/pkg/sentry/syscalls/linux/sys_socket.go +++ b/pkg/sentry/syscalls/linux/sys_socket.go @@ -29,7 +29,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/host" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/control" "gvisor.dev/gvisor/pkg/sentry/socket/unix/transport" diff --git a/pkg/sentry/syscalls/linux/sys_time.go b/pkg/sentry/syscalls/linux/sys_time.go index f76bc6f3f..385e09bc2 100644 --- a/pkg/sentry/syscalls/linux/sys_time.go +++ b/pkg/sentry/syscalls/linux/sys_time.go @@ -24,7 +24,7 @@ import ( "gvisor.dev/gvisor/pkg/marshal/primitive" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" ) // The most significant 29 bits hold either a pid or a file descriptor. diff --git a/pkg/sentry/syscalls/linux/sys_timerfd.go b/pkg/sentry/syscalls/linux/sys_timerfd.go index 80fe97c98..e47332cf8 100644 --- a/pkg/sentry/syscalls/linux/sys_timerfd.go +++ b/pkg/sentry/syscalls/linux/sys_timerfd.go @@ -20,7 +20,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/fsimpl/timerfd" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" ) // TimerfdCreate implements Linux syscall timerfd_create(2). diff --git a/pkg/sentry/vfs/BUILD b/pkg/sentry/vfs/BUILD index b4a13770c..27602d8b0 100644 --- a/pkg/sentry/vfs/BUILD +++ b/pkg/sentry/vfs/BUILD @@ -191,7 +191,7 @@ go_library( "//pkg/sentry/fsimpl/lock", "//pkg/sentry/fsmetric", "//pkg/sentry/kernel/auth", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sentry/limits", "//pkg/sentry/memmap", "//pkg/sentry/socket/unix/transport", diff --git a/pkg/sentry/watchdog/BUILD b/pkg/sentry/watchdog/BUILD index bbc369461..4efc554f9 100644 --- a/pkg/sentry/watchdog/BUILD +++ b/pkg/sentry/watchdog/BUILD @@ -14,7 +14,7 @@ go_library( "//pkg/log", "//pkg/metric", "//pkg/sentry/kernel", - "//pkg/sentry/kernel/time", + "//pkg/sentry/ktime", "//pkg/sync", ], ) diff --git a/pkg/sentry/watchdog/watchdog.go b/pkg/sentry/watchdog/watchdog.go index bde2efe03..4dc018a64 100644 --- a/pkg/sentry/watchdog/watchdog.go +++ b/pkg/sentry/watchdog/watchdog.go @@ -37,7 +37,7 @@ import ( "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/metric" "gvisor.dev/gvisor/pkg/sentry/kernel" - ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" + "gvisor.dev/gvisor/pkg/sentry/ktime" "gvisor.dev/gvisor/pkg/sync" )