提交 64c57923 编写于 作者: A apetushkov

8223147: JFR Backport

8199712: Flight Recorder
8203346: JFR: Inconsistent signature of jfr_add_string_constant
8195817: JFR.stop should require name of recording
8195818: JFR.start should increase autogenerated name by one
8195819: Remove recording=x from jcmd JFR.check output
8203921: JFR thread sampling is missing fixes from JDK-8194552
8203929: Limit amount of data for JFR.dump
8203664: JFR start failure after AppCDS archive created with JFR StartFlightRecording
8003209: JFR events for network utilization
8207392: [PPC64] Implement JFR profiling
Summary: Backport JFR from JDK11. Initial integration
Reviewed-by: neugens
上级 90629f9c
...@@ -843,6 +843,7 @@ JDK_MICRO_VERSION ...@@ -843,6 +843,7 @@ JDK_MICRO_VERSION
JDK_MINOR_VERSION JDK_MINOR_VERSION
JDK_MAJOR_VERSION JDK_MAJOR_VERSION
USER_RELEASE_SUFFIX USER_RELEASE_SUFFIX
ENABLE_JFR
COMPRESS_JARS COMPRESS_JARS
UNLIMITED_CRYPTO UNLIMITED_CRYPTO
CACERTS_FILE CACERTS_FILE
...@@ -1011,6 +1012,7 @@ infodir ...@@ -1011,6 +1012,7 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
...@@ -1057,6 +1059,7 @@ enable_headful ...@@ -1057,6 +1059,7 @@ enable_headful
enable_hotspot_test_in_build enable_hotspot_test_in_build
with_cacerts_file with_cacerts_file
enable_unlimited_crypto enable_unlimited_crypto
enable_jfr
with_milestone with_milestone
with_update_version with_update_version
with_user_release_suffix with_user_release_suffix
...@@ -1251,6 +1254,7 @@ datadir='${datarootdir}' ...@@ -1251,6 +1254,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
...@@ -1503,6 +1507,15 @@ do ...@@ -1503,6 +1507,15 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
...@@ -1640,7 +1653,7 @@ fi ...@@ -1640,7 +1653,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir libdir localedir mandir runstatedir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
...@@ -1793,6 +1806,7 @@ Fine tuning of the installation directories: ...@@ -1793,6 +1806,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
...@@ -1841,6 +1855,7 @@ Optional Features: ...@@ -1841,6 +1855,7 @@ Optional Features:
run the Queens test after Hotspot build [disabled] run the Queens test after Hotspot build [disabled]
--enable-unlimited-crypto --enable-unlimited-crypto
Enable unlimited crypto policy [disabled] Enable unlimited crypto policy [disabled]
--enable-jfr Enable Java Flight Recorder support [disabled]
--disable-debug-symbols disable generation of debug symbols [enabled] --disable-debug-symbols disable generation of debug symbols [enabled]
--disable-zip-debug-info --disable-zip-debug-info
disable zipping of debug-info files [enabled] disable zipping of debug-info files [enabled]
...@@ -4376,7 +4391,7 @@ VS_SDK_PLATFORM_NAME_2017= ...@@ -4376,7 +4391,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1560366811 DATE_WHEN_GENERATED=1565695932
############################################################################### ###############################################################################
# #
...@@ -19802,6 +19817,30 @@ fi ...@@ -19802,6 +19817,30 @@ fi
###############################################################################
#
# Enable or disable JFR
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
$as_echo_n "checking whether to build jfr... " >&6; }
# Check whether --enable-jfr was given.
if test "${enable_jfr+set}" = set; then :
enableval=$enable_jfr;
else
enable_jfr=no
fi
if test "x$enable_jfr" = "xno"; then
ENABLE_JFR=false
elif test "x$enable_jfr" = "xyes"; then
ENABLE_JFR=true
else
as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
$as_echo "$ENABLE_JFR" >&6; }
# Source the version numbers # Source the version numbers
. $AUTOCONF_DIR/version-numbers . $AUTOCONF_DIR/version-numbers
...@@ -434,6 +434,24 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], ...@@ -434,6 +434,24 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
COMPRESS_JARS=false COMPRESS_JARS=false
AC_SUBST(COMPRESS_JARS) AC_SUBST(COMPRESS_JARS)
###############################################################################
#
# Enable or disable JFR
#
AC_MSG_CHECKING([whether to build jfr])
AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
[Enable Java Flight Recorder support @<:@disabled@:>@])],,
[enable_jfr=no])
if test "x$enable_jfr" = "xno"; then
ENABLE_JFR=false
elif test "x$enable_jfr" = "xyes"; then
ENABLE_JFR=true
else
AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
fi
AC_MSG_RESULT([$ENABLE_JFR])
AC_SUBST(ENABLE_JFR)
]) ])
############################################################################### ###############################################################################
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册