mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-26 06:08:07 +01:00
Code Issues

Update nc dependency to 0.9.2 (#2884)

Browse Source 
* Update Cargo.toml in libcontainer and runtimetest

Signed-off-by: posutsai <posutsai@gmail.com>

* Fix libc version to 0.2.158

Signed-off-by: posutsai <posutsai@gmail.com>

---------

Signed-off-by: posutsai <posutsai@gmail.com>
This commit is contained in:
posutsai 2024-08-20 19:50:20 +08:00 committed by GitHub
parent 13e9fc0ffd
commit 1749ef386e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Cargo.lock generated
View File

@ -383,12 +383,13 @@ dependencies = [
[[package]]
name = "cc"
version = "1.1.6"
version = "1.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
dependencies = [
"jobserver",
"libc",
"shlex",
]
[[package]]
@ -2259,9 +2260,9 @@ dependencies = [
[[package]]
name = "nc"
version = "0.8.23"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44b24115ea9683b6fd45d99c7e83002a739601faea67908edb02737497fabdd3"
checksum = "34c069e5680f6e9c5cfbd428822fda91adf12fd6cf8dd84de00709efa50a84db"
dependencies = [
"cc",
]

2
crates/libcontainer/Cargo.toml
View File

@ -53,7 +53,7 @@ regex = { version = "1.10.6", default-features = false, features = ["std", "unic
thiserror = "1.0.63"
tracing = { version = "0.1.40", features = ["attributes"] }
safe-path = "0.1.0"
nc = "0.8.23"
nc = "0.9.2"
[dev-dependencies]
oci-spec = { version = "~0.6.8", features = ["proptests", "runtime"] }

4
crates/libcontainer/src/process/container_init_process.rs
View File

@ -782,7 +782,7 @@ fn setup_scheduler(sc_op: &Option<Scheduler>) -> Result<()> {
}
}
}
let mut a = nc::sched_attr_t {
let a = nc::sched_attr_t {
// size of the structure should always be within u32 bounds,
// so this unwrap should never fail
size: mem::size_of::<nc::sched_attr_t>().try_into().unwrap(),
@ -798,7 +798,7 @@ fn setup_scheduler(sc_op: &Option<Scheduler>) -> Result<()> {
};
// TODO when nix or libc support this function, replace nx crates.
unsafe {
let result = nc::sched_setattr(0, &mut a, 0);
let result = nc::sched_setattr(0, &a, 0);
match result {
Ok(_) => {}
Err(err) => {

2
tests/contest/runtimetest/Cargo.toml
View File

@ -8,4 +8,4 @@ oci-spec = { version = "0.6.8", features = ["runtime"] }
nix = "0.28.0"
anyhow = "1.0"
libc = "0.2.158" # TODO (YJDoc2) upgrade to latest
nc = "0.8.23"
nc = "0.9.2"

4
tests/contest/runtimetest/src/tests.rs
View File

@ -1,5 +1,4 @@
use std::fs::{self, read_dir};
use std::mem;
use std::os::linux::fs::MetadataExt;
use std::os::unix::fs::{FileTypeExt, PermissionsExt};
use std::path::Path;
@ -340,7 +339,6 @@ pub fn validate_scheduler_policy(spec: &Spec) {
let proc = spec.process().as_ref().unwrap();
let sc = proc.scheduler().as_ref().unwrap();
println!("schedule is {:?}", spec);
let size = mem::size_of::<nc::sched_attr_t>().try_into().unwrap();
let mut get_sched_attr = nc::sched_attr_t {
size: 0,
sched_policy: 0,
@ -354,7 +352,7 @@ pub fn validate_scheduler_policy(spec: &Spec) {
sched_util_max: 0,
};
unsafe {
match nc::sched_getattr(0, &mut get_sched_attr, size, 0) {
match nc::sched_getattr(0, &mut get_sched_attr, 0) {
Ok(_) => {
println!("sched_getattr get success");
}