7338: Add parser support for frame types generated by async-profiler

Reviewed-by: hirt
openjdk · Sep 9, 2021 · 341f3d5 · 341f3d5
1 parent 2844db9
commit 341f3d5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/IMCFrame.java b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/IMCFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -62,6 +62,18 @@ public enum Type {
 	 * The frame was executed as code that was inlined by the Java JIT compiler.
 	 */
 	INLINED,
+	/**
+	 * The frame was executed as native code, most probably a C function.
+	 */
+	NATIVE,
+	/**
+	 * The frame was executed as native code compiled from C++.
+	 */
+	CPP,
+	/**
+	 * The frame was executed as kernel native code.
+	 */
+	KERNEL,
 	/**
 	 * The frame compilation type is unknown.
 	 */

diff --git a/...ghtrecorder/src/main/java/org/openjdk/jmc/flightrecorder/internal/util/ParserToolkit.java b/...ghtrecorder/src/main/java/org/openjdk/jmc/flightrecorder/internal/util/ParserToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -80,6 +80,15 @@ public static IMCFrame.Type parseFrameType(String type) {
 		if ("Inlined".equals(type)) { //$NON-NLS-1$
 			return IMCFrame.Type.INLINED;
 		}
+		if ("Native".equals(type)) { //$NON-NLS-1$
+			return IMCFrame.Type.NATIVE;
+		}
+		if ("C++".equals(type)) { //$NON-NLS-1$
+			return IMCFrame.Type.CPP;
+		}
+		if ("Kernel".equals(type)) { //$NON-NLS-1$
+			return IMCFrame.Type.KERNEL;
+		}
 		return IMCFrame.Type.UNKNOWN;
 	}
 }