program-runtime: add LogCollector::new_ref_with_limit() (#21691)
program-runtime: add LogCollector::new_ref_with_limit() LogCollector::new_ref_with_limit(limit: Option<usize>) can be used to initialize a collector with the given bytes limit. The limit can be None, in which case logs are never truncated. new_ref_with_limit(None) is used by cargo-run-bpf-tests so that the output of cargo test --target=bpfel-unknown-unknown is not truncated.
This commit is contained in:
parent
16a6dceb6b
commit
805d53fc10
|
@ -3,17 +3,36 @@ use std::{cell::RefCell, rc::Rc};
|
|||
|
||||
const LOG_MESSAGES_BYTES_LIMIT: usize = 10 * 1000;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct LogCollector {
|
||||
messages: Vec<String>,
|
||||
bytes_written: usize,
|
||||
bytes_limit: Option<usize>,
|
||||
limit_warning: bool,
|
||||
}
|
||||
|
||||
impl Default for LogCollector {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
messages: Vec::new(),
|
||||
bytes_written: 0,
|
||||
bytes_limit: Some(LOG_MESSAGES_BYTES_LIMIT),
|
||||
limit_warning: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl LogCollector {
|
||||
pub fn log(&mut self, message: &str) {
|
||||
let limit = match self.bytes_limit {
|
||||
Some(limit) => limit,
|
||||
None => {
|
||||
self.messages.push(message.to_string());
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let bytes_written = self.bytes_written.saturating_add(message.len());
|
||||
if bytes_written >= LOG_MESSAGES_BYTES_LIMIT {
|
||||
if bytes_written >= limit {
|
||||
if !self.limit_warning {
|
||||
self.limit_warning = true;
|
||||
self.messages.push(String::from("Log truncated"));
|
||||
|
@ -31,6 +50,13 @@ impl LogCollector {
|
|||
pub fn new_ref() -> Rc<RefCell<Self>> {
|
||||
Rc::new(RefCell::new(Self::default()))
|
||||
}
|
||||
|
||||
pub fn new_ref_with_limit(bytes_limit: Option<usize>) -> Rc<RefCell<Self>> {
|
||||
Rc::new(RefCell::new(Self {
|
||||
bytes_limit,
|
||||
..Self::default()
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
impl From<LogCollector> for Vec<String> {
|
||||
|
|
Loading…
Reference in New Issue