8361639: JFR: Incorrect top frame for I/O events

Reviewed-by: mgronlun
Backport-of: 1a6cbe4

Author: egahlin

src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java

@@ -38,7 +38,13 @@
 @Label("File Read")
 @Category("Java Application")
 @Description("Reading data from a file")
-@StackFilter({"java.io.FileInputStream", "java.io.RandomAccessFile", "sun.nio.ch.FileChannelImpl"})
+@StackFilter({"java.nio.channels.FileChannel",
+              "java.io.DataInputStream",
+              "java.io.FileInputStream",
+              "java.io.InputStream",
+              "java.io.RandomAccessFile",
+              "sun.nio.ch.ChannelInputStream",
+              "sun.nio.ch.FileChannelImpl"})
 @Throttle
 public final class FileReadEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java

@@ -38,7 +38,13 @@
 @Label("File Write")
 @Category("Java Application")
 @Description("Writing data to a file")
-@StackFilter({"java.io.FileOutputStream", "java.io.RandomAccessFile", "sun.nio.ch.FileChannelImpl"})
+@StackFilter({"java.nio.channels.FileChannel",
+              "java.io.DataOutputStream",
+              "java.io.FileOutputStream",
+              "java.io.OutputStream",
+              "java.io.RandomAccessFile",
+              "sun.nio.ch.ChannelOutputStream",
+              "sun.nio.ch.FileChannelImpl"})
 @Throttle
 public final class FileWriteEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java

@@ -39,6 +39,10 @@
 @Label("Socket Read")
 @Category("Java Application")
 @Description("Reading data from a socket")
+@StackFilter({"java.io.InputStream",
+              "java.net.Socket$SocketInputStream",
+              "java.nio.channels.SocketChannel",
+              "sun.nio.ch.SocketInputStream"})
 @Throttle
 public final class SocketReadEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java

@@ -38,6 +38,10 @@
 @Label("Socket Write")
 @Category("Java Application")
 @Description("Writing data to a socket")
+@StackFilter({"java.io.OutputStream",
+              "java.net.Socket$SocketOutputStream",
+              "java.nio.channels.SocketChannel",
+              "sun.nio.ch.SocketOutputStream"})
 @Throttle
 public final class SocketWriteEvent extends MirrorEvent {
 

src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java

@@ -95,18 +95,6 @@ private boolean isExceptionEvent() {
         return false;
     }
 
-    private boolean isStaticCommit() {
-        switch (getName()) {
-            case Type.EVENT_NAME_PREFIX + "SocketRead"  :
-            case Type.EVENT_NAME_PREFIX + "SocketWrite" :
-            case Type.EVENT_NAME_PREFIX + "FileRead"    :
-            case Type.EVENT_NAME_PREFIX + "FileWrite"   :
-            case Type.EVENT_NAME_PREFIX + "FileForce"   :
-                return true;
-        }
-        return false;
-    }
-
     private int determineStackTraceOffset() {
         if (isJDK) {
             // Order matters
@@ -116,9 +104,14 @@ private int determineStackTraceOffset() {
             if (getModification() == Modification.TRACING) {
                 return 5;
             }
-            if (isStaticCommit()) {
-                return 3;
-            }
+            return switch (getName()) {
+                case Type.EVENT_NAME_PREFIX + "SocketRead",
+                     Type.EVENT_NAME_PREFIX + "SocketWrite",
+                     Type.EVENT_NAME_PREFIX + "FileRead",
+                     Type.EVENT_NAME_PREFIX + "FileWrite" -> 6;
+                case Type.EVENT_NAME_PREFIX + "FileForce" -> 5;
+                default -> 3;
+            };
         }
         return 3;
     }