diff options
author | Ayush Ranjan <ayushranjan@google.com> | 2021-03-03 10:23:55 -0800 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-03-03 10:25:58 -0800 |
commit | a9441aea2780da8c93da1c73da860219f98438de (patch) | |
tree | 8b12915756f5bfb926218214cd7bc0b3281605fd /pkg/procid | |
parent | b8a5420f49a2afd622ec08b5019e1bf537f7da82 (diff) |
[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
Diffstat (limited to 'pkg/procid')
-rw-r--r-- | pkg/procid/BUILD | 10 | ||||
-rw-r--r-- | pkg/procid/procid_test.go | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkg/procid/BUILD b/pkg/procid/BUILD index aa3e3ac0b..2838b5aca 100644 --- a/pkg/procid/BUILD +++ b/pkg/procid/BUILD @@ -19,7 +19,10 @@ go_test( "procid_test.go", ], library = ":procid", - deps = ["//pkg/sync"], + deps = [ + "//pkg/sync", + "@org_golang_x_sys//unix:go_default_library", + ], ) go_test( @@ -30,5 +33,8 @@ go_test( "procid_test.go", ], library = ":procid", - deps = ["//pkg/sync"], + deps = [ + "//pkg/sync", + "@org_golang_x_sys//unix:go_default_library", + ], ) diff --git a/pkg/procid/procid_test.go b/pkg/procid/procid_test.go index 9ec08c3d6..a08110b35 100644 --- a/pkg/procid/procid_test.go +++ b/pkg/procid/procid_test.go @@ -17,9 +17,9 @@ package procid import ( "os" "runtime" - "syscall" "testing" + "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/sync" ) @@ -36,7 +36,7 @@ func checkProcid(t *testing.T, start *sync.WaitGroup, done *sync.WaitGroup) { start.Wait() procID := Current() - tid := syscall.Gettid() + tid := unix.Gettid() if procID != uint64(tid) { t.Logf("Bad procid: expected %v, got %v", tid, procID) |