Merge pull request #19235 from tajila/criu_1

(0.44) Add JFR flags
eclipse-openj9 · Mar 26, 2024 · bda2c6f · bda2c6f
2 parents 2e56066 + 41de466
commit bda2c6f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/buildspecs/core.feature b/buildspecs/core.feature
@@ -110,6 +110,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_criuSupport" value="false"/>
 		<flag id="opt_fragmentRamClasses" value="true"/>
 		<flag id="opt_inlineJsrs" value="true"/>
+		<flag id="opt_jfr" value="false"/>
 		<flag id="opt_jitserver" value="false"/>
 		<flag id="opt_methodHandle" value="true"/>
 		<flag id="opt_methodHandleCommon" value="true"/>

diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags
@@ -1762,6 +1762,10 @@ Only available on zOS</description>
 			<require flag="module_ifa"/>
 		</requires>
 	</flag>
+	<flag id="opt_jfr">
+		<description>Enables support for JFR</description>
+		<ifRemoved>No support for JFR</ifRemoved>
+	</flag>
 	<flag id="opt_jitserver">
 		<description>JITServer support is enabled in the buildspec.</description>
 		<ifRemoved></ifRemoved>

diff --git a/runtime/cmake/options.cmake b/runtime/cmake/options.cmake
@@ -132,6 +132,7 @@ option(J9VM_OPT_DYNAMIC_LOAD_SUPPORT "Determines if the dynamic loader is includ
 option(J9VM_OPT_FIPS "Add supports for FIPS")
 option(J9VM_OPT_FRAGMENT_RAM_CLASSES "Transitional flag for the GC during the switch to fragmented RAM class allocation")
 
+option(J9VM_OPT_JFR "Add support for JFR")
 option(J9VM_OPT_JVMTI "Support for the JVMTI interface")
 option(J9VM_OPT_JXE_LOAD_SUPPORT "Controls if main will allow -jxe: and relocate the disk image for you.")
 

diff --git a/runtime/include/j9cfg.h.in b/runtime/include/j9cfg.h.in
@@ -221,6 +221,7 @@ extern "C" {
 #cmakedefine J9VM_OPT_INLINE_JSRS
 #cmakedefine J9VM_OPT_INVARIANT_INTERNING
 #cmakedefine J9VM_OPT_JAVA_OFFLOAD_SUPPORT
+#cmakedefine J9VM_OPT_JFR
 #cmakedefine J9VM_OPT_JITSERVER
 #cmakedefine J9VM_OPT_JVMTI
 #cmakedefine J9VM_OPT_JXE_LOAD_SUPPORT