Skip to content

fix(printk): 添加并发输出保护锁调试选项 #1768

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
sparkzky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(printk): 添加并发输出保护锁调试选项 #1768

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
5 changes: 5 additions & 0 deletions kernel/src/libs/printk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ use crate::{
driver::tty::{tty_driver::TtyOperation, virtual_terminal::vc_manager},
filesystem::procfs::{klog::LogMessage, kmsg::KMSG},
time::PosixTimeSpec,
// libs::spinlock::SpinLock,
};

// static OUTPUT_LOCK: SpinLock<()> = SpinLock::new(());

#[macro_export]
macro_rules! print {
($($arg:tt)*) => ($crate::libs::printk::__printk(format_args!($($arg)*)));
Expand All @@ -36,6 +39,8 @@ impl PrintkWriter {
/// 并输出白底黑字
/// @param str: 要写入的字符
pub fn __write_string(&mut self, s: &str) {
// DEBUG 调试的时候可以将这里取消注释，可以避免日志输出混在一起
// let _guard = OUTPUT_LOCK.lock();
if let Some(current_vc) = vc_manager().current_vc() {
// tty已经初始化了之后才输出到屏幕
let port = current_vc.port();
Expand Down
Loading