External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 11:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhost_user_net: Shutdown worker thread on exit

Browse Source 
This will ensure a clean shutdown of the backend

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-02-06 12:17:59 +00:00 committed by Sebastien Boeuf
parent 7f032c8bb3
commit 97ab767a2f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vhost_user_net/src/lib.rs
View File

@ -22,7 +22,6 @@ use std::io::Read;
use std::io::{self}; use std::io::{self};
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::os::unix::io::RawFd;
use std::process; use std::process;
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use std::vec::Vec; use std::vec::Vec;
@ -267,10 +266,10 @@ impl VhostUserNetBackend {
self.vring_worker = vring_worker; self.vring_worker = vring_worker;
} }
pub fn get_kill_event(&self) -> (u16, RawFd) { pub fn get_kill_event(&self) -> (u16, EventFd) {
( (
(self.num_queues + (self.num_queues / 2)) as u16, (self.num_queues + (self.num_queues / 2)) as u16,
self.kill_evt.as_raw_fd(), self.kill_evt.try_clone().unwrap(),
) )
} }
} }
@ -459,9 +458,11 @@ pub fn start_net_backend(backend_command: &str) {
let (kill_index, kill_evt_fd) = net_backend.read().unwrap().get_kill_event(); let (kill_index, kill_evt_fd) = net_backend.read().unwrap().get_kill_event();
let vring_worker = net_daemon.get_vring_worker(); let vring_worker = net_daemon.get_vring_worker();
if let Err(e) = if let Err(e) = vring_worker.register_listener(
vring_worker.register_listener(kill_evt_fd, epoll::Events::EPOLLIN, u64::from(kill_index)) kill_evt_fd.as_raw_fd(),
{ epoll::Events::EPOLLIN,
u64::from(kill_index),
) {
println!("failed to register listener for kill event: {:?}", e); println!("failed to register listener for kill event: {:?}", e);
process::exit(1); process::exit(1);
} }
@ -479,5 +480,11 @@ pub fn start_net_backend(backend_command: &str) {
process::exit(1); process::exit(1);
} }
net_daemon.wait().unwrap(); if let Err(e) = net_daemon.wait() {
error!("Error from the main thread: {:?}", e);
}
if let Err(e) = kill_evt_fd.write(1) {
error!("Error shutting down worker thread: {:?}", e)
}
} }