Skip to content

Batch console output to one VM exit per print call #2263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stlankes wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −2
Open

Batch console output to one VM exit per print call #2263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/console.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::executor::WakerRegistration;
#[cfg(not(target_arch = "riscv64"))]
use crate::syscalls::interfaces::serial_buf_hypercall;

const SERIAL_BUFFER_SIZE: usize = 256;
const SERIAL_BUFFER_SIZE: usize = 2048;

pub(crate) enum IoDevice {
#[cfg(not(target_arch = "riscv64"))]
Expand Down Expand Up @@ -162,6 +162,7 @@ impl Write for Console {
if SERIAL_BUFFER_SIZE - self.buffer.len() >= buf.len() {
// unwrap: we checked that buf fits in self.buffer
self.buffer.extend_from_slice(buf).unwrap();
#[cfg(debug_assertions)]
if buf.contains(&b'\n') {
self.flush()?;
}
Expand All @@ -173,6 +174,7 @@ impl Write for Console {
} else {
// unwrap: we checked that buf fits in self.buffer
self.buffer.extend_from_slice(buf).unwrap();
#[cfg(debug_assertions)]
if buf.contains(&b'\n') {
self.flush()?;
}
Expand Down Expand Up @@ -209,13 +211,16 @@ pub(crate) static CONSOLE: Lazy<InterruptTicketMutex<Console>> = Lazy::new(|| {

#[doc(hidden)]
pub fn _print(args: fmt::Arguments<'_>) {
CONSOLE.lock().write_fmt(args).unwrap();
let mut console = CONSOLE.lock();
console.write_fmt(args).unwrap();
console.flush().unwrap();
}

#[doc(hidden)]
pub fn _panic_print(args: fmt::Arguments<'_>) {
let mut console = unsafe { CONSOLE.make_guard_unchecked() };
console.write_fmt(args).ok();
console.flush().ok();
mem::forget(console);
}

Expand Down