forked from M-Labs/artiq-zynq
Logger: ported log_buffer.
This commit is contained in:
parent
ea96cf96d3
commit
855b26aa19
|
@ -0,0 +1,111 @@
|
||||||
|
use core::cell::{Cell, RefCell, RefMut};
|
||||||
|
use core::fmt::Write;
|
||||||
|
use log::{Log, LevelFilter};
|
||||||
|
use log_buffer::LogBuffer;
|
||||||
|
use libboard_zynq::{println, timer::GlobalTimer};
|
||||||
|
|
||||||
|
pub struct LogBufferRef<'a> {
|
||||||
|
buffer: RefMut<'a, LogBuffer<&'static mut [u8]>>,
|
||||||
|
old_log_level: LevelFilter
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> LogBufferRef<'a> {
|
||||||
|
fn new(buffer: RefMut<'a, LogBuffer<&'static mut [u8]>>) -> LogBufferRef<'a> {
|
||||||
|
let old_log_level = log::max_level();
|
||||||
|
log::set_max_level(LevelFilter::Off);
|
||||||
|
LogBufferRef { buffer, old_log_level }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_empty(&self) -> bool {
|
||||||
|
self.buffer.is_empty()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn clear(&mut self) {
|
||||||
|
self.buffer.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn extract(&mut self) -> &str {
|
||||||
|
self.buffer.extract()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Drop for LogBufferRef<'a> {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
log::set_max_level(self.old_log_level)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct BufferLogger {
|
||||||
|
buffer: RefCell<LogBuffer<&'static mut [u8]>>,
|
||||||
|
uart_filter: Cell<LevelFilter>
|
||||||
|
}
|
||||||
|
|
||||||
|
static mut LOGGER: Option<BufferLogger> = None;
|
||||||
|
|
||||||
|
impl BufferLogger {
|
||||||
|
pub fn new(buffer: &'static mut [u8]) -> BufferLogger {
|
||||||
|
BufferLogger {
|
||||||
|
buffer: RefCell::new(LogBuffer::new(buffer)),
|
||||||
|
uart_filter: Cell::new(LevelFilter::Info),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register(self) {
|
||||||
|
unsafe {
|
||||||
|
LOGGER = Some(self);
|
||||||
|
log::set_logger(LOGGER.as_ref().unwrap())
|
||||||
|
.expect("global logger can only be initialized once");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub unsafe fn get_logger() -> &'static mut Option<BufferLogger> {
|
||||||
|
&mut LOGGER
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn buffer<'a>(&'a self) -> Result<LogBufferRef<'a>, ()> {
|
||||||
|
self.buffer
|
||||||
|
.try_borrow_mut()
|
||||||
|
.map(LogBufferRef::new)
|
||||||
|
.map_err(|_| ())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn uart_log_level(&self) -> LevelFilter {
|
||||||
|
self.uart_filter.get()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_uart_log_level(&self, max_level: LevelFilter) {
|
||||||
|
self.uart_filter.set(max_level)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// required for impl Log
|
||||||
|
unsafe impl Sync for BufferLogger {}
|
||||||
|
|
||||||
|
impl Log for BufferLogger {
|
||||||
|
fn enabled(&self, _metadata: &log::Metadata) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
fn log(&self, record: &log::Record) {
|
||||||
|
if self.enabled(record.metadata()) {
|
||||||
|
let timestamp = unsafe {
|
||||||
|
GlobalTimer::get()
|
||||||
|
}.get_us();
|
||||||
|
let seconds = timestamp / 1_000_000;
|
||||||
|
let micros = timestamp % 1_000_000;
|
||||||
|
|
||||||
|
if let Ok(mut buffer) = self.buffer.try_borrow_mut() {
|
||||||
|
writeln!(buffer, "[{:6}.{:06}s] {:>5}({}): {}", seconds, micros,
|
||||||
|
record.level(), record.target(), record.args()).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if record.level() <= self.uart_log_level() {
|
||||||
|
println!("[{:6}.{:06}s] {:>5}({}): {}", seconds, micros,
|
||||||
|
record.level(), record.target(), record.args());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flush(&self) {
|
||||||
|
}
|
||||||
|
}
|
|
@ -9,7 +9,7 @@ extern crate alloc;
|
||||||
use core::{cmp, str};
|
use core::{cmp, str};
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
|
|
||||||
use libboard_zynq::{timer::GlobalTimer, time::Milliseconds, logger, devc, slcr};
|
use libboard_zynq::{timer::GlobalTimer, time::Milliseconds, devc, slcr};
|
||||||
use libsupport_zynq::ram;
|
use libsupport_zynq::ram;
|
||||||
use libregister::RegisterW;
|
use libregister::RegisterW;
|
||||||
use nb::block;
|
use nb::block;
|
||||||
|
@ -30,6 +30,7 @@ mod moninj;
|
||||||
mod load_pl;
|
mod load_pl;
|
||||||
mod eh_artiq;
|
mod eh_artiq;
|
||||||
mod panic;
|
mod panic;
|
||||||
|
mod logger;
|
||||||
|
|
||||||
fn init_gateware() {
|
fn init_gateware() {
|
||||||
// Set up PS->PL clocks
|
// Set up PS->PL clocks
|
||||||
|
@ -124,11 +125,19 @@ fn init_rtio(timer: GlobalTimer, cfg: &config::Config) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static mut LOG_BUFFER: [u8; 1<<17] = [0; 1<<17];
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub fn main_core0() {
|
pub fn main_core0() {
|
||||||
let timer = GlobalTimer::start();
|
let timer = GlobalTimer::start();
|
||||||
let _ = logger::init();
|
|
||||||
|
let buffer_logger = unsafe {
|
||||||
|
logger::BufferLogger::new(&mut LOG_BUFFER[..])
|
||||||
|
};
|
||||||
|
buffer_logger.set_uart_log_level(log::LevelFilter::Debug);
|
||||||
|
buffer_logger.register();
|
||||||
log::set_max_level(log::LevelFilter::Debug);
|
log::set_max_level(log::LevelFilter::Debug);
|
||||||
|
|
||||||
info!("NAR3/Zynq7000 starting...");
|
info!("NAR3/Zynq7000 starting...");
|
||||||
|
|
||||||
ram::init_alloc_linker();
|
ram::init_alloc_linker();
|
||||||
|
|
Loading…
Reference in New Issue