Skip to content
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

Jump to bottom

Optimize shell printing #75

Merged
merged 3 commits into from
Jul 10, 2020
Merged

Optimize shell printing #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37db55f
Optimze shell printing
vinc Jul 10, 2020
badf371
Fix autocomplete with serial output
vinc Jul 10, 2020
c2f2934
Use cfg macro to dry code
vinc Jul 10, 2020
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
90 changes: 54 additions & 36 deletions src/kernel/console.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,63 +33,81 @@ lazy_static! {
pub static ref RAW: Mutex<bool> = Mutex::new(false);
}

#[cfg(feature="vga")]
pub fn has_cursor() -> bool {
true
cfg!(feature="vga")
}

#[cfg(feature="serial")]
pub fn has_cursor() -> bool {
false
}

#[cfg(feature="vga")]
pub fn clear_row() {
kernel::vga::clear_row();
pub fn clear_row_after(x: usize) {
if cfg!(feature="vga") {
kernel::vga::clear_row_after(x);
} else {
print!("\r"); // Move cursor to begining of line
print!("\x1b[{}C", x); // Move cursor forward to position
print!("\x1b[K"); // Clear line after position
}
}

#[cfg(feature="serial")]
pub fn clear_row() {
print!("\x1b[2K\r");
pub fn cursor_position() -> (usize, usize) {
if cfg!(feature="vga") {
kernel::vga::cursor_position()
} else {
print!("\x1b[6n"); // Ask cursor position
get_char(); // ESC
get_char(); // [
let mut x = String::new();
let mut y = String::new();
loop {
let c = get_char();
if c == ';' {
break;
} else {
y.push(c);
}
}
loop {
let c = get_char();
if c == 'R' {
break;
} else {
x.push(c);
}
}
(x.parse().unwrap_or(1), y.parse().unwrap_or(1))
}
}

#[cfg(feature="vga")]
#[macro_export]
macro_rules! print {
($($arg:tt)*) => ({
$crate::kernel::vga::print_fmt(format_args!($($arg)*));
});
pub fn set_writer_position(x: usize, y: usize) {
if cfg!(feature="vga") {
kernel::vga::set_writer_position(x, y);
} else {
print!("\x1b[{};{}H", y + 1, x + 1);
}
}

#[cfg(feature="serial")]
#[macro_export]
macro_rules! print {
($($arg:tt)*) => ({
$crate::kernel::serial::print_fmt(format_args!($($arg)*));
});
}

#[cfg(feature="vga")]
#[macro_export]
macro_rules! log {
($($arg:tt)*) => ({
let uptime = $crate::kernel::clock::uptime();
let csi_color = $crate::kernel::console::color("LightGreen");
let csi_reset = $crate::kernel::console::color("Reset");
$crate::kernel::vga::print_fmt(format_args!("{}[{:.6}]{} ", csi_color, uptime, csi_reset));
$crate::kernel::vga::print_fmt(format_args!($($arg)*));
if cfg!(feature="vga") {
$crate::kernel::vga::print_fmt(format_args!($($arg)*));
} else {
$crate::kernel::serial::print_fmt(format_args!($($arg)*));
}
});
}

#[cfg(feature="serial")]
#[macro_export]
macro_rules! log {
($($arg:tt)*) => ({
let uptime = $crate::kernel::clock::uptime();
let csi_color = $crate::kernel::console::color("LightGreen");
let csi_reset = $crate::kernel::console::color("Reset");
$crate::kernel::serial::print_fmt(format_args!("{}[{:.6}]{} ", csi_color, uptime, csi_reset));
$crate::kernel::serial::print_fmt(format_args!($($arg)*));
if cfg!(feature="vga") {
$crate::kernel::vga::print_fmt(format_args!("{}[{:.6}]{} ", csi_color, uptime, csi_reset));
$crate::kernel::vga::print_fmt(format_args!($($arg)*));
} else {
$crate::kernel::serial::print_fmt(format_args!("{}[{:.6}]{} ", csi_color, uptime, csi_reset));
$crate::kernel::serial::print_fmt(format_args!($($arg)*));
}
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/kernel/keyboard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub fn init() {
kernel::idt::set_irq_handler(1, interrupt_handler);
}

pub fn read_scancode() -> u8 {
fn read_scancode() -> u8 {
let mut port = Port::new(0x60);
unsafe {
port.read()
Expand Down
19 changes: 11 additions & 8 deletions src/kernel/vga.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,26 +215,25 @@ impl Writer {
self.buffer.chars[y - 1][x].write(character);
}
}
self.clear_row(BUFFER_HEIGHT - 1);
self.clear_row_after(0, BUFFER_HEIGHT - 1);
}
self.writer[0] = 0;

}

/// Clears a row by overwriting it with blank characters
fn clear_row(&mut self, y: usize) {
fn clear_row_after(&mut self, x: usize, y: usize) {
let blank = ScreenChar {
ascii_code: b' ',
color_code: self.color_code,
};
for x in 0..BUFFER_WIDTH {
self.buffer.chars[y][x].write(blank);
for i in x..BUFFER_WIDTH {
self.buffer.chars[y][i].write(blank);
}
}

pub fn clear_screen(&mut self) {
for y in 0..BUFFER_HEIGHT {
self.clear_row(y);
self.clear_row_after(0, y);
}
self.set_writer_position(0, 0);
self.set_cursor_position(0, 0);
Expand Down Expand Up @@ -332,11 +331,15 @@ pub fn clear_screen() {
}

pub fn clear_row() {
clear_row_after(0);
}

pub fn clear_row_after(x: usize) {
let (_, y) = writer_position();
interrupts::without_interrupts(|| {
WRITER.lock().clear_row(y);
WRITER.lock().clear_row_after(x, y);
});
set_writer_position(0, y);
set_writer_position(x, y);
}

pub fn screen_width() -> usize {
Expand Down
24 changes: 12 additions & 12 deletions src/user/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ impl Shell {
self.history_index -= 1;
}
let cmd = &self.history[self.history_index];
kernel::vga::clear_row();
self.print_prompt();
let n = self.prompt.len();
kernel::console::clear_row_after(n + cmd.len());
kernel::vga::set_writer_position(n, y);
print!("{}", cmd);
}
},
Expand All @@ -135,8 +136,9 @@ impl Shell {
} else {
&self.cmd
};
kernel::vga::clear_row();
self.print_prompt();
let n = self.prompt.len();
kernel::console::clear_row_after(n + cmd.len());
kernel::vga::set_writer_position(n, y);
print!("{}", cmd);
}
},
Expand Down Expand Up @@ -170,9 +172,7 @@ impl Shell {
self.cmd.clear();
self.cmd.push_str(before_cursor);
self.cmd.push_str(after_cursor);
kernel::vga::clear_row();
self.print_prompt();
print!("{}", self.cmd);
print!("{}{} ", c, after_cursor);
kernel::vga::set_cursor_position(x - 1, y);
kernel::vga::set_writer_position(x - 1, y);
}
Expand All @@ -193,9 +193,7 @@ impl Shell {
self.cmd.push_str(before_cursor);
self.cmd.push(c);
self.cmd.push_str(after_cursor);
kernel::vga::clear_row();
self.print_prompt();
print!("{}", self.cmd);
print!("{}{}", c, after_cursor);
kernel::vga::set_cursor_position(x + 1, y);
kernel::vga::set_writer_position(x + 1, y);
} else {
Expand Down Expand Up @@ -293,8 +291,10 @@ impl Shell {
args[i] = &self.autocomplete[self.autocomplete_index];

let cmd = args.join(" ");
kernel::console::clear_row();
self.print_prompt();
let n = self.prompt.len();
let (_, y) = kernel::console::cursor_position();
kernel::console::clear_row_after(n + cmd.len());
kernel::console::set_writer_position(n, y);
print!("{}", cmd);
}

Expand Down