dsg/vhost
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend: set default type for VhostUserBackend

Browse source 
Use () as default type for trait VhostUserBackend and
VhostUserBackendMut.

Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
This commit is contained in:
Liu Jiang 2021-08-13 14:25:37 +08:00
parent 6b685925a1
commit 6d04368c46
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
coverage_config_x86_64.json
View file

@ -1,5 +1,5 @@
{
"coverage_score": 50.8,
"coverage_score": 77.4,
"exclude_path": "",
"crate_features": ""
}

8
src/backend.rs
View file

@ -34,7 +34,7 @@ use super::{Vring, GM};
///
/// To support multi-threading and asynchronous IO, we enforce `the Send + Sync + 'static`.
/// So there's no plan for support of "Rc<T>" and "RefCell<T>".
pub trait VhostUserBackend<B: Bitmap + 'static>: Send + Sync + 'static {
pub trait VhostUserBackend<B: Bitmap + 'static = ()>: Send + Sync + 'static {
/// Get number of queues supported.
fn num_queues(&self) -> usize;
@ -113,7 +113,7 @@ pub trait VhostUserBackend<B: Bitmap + 'static>: Send + Sync + 'static {
}
/// Trait without interior mutability for vhost user backend servers to implement concrete services.
pub trait VhostUserBackendMut<B: Bitmap + 'static>: Send + Sync + 'static {
pub trait VhostUserBackendMut<B: Bitmap + 'static = ()>: Send + Sync + 'static {
/// Get number of queues supported.
fn num_queues(&self) -> usize;
@ -486,7 +486,7 @@ pub mod tests {
assert_eq!(backend.queues_per_thread(), [1, 1]);
assert_eq!(backend.get_config(0x200, 8), vec![0xa5; 8]);
backend.set_config(0x200, &vec![0xa5; 8]).unwrap();
backend.set_config(0x200, &[0xa5; 8]).unwrap();
backend.acked_features(0xffff);
assert_eq!(backend.lock().unwrap().acked_features, 0xffff);
@ -509,7 +509,7 @@ pub mod tests {
assert_eq!(backend.queues_per_thread(), [1, 1]);
assert_eq!(backend.get_config(0x200, 8), vec![0xa5; 8]);
backend.set_config(0x200, &vec![0xa5; 8]).unwrap();
backend.set_config(0x200, &[0xa5; 8]).unwrap();
backend.acked_features(0xffff);
assert_eq!(backend.read().unwrap().acked_features, 0xffff);

2
src/lib.rs
View file

@ -75,7 +75,7 @@ pub type Result<T> = result::Result<T, Error>;
///
/// This structure is the public API the backend is allowed to interact with in order to run
/// a fully functional vhost-user daemon.
pub struct VhostUserDaemon<S: VhostUserBackend<B>, B: Bitmap + 'static> {
pub struct VhostUserDaemon<S: VhostUserBackend<B>, B: Bitmap + 'static = ()> {
name: String,
handler: Arc<Mutex<VhostUserHandler<S, B>>>,
main_thread: Option<thread::JoinHandle<Result<()>>>,