From 09cbf0f4ba62c69a2ef66993962932d30d78bd26 Mon Sep 17 00:00:00 2001 From: Gary Guo <gary.guo@lowrisc.org> Date: Thu, 18 Apr 2024 12:12:25 +0100 Subject: [PATCH] Move cgroup module out from docker --- src/{docker => }/cgroup.rs | 0 src/docker/container.rs | 4 ++-- src/docker/mod.rs | 1 - src/main.rs | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{docker => }/cgroup.rs (100%) diff --git a/src/docker/cgroup.rs b/src/cgroup.rs similarity index 100% rename from src/docker/cgroup.rs rename to src/cgroup.rs diff --git a/src/docker/container.rs b/src/docker/container.rs index 7a4e005..4598cda 100644 --- a/src/docker/container.rs +++ b/src/docker/container.rs @@ -10,11 +10,11 @@ use tokio::signal::unix::{signal, SignalKind}; use tokio::task::{spawn, JoinHandle}; use tokio_stream::StreamExt; -use super::cgroup::{ +use super::{IoStream, IoStreamSource}; +use crate::cgroup::{ Access, DeviceAccessController, DeviceAccessControllerDummy, DeviceAccessControllerV1, DeviceAccessControllerV2, DeviceType, }; -use super::{IoStream, IoStreamSource}; #[derive(Clone)] pub struct Container { diff --git a/src/docker/mod.rs b/src/docker/mod.rs index f015187..4025f5d 100644 --- a/src/docker/mod.rs +++ b/src/docker/mod.rs @@ -1,4 +1,3 @@ -mod cgroup; mod container; mod docker; mod iostream; diff --git a/src/main.rs b/src/main.rs index 0bf6372..659aedd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,4 @@ +mod cgroup; mod cli; mod docker; mod hotplug;