lttng: Bug 498083: Fix sys call entry matching in I/O analysis

Change-Id: I30bf823530b8613f2db58e4e1bd4a8550b76bf4f
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/77485
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Hudson CI

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 63d4f5d5baef4a8663841add728ac6cec49f17d0..02d280380beecef69c88f1c0a8e041e8af636a54 100644 (file)
--- 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 7b53824e550570ce854616960448bc6836f53349..86aea43790b61400d30fb2e78bb7c2426c995bc7 100644 (file)
--- 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;