From a9441aea2780da8c93da1c73da860219f98438de Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Wed, 3 Mar 2021 10:23:55 -0800 Subject: [op] Replace syscall package usage with golang.org/x/sys/unix in pkg/. The syscall package has been deprecated in favor of golang.org/x/sys. Note that syscall is still used in the following places: - pkg/sentry/socket/hostinet/stack.go: some netlink related functionalities are not yet available in golang.org/x/sys. - syscall.Stat_t is still used in some places because os.FileInfo.Sys() still returns it and not unix.Stat_t. Updates #214 PiperOrigin-RevId: 360701387 --- pkg/log/BUILD | 1 + pkg/log/log.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'pkg/log') diff --git a/pkg/log/BUILD b/pkg/log/BUILD index 3ed6aba5c..23ef7ea8d 100644 --- a/pkg/log/BUILD +++ b/pkg/log/BUILD @@ -18,6 +18,7 @@ go_library( deps = [ "//pkg/linewriter", "//pkg/sync", + "@org_golang_x_sys//unix:go_default_library", ], ) diff --git a/pkg/log/log.go b/pkg/log/log.go index 2e3408357..d39af3bf4 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -38,9 +38,9 @@ import ( "os" "runtime" "sync/atomic" - "syscall" "time" + "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/linewriter" "gvisor.dev/gvisor/pkg/sync" ) @@ -105,7 +105,7 @@ func (l *Writer) Write(data []byte) (int, error) { n += w // Is it a non-blocking socket? - if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == syscall.EAGAIN { + if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == unix.EAGAIN { runtime.Gosched() continue } -- cgit v1.2.3