Add JFR flags

Signed-off-by: Tobi Ajila <atobia@ca.ibm.com>

closed/OpenJ9.gmk

@@ -273,6 +273,13 @@ else
  SPEC_SED_SCRIPT += $(call SedDisable,module_ddr)
 endif
 
+# Adjust JFR enablement flags.
+ifeq (true,$(OPENJ9_ENABLE_JFR))
+ FEATURE_SED_SCRIPT += $(call SedEnable,opt_jfr)
+else
+ FEATURE_SED_SCRIPT += $(call SedDisable,opt_jfr)
+endif
+
 # Adjust JITServer enablement flags.
 ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
  FEATURE_SED_SCRIPT += $(call SedEnable,opt_jitserver)
@@ -462,13 +469,19 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
  else # OPENJ9_ENABLE_INLINE_TYPES
  CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=OFF
  endif # OPENJ9_ENABLE_INLINE_TYPES
- 
+
  ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT))
  CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=ON
  else # OPENJ9_ENABLE_CRAC_SUPPORT
  CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=OFF
  endif # OPENJ9_ENABLE_CRAC_SUPPORT
 
+ ifeq (true,$(OPENJ9_ENABLE_JFR))
+ CMAKE_ARGS += -DJ9VM_OPT_JFR=ON
+ else # OPENJ9_ENABLE_JFR
+ CMAKE_ARGS += -DJ9VM_OPT_JFR=OFF
+ endif # OPENJ9_ENABLE_JFR
+
  ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT))
  CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=ON
  else # OPENJ9_ENABLE_CRIU_SUPPORT

closed/autoconf/custom-hook.m4

@@ -46,11 +46,12 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
  OPENJ9_CONFIGURE_CUDA
  OPENJ9_CONFIGURE_DDR
  OPENJ9_CONFIGURE_DEMOS
+ OPENJ9_CONFIGURE_INLINE_TYPES
+ OPENJ9_CONFIGURE_JFR
+ OPENJ9_CONFIGURE_JITSERVER
  OPENJ9_CONFIGURE_HEALTHCENTER
  OPENJ9_CONFIGURE_NUMA
  OPENJ9_CONFIGURE_WARNINGS
- OPENJ9_CONFIGURE_JITSERVER
- OPENJ9_CONFIGURE_INLINE_TYPES
  OPENJ9_THIRD_PARTY_REQUIREMENTS
  OPENJ9_CHECK_NASM_VERSION
  OPENJCEPLUS_SETUP
@@ -445,6 +446,34 @@ AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER],
  AC_SUBST(OPENJ9_ENABLE_JITSERVER)
 ])
 
+AC_DEFUN([OPENJ9_CONFIGURE_JFR],
+[
+ AC_ARG_ENABLE([jfr], [AS_HELP_STRING([--enable-jfr], [enable JFR support @<:@platform dependent@:>@])])
+
+ AC_MSG_CHECKING([for jfr])
+ OPENJ9_ENABLE_JFR=false
+ if test "x$enable_jfr" = xyes ; then
+ AC_MSG_RESULT([yes (explicitly enabled)])
+ OPENJ9_ENABLE_JFR=true
+ elif test "x$enable_jfr" = xno ; then
+ AC_MSG_RESULT([no (explicitly disabled)])
+ elif test "x$enable_jfr" = x ; then
+ case "$OPENJ9_PLATFORM_CODE" in
+ xa64)
+ AC_MSG_RESULT([yes (default)])
+ OPENJ9_ENABLE_JFR=true
+ ;;
+ *)
+ AC_MSG_RESULT([no (default)])
+ ;;
+ esac
+ else
+ AC_MSG_ERROR([--enable-jfr accepts no argument])
+ fi
+
+ AC_SUBST(OPENJ9_ENABLE_JFR)
+])
+
 AC_DEFUN([OPENJ9_CONFIGURE_CONTINUATION_PROFILE],
 [
  AC_MSG_CHECKING([for Continuation profiling])

closed/autoconf/custom-spec.gmk.in

@@ -75,6 +75,7 @@ OPENJ9_ENABLE_CRIU_SUPPORT := @OPENJ9_ENABLE_CRIU_SUPPORT@
 OPENJ9_ENABLE_DDR := @OPENJ9_ENABLE_DDR@
 OPENJ9_ENABLE_DEMOS := @OPENJ9_ENABLE_DEMOS@
 OPENJ9_ENABLE_INLINE_TYPES := @OPENJ9_ENABLE_INLINE_TYPES@
+OPENJ9_ENABLE_JFR := @OPENJ9_ENABLE_JFR@
 OPENJ9_ENABLE_JITSERVER := @OPENJ9_ENABLE_JITSERVER@
 
 # for constructing version output