Skip to content

ftrace: Update ftrace event regex #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
felix-khlmnn wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

ftrace: Update ftrace event regex #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0676e
ftrace: Update ftrace event regex
felix-khlmnn Jan 5, 2026
4e75b76
ftrace: Implement test case for parentheses error
felix-khlmnn Jan 5, 2026
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
20 changes: 20 additions & 0 deletions ...tests/src/org/eclipse/tracecompass/incubator/ftrace/core/tests/event/FtraceFieldTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,26 @@ public void testParseIrqRaise() {
assertEquals("RCU", field.getContent().getFieldValue(String.class, "action"));
}

/**
* Testing of parse line with a line that starts with parentheses
*/
@Test
public void testParseStartsWithParentheses() {
String line = "(udev-worker)-299 [000] d.h1. 73.294605: sched_stat_runtime: comm=systemd-udevd pid=299 runtime=65790 [ns] vruntime=6269486605 [ns]";

GenericFtraceField field = GenericFtraceField.parseLine(line);

assertNotNull(field);
assertEquals(4, field.getContent().getFields().size());
assertEquals((Integer) 0, field.getCpu());
assertEquals((Integer) 299, field.getPid());
assertEquals("sched_stat_runtime", field.getName());

assertEquals("systemd-udevd", field.getContent().getFieldValue(String.class, "comm"));
assertEquals((Long) 65790L, field.getContent().getFieldValue(Long.class, "runtime"));
assertEquals((Long) 6269486605L, field.getContent().getFieldValue(Long.class, "vruntime"));
}

/**
* Testing of parse line with odd comm names
*/
Expand Down
2 changes: 1 addition & 1 deletion ...rg/eclipse/tracecompass/incubator/internal/ftrace/core/event/IGenericFtraceConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public interface IGenericFtraceConstants {
* Pattern to match the rest of the event (event name, event fields), like:
* sched_switch: prev_comm=kworker/u16:6 prev_pid=214 prev_prio=120 prev_state=R+ ==> next_comm=swapper/2 next_pid=0 next_prio=120
*/
"(?<name>\\w+)(?<separator>:\\s+|\\(|\\s+->\\s+)(?<data>[^\\)]*)(\\))?" //$NON-NLS-1$
"(?<name>\\w+)(?<separator>:\\s+|\\(|\\s+->\\s+)(?<data>.*)$" //$NON-NLS-1$
);
/**
* comm group in {@link IGenericFtraceConstants#FTRACE_PATTERN}
Expand Down
Loading