Update nc dependency to 0.9.2 (#2884)

* Update Cargo.toml in libcontainer and runtimetest Signed-off-by: posutsai <[email protected]> * Fix libc version to 0.2.158 Signed-off-by: posutsai <[email protected]> --------- Signed-off-by: posutsai <[email protected]>
youki-dev · Aug 20, 2024 · 1749ef3 · 1749ef3
1 parent 13e9fc0
commit 1749ef3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml
@@ -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"] }

diff --git a/crates/libcontainer/src/process/container_init_process.rs b/crates/libcontainer/src/process/container_init_process.rs
@@ -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) => {

diff --git a/tests/contest/runtimetest/Cargo.toml b/tests/contest/runtimetest/Cargo.toml
@@ -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"
diff --git a/tests/contest/runtimetest/src/tests.rs b/tests/contest/runtimetest/src/tests.rs
@@ -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");
             }