From e0d1bc069e4fd3d7e50c504fd9b8f540456587fd Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Mon, 18 Jul 2016 14:19:16 -0400 Subject: [PATCH] lttng: Bug 498083: Fix sys call entry matching in I/O analysis Change-Id: I30bf823530b8613f2db58e4e1bd4a8550b76bf4f Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/77485 Reviewed-by: Genevieve Bastien Tested-by: Genevieve Bastien Reviewed-by: Hudson CI --- .../core/tests/inputoutput/AbstractTestInputOutput.java | 8 ++++---- .../linux/core/inputoutput/handlers/SysExitHandler.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/AbstractTestInputOutput.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/AbstractTestInputOutput.java index 63d4f5d5ba..02d280380b 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/AbstractTestInputOutput.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/AbstractTestInputOutput.java @@ -56,22 +56,22 @@ public class AbstractTestInputOutput { @Override public @NonNull String eventSyscallEntryPrefix() { - return "syscall_entry"; + return "syscall_entry_"; } @Override public @NonNull String eventCompatSyscallEntryPrefix() { - return "syscall_compat_entry"; + return "syscall_compat_entry_"; } @Override public @NonNull String eventSyscallExitPrefix() { - return "syscall_exit"; + return "syscall_exit_"; } @Override public @NonNull String eventCompatSyscallExitPrefix() { - return "syscall_compat_exit"; + return "syscall_compat_exit_"; } } diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/inputoutput/handlers/SysExitHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/inputoutput/handlers/SysExitHandler.java index 7b53824e55..86aea43790 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/inputoutput/handlers/SysExitHandler.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/inputoutput/handlers/SysExitHandler.java @@ -35,8 +35,8 @@ import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; */ public class SysExitHandler extends KernelEventHandler { - private static final String SYSCALL_READ_PATTERN = "_[p]?read.*"; //$NON-NLS-1$ - private static final String SYSCALL_WRITE_PATTERN = "_[p]?write.*"; //$NON-NLS-1$ + private static final String SYSCALL_READ_PATTERN = "[p]?read.*"; //$NON-NLS-1$ + private static final String SYSCALL_WRITE_PATTERN = "[p]?write.*"; //$NON-NLS-1$ private final Pattern fSyscallReadPattern; private final Pattern fSyscallWritePattern; -- 2.34.1