Skip to content

Commit

Permalink
Merge pull request #19235 from tajila/criu_1
Browse files Browse the repository at this point in the history
(0.44) Add JFR flags
pshipton authored Mar 26, 2024

Verified

This commit was signed with the committer’s verified signature.
jalaziz Jameel Al-Aziz
2 parents 2e56066 + 41de466 commit bda2c6f
Showing 4 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions buildspecs/core.feature
Original file line number Diff line number Diff line change
@@ -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"/>
4 changes: 4 additions & 0 deletions buildspecs/j9.flags
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions runtime/cmake/options.cmake
Original file line number Diff line number Diff line change
@@ -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.")

1 change: 1 addition & 0 deletions runtime/include/j9cfg.h.in
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit bda2c6f

Please sign in to comment.