diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:55:34 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:55:34 +0000 |
commit | 2f16c19d66b2f74129f8e96ad25a4354fb0a27c9 (patch) | |
tree | 0d1aa95d495c81daeb48b4ec1176178fa081db2d | |
parent | 6efd2e05e314851f354b901ee7ac8c100df83500 (diff) | |
parent | 0773d29573d2deb8a8eb41a2a2172ebc6bcd56fd (diff) | |
download | num_cpus-aml_med_341011000.tar.gz |
Snap for 10453563 from 0773d29573d2deb8a8eb41a2a2172ebc6bcd56fd to mainline-media-releaseaml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010android14-mainline-media-release
Change-Id: I514a88739d9b80bab023a7707174ef3ada9b683c
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 12 | ||||
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | CHANGELOG.md | 13 | ||||
-rw-r--r-- | Cargo.lock | 26 | ||||
-rw-r--r-- | Cargo.toml | 12 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 14 | ||||
-rw-r--r-- | TEST_MAPPING | 56 | ||||
-rw-r--r-- | cargo2android.json | 2 | ||||
-rw-r--r-- | fixtures/cgroups2/cgroups/ceil/cpu.max | 1 | ||||
-rw-r--r-- | fixtures/cgroups2/cgroups/good/cpu.max | 1 | ||||
-rw-r--r-- | fixtures/cgroups2/cgroups/zero-period/cpu.max | 1 | ||||
-rw-r--r-- | fixtures/cgroups2/proc/cgroups/cgroup | 2 | ||||
-rw-r--r-- | fixtures/cgroups2/proc/cgroups/cgroup_multi | 3 | ||||
-rw-r--r-- | fixtures/cgroups2/proc/cgroups/mountinfo | 5 | ||||
-rw-r--r-- | src/linux.rs | 407 |
17 files changed, 378 insertions, 190 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 45e1a87..d5c8f1d 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "5f1b03332000b4c4274b5bd35fac516049ff1c6b" + "sha1": "5bea3c7986c2a5c6763ca1b3f6d6982aca7cdc23" }, "path_in_vcs": "" }
\ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9adc30..36dc5b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - x86_64-unknown-linux-gnu steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -55,7 +55,7 @@ jobs: - x86_64-unknown-linux-musl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -75,7 +75,7 @@ jobs: - x86_64-apple-darwin steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -96,7 +96,7 @@ jobs: - x86_64-pc-windows-msvc steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run tests run: | rustup default ${{ matrix.rust }} @@ -143,7 +143,7 @@ jobs: - aarch64-apple-ios-sim - aarch64-apple-darwin steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run build run: | rustup default ${{ matrix.rust }} @@ -154,7 +154,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test Cgroup run: | docker build -f ci/cgroups/Dockerfile -t num-cpus-cgroups . @@ -42,7 +42,7 @@ rust_library { host_supported: true, crate_name: "num_cpus", cargo_env_compat: true, - cargo_pkg_version: "1.13.1", + cargo_pkg_version: "1.15.0", srcs: ["src/lib.rs"], edition: "2015", rustlibs: [ @@ -50,12 +50,13 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.compos", "com.android.resolv", "com.android.uwb", "com.android.virt", ], + product_available: true, vendor_available: true, min_sdk_version: "29", } @@ -64,7 +65,7 @@ rust_test { name: "num_cpus_test_src_lib", crate_name: "num_cpus", cargo_env_compat: true, - cargo_pkg_version: "1.13.1", + cargo_pkg_version: "1.15.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, diff --git a/CHANGELOG.md b/CHANGELOG.md index 5496ace..5be725c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## v1.15.0 + +### Fixes + +- update hermit-abi + +## v1.14.0 + +### Features + +- add support for cgroups v2 +- Skip reading files in Miri + ## v1.13.1 ### Fixes diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index 93137c3..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,26 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "hermit-abi" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" - -[[package]] -name = "num_cpus" -version = "1.13.1" -dependencies = [ - "hermit-abi", - "libc", -] @@ -11,16 +11,22 @@ [package] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" authors = ["Sean McArthur <sean@seanmonstar.com>"] description = "Get the number of CPUs on a machine." documentation = "https://docs.rs/num_cpus" readme = "README.md" -keywords = ["cpu", "cpus", "cores"] +keywords = [ + "cpu", + "cpus", + "cores", +] categories = ["hardware-support"] license = "MIT OR Apache-2.0" repository = "https://github.com/seanmonstar/num_cpus" + [target."cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))".dependencies.hermit-abi] -version = "0.1.3" +version = "0.2.6" + [target."cfg(not(windows))".dependencies.libc] version = "0.2.26" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index a6cbbd2..5ebfd93 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" description = "Get the number of CPUs on a machine." authors = ["Sean McArthur <sean@seanmonstar.com>"] license = "MIT OR Apache-2.0" @@ -15,4 +15,4 @@ readme = "README.md" libc = "0.2.26" [target.'cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_os = "hermit"))'.dependencies] -hermit-abi = "0.1.3" +hermit-abi = "0.2.6" @@ -1,3 +1,7 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update rust/crates/num_cpus +# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md + name: "num_cpus" description: "Get the number of CPUs on a machine." third_party { @@ -7,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate" + value: "https://static.crates.io/crates/num_cpus/num_cpus-1.15.0.crate" } - version: "1.13.1" + version: "1.15.0" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 3 - day: 1 + year: 2023 + month: 2 + day: 3 } } diff --git a/TEST_MAPPING b/TEST_MAPPING index 45ba394..e6f36fd 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -5,12 +5,27 @@ "path": "external/rust/crates/anyhow" }, { + "path": "external/rust/crates/async-stream" + }, + { "path": "external/rust/crates/base64" }, { + "path": "external/rust/crates/futures-channel" + }, + { + "path": "external/rust/crates/futures-executor" + }, + { + "path": "external/rust/crates/futures-test" + }, + { "path": "external/rust/crates/futures-util" }, { + "path": "external/rust/crates/hashbrown" + }, + { "path": "external/rust/crates/ryu" }, { @@ -27,52 +42,37 @@ }, { "path": "external/rust/crates/unicode-xid" - } - ], - "presubmit": [ + }, { - "name": "ZipFuseTest" + "path": "external/uwb/src" }, { - "name": "authfs_device_test_src_lib" + "path": "packages/modules/DnsResolver" }, { - "name": "doh_unit_test" + "path": "packages/modules/Virtualization/authfs" }, { - "name": "keystore2_selinux_concurrency_test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "num_cpus_test_src_lib" + "path": "packages/modules/Virtualization/zipfuse" }, { - "name": "rustBinderTest" + "path": "system/security/keystore2" }, { - "name": "virtualizationservice_device_test" + "path": "system/security/keystore2/legacykeystore" } ], - "presubmit-rust": [ - { - "name": "ZipFuseTest" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "doh_unit_test" - }, - { - "name": "keystore2_selinux_concurrency_test" - }, + "presubmit": [ { "name": "num_cpus_test_src_lib" - }, - { - "name": "rustBinderTest" - }, + } + ], + "presubmit-rust": [ { - "name": "virtualizationservice_device_test" + "name": "num_cpus_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json index 5dce664..d95e478 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,7 +1,7 @@ { "apex-available": [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.compos", "com.android.resolv", "com.android.uwb", diff --git a/fixtures/cgroups2/cgroups/ceil/cpu.max b/fixtures/cgroups2/cgroups/ceil/cpu.max new file mode 100644 index 0000000..833a8f2 --- /dev/null +++ b/fixtures/cgroups2/cgroups/ceil/cpu.max @@ -0,0 +1 @@ +150000 100000 diff --git a/fixtures/cgroups2/cgroups/good/cpu.max b/fixtures/cgroups2/cgroups/good/cpu.max new file mode 100644 index 0000000..e469067 --- /dev/null +++ b/fixtures/cgroups2/cgroups/good/cpu.max @@ -0,0 +1 @@ +600000 100000 diff --git a/fixtures/cgroups2/cgroups/zero-period/cpu.max b/fixtures/cgroups2/cgroups/zero-period/cpu.max new file mode 100644 index 0000000..24e757f --- /dev/null +++ b/fixtures/cgroups2/cgroups/zero-period/cpu.max @@ -0,0 +1 @@ +600000 0 diff --git a/fixtures/cgroups2/proc/cgroups/cgroup b/fixtures/cgroups2/proc/cgroups/cgroup new file mode 100644 index 0000000..35b49db --- /dev/null +++ b/fixtures/cgroups2/proc/cgroups/cgroup @@ -0,0 +1,2 @@ +12::/ +3::/user.slice diff --git a/fixtures/cgroups2/proc/cgroups/cgroup_multi b/fixtures/cgroups2/proc/cgroups/cgroup_multi new file mode 100644 index 0000000..1a9282a --- /dev/null +++ b/fixtures/cgroups2/proc/cgroups/cgroup_multi @@ -0,0 +1,3 @@ +12::/ +11:cpu,cpuacct:/ +3::/user.slice diff --git a/fixtures/cgroups2/proc/cgroups/mountinfo b/fixtures/cgroups2/proc/cgroups/mountinfo new file mode 100644 index 0000000..da36e41 --- /dev/null +++ b/fixtures/cgroups2/proc/cgroups/mountinfo @@ -0,0 +1,5 @@ +1 0 8:1 / / rw,noatime shared:1 - ext4 /dev/sda1 rw,errors=remount-ro,data=reordered +2 1 0:1 / /dev rw,relatime shared:2 - devtmpfs udev rw,size=10240k,nr_inodes=16487629,mode=755 +3 1 0:2 / /proc rw,nosuid,nodev,noexec,relatime shared:3 - proc proc rw +4 1 0:3 / /sys rw,nosuid,nodev,noexec,relatime shared:4 - sysfs sysfs rw +5 4 0:4 / /sys/fs/cgroup rw,nosuid,nodev,noexec,relatime shared:5 - cgroup2 cgroup2 rw,nsdelegate,memory_recursiveprot diff --git a/src/linux.rs b/src/linux.rs index 36f4727..295c925 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -126,6 +126,11 @@ fn init_cgroups() { // Should only be called once debug_assert!(CGROUPS_CPUS.load(Ordering::SeqCst) == 0); + // Fails in Miri by default (cannot open files), and Miri does not have parallelism anyway. + if cfg!(miri) { + return; + } + if let Some(quota) = load_cgroups("/proc/self/cgroup", "/proc/self/mountinfo") { if quota == 0 { return; @@ -144,27 +149,36 @@ where P2: AsRef<Path>, { let subsys = some!(Subsys::load_cpu(cgroup_proc)); - let mntinfo = some!(MountInfo::load_cpu(mountinfo_proc)); + let mntinfo = some!(MountInfo::load_cpu(mountinfo_proc, subsys.version)); let cgroup = some!(Cgroup::translate(mntinfo, subsys)); cgroup.cpu_quota() } +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +enum CgroupVersion { + V1, + V2, +} + struct Cgroup { + version: CgroupVersion, base: PathBuf, } struct MountInfo { + version: CgroupVersion, root: String, mount_point: String, } struct Subsys { + version: CgroupVersion, base: String, } impl Cgroup { - fn new(dir: PathBuf) -> Cgroup { - Cgroup { base: dir } + fn new(version: CgroupVersion, dir: PathBuf) -> Cgroup { + Cgroup { version: version, base: dir } } fn translate(mntinfo: MountInfo, subsys: Subsys) -> Option<Cgroup> { @@ -181,12 +195,14 @@ impl Cgroup { // join(mp.MountPoint, relPath) let mut path = PathBuf::from(mntinfo.mount_point); path.push(rel_from_root); - Some(Cgroup::new(path)) + Some(Cgroup::new(mntinfo.version, path)) } fn cpu_quota(&self) -> Option<usize> { - let quota_us = some!(self.quota_us()); - let period_us = some!(self.period_us()); + let (quota_us, period_us) = match self.version { + CgroupVersion::V1 => (some!(self.quota_us()), some!(self.period_us())), + CgroupVersion::V2 => some!(self.max()), + }; // protect against dividing by zero if period_us == 0 { @@ -207,25 +223,41 @@ impl Cgroup { self.param("cpu.cfs_period_us") } + fn max(&self) -> Option<(usize, usize)> { + let max = some!(self.raw_param("cpu.max")); + let mut max = some!(max.lines().next()).split(' '); + + let quota = some!(max.next().and_then(|quota| quota.parse().ok())); + let period = some!(max.next().and_then(|period| period.parse().ok())); + + Some((quota, period)) + } + fn param(&self, param: &str) -> Option<usize> { + let buf = some!(self.raw_param(param)); + + buf.trim().parse().ok() + } + + fn raw_param(&self, param: &str) -> Option<String> { let mut file = some!(File::open(self.base.join(param)).ok()); let mut buf = String::new(); some!(file.read_to_string(&mut buf).ok()); - buf.trim().parse().ok() + Some(buf) } } impl MountInfo { - fn load_cpu<P: AsRef<Path>>(proc_path: P) -> Option<MountInfo> { + fn load_cpu<P: AsRef<Path>>(proc_path: P, version: CgroupVersion) -> Option<MountInfo> { let file = some!(File::open(proc_path).ok()); let file = BufReader::new(file); file.lines() .filter_map(|result| result.ok()) .filter_map(MountInfo::parse_line) - .next() + .find(|mount_info| mount_info.version == version) } fn parse_line(line: String) -> Option<MountInfo> { @@ -247,19 +279,25 @@ impl MountInfo { }; // 7 5 0:6 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - <cgroup> cgroup rw,cpu,cpuacct - if fields.next() != Some("cgroup") { - return None; - } + let version = match fields.next() { + Some("cgroup") => CgroupVersion::V1, + Some("cgroup2") => CgroupVersion::V2, + _ => return None, + }; - // 7 5 0:6 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup <rw,cpu,cpuacct> - let super_opts = some!(fields.nth(1)); + // cgroups2 only has a single mount point + if version == CgroupVersion::V1 { + // 7 5 0:6 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup <rw,cpu,cpuacct> + let super_opts = some!(fields.nth(1)); - // We only care about the 'cpu' option - if !super_opts.split(',').any(|opt| opt == "cpu") { - return None; + // We only care about the 'cpu' option + if !super_opts.split(',').any(|opt| opt == "cpu") { + return None; + } } Some(MountInfo { + version: version, root: mnt_root.to_owned(), mount_point: mnt_point.to_owned(), }) @@ -274,7 +312,14 @@ impl Subsys { file.lines() .filter_map(|result| result.ok()) .filter_map(Subsys::parse_line) - .next() + .fold(None, |previous, line| { + // already-found v1 trumps v2 since it explicitly specifies its controllers + if previous.is_some() && line.version == CgroupVersion::V2 { + return previous; + } + + Some(line) + }) } fn parse_line(line: String) -> Option<Subsys> { @@ -284,11 +329,18 @@ impl Subsys { let sub_systems = some!(fields.nth(1)); - if !sub_systems.split(',').any(|sub| sub == "cpu") { + let version = if sub_systems.is_empty() { + CgroupVersion::V2 + } else { + CgroupVersion::V1 + }; + + if version == CgroupVersion::V1 && !sub_systems.split(',').any(|sub| sub == "cpu") { return None; } fields.next().map(|path| Subsys { + version: version, base: path.to_owned(), }) } @@ -296,123 +348,248 @@ impl Subsys { #[cfg(test)] mod tests { - use super::{Cgroup, MountInfo, Subsys}; - use std::path::{Path, PathBuf}; + mod v1 { + use super::super::{Cgroup, CgroupVersion, MountInfo, Subsys}; + use std::path::{Path, PathBuf}; - // `static_in_const` feature is not stable in Rust 1.13. - static FIXTURES_PROC: &'static str = "fixtures/cgroups/proc/cgroups"; + // `static_in_const` feature is not stable in Rust 1.13. + static FIXTURES_PROC: &'static str = "fixtures/cgroups/proc/cgroups"; - static FIXTURES_CGROUPS: &'static str = "fixtures/cgroups/cgroups"; + static FIXTURES_CGROUPS: &'static str = "fixtures/cgroups/cgroups"; - macro_rules! join { - ($base:expr, $($path:expr),+) => ({ - Path::new($base) - $(.join($path))+ - }) - } + macro_rules! join { + ($base:expr, $($path:expr),+) => ({ + Path::new($base) + $(.join($path))+ + }) + } - #[test] - fn test_load_mountinfo() { - // test only one optional fields - let path = join!(FIXTURES_PROC, "mountinfo"); + #[test] + fn test_load_mountinfo() { + // test only one optional fields + let path = join!(FIXTURES_PROC, "mountinfo"); - let mnt_info = MountInfo::load_cpu(path).unwrap(); + let mnt_info = MountInfo::load_cpu(path, CgroupVersion::V1).unwrap(); - assert_eq!(mnt_info.root, "/"); - assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup/cpu,cpuacct"); + assert_eq!(mnt_info.root, "/"); + assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup/cpu,cpuacct"); - // test zero optional field - let path = join!(FIXTURES_PROC, "mountinfo_zero_opt"); + // test zero optional field + let path = join!(FIXTURES_PROC, "mountinfo_zero_opt"); - let mnt_info = MountInfo::load_cpu(path).unwrap(); + let mnt_info = MountInfo::load_cpu(path, CgroupVersion::V1).unwrap(); - assert_eq!(mnt_info.root, "/"); - assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup/cpu,cpuacct"); + assert_eq!(mnt_info.root, "/"); + assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup/cpu,cpuacct"); - // test multi optional fields - let path = join!(FIXTURES_PROC, "mountinfo_multi_opt"); + // test multi optional fields + let path = join!(FIXTURES_PROC, "mountinfo_multi_opt"); - let mnt_info = MountInfo::load_cpu(path).unwrap(); + let mnt_info = MountInfo::load_cpu(path, CgroupVersion::V1).unwrap(); - assert_eq!(mnt_info.root, "/"); - assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup/cpu,cpuacct"); - } + assert_eq!(mnt_info.root, "/"); + assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup/cpu,cpuacct"); + } - #[test] - fn test_load_subsys() { - let path = join!(FIXTURES_PROC, "cgroup"); + #[test] + fn test_load_subsys() { + let path = join!(FIXTURES_PROC, "cgroup"); - let subsys = Subsys::load_cpu(path).unwrap(); + let subsys = Subsys::load_cpu(path).unwrap(); - assert_eq!(subsys.base, "/"); - } + assert_eq!(subsys.base, "/"); + assert_eq!(subsys.version, CgroupVersion::V1); + } - #[test] - fn test_cgroup_mount() { - let cases = &[ - ("/", "/sys/fs/cgroup/cpu", "/", Some("/sys/fs/cgroup/cpu")), - ( - "/docker/01abcd", - "/sys/fs/cgroup/cpu", - "/docker/01abcd", - Some("/sys/fs/cgroup/cpu"), - ), - ( - "/docker/01abcd", - "/sys/fs/cgroup/cpu", - "/docker/01abcd/", - Some("/sys/fs/cgroup/cpu"), - ), - ( - "/docker/01abcd", - "/sys/fs/cgroup/cpu", - "/docker/01abcd/large", - Some("/sys/fs/cgroup/cpu/large"), - ), - // fails - ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/", None), - ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/docker", None), - ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/elsewhere", None), - ( - "/docker/01abcd", - "/sys/fs/cgroup/cpu", - "/docker/01abcd-other-dir", - None, - ), - ]; - - for &(root, mount_point, subsys, expected) in cases.iter() { - let mnt_info = MountInfo { - root: root.into(), - mount_point: mount_point.into(), - }; - let subsys = Subsys { - base: subsys.into(), - }; + #[test] + fn test_cgroup_mount() { + let cases = &[ + ("/", "/sys/fs/cgroup/cpu", "/", Some("/sys/fs/cgroup/cpu")), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd", + Some("/sys/fs/cgroup/cpu"), + ), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd/", + Some("/sys/fs/cgroup/cpu"), + ), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd/large", + Some("/sys/fs/cgroup/cpu/large"), + ), + // fails + ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/", None), + ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/docker", None), + ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/elsewhere", None), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd-other-dir", + None, + ), + ]; + + for &(root, mount_point, subsys, expected) in cases.iter() { + let mnt_info = MountInfo { + version: CgroupVersion::V1, + root: root.into(), + mount_point: mount_point.into(), + }; + let subsys = Subsys { + version: CgroupVersion::V1, + base: subsys.into(), + }; + + let actual = Cgroup::translate(mnt_info, subsys).map(|c| c.base); + let expected = expected.map(PathBuf::from); + assert_eq!(actual, expected); + } + } - let actual = Cgroup::translate(mnt_info, subsys).map(|c| c.base); - let expected = expected.map(PathBuf::from); - assert_eq!(actual, expected); + #[test] + fn test_cgroup_cpu_quota() { + let cgroup = Cgroup::new(CgroupVersion::V1, join!(FIXTURES_CGROUPS, "good")); + assert_eq!(cgroup.cpu_quota(), Some(6)); } - } - #[test] - fn test_cgroup_cpu_quota() { - let cgroup = Cgroup::new(join!(FIXTURES_CGROUPS, "good")); - assert_eq!(cgroup.cpu_quota(), Some(6)); - } + #[test] + fn test_cgroup_cpu_quota_divide_by_zero() { + let cgroup = Cgroup::new(CgroupVersion::V1, join!(FIXTURES_CGROUPS, "zero-period")); + assert!(cgroup.quota_us().is_some()); + assert_eq!(cgroup.period_us(), Some(0)); + assert_eq!(cgroup.cpu_quota(), None); + } - #[test] - fn test_cgroup_cpu_quota_divide_by_zero() { - let cgroup = Cgroup::new(join!(FIXTURES_CGROUPS, "zero-period")); - assert!(cgroup.quota_us().is_some()); - assert_eq!(cgroup.period_us(), Some(0)); - assert_eq!(cgroup.cpu_quota(), None); + #[test] + fn test_cgroup_cpu_quota_ceil() { + let cgroup = Cgroup::new(CgroupVersion::V1, join!(FIXTURES_CGROUPS, "ceil")); + assert_eq!(cgroup.cpu_quota(), Some(2)); + } } - #[test] - fn test_cgroup_cpu_quota_ceil() { - let cgroup = Cgroup::new(join!(FIXTURES_CGROUPS, "ceil")); - assert_eq!(cgroup.cpu_quota(), Some(2)); + mod v2 { + use super::super::{Cgroup, CgroupVersion, MountInfo, Subsys}; + use std::path::{Path, PathBuf}; + + // `static_in_const` feature is not stable in Rust 1.13. + static FIXTURES_PROC: &'static str = "fixtures/cgroups2/proc/cgroups"; + + static FIXTURES_CGROUPS: &'static str = "fixtures/cgroups2/cgroups"; + + macro_rules! join { + ($base:expr, $($path:expr),+) => ({ + Path::new($base) + $(.join($path))+ + }) + } + + #[test] + fn test_load_mountinfo() { + // test only one optional fields + let path = join!(FIXTURES_PROC, "mountinfo"); + + let mnt_info = MountInfo::load_cpu(path, CgroupVersion::V2).unwrap(); + + assert_eq!(mnt_info.root, "/"); + assert_eq!(mnt_info.mount_point, "/sys/fs/cgroup"); + } + + #[test] + fn test_load_subsys() { + let path = join!(FIXTURES_PROC, "cgroup"); + + let subsys = Subsys::load_cpu(path).unwrap(); + + assert_eq!(subsys.base, "/"); + assert_eq!(subsys.version, CgroupVersion::V2); + } + + #[test] + fn test_load_subsys_multi() { + let path = join!(FIXTURES_PROC, "cgroup_multi"); + + let subsys = Subsys::load_cpu(path).unwrap(); + + assert_eq!(subsys.base, "/"); + assert_eq!(subsys.version, CgroupVersion::V1); + } + + #[test] + fn test_cgroup_mount() { + let cases = &[ + ("/", "/sys/fs/cgroup/cpu", "/", Some("/sys/fs/cgroup/cpu")), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd", + Some("/sys/fs/cgroup/cpu"), + ), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd/", + Some("/sys/fs/cgroup/cpu"), + ), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd/large", + Some("/sys/fs/cgroup/cpu/large"), + ), + // fails + ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/", None), + ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/docker", None), + ("/docker/01abcd", "/sys/fs/cgroup/cpu", "/elsewhere", None), + ( + "/docker/01abcd", + "/sys/fs/cgroup/cpu", + "/docker/01abcd-other-dir", + None, + ), + ]; + + for &(root, mount_point, subsys, expected) in cases.iter() { + let mnt_info = MountInfo { + version: CgroupVersion::V1, + root: root.into(), + mount_point: mount_point.into(), + }; + let subsys = Subsys { + version: CgroupVersion::V1, + base: subsys.into(), + }; + + let actual = Cgroup::translate(mnt_info, subsys).map(|c| c.base); + let expected = expected.map(PathBuf::from); + assert_eq!(actual, expected); + } + } + + #[test] + fn test_cgroup_cpu_quota() { + let cgroup = Cgroup::new(CgroupVersion::V2, join!(FIXTURES_CGROUPS, "good")); + assert_eq!(cgroup.cpu_quota(), Some(6)); + } + + #[test] + fn test_cgroup_cpu_quota_divide_by_zero() { + let cgroup = Cgroup::new(CgroupVersion::V2, join!(FIXTURES_CGROUPS, "zero-period")); + let period = cgroup.max().map(|max| max.1); + + assert_eq!(period, Some(0)); + assert_eq!(cgroup.cpu_quota(), None); + } + + #[test] + fn test_cgroup_cpu_quota_ceil() { + let cgroup = Cgroup::new(CgroupVersion::V2, join!(FIXTURES_CGROUPS, "ceil")); + assert_eq!(cgroup.cpu_quota(), Some(2)); + } } } |