Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions AdvLoggerPkg/Crates/RustAdvancedLoggerDxe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ path = "src/lib.rs"
[dependencies]
r-efi = { workspace = true }
mu_uefi_boot_services = { workspace = true }
log = { workspace = true }

[dev-dependencies]
mu_uefi_boot_services = { workspace = true, features = ["mockall"] }
36 changes: 36 additions & 0 deletions AdvLoggerPkg/Crates/RustAdvancedLoggerDxe/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,49 @@ impl fmt::Write for LogTransactor<'_> {
}
}

// Adapter to route log crate output to AdvancedLogger
struct LogCrateAdapter;

static LOG_CRATE_ADAPTER: LogCrateAdapter = LogCrateAdapter;

impl log::Log for LogCrateAdapter {
fn enabled(&self, _metadata: &log::Metadata) -> bool {
// Always enabled - let AdvancedLogger decide
true
}

fn log(&self, record: &log::Record) {
if self.enabled(record.metadata()) {
// Map log crate levels to UEFI debug levels
let level = match record.level() {
log::Level::Error => DEBUG_ERROR,
log::Level::Warn => DEBUG_WARN,
log::Level::Info => DEBUG_INFO,
log::Level::Debug => DEBUG_VERBOSE,
log::Level::Trace => DEBUG_VERBOSE,
};

// Format: [LEVEL] target: message (with newline)
LOGGER.log(level, format_args!("[{}] {}: {}\n", record.level(), record.target(), record.args()));
}
}

fn flush(&self) {
// No-op for AdvancedLogger
}
}

/// Initializes the logging subsystem. The `debug` and `debugln` macros may be called before calling this function, but
/// output is discarded if the logger has not yet been initialized via this routine.
/// # Safety
/// Parameter `efi_boot_services` should be a valid pointer of [`efi::BootServices`] with a static lifetime.
pub unsafe fn init_debug(efi_boot_services: *mut efi::BootServices) {
let standard_boot_services = unsafe { boot_services::StandardBootServices::new(&*efi_boot_services) };
LOGGER.init(&standard_boot_services);

// Also set up the standard log crate to route to AdvancedLogger
let _ = log::set_logger(&LOG_CRATE_ADAPTER);
log::set_max_level(log::LevelFilter::Trace);
}

#[doc(hidden)]
Expand Down
Loading