diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
| commit | 31e49f4b19309259baeeb63e7b6ef41f8edd6d35 (patch) | |
| tree | ad6cae1ad4f173946eb68156653bea84d7254f81 /pkg/eventchannel | |
| parent | d147e6d1b29d25607bcdcdb0beddb5122fea085e (diff) | |
| parent | b30cfb1df72e201c6caf576bbef8fcc968df2d41 (diff) | |
Merge branch 'master' into iptables-write-input-drop
Diffstat (limited to 'pkg/eventchannel')
| -rw-r--r-- | pkg/eventchannel/BUILD | 2 | ||||
| -rw-r--r-- | pkg/eventchannel/event.go | 2 | ||||
| -rw-r--r-- | pkg/eventchannel/event_test.go | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/pkg/eventchannel/BUILD b/pkg/eventchannel/BUILD index 0b4b7cc44..9d68682c7 100644 --- a/pkg/eventchannel/BUILD +++ b/pkg/eventchannel/BUILD @@ -15,6 +15,7 @@ go_library( deps = [ ":eventchannel_go_proto", "//pkg/log", + "//pkg/sync", "//pkg/unet", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_golang_protobuf//ptypes:go_default_library_gen", @@ -40,6 +41,7 @@ go_test( srcs = ["event_test.go"], embed = [":eventchannel"], deps = [ + "//pkg/sync", "@com_github_golang_protobuf//proto:go_default_library", ], ) diff --git a/pkg/eventchannel/event.go b/pkg/eventchannel/event.go index d37ad0428..9a29c58bd 100644 --- a/pkg/eventchannel/event.go +++ b/pkg/eventchannel/event.go @@ -22,13 +22,13 @@ package eventchannel import ( "encoding/binary" "fmt" - "sync" "syscall" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" pb "gvisor.dev/gvisor/pkg/eventchannel/eventchannel_go_proto" "gvisor.dev/gvisor/pkg/log" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/unet" ) diff --git a/pkg/eventchannel/event_test.go b/pkg/eventchannel/event_test.go index 3649097d6..7f41b4a27 100644 --- a/pkg/eventchannel/event_test.go +++ b/pkg/eventchannel/event_test.go @@ -16,11 +16,11 @@ package eventchannel import ( "fmt" - "sync" "testing" "time" "github.com/golang/protobuf/proto" + "gvisor.dev/gvisor/pkg/sync" ) // testEmitter is an emitter that can be used in tests. It records all events |