diff options
author | Zach Reizner <zachr@google.com> | 2018-08-23 13:34:56 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-17 21:34:50 -0700 |
commit | a99954cb7c076c9585aba416afdcb86f67e3676f (patch) | |
tree | 359c901223f8bb11e1227f4b71e082c0d45f4b0a /src/main.rs | |
parent | 4a55609f50ae6a66d0b3c255e18bd8e78a283242 (diff) | |
download | crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.tar crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.tar.gz crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.tar.bz2 crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.tar.lz crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.tar.xz crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.tar.zst crosvm-a99954cb7c076c9585aba416afdcb86f67e3676f.zip |
sys_util: remove Scm struct and sock_ctrl_msg C library
The Scm object was made to reduce the number of heap allocations in the hot paths of poll loops, at the cost of some code complexity. As it turns out, the number of file descriptors being sent or received is usually just one or limited to a fixed amount that can easily be covered with a fixed size stack allocated buffer. This change implements that solution, with heap allocation as a backup in the rare case that many file descriptors must be sent or received. This change also moves the msg and cmsg manipulation code out of C and into pure Rust. The move was necessary to allocate the correct amount of buffer space at compile time. It also improves safety by reducing the scope of unsafe code. Deleting the code for building the C library is also a nice bonus. Finally, the removal of the commonly used Scm struct required transitioning existing usage to the ScmSocket trait based methods. This includes all those changes. TEST=cargo test BUG=None Change-Id: If27ba297f5416dd9b8bc686ce740866912fa0aa0 Reviewed-on: https://chromium-review.googlesource.com/1186146 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Zach Reizner <zachr@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs index bd2b632..de93f1b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -47,7 +47,7 @@ use std::string::String; use std::thread::sleep; use std::time::Duration; -use sys_util::{Scm, getpid, kill_process_group, reap_child, syslog}; +use sys_util::{getpid, kill_process_group, reap_child, syslog}; use qcow::QcowFile; use argument::{Argument, set_arguments, print_help}; @@ -519,7 +519,6 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> { } fn stop_vms(args: std::env::Args) -> std::result::Result<(), ()> { - let mut scm = Scm::new(1); if args.len() == 0 { print_help("crosvm stop", "VM_SOCKET...", &[]); println!("Stops the crosvm instance listening on each `VM_SOCKET` given."); @@ -532,7 +531,7 @@ fn stop_vms(args: std::env::Args) -> std::result::Result<(), ()> { Ok(s) }) { Ok(s) => { - if let Err(e) = VmRequest::Exit.send(&mut scm, &s) { + if let Err(e) = VmRequest::Exit.send(&s) { error!("failed to send stop request to socket at '{}': {:?}", socket_path, e); @@ -549,7 +548,6 @@ fn stop_vms(args: std::env::Args) -> std::result::Result<(), ()> { } fn balloon_vms(mut args: std::env::Args) -> std::result::Result<(), ()> { - let mut scm = Scm::new(1); if args.len() < 2 { print_help("crosvm balloon", "PAGE_ADJUST VM_SOCKET...", &[]); println!("Adjust the ballon size of the crosvm instance by `PAGE_ADJUST` pages, `PAGE_ADJUST` can be negative to shrink the balloon."); @@ -569,7 +567,7 @@ fn balloon_vms(mut args: std::env::Args) -> std::result::Result<(), ()> { Ok(s) }) { Ok(s) => { - if let Err(e) = VmRequest::BalloonAdjust(num_pages).send(&mut scm, &s) { + if let Err(e) = VmRequest::BalloonAdjust(num_pages).send(&s) { error!("failed to send balloon request to socket at '{}': {:?}", socket_path, e); |