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

virtio-devices: console: Avoid using vector and direct indexing

Browse Source 
The the number of queues and associated events is known and fixed. We
can define and use each of them explicitly and avoid using vector (and
hence direct indexing), which is cleaner and slightly more efficient.

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-10-19 15:00:32 -07:00 committed by Bo Chen
parent 710a860e9b
commit a388d76228
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
virtio-devices/src/console.rs
View File

@ -77,7 +77,8 @@ unsafe impl ByteValued for VirtioConsoleConfig {}
struct ConsoleEpollHandler { struct ConsoleEpollHandler {
mem: GuestMemoryAtomic<GuestMemoryMmap>, mem: GuestMemoryAtomic<GuestMemoryMmap>,
queues: Vec<Queue>, input_queue: Queue,
output_queue: Queue,
interrupt_cb: Arc<dyn VirtioInterrupt>, interrupt_cb: Arc<dyn VirtioInterrupt>,
in_buffer: Arc<Mutex<VecDeque<u8>>>, in_buffer: Arc<Mutex<VecDeque<u8>>>,
resizer: Arc<ConsoleResizer>, resizer: Arc<ConsoleResizer>,
@ -145,7 +146,8 @@ impl ConsoleEpollHandler {
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
fn new( fn new(
mem: GuestMemoryAtomic<GuestMemoryMmap>, mem: GuestMemoryAtomic<GuestMemoryMmap>,
queues: Vec<Queue>, input_queue: Queue,
output_queue: Queue,
interrupt_cb: Arc<dyn VirtioInterrupt>, interrupt_cb: Arc<dyn VirtioInterrupt>,
in_buffer: Arc<Mutex<VecDeque<u8>>>, in_buffer: Arc<Mutex<VecDeque<u8>>>,
resizer: Arc<ConsoleResizer>, resizer: Arc<ConsoleResizer>,
@ -176,7 +178,8 @@ impl ConsoleEpollHandler {
ConsoleEpollHandler { ConsoleEpollHandler {
mem, mem,
queues, input_queue,
output_queue,
interrupt_cb, interrupt_cb,
in_buffer, in_buffer,
resizer, resizer,
@ -203,7 +206,7 @@ impl ConsoleEpollHandler {
*/ */
fn process_input_queue(&mut self) -> bool { fn process_input_queue(&mut self) -> bool {
let mut in_buffer = self.in_buffer.lock().unwrap(); let mut in_buffer = self.in_buffer.lock().unwrap();
let recv_queue = &mut self.queues[0]; //receiveq let recv_queue = &mut self.input_queue; //receiveq
let mut used_descs = false; let mut used_descs = false;
if in_buffer.is_empty() { if in_buffer.is_empty() {
@ -246,7 +249,7 @@ impl ConsoleEpollHandler {
* to the referenced address. * to the referenced address.
*/ */
fn process_output_queue(&mut self) -> bool { fn process_output_queue(&mut self) -> bool {
let trans_queue = &mut self.queues[1]; //transmitq let trans_queue = &mut self.output_queue; //transmitq
let mut used_descs = false; let mut used_descs = false;
while let Some(mut desc_chain) = trans_queue.pop_descriptor_chain(self.mem.memory()) { while let Some(mut desc_chain) = trans_queue.pop_descriptor_chain(self.mem.memory()) {
@ -714,17 +717,13 @@ impl VirtioDevice for Console {
let (kill_evt, pause_evt) = self.common.dup_eventfds(); let (kill_evt, pause_evt) = self.common.dup_eventfds();
let input_evt = EventFd::new(EFD_NONBLOCK).unwrap(); let input_evt = EventFd::new(EFD_NONBLOCK).unwrap();
let mut virtqueues = Vec::new(); let (_, input_queue, input_queue_evt) = queues.remove(0);
let (_, queue, queue_evt) = queues.remove(0); let (_, output_queue, output_queue_evt) = queues.remove(0);
virtqueues.push(queue);
let input_queue_evt = queue_evt;
let (_, queue, queue_evt) = queues.remove(0);
virtqueues.push(queue);
let output_queue_evt = queue_evt;
let mut handler = ConsoleEpollHandler::new( let mut handler = ConsoleEpollHandler::new(
mem, mem,
virtqueues, input_queue,
output_queue,
interrupt_cb, interrupt_cb,
self.in_buffer.clone(), self.in_buffer.clone(),
Arc::clone(&self.resizer), Arc::clone(&self.resizer),