Tue, 03 Mar 2020 13:21:24 +0000
8240375: Disable JFR by default for July 2020 release
Reviewed-by: aph, neugens
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/jdk-options.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Tue Mar 03 12:57:18 2020 +0000 1.2 +++ b/common/autoconf/generated-configure.sh Tue Mar 03 13:21:24 2020 +0000 1.3 @@ -1857,7 +1857,7 @@ 1.4 run the Queens test after Hotspot build [disabled] 1.5 --enable-unlimited-crypto 1.6 Enable unlimited crypto policy [disabled] 1.7 - --disable-jfr Disable Java Flight Recorder support [enabled] 1.8 + --enable-jfr Enable Java Flight Recorder support [disabled] 1.9 --disable-debug-symbols disable generation of debug symbols [enabled] 1.10 --disable-zip-debug-info 1.11 disable zipping of debug-info files [enabled] 1.12 @@ -4394,7 +4394,7 @@ 1.13 #CUSTOM_AUTOCONF_INCLUDE 1.14 1.15 # Do not change or remove the following line, it is needed for consistency checks: 1.16 -DATE_WHEN_GENERATED=1582132239 1.17 +DATE_WHEN_GENERATED=1583241599 1.18 1.19 ############################################################################### 1.20 # 1.21 @@ -19831,15 +19831,11 @@ 1.22 enable_jfr=auto 1.23 fi 1.24 1.25 - if test "x$enable_jfr" = "xno"; then 1.26 + if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then 1.27 ENABLE_JFR=false 1.28 - elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then 1.29 + elif test "x$enable_jfr" = "xyes" ; then 1.30 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 1.31 - if test "x$enable_jfr" = "xyes"; then 1.32 - as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 1.33 - else 1.34 - ENABLE_JFR=false 1.35 - fi 1.36 + as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5 1.37 else 1.38 ENABLE_JFR=true 1.39 fi
2.1 --- a/common/autoconf/jdk-options.m4 Tue Mar 03 12:57:18 2020 +0000 2.2 +++ b/common/autoconf/jdk-options.m4 Tue Mar 03 13:21:24 2020 +0000 2.3 @@ -438,18 +438,14 @@ 2.4 # Enable or disable JFR 2.5 # 2.6 AC_MSG_CHECKING([whether to build jfr]) 2.7 - AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr], 2.8 - [Disable Java Flight Recorder support @<:@enabled@:>@])],, 2.9 + AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr], 2.10 + [Enable Java Flight Recorder support @<:@disabled@:>@])],, 2.11 [enable_jfr=auto]) 2.12 - if test "x$enable_jfr" = "xno"; then 2.13 + if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then 2.14 ENABLE_JFR=false 2.15 - elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then 2.16 + elif test "x$enable_jfr" = "xyes" ; then 2.17 if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then 2.18 - if test "x$enable_jfr" = "xyes"; then 2.19 - AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build]) 2.20 - else 2.21 - ENABLE_JFR=false 2.22 - fi 2.23 + AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build]) 2.24 else 2.25 ENABLE_JFR=true 2.26 fi