M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: split log timestamp into secs.micros.

This commit is contained in:
whitequark 2017-07-18 02:53:55 +00:00
parent 9e38132c0a
commit 819440f839
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/firmware/liblogger_artiq/lib.rs
View File

@ -94,10 +94,14 @@ impl Log for BufferLogger {
fn log(&self, record: &LogRecord) { fn log(&self, record: &LogRecord) {
if self.enabled(record.metadata()) { if self.enabled(record.metadata()) {
let timestamp = clock::get_us();
let seconds = timestamp / 1_000_000;
let micros = timestamp % 1_000_000;
let force_uart = match self.buffer.try_borrow_mut() { let force_uart = match self.buffer.try_borrow_mut() {
Ok(mut buffer) => { Ok(mut buffer) => {
writeln!(buffer, "[{:12}us] {:>5}({}): {}", writeln!(buffer, "[{:6}.{:06}s] {:>5}({}): {}",
clock::get_us(), record.level(), seconds, micros, record.level(),
record.target(), record.args()).unwrap(); record.target(), record.args()).unwrap();
false false
} }
@ -109,8 +113,8 @@ impl Log for BufferLogger {
}; };
if record.level() <= self.uart_filter.get() || force_uart { if record.level() <= self.uart_filter.get() || force_uart {
writeln!(Console, "[{:12}us] {:>5}({}): {}", writeln!(Console, "[{:6}.{:06}s] {:>5}({}): {}",
clock::get_us(), record.level(), seconds, micros, record.level(),
record.target(), record.args()).unwrap(); record.target(), record.args()).unwrap();
} }
} }