diff --git a/archutils/epoll.go b/epoll/epoll.go similarity index 96% rename from archutils/epoll.go rename to epoll/epoll.go index 3f08d8fb5..ae2092269 100644 --- a/archutils/epoll.go +++ b/epoll/epoll.go @@ -1,6 +1,6 @@ // +build linux,!arm64 -package archutils +package epoll import ( "syscall" diff --git a/archutils/epoll_arm64.go b/epoll/epoll_arm64.go similarity index 98% rename from archutils/epoll_arm64.go rename to epoll/epoll_arm64.go index 3c6e63d3d..302408386 100644 --- a/archutils/epoll_arm64.go +++ b/epoll/epoll_arm64.go @@ -1,6 +1,6 @@ // +build linux,arm64 -package archutils +package epoll // #include /* diff --git a/monitor/monitor_linux.go b/monitor/monitor_linux.go index b0f451f4c..6a44a1fea 100644 --- a/monitor/monitor_linux.go +++ b/monitor/monitor_linux.go @@ -5,7 +5,7 @@ import ( "syscall" "github.com/Sirupsen/logrus" - "github.com/docker/containerd/archutils" + "github.com/docker/containerd/epoll" ) type Monitorable interface { @@ -19,7 +19,7 @@ type Flusher interface { // New returns a new process monitor that emits events whenever the // state of the fd refering to a process changes func New() (*Monitor, error) { - fd, err := archutils.EpollCreate1(0) + fd, err := epoll.EpollCreate1(0) if err != nil { return nil, err } @@ -51,7 +51,7 @@ func (m *Monitor) Add(ma Monitorable) error { Fd: int32(fd), Events: syscall.EPOLLHUP, } - if err := archutils.EpollCtl(m.epollFd, syscall.EPOLL_CTL_ADD, fd, &event); err != nil { + if err := epoll.EpollCtl(m.epollFd, syscall.EPOLL_CTL_ADD, fd, &event); err != nil { return err } m.receivers[fd] = ma @@ -79,7 +79,7 @@ func (m *Monitor) Close() error { func (m *Monitor) Run() { var events [128]syscall.EpollEvent for { - n, err := archutils.EpollWait(m.epollFd, events[:], -1) + n, err := epoll.EpollWait(m.epollFd, events[:], -1) if err != nil { if err == syscall.EINTR { continue