From 0767567be67a61536c417a27cada9ce34fc3f2ed Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Tue, 6 May 2025 17:38:29 +0100 Subject: [PATCH] tools/trace-parser: Allow trailing whitespaces in trace_printk events FIX Allow trailing whitespaces like \n at the end of the trace_printk formats that are decoded like events. --- .../src/lib/tracedat/parquet/dump.rs | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/trace-parser/trace-tools/src/lib/tracedat/parquet/dump.rs b/tools/trace-parser/trace-tools/src/lib/tracedat/parquet/dump.rs index 70fad5d1b..c3089de6d 100644 --- a/tools/trace-parser/trace-tools/src/lib/tracedat/parquet/dump.rs +++ b/tools/trace-parser/trace-tools/src/lib/tracedat/parquet/dump.rs @@ -1318,15 +1318,22 @@ where } else { match atom { PrintAtom::Fixed(fixed) => { - match nom::combinator::all_consuming(field_name_parser()) - .parse(fixed.as_bytes()) + let fixed = fixed.as_bytes(); + match nom::combinator::all_consuming(nom::character::complete::multispace1) + .parse(fixed) .finish() { - Err(()) => Some(Err(MainError::NotAMetaEvent)), - Ok((_, name)) => { - field_name = Some(name); - None - } + Ok(_) => None, + Err(()) => match nom::combinator::all_consuming(field_name_parser()) + .parse(fixed) + .finish() + { + Err(()) => Some(Err(MainError::NotAMetaEvent)), + Ok((_, name)) => { + field_name = Some(name); + None + } + }, } } PrintAtom::Variable { vbin_spec, .. } => { -- GitLab