Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index d0fc930..3d8197a 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -269,3 +269,4 @@
1d4a293fbec19dc2d5790bbb2c7dd0ed8f265484 jdk9-b24
aefd8899a8d6615fb34ba99b2e38996a7145baa8 jdk9-b25
d3ec8d048e6c3c46b6e0ee011cc551ad386dfba5 jdk9-b26
+ba5645f2735b41ed085d07ba20fa7b322afff318 jdk9-b27
diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
index 79d54a2..ca88e9f 100644
--- a/common/autoconf/basics.m4
+++ b/common/autoconf/basics.m4
@@ -377,7 +377,6 @@
BASIC_REQUIRE_PROGS(CMP, cmp)
BASIC_REQUIRE_PROGS(COMM, comm)
BASIC_REQUIRE_PROGS(CP, cp)
- BASIC_REQUIRE_PROGS(CPIO, cpio)
BASIC_REQUIRE_PROGS(CUT, cut)
BASIC_REQUIRE_PROGS(DATE, date)
BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
@@ -427,6 +426,7 @@
BASIC_PATH_PROGS(READLINK, [greadlink readlink])
BASIC_PATH_PROGS(DF, df)
BASIC_PATH_PROGS(SETFILE, SetFile)
+ BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
])
# Setup basic configuration paths, and platform-specific stuff related to PATHs.
@@ -954,7 +954,7 @@
# not be the case in cygwin in certain conditions.
AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
[
- if test x"$OPENJDK_BUILD_OS" = xwindows; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
file_to_test="$SRC_ROOT/LICENSE"
if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
diff --git a/common/autoconf/basics_windows.m4 b/common/autoconf/basics_windows.m4
index 0d43553..1bcb615 100644
--- a/common/autoconf/basics_windows.m4
+++ b/common/autoconf/basics_windows.m4
@@ -266,6 +266,14 @@
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
index 6f69f0c..4500692 100644
--- a/common/autoconf/flags.m4
+++ b/common/autoconf/flags.m4
@@ -900,7 +900,7 @@
case "${TOOLCHAIN_TYPE}" in
microsoft)
- CFLAGS_WARNINGS_ARE_ERRORS="/WX"
+ CFLAGS_WARNINGS_ARE_ERRORS="-WX"
;;
solstudio)
CFLAGS_WARNINGS_ARE_ERRORS="-errtags -errwarn=%all"
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 5b044dc..4dd04bd 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -920,12 +920,14 @@
OPENJDK_TARGET_CPU_BITS
OPENJDK_TARGET_CPU_ARCH
OPENJDK_TARGET_CPU
+OPENJDK_TARGET_OS_ENV
OPENJDK_TARGET_OS_API
OPENJDK_TARGET_OS
OPENJDK_BUILD_CPU_ENDIAN
OPENJDK_BUILD_CPU_BITS
OPENJDK_BUILD_CPU_ARCH
OPENJDK_BUILD_CPU
+OPENJDK_BUILD_OS_ENV
OPENJDK_BUILD_OS_API
OPENJDK_BUILD_OS
OPENJDK_BUILD_AUTOCONF_NAME
@@ -942,6 +944,7 @@
build_vendor
build_cpu
build
+CPIO
SETFILE
DF
READLINK
@@ -980,7 +983,6 @@
DIFF
DATE
CUT
-CPIO
CP
COMM
CMP
@@ -1120,7 +1122,6 @@
CMP
COMM
CP
-CPIO
CUT
DATE
DIFF
@@ -1159,6 +1160,7 @@
READLINK
DF
SETFILE
+CPIO
UNZIP
ZIP
LDD
@@ -1990,7 +1992,6 @@
CMP Override default value for CMP
COMM Override default value for COMM
CP Override default value for CP
- CPIO Override default value for CPIO
CUT Override default value for CUT
DATE Override default value for DATE
DIFF Override default value for DIFF
@@ -2029,6 +2030,7 @@
READLINK Override default value for READLINK
DF Override default value for DF
SETFILE Override default value for SETFILE
+ CPIO Override default value for CPIO
UNZIP Override default value for UNZIP
ZIP Override default value for ZIP
LDD Override default value for LDD
@@ -4319,7 +4321,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1407143049
+DATE_WHEN_GENERATED=1408448519
###############################################################################
#
@@ -5724,199 +5726,6 @@
# Publish this variable in the help.
- if test "x$CPIO" = x; then
- # The variable is not set by user, try to locate tool using the code snippet
- for ac_prog in cpio
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPIO+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CPIO in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CPIO=$ac_cv_path_CPIO
-if test -n "$CPIO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
-$as_echo "$CPIO" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CPIO" && break
-done
-
- else
- # The variable is set, but is it from the command line or the environment?
-
- # Try to remove the string !CPIO! from our list.
- try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/}
- if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
- # If it failed, the variable was not from the command line. Ignore it,
- # but warn the user (except for BASH, which is always set by the calling BASH).
- if test "xCPIO" != xBASH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5
-$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;}
- fi
- # Try to locate tool using the code snippet
- for ac_prog in cpio
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPIO+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CPIO in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CPIO=$ac_cv_path_CPIO
-if test -n "$CPIO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
-$as_echo "$CPIO" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CPIO" && break
-done
-
- else
- # If it succeeded, then it was overridden by the user. We will use it
- # for the tool.
-
- # First remove it from the list of overridden variables, so we can test
- # for unknown variables in the end.
- CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
- # Check if the provided tool contains a complete path.
- tool_specified="$CPIO"
- tool_basename="${tool_specified##*/}"
- if test "x$tool_basename" = "x$tool_specified"; then
- # A command without a complete path is provided, search $PATH.
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5
-$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;}
- # Extract the first word of "$tool_basename", so it can be a program name with args.
-set dummy $tool_basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPIO+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CPIO in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CPIO=$ac_cv_path_CPIO
-if test -n "$CPIO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
-$as_echo "$CPIO" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test "x$CPIO" = x; then
- as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
- fi
- else
- # Otherwise we believe it is a complete path. Use it as it is.
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5
-$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5
-$as_echo_n "checking for CPIO... " >&6; }
- if test ! -x "$tool_specified"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
-$as_echo "$tool_specified" >&6; }
- fi
- fi
- fi
-
-
-
- if test "x$CPIO" = x; then
- as_fn_error $? "Could not find required tool for CPIO" "$LINENO" 5
- fi
-
-
-
-
-
- # Publish this variable in the help.
-
-
if test "x$CUT" = x; then
# The variable is not set by user, try to locate tool using the code snippet
for ac_prog in cut
@@ -13386,6 +13195,192 @@
+ # Publish this variable in the help.
+
+
+ if test "x$CPIO" = x; then
+ # The variable is not set by user, try to locate tool using the code snippet
+ for ac_prog in cpio bsdcpio
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CPIO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CPIO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CPIO=$ac_cv_path_CPIO
+if test -n "$CPIO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
+$as_echo "$CPIO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CPIO" && break
+done
+
+ else
+ # The variable is set, but is it from the command line or the environment?
+
+ # Try to remove the string !CPIO! from our list.
+ try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/}
+ if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
+ # If it failed, the variable was not from the command line. Ignore it,
+ # but warn the user (except for BASH, which is always set by the calling BASH).
+ if test "xCPIO" != xBASH; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5
+$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;}
+ fi
+ # Try to locate tool using the code snippet
+ for ac_prog in cpio bsdcpio
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CPIO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CPIO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CPIO=$ac_cv_path_CPIO
+if test -n "$CPIO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
+$as_echo "$CPIO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CPIO" && break
+done
+
+ else
+ # If it succeeded, then it was overridden by the user. We will use it
+ # for the tool.
+
+ # First remove it from the list of overridden variables, so we can test
+ # for unknown variables in the end.
+ CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+
+ # Check if the provided tool contains a complete path.
+ tool_specified="$CPIO"
+ tool_basename="${tool_specified##*/}"
+ if test "x$tool_basename" = "x$tool_specified"; then
+ # A command without a complete path is provided, search $PATH.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5
+$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;}
+ # Extract the first word of "$tool_basename", so it can be a program name with args.
+set dummy $tool_basename; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CPIO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CPIO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CPIO=$ac_cv_path_CPIO
+if test -n "$CPIO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
+$as_echo "$CPIO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "x$CPIO" = x; then
+ as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
+ fi
+ else
+ # Otherwise we believe it is a complete path. Use it as it is.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5
+$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5
+$as_echo_n "checking for CPIO... " >&6; }
+ if test ! -x "$tool_specified"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
+$as_echo "$tool_specified" >&6; }
+ fi
+ fi
+ fi
+
+
+
+
# Now we can determine OpenJDK build and target platforms. This is required to
# have early on.
# Make sure we can run config.sub.
@@ -13644,6 +13639,7 @@
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
$as_echo_n "checking openjdk-build os-cpu... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
@@ -13775,6 +13771,7 @@
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
$as_echo_n "checking openjdk-target os-cpu... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
@@ -15611,6 +15608,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -15967,6 +15981,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -16320,6 +16351,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -16678,6 +16726,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -17030,6 +17095,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -27493,6 +27575,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -28136,6 +28235,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -28576,6 +28692,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -29842,6 +29975,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -30282,6 +30432,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -31127,6 +31294,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -31525,6 +31709,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -31852,6 +32053,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -32330,6 +32548,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -32941,6 +33176,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -33460,6 +33712,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -33911,6 +34180,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -34235,6 +34521,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -34555,6 +34858,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -34857,6 +35177,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -35311,6 +35648,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -35762,6 +36116,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -36213,6 +36584,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -36665,6 +37053,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -37228,6 +37633,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -37789,6 +38211,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -38359,6 +38798,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -38926,6 +39382,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -39402,6 +39875,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -39853,6 +40343,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -40304,6 +40811,23 @@
new_path=`$WHICH "$new_path" 2> /dev/null`
+ # bat and cmd files are not always considered executable in MSYS causing which
+ # to not find them
+ if test "x$new_path" = x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$LS \"$path\" 2>/dev/null`" != x; then
+ new_path="$path"
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ fi
if test "x$new_path" = x; then
# It's still not found. Now this is an unrecoverable error.
@@ -42629,7 +43153,7 @@
case "${TOOLCHAIN_TYPE}" in
microsoft)
- CFLAGS_WARNINGS_ARE_ERRORS="/WX"
+ CFLAGS_WARNINGS_ARE_ERRORS="-WX"
;;
solstudio)
CFLAGS_WARNINGS_ARE_ERRORS="-errtags -errwarn=%all"
@@ -48711,12 +49235,22 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
@@ -48767,12 +49301,22 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
@@ -48805,12 +49349,22 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
@@ -48853,12 +49407,22 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
@@ -48906,12 +49470,22 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
@@ -48955,12 +49529,22 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
@@ -49903,7 +50487,7 @@
# Check for some common pitfalls
- if test x"$OPENJDK_BUILD_OS" = xwindows; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
file_to_test="$SRC_ROOT/LICENSE"
if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
as_fn_error $? "Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin." "$LINENO" 5
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
index ead832d..4eacb39 100644
--- a/common/autoconf/platform.m4
+++ b/common/autoconf/platform.m4
@@ -173,6 +173,7 @@
OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
AC_SUBST(OPENJDK_BUILD_OS)
AC_SUBST(OPENJDK_BUILD_OS_API)
+ AC_SUBST(OPENJDK_BUILD_OS_ENV)
AC_SUBST(OPENJDK_BUILD_CPU)
AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
AC_SUBST(OPENJDK_BUILD_CPU_BITS)
@@ -194,6 +195,7 @@
OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
AC_SUBST(OPENJDK_TARGET_OS)
AC_SUBST(OPENJDK_TARGET_OS_API)
+ AC_SUBST(OPENJDK_TARGET_OS_ENV)
AC_SUBST(OPENJDK_TARGET_CPU)
AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
AC_SUBST(OPENJDK_TARGET_CPU_BITS)
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 315c106..e85c830 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -106,6 +106,7 @@
# When not cross-compiling, it is the same as the target.
OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
OPENJDK_BUILD_OS_API:=@OPENJDK_BUILD_OS_API@
+OPENJDK_BUILD_OS_ENV:=@OPENJDK_BUILD_OS_ENV@
OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
index b4888a4..bdd1105 100644
--- a/common/autoconf/toolchain_windows.m4
+++ b/common/autoconf/toolchain_windows.m4
@@ -244,12 +244,22 @@
# Need to check if the found msvcr is correct architecture
AC_MSG_CHECKING([found msvcr100.dll architecture])
MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- CORRECT_MSVCR_ARCH=386
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
+ # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH="PE32 executable"
+ else
+ CORRECT_MSVCR_ARCH="PE32+ executable"
+ fi
else
- CORRECT_MSVCR_ARCH=x86-64
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
fi
- if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
AC_MSG_RESULT([ok])
MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
AC_MSG_CHECKING([for msvcr100.dll])
diff --git a/corba/.hgtags b/corba/.hgtags
index d7401bc..6b8724a 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -269,3 +269,4 @@
8a44142bb7fc8118f70f91a1b97c12dfc50563ee jdk9-b24
da08cca6b97f41b7081a3e176dcb400af6e4bb26 jdk9-b25
6c777df597bbf5abba3488d44c401edfe73c74af jdk9-b26
+7e06bf1dcb0907b80ddf59315426ce9ce775e56d jdk9-b27
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java
index ad02ae3..8cf9684 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java
@@ -38,11 +38,11 @@
* OMG specifications :
* <ul>
* <li> ORB core as defined by CORBA 2.3.1
-* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
+* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
* </li>
*
* <li> IDL/Java Language Mapping as defined in
-* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
* </li>
* </ul>
*/
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 2dbb048..eada5bf 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -429,3 +429,4 @@
dde2d03b0ea46a27650839e3a1d212c7c1f7b4c8 jdk9-b24
6de94e8693240cec8aae11f6b42f43433456a733 jdk9-b25
48b95a073d752d6891cc0d1d2836b321ecf3ce0c jdk9-b26
+f95347244306affc32ce3056f27ceff7b2100810 jdk9-b27
diff --git a/hotspot/agent/src/os/solaris/proc/saproc.cpp b/hotspot/agent/src/os/solaris/proc/saproc.cpp
index 5a910d3..3f0e6b2 100644
--- a/hotspot/agent/src/os/solaris/proc/saproc.cpp
+++ b/hotspot/agent/src/os/solaris/proc/saproc.cpp
@@ -314,7 +314,7 @@
handle = dlopen(name, mode);
}
if (_libsaproc_debug) {
- printf("libsaproc DEBUG: pathmap_dlopen %s return 0x%x\n", name, handle);
+ printf("libsaproc DEBUG: pathmap_dlopen %s return 0x%lx\n", name, (unsigned long) handle);
}
return handle;
}
@@ -661,30 +661,30 @@
// read FileMapHeader
size_t n = read(fd, pheader, sizeof(struct FileMapHeader));
if (n != sizeof(struct FileMapHeader)) {
- free(pheader);
- close(fd);
char errMsg[ERR_MSG_SIZE];
sprintf(errMsg, "unable to read shared archive file map header from %s", classes_jsa);
+ close(fd);
+ free(pheader);
THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1);
}
// check file magic
if (pheader->_magic != 0xf00baba2) {
- free(pheader);
- close(fd);
char errMsg[ERR_MSG_SIZE];
sprintf(errMsg, "%s has bad shared archive magic 0x%x, expecting 0xf00baba2",
classes_jsa, pheader->_magic);
+ close(fd);
+ free(pheader);
THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1);
}
// check version
if (pheader->_version != CURRENT_ARCHIVE_VERSION) {
- free(pheader);
- close(fd);
char errMsg[ERR_MSG_SIZE];
sprintf(errMsg, "%s has wrong shared archive version %d, expecting %d",
classes_jsa, pheader->_version, CURRENT_ARCHIVE_VERSION);
+ close(fd);
+ free(pheader);
THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1);
}
diff --git a/hotspot/make/excludeSrc.make b/hotspot/make/excludeSrc.make
index 00db453..5aabf4c 100644
--- a/hotspot/make/excludeSrc.make
+++ b/hotspot/make/excludeSrc.make
@@ -119,8 +119,8 @@
CFLAGS += -DINCLUDE_NMT=0
Src_Files_EXCLUDE += \
- memBaseline.cpp memPtr.cpp memRecorder.cpp memReporter.cpp memSnapshot.cpp memTrackWorker.cpp \
- memTracker.cpp nmtDCmd.cpp
+ memBaseline.cpp memReporter.cpp mallocTracker.cpp virtualMemoryTracker.cpp nmtCommon.cpp \
+ memTracker.cpp nmtDCmd.cpp mallocSiteTable.cpp
endif
-include $(HS_ALT_MAKE)/excludeSrc.make
diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties
index a6ff452..252216f 100644
--- a/hotspot/make/jprt.properties
+++ b/hotspot/make/jprt.properties
@@ -356,14 +356,15 @@
${jprt.my.windows.x64}-fastdebug-c2-internalvmtests
jprt.make.rule.test.targets.standard.reg.group = \
- ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GROUP, \
- ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GROUP, \
- ${jprt.my.linux.i586}-{product|fastdebug}-c2-GROUP, \
- ${jprt.my.linux.x64}-{product|fastdebug}-c2-GROUP, \
- ${jprt.my.windows.i586}-{product|fastdebug}-c2-GROUP, \
- ${jprt.my.windows.x64}-{product|fastdebug}-c2-GROUP, \
- ${jprt.my.linux.i586}-{product|fastdebug}-c1-GROUP, \
- ${jprt.my.windows.i586}-{product|fastdebug}-c1-GROUP
+ ${jprt.my.solaris.sparcv9}-fastdebug-c2-GROUP, \
+ ${jprt.my.solaris.x64}-fastdebug-c2-GROUP, \
+ ${jprt.my.linux.i586}-fastdebug-c2-GROUP, \
+ ${jprt.my.linux.x64}-fastdebug-c2-GROUP, \
+ ${jprt.my.macosx.x64}-fastdebug-c2-GROUP, \
+ ${jprt.my.windows.i586}-fastdebug-c2-GROUP, \
+ ${jprt.my.windows.x64}-fastdebug-c2-GROUP, \
+ ${jprt.my.linux.i586}-fastdebug-c1-GROUP, \
+ ${jprt.my.windows.i586}-fastdebug-c1-GROUP
jprt.make.rule.test.targets.standard = \
${jprt.make.rule.test.targets.standard.client}, \
diff --git a/hotspot/make/solaris/makefiles/dtrace.make b/hotspot/make/solaris/makefiles/dtrace.make
index 5af625b..ad2275c 100644
--- a/hotspot/make/solaris/makefiles/dtrace.make
+++ b/hotspot/make/solaris/makefiles/dtrace.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,8 @@
DTRACE_COMMON_SRCDIR = $(GAMMADIR)/src/os/posix/dtrace
DTRACE = dtrace
DTRACE.o = $(DTRACE).o
+DTRACE_JHELPER = dtrace_jhelper
+DTRACE_JHELPER.o = $(DTRACE_JHELPER).o
# to remove '-g' option which causes link problems
# also '-z nodefs' is used as workaround
@@ -255,7 +257,10 @@
endif
$(DTRACE).d: $(DTRACE_COMMON_SRCDIR)/hotspot.d $(DTRACE_COMMON_SRCDIR)/hotspot_jni.d \
- $(DTRACE_COMMON_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
+ $(DTRACE_COMMON_SRCDIR)/hs_private.d
+ $(QUIETLY) cat $^ > $@
+
+$(DTRACE_JHELPER).d: $(DTRACE_SRCDIR)/jhelper.d
$(QUIETLY) cat $^ > $@
DTraced_Files = ciEnv.o \
@@ -280,7 +285,7 @@
vmGCOperations.o \
# Dtrace is available, so we build $(DTRACE.o)
-$(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files)
+$(DTRACE.o): $(DTRACE).d $(DTraced_Files)
@echo Compiling $(DTRACE).d
$(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -xlazyload -o $@ -s $(DTRACE).d \
@@ -344,6 +349,11 @@
dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(DtraceOutDir)/hs_private.h
+# The jhelper.d and hotspot probes are separated into two different SUNW_dof sections.
+# Now the jhelper.d is built without the -Xlazyload flag.
+$(DTRACE_JHELPER.o) : $(DTRACE_JHELPER).d $(JVMOFFS).h $(JVMOFFS)Index.h
+ @echo Compiling $(DTRACE_JHELPER).d
+ $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -o $@ -s $(DTRACE_JHELPER).d
.PHONY: dtraceCheck
@@ -372,7 +382,7 @@
ifneq ("${DTRACE_PROG}", "")
ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
-DTRACE_OBJS = $(DTRACE.o) $(JVMOFFS.o)
+DTRACE_OBJS = $(DTRACE.o) $(JVMOFFS.o) $(DTRACE_JHELPER.o)
CFLAGS += $(DTRACE_INCL) -DDTRACE_ENABLED
MAPFILE_DTRACE_OPT = $(MAPFILE_DTRACE)
diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp b/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
index 5a1c0f1..0c8cf43 100644
--- a/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
@@ -298,6 +298,7 @@
LWZ_OPCODE = (32u << OPCODE_SHIFT),
LWZX_OPCODE = (31u << OPCODE_SHIFT | 23u << 1),
LWZU_OPCODE = (33u << OPCODE_SHIFT),
+ LWBRX_OPCODE = (31u << OPCODE_SHIFT | 534 << 1),
LHA_OPCODE = (42u << OPCODE_SHIFT),
LHAX_OPCODE = (31u << OPCODE_SHIFT | 343u << 1),
@@ -306,6 +307,7 @@
LHZ_OPCODE = (40u << OPCODE_SHIFT),
LHZX_OPCODE = (31u << OPCODE_SHIFT | 279u << 1),
LHZU_OPCODE = (41u << OPCODE_SHIFT),
+ LHBRX_OPCODE = (31u << OPCODE_SHIFT | 790 << 1),
LBZ_OPCODE = (34u << OPCODE_SHIFT),
LBZX_OPCODE = (31u << OPCODE_SHIFT | 87u << 1),
@@ -1364,11 +1366,17 @@
inline void lwax( Register d, Register s1, Register s2);
inline void lwa( Register d, int si16, Register s1);
+ // 4 bytes reversed
+ inline void lwbrx( Register d, Register s1, Register s2);
+
// 2 bytes
inline void lhzx( Register d, Register s1, Register s2);
inline void lhz( Register d, int si16, Register s1);
inline void lhzu( Register d, int si16, Register s1);
+ // 2 bytes reversed
+ inline void lhbrx( Register d, Register s1, Register s2);
+
// 2 bytes
inline void lhax( Register d, Register s1, Register s2);
inline void lha( Register d, int si16, Register s1);
@@ -1858,10 +1866,12 @@
inline void lwz( Register d, int si16);
inline void lwax( Register d, Register s2);
inline void lwa( Register d, int si16);
+ inline void lwbrx(Register d, Register s2);
inline void lhzx( Register d, Register s2);
inline void lhz( Register d, int si16);
inline void lhax( Register d, Register s2);
inline void lha( Register d, int si16);
+ inline void lhbrx(Register d, Register s2);
inline void lbzx( Register d, Register s2);
inline void lbz( Register d, int si16);
inline void ldx( Register d, Register s2);
diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp b/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
index 3b7eb5f..87db4bf 100644
--- a/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+++ b/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
@@ -263,10 +263,14 @@
inline void Assembler::lwax( Register d, Register s1, Register s2) { emit_int32(LWAX_OPCODE | rt(d) | ra0mem(s1) | rb(s2));}
inline void Assembler::lwa( Register d, int si16, Register s1) { emit_int32(LWA_OPCODE | rt(d) | ds(si16) | ra0mem(s1));}
+inline void Assembler::lwbrx( Register d, Register s1, Register s2) { emit_int32(LWBRX_OPCODE | rt(d) | ra0mem(s1) | rb(s2));}
+
inline void Assembler::lhzx( Register d, Register s1, Register s2) { emit_int32(LHZX_OPCODE | rt(d) | ra0mem(s1) | rb(s2));}
inline void Assembler::lhz( Register d, int si16, Register s1) { emit_int32(LHZ_OPCODE | rt(d) | d1(si16) | ra0mem(s1));}
inline void Assembler::lhzu( Register d, int si16, Register s1) { assert(d != s1, "according to ibm manual"); emit_int32(LHZU_OPCODE | rt(d) | d1(si16) | rta0mem(s1));}
+inline void Assembler::lhbrx( Register d, Register s1, Register s2) { emit_int32(LHBRX_OPCODE | rt(d) | ra0mem(s1) | rb(s2));}
+
inline void Assembler::lhax( Register d, Register s1, Register s2) { emit_int32(LHAX_OPCODE | rt(d) | ra0mem(s1) | rb(s2));}
inline void Assembler::lha( Register d, int si16, Register s1) { emit_int32(LHA_OPCODE | rt(d) | d1(si16) | ra0mem(s1));}
inline void Assembler::lhau( Register d, int si16, Register s1) { assert(d != s1, "according to ibm manual"); emit_int32(LHAU_OPCODE | rt(d) | d1(si16) | rta0mem(s1));}
@@ -736,10 +740,12 @@
inline void Assembler::lwz( Register d, int si16 ) { emit_int32( LWZ_OPCODE | rt(d) | d1(si16));}
inline void Assembler::lwax( Register d, Register s2) { emit_int32( LWAX_OPCODE | rt(d) | rb(s2));}
inline void Assembler::lwa( Register d, int si16 ) { emit_int32( LWA_OPCODE | rt(d) | ds(si16));}
+inline void Assembler::lwbrx(Register d, Register s2) { emit_int32( LWBRX_OPCODE| rt(d) | rb(s2));}
inline void Assembler::lhzx( Register d, Register s2) { emit_int32( LHZX_OPCODE | rt(d) | rb(s2));}
inline void Assembler::lhz( Register d, int si16 ) { emit_int32( LHZ_OPCODE | rt(d) | d1(si16));}
inline void Assembler::lhax( Register d, Register s2) { emit_int32( LHAX_OPCODE | rt(d) | rb(s2));}
inline void Assembler::lha( Register d, int si16 ) { emit_int32( LHA_OPCODE | rt(d) | d1(si16));}
+inline void Assembler::lhbrx(Register d, Register s2) { emit_int32( LHBRX_OPCODE| rt(d) | rb(s2));}
inline void Assembler::lbzx( Register d, Register s2) { emit_int32( LBZX_OPCODE | rt(d) | rb(s2));}
inline void Assembler::lbz( Register d, int si16 ) { emit_int32( LBZ_OPCODE | rt(d) | d1(si16));}
inline void Assembler::ld( Register d, int si16 ) { emit_int32( LD_OPCODE | rt(d) | ds(si16));}
diff --git a/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp b/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp
index 6e43183..94cbe0a 100644
--- a/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012, 2013 SAP AG. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -26,8 +26,9 @@
#ifndef CPU_PPC_VM_CPPINTERPRETERGENERATOR_PPC_HPP
#define CPU_PPC_VM_CPPINTERPRETERGENERATOR_PPC_HPP
- address generate_normal_entry(void);
- address generate_native_entry(void);
+ address generate_normal_entry(bool synchronized);
+ address generate_native_entry(bool synchronized);
+ address generate_math_entry(AbstractInterpreter::MethodKind kind) { return NULL; }
void lock_method(void);
void unlock_method(void);
diff --git a/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp b/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
index 8a9534e..3ff878b 100644
--- a/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
@@ -938,8 +938,9 @@
// Interpreter stub for calling a native method. (C++ interpreter)
// This sets up a somewhat different looking stack for calling the native method
// than the typical interpreter frame setup.
+// The synchronized parameter is ignored.
//
-address CppInterpreterGenerator::generate_native_entry(void) {
+address CppInterpreterGenerator::generate_native_entry(bool synchronized) {
if (native_entry != NULL) return native_entry;
address entry = __ pc();
@@ -1729,7 +1730,8 @@
__ std(R0, BasicObjectLock::obj_offset_in_bytes(), stack_base); // Mark lock as unused
}
-address CppInterpreterGenerator::generate_normal_entry(void) {
+// The synchronized parameter is ignored
+address CppInterpreterGenerator::generate_normal_entry(bool synchronized) {
if (interpreter_frame_manager != NULL) return interpreter_frame_manager;
address entry = __ pc();
@@ -2789,38 +2791,6 @@
return interpreter_frame_manager;
}
-// Generate code for various sorts of method entries
-//
-address AbstractInterpreterGenerator::generate_method_entry(AbstractInterpreter::MethodKind kind) {
- address entry_point = NULL;
-
- switch (kind) {
- case Interpreter::zerolocals : break;
- case Interpreter::zerolocals_synchronized : break;
- case Interpreter::native : // Fall thru
- case Interpreter::native_synchronized : entry_point = ((CppInterpreterGenerator*)this)->generate_native_entry(); break;
- case Interpreter::empty : break;
- case Interpreter::accessor : entry_point = ((InterpreterGenerator*)this)->generate_accessor_entry(); break;
- case Interpreter::abstract : entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); break;
- // These are special interpreter intrinsics which we don't support so far.
- case Interpreter::java_lang_math_sin : break;
- case Interpreter::java_lang_math_cos : break;
- case Interpreter::java_lang_math_tan : break;
- case Interpreter::java_lang_math_abs : break;
- case Interpreter::java_lang_math_log : break;
- case Interpreter::java_lang_math_log10 : break;
- case Interpreter::java_lang_math_sqrt : break;
- case Interpreter::java_lang_math_pow : break;
- case Interpreter::java_lang_math_exp : break;
- case Interpreter::java_lang_ref_reference_get: entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
- default : ShouldNotReachHere(); break;
- }
-
- if (entry_point) {
- return entry_point;
- }
- return ((InterpreterGenerator*)this)->generate_normal_entry();
-}
InterpreterGenerator::InterpreterGenerator(StubQueue* code)
: CppInterpreterGenerator(code) {
diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
index 98c34b1..a47f9f5 100644
--- a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
+++ b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
@@ -119,9 +119,15 @@
// Call the Interpreter::remove_activation_preserving_args_entry()
// func to get the address of the same-named entrypoint in the
// generated interpreter code.
+#if defined(ABI_ELFv2)
+ call_c(CAST_FROM_FN_PTR(address,
+ Interpreter::remove_activation_preserving_args_entry),
+ relocInfo::none);
+#else
call_c(CAST_FROM_FN_PTR(FunctionDescriptor*,
Interpreter::remove_activation_preserving_args_entry),
relocInfo::none);
+#endif
// Jump to Interpreter::_remove_activation_preserving_args_entry.
mtctr(R3_RET);
@@ -331,29 +337,40 @@
void InterpreterMacroAssembler::get_2_byte_integer_at_bcp(int bcp_offset,
Register Rdst,
signedOrNot is_signed) {
+#if defined(VM_LITTLE_ENDIAN)
+ if (bcp_offset) {
+ load_const_optimized(Rdst, bcp_offset);
+ lhbrx(Rdst, R14_bcp, Rdst);
+ } else {
+ lhbrx(Rdst, R14_bcp);
+ }
+ if (is_signed == Signed) {
+ extsh(Rdst, Rdst);
+ }
+#else
// Read Java big endian format.
if (is_signed == Signed) {
lha(Rdst, bcp_offset, R14_bcp);
} else {
lhz(Rdst, bcp_offset, R14_bcp);
}
-#if 0
- assert(Rtmp != Rdst, "need separate temp register");
- Register Rfirst = Rtmp;
- lbz(Rfirst, bcp_offset, R14_bcp); // first byte
- lbz(Rdst, bcp_offset+1, R14_bcp); // second byte
-
- // Rdst = ((Rfirst<<8) & 0xFF00) | (Rdst &~ 0xFF00)
- rldimi(/*RA=*/Rdst, /*RS=*/Rfirst, /*sh=*/8, /*mb=*/48);
- if (is_signed == Signed) {
- extsh(Rdst, Rdst);
- }
#endif
}
void InterpreterMacroAssembler::get_4_byte_integer_at_bcp(int bcp_offset,
Register Rdst,
signedOrNot is_signed) {
+#if defined(VM_LITTLE_ENDIAN)
+ if (bcp_offset) {
+ load_const_optimized(Rdst, bcp_offset);
+ lwbrx(Rdst, R14_bcp, Rdst);
+ } else {
+ lwbrx(Rdst, R14_bcp);
+ }
+ if (is_signed == Signed) {
+ extsw(Rdst, Rdst);
+ }
+#else
// Read Java big endian format.
if (bcp_offset & 3) { // Offset unaligned?
load_const_optimized(Rdst, bcp_offset);
@@ -369,18 +386,26 @@
lwz(Rdst, bcp_offset, R14_bcp);
}
}
+#endif
}
+
// Load the constant pool cache index from the bytecode stream.
//
// Kills / writes:
// - Rdst, Rscratch
void InterpreterMacroAssembler::get_cache_index_at_bcp(Register Rdst, int bcp_offset, size_t index_size) {
assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
+ // Cache index is always in the native format, courtesy of Rewriter.
if (index_size == sizeof(u2)) {
- get_2_byte_integer_at_bcp(bcp_offset, Rdst, Unsigned);
+ lhz(Rdst, bcp_offset, R14_bcp);
} else if (index_size == sizeof(u4)) {
- get_4_byte_integer_at_bcp(bcp_offset, Rdst, Signed);
+ if (bcp_offset & 3) {
+ load_const_optimized(Rdst, bcp_offset);
+ lwax(Rdst, R14_bcp, Rdst);
+ } else {
+ lwa(Rdst, bcp_offset, R14_bcp);
+ }
assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
nand(Rdst, Rdst, Rdst); // convert to plain index
} else if (index_size == sizeof(u1)) {
@@ -397,6 +422,29 @@
add(cache, R27_constPoolCache, cache);
}
+// Load 4-byte signed or unsigned integer in Java format (that is, big-endian format)
+// from (Rsrc)+offset.
+void InterpreterMacroAssembler::get_u4(Register Rdst, Register Rsrc, int offset,
+ signedOrNot is_signed) {
+#if defined(VM_LITTLE_ENDIAN)
+ if (offset) {
+ load_const_optimized(Rdst, offset);
+ lwbrx(Rdst, Rdst, Rsrc);
+ } else {
+ lwbrx(Rdst, Rsrc);
+ }
+ if (is_signed == Signed) {
+ extsw(Rdst, Rdst);
+ }
+#else
+ if (is_signed == Signed) {
+ lwa(Rdst, offset, Rsrc);
+ } else {
+ lwz(Rdst, offset, Rsrc);
+ }
+#endif
+}
+
// Load object from cpool->resolved_references(index).
void InterpreterMacroAssembler::load_resolved_reference_at_index(Register result, Register index) {
assert_different_registers(result, index);
diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp
index b4c95a6..37c7432 100644
--- a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp
+++ b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp
@@ -130,6 +130,7 @@
void get_cache_and_index_at_bcp(Register cache, int bcp_offset, size_t index_size = sizeof(u2));
+ void get_u4(Register Rdst, Register Rsrc, int offset, signedOrNot is_signed);
// common code
diff --git a/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp b/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
index 74f6001..d4f53f0 100644
--- a/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012, 2013 SAP AG. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -31,7 +31,12 @@
private:
address generate_abstract_entry(void);
- address generate_accessor_entry(void);
+ address generate_jump_to_normal_entry(void);
+ address generate_accessor_entry(void) { return generate_jump_to_normal_entry(); }
+ address generate_empty_entry(void) { return generate_jump_to_normal_entry(); }
address generate_Reference_get_entry(void);
+ // Not supported
+ address generate_CRC32_update_entry() { return NULL; }
+ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) { return NULL; }
#endif // CPU_PPC_VM_INTERPRETERGENERATOR_PPC_HPP
diff --git a/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp b/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
index 9681418..d64da8e 100644
--- a/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
@@ -428,6 +428,19 @@
return entry;
}
+
+// Call an accessor method (assuming it is resolved, otherwise drop into
+// vanilla (slow path) entry.
+address InterpreterGenerator::generate_jump_to_normal_entry(void) {
+ address entry = __ pc();
+ address normal_entry = Interpreter::entry_for_kind(Interpreter::zerolocals);
+ assert(normal_entry != NULL, "should already be generated.");
+ __ branch_to_entry(normal_entry, R11_scratch1);
+ __ flush();
+
+ return entry;
+}
+
// Abstract method entry.
//
address InterpreterGenerator::generate_abstract_entry(void) {
@@ -485,203 +498,6 @@
return entry;
}
-// Call an accessor method (assuming it is resolved, otherwise drop into
-// vanilla (slow path) entry.
-address InterpreterGenerator::generate_accessor_entry(void) {
- if (!UseFastAccessorMethods && (!FLAG_IS_ERGO(UseFastAccessorMethods))) {
- return NULL;
- }
-
- Label Lslow_path, Lacquire;
-
- const Register
- Rclass_or_obj = R3_ARG1,
- Rconst_method = R4_ARG2,
- Rcodes = Rconst_method,
- Rcpool_cache = R5_ARG3,
- Rscratch = R11_scratch1,
- Rjvmti_mode = Rscratch,
- Roffset = R12_scratch2,
- Rflags = R6_ARG4,
- Rbtable = R7_ARG5;
-
- static address branch_table[number_of_states];
-
- address entry = __ pc();
-
- // Check for safepoint:
- // Ditch this, real man don't need safepoint checks.
-
- // Also check for JVMTI mode
- // Check for null obj, take slow path if so.
- __ ld(Rclass_or_obj, Interpreter::stackElementSize, CC_INTERP_ONLY(R17_tos) NOT_CC_INTERP(R15_esp));
- __ lwz(Rjvmti_mode, thread_(interp_only_mode));
- __ cmpdi(CCR1, Rclass_or_obj, 0);
- __ cmpwi(CCR0, Rjvmti_mode, 0);
- __ crorc(/*CCR0 eq*/2, /*CCR1 eq*/4+2, /*CCR0 eq*/2);
- __ beq(CCR0, Lslow_path); // this==null or jvmti_mode!=0
-
- // Do 2 things in parallel:
- // 1. Load the index out of the first instruction word, which looks like this:
- // <0x2a><0xb4><index (2 byte, native endianess)>.
- // 2. Load constant pool cache base.
- __ ld(Rconst_method, in_bytes(Method::const_offset()), R19_method);
- __ ld(Rcpool_cache, in_bytes(ConstMethod::constants_offset()), Rconst_method);
-
- __ lhz(Rcodes, in_bytes(ConstMethod::codes_offset()) + 2, Rconst_method); // Lower half of 32 bit field.
- __ ld(Rcpool_cache, ConstantPool::cache_offset_in_bytes(), Rcpool_cache);
-
- // Get the const pool entry by means of <index>.
- const int codes_shift = exact_log2(in_words(ConstantPoolCacheEntry::size()) * BytesPerWord);
- __ slwi(Rscratch, Rcodes, codes_shift); // (codes&0xFFFF)<<codes_shift
- __ add(Rcpool_cache, Rscratch, Rcpool_cache);
-
- // Check if cpool cache entry is resolved.
- // We are resolved if the indices offset contains the current bytecode.
- ByteSize cp_base_offset = ConstantPoolCache::base_offset();
- // Big Endian:
- __ lbz(Rscratch, in_bytes(cp_base_offset) + in_bytes(ConstantPoolCacheEntry::indices_offset()) + 7 - 2, Rcpool_cache);
- __ cmpwi(CCR0, Rscratch, Bytecodes::_getfield);
- __ bne(CCR0, Lslow_path);
- __ isync(); // Order succeeding loads wrt. load of _indices field from cpool_cache.
-
- // Finally, start loading the value: Get cp cache entry into regs.
- __ ld(Rflags, in_bytes(cp_base_offset) + in_bytes(ConstantPoolCacheEntry::flags_offset()), Rcpool_cache);
- __ ld(Roffset, in_bytes(cp_base_offset) + in_bytes(ConstantPoolCacheEntry::f2_offset()), Rcpool_cache);
-
- // Following code is from templateTable::getfield_or_static
- // Load pointer to branch table
- __ load_const_optimized(Rbtable, (address)branch_table, Rscratch);
-
- // Get volatile flag
- __ rldicl(Rscratch, Rflags, 64-ConstantPoolCacheEntry::is_volatile_shift, 63); // extract volatile bit
- // note: sync is needed before volatile load on PPC64
-
- // Check field type
- __ rldicl(Rflags, Rflags, 64-ConstantPoolCacheEntry::tos_state_shift, 64-ConstantPoolCacheEntry::tos_state_bits);
-
-#ifdef ASSERT
- Label LFlagInvalid;
- __ cmpldi(CCR0, Rflags, number_of_states);
- __ bge(CCR0, LFlagInvalid);
-
- __ ld(R9_ARG7, 0, R1_SP);
- __ ld(R10_ARG8, 0, R21_sender_SP);
- __ cmpd(CCR0, R9_ARG7, R10_ARG8);
- __ asm_assert_eq("backlink", 0x543);
-#endif // ASSERT
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
-
- // Load from branch table and dispatch (volatile case: one instruction ahead)
- __ sldi(Rflags, Rflags, LogBytesPerWord);
- __ cmpwi(CCR6, Rscratch, 1); // volatile?
- if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
- __ sldi(Rscratch, Rscratch, exact_log2(BytesPerInstWord)); // volatile ? size of 1 instruction : 0
- }
- __ ldx(Rbtable, Rbtable, Rflags);
-
- if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
- __ subf(Rbtable, Rscratch, Rbtable); // point to volatile/non-volatile entry point
- }
- __ mtctr(Rbtable);
- __ bctr();
-
-#ifdef ASSERT
- __ bind(LFlagInvalid);
- __ stop("got invalid flag", 0x6541);
-
- bool all_uninitialized = true,
- all_initialized = true;
- for (int i = 0; i<number_of_states; ++i) {
- all_uninitialized = all_uninitialized && (branch_table[i] == NULL);
- all_initialized = all_initialized && (branch_table[i] != NULL);
- }
- assert(all_uninitialized != all_initialized, "consistency"); // either or
-
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- if (branch_table[vtos] == 0) branch_table[vtos] = __ pc(); // non-volatile_entry point
- if (branch_table[dtos] == 0) branch_table[dtos] = __ pc(); // non-volatile_entry point
- if (branch_table[ftos] == 0) branch_table[ftos] = __ pc(); // non-volatile_entry point
- __ stop("unexpected type", 0x6551);
-#endif
-
- if (branch_table[itos] == 0) { // generate only once
- __ align(32, 28, 28); // align load
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- branch_table[itos] = __ pc(); // non-volatile_entry point
- __ lwax(R3_RET, Rclass_or_obj, Roffset);
- __ beq(CCR6, Lacquire);
- __ blr();
- }
-
- if (branch_table[ltos] == 0) { // generate only once
- __ align(32, 28, 28); // align load
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- branch_table[ltos] = __ pc(); // non-volatile_entry point
- __ ldx(R3_RET, Rclass_or_obj, Roffset);
- __ beq(CCR6, Lacquire);
- __ blr();
- }
-
- if (branch_table[btos] == 0) { // generate only once
- __ align(32, 28, 28); // align load
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- branch_table[btos] = __ pc(); // non-volatile_entry point
- __ lbzx(R3_RET, Rclass_or_obj, Roffset);
- __ extsb(R3_RET, R3_RET);
- __ beq(CCR6, Lacquire);
- __ blr();
- }
-
- if (branch_table[ctos] == 0) { // generate only once
- __ align(32, 28, 28); // align load
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- branch_table[ctos] = __ pc(); // non-volatile_entry point
- __ lhzx(R3_RET, Rclass_or_obj, Roffset);
- __ beq(CCR6, Lacquire);
- __ blr();
- }
-
- if (branch_table[stos] == 0) { // generate only once
- __ align(32, 28, 28); // align load
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- branch_table[stos] = __ pc(); // non-volatile_entry point
- __ lhax(R3_RET, Rclass_or_obj, Roffset);
- __ beq(CCR6, Lacquire);
- __ blr();
- }
-
- if (branch_table[atos] == 0) { // generate only once
- __ align(32, 28, 28); // align load
- __ fence(); // volatile entry point (one instruction before non-volatile_entry point)
- branch_table[atos] = __ pc(); // non-volatile_entry point
- __ load_heap_oop(R3_RET, (RegisterOrConstant)Roffset, Rclass_or_obj);
- __ verify_oop(R3_RET);
- //__ dcbt(R3_RET); // prefetch
- __ beq(CCR6, Lacquire);
- __ blr();
- }
-
- __ align(32, 12);
- __ bind(Lacquire);
- __ twi_0(R3_RET);
- __ isync(); // acquire
- __ blr();
-
-#ifdef ASSERT
- for (int i = 0; i<number_of_states; ++i) {
- assert(branch_table[i], "accessor_entry initialization");
- //tty->print_cr("accessor_entry: branch_table[%d] = 0x%llx (opcode 0x%llx)", i, branch_table[i], *((unsigned int*)branch_table[i]));
- }
-#endif
-
- __ bind(Lslow_path);
- __ branch_to_entry(Interpreter::entry_for_kind(Interpreter::zerolocals), Rscratch);
- __ flush();
-
- return entry;
-}
-
// Interpreter intrinsic for WeakReference.get().
// 1. Don't push a full blown frame and go on dispatching, but fetch the value
// into R8 and return quickly
@@ -713,7 +529,6 @@
// and so we don't need to call the G1 pre-barrier. Thus we can use the
// regular method entry code to generate the NPE.
//
- // This code is based on generate_accessor_enty.
address entry = __ pc();
@@ -768,7 +583,7 @@
return entry;
} else {
- return generate_accessor_entry();
+ return generate_jump_to_normal_entry();
}
}
diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad
index 1887035..ab2d535 100644
--- a/hotspot/src/cpu/ppc/vm/ppc.ad
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad
@@ -1283,8 +1283,6 @@
bool MachConstantBaseNode::requires_postalloc_expand() const { return true; }
void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, PhaseRegAlloc *ra_) {
- Compile *C = ra_->C;
-
iRegPdstOper *op_dst = new iRegPdstOper();
MachNode *m1 = new loadToc_hiNode();
MachNode *m2 = new loadToc_loNode();
@@ -2229,7 +2227,7 @@
}
/* TODO: PPC port
// Make a new machine dependent decode node (with its operands).
-MachTypeNode *Matcher::make_decode_node(Compile *C) {
+MachTypeNode *Matcher::make_decode_node() {
assert(Universe::narrow_oop_base() == NULL && Universe::narrow_oop_shift() == 0,
"This method is only implemented for unscaled cOops mode so far");
MachTypeNode *decode = new decodeN_unscaledNode();
@@ -2593,7 +2591,7 @@
MachNode *_last;
} loadConLNodesTuple;
-loadConLNodesTuple loadConLNodesTuple_create(Compile *C, PhaseRegAlloc *ra_, Node *toc, immLOper *immSrc,
+loadConLNodesTuple loadConLNodesTuple_create(PhaseRegAlloc *ra_, Node *toc, immLOper *immSrc,
OptoReg::Name reg_second, OptoReg::Name reg_first) {
loadConLNodesTuple nodes;
@@ -2669,7 +2667,7 @@
enc_class postalloc_expand_load_long_constant(iRegLdst dst, immL src, iRegLdst toc) %{
// Create new nodes.
loadConLNodesTuple loadConLNodes =
- loadConLNodesTuple_create(C, ra_, n_toc, op_src,
+ loadConLNodesTuple_create(ra_, n_toc, op_src,
ra_->get_reg_second(this), ra_->get_reg_first(this));
// Push new nodes.
@@ -3391,7 +3389,7 @@
immLOper *op_repl = new immLOper((jlong)replicate_immF(op_src->constantF()));
loadConLNodesTuple loadConLNodes =
- loadConLNodesTuple_create(C, ra_, n_toc, op_repl,
+ loadConLNodesTuple_create(ra_, n_toc, op_repl,
ra_->get_reg_second(this), ra_->get_reg_first(this));
// Push new nodes.
@@ -3611,7 +3609,7 @@
// Create the nodes for loading the IC from the TOC.
loadConLNodesTuple loadConLNodes_IC =
- loadConLNodesTuple_create(C, ra_, n_toc, new immLOper((jlong)Universe::non_oop_word()),
+ loadConLNodesTuple_create(ra_, n_toc, new immLOper((jlong)Universe::non_oop_word()),
OptoReg::Name(R19_H_num), OptoReg::Name(R19_num));
// Create the call node.
@@ -3765,7 +3763,7 @@
#if defined(ABI_ELFv2)
jlong entry_address = (jlong) this->entry_point();
assert(entry_address, "need address here");
- loadConLNodes_Entry = loadConLNodesTuple_create(C, ra_, n_toc, new immLOper(entry_address),
+ loadConLNodes_Entry = loadConLNodesTuple_create(ra_, n_toc, new immLOper(entry_address),
OptoReg::Name(R12_H_num), OptoReg::Name(R12_num));
#else
// Get the struct that describes the function we are about to call.
@@ -3777,13 +3775,13 @@
loadConLNodesTuple loadConLNodes_Toc;
// Create nodes and operands for loading the entry point.
- loadConLNodes_Entry = loadConLNodesTuple_create(C, ra_, n_toc, new immLOper(entry_address),
+ loadConLNodes_Entry = loadConLNodesTuple_create(ra_, n_toc, new immLOper(entry_address),
OptoReg::Name(R12_H_num), OptoReg::Name(R12_num));
// Create nodes and operands for loading the env pointer.
if (fd->env() != NULL) {
- loadConLNodes_Env = loadConLNodesTuple_create(C, ra_, n_toc, new immLOper((jlong) fd->env()),
+ loadConLNodes_Env = loadConLNodesTuple_create(ra_, n_toc, new immLOper((jlong) fd->env()),
OptoReg::Name(R11_H_num), OptoReg::Name(R11_num));
} else {
loadConLNodes_Env._large_hi = NULL;
@@ -3796,7 +3794,7 @@
}
// Create nodes and operands for loading the Toc point.
- loadConLNodes_Toc = loadConLNodesTuple_create(C, ra_, n_toc, new immLOper((jlong) fd->toc()),
+ loadConLNodes_Toc = loadConLNodesTuple_create(ra_, n_toc, new immLOper((jlong) fd->toc()),
OptoReg::Name(R2_H_num), OptoReg::Name(R2_num));
#endif // ABI_ELFv2
// mtctr node
diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp
index 051ed26..ea12f04 100644
--- a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp
@@ -30,7 +30,6 @@
address generate_normal_entry(bool synchronized);
address generate_native_entry(bool synchronized);
address generate_math_entry(AbstractInterpreter::MethodKind kind);
- address generate_empty_entry(void);
void lock_method(Register Rflags, Register Rscratch1, Register Rscratch2, bool flags_preloaded=false);
void unlock_method(bool check_exceptions = true);
diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp b/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
index b787fec..c53d73e 100644
--- a/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
@@ -176,8 +176,12 @@
const Register size = R12_scratch2;
__ get_cache_and_index_at_bcp(cache, 1, index_size);
- // Big Endian (get least significant byte of 64 bit value):
+ // Get least significant byte of 64 bit value:
+#if defined(VM_LITTLE_ENDIAN)
+ __ lbz(size, in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()), cache);
+#else
__ lbz(size, in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()) + 7, cache);
+#endif
__ sldi(size, size, Interpreter::logStackElementSize);
__ add(R15_esp, R15_esp, size);
__ dispatch_next(state, step);
@@ -598,48 +602,6 @@
// End of helpers
-// ============================================================================
-// Various method entries
-//
-
-// Empty method, generate a very fast return. We must skip this entry if
-// someone's debugging, indicated by the flag
-// "interp_mode" in the Thread obj.
-// Note: empty methods are generated mostly methods that do assertions, which are
-// disabled in the "java opt build".
-address TemplateInterpreterGenerator::generate_empty_entry(void) {
- if (!UseFastEmptyMethods) {
- NOT_PRODUCT(__ should_not_reach_here();)
- return Interpreter::entry_for_kind(Interpreter::zerolocals);
- }
-
- Label Lslow_path;
- const Register Rjvmti_mode = R11_scratch1;
- address entry = __ pc();
-
- __ lwz(Rjvmti_mode, thread_(interp_only_mode));
- __ cmpwi(CCR0, Rjvmti_mode, 0);
- __ bne(CCR0, Lslow_path); // jvmti_mode!=0
-
- // Noone's debuggin: Simply return.
- // Pop c2i arguments (if any) off when we return.
-#ifdef ASSERT
- __ ld(R9_ARG7, 0, R1_SP);
- __ ld(R10_ARG8, 0, R21_sender_SP);
- __ cmpd(CCR0, R9_ARG7, R10_ARG8);
- __ asm_assert_eq("backlink", 0x545);
-#endif // ASSERT
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
-
- // And we're done.
- __ blr();
-
- __ bind(Lslow_path);
- __ branch_to_entry(Interpreter::entry_for_kind(Interpreter::zerolocals), R11_scratch1);
- __ flush();
-
- return entry;
-}
// Support abs and sqrt like in compiler.
// For others we can use a normal (native) entry.
@@ -858,7 +820,9 @@
// Our signature handlers copy required arguments to the C stack
// (outgoing C args), R3_ARG1 to R10_ARG8, and FARG1 to FARG13.
__ mr(R3_ARG1, R18_locals);
+#if !defined(ABI_ELFv2)
__ ld(signature_handler_fd, 0, signature_handler_fd);
+#endif
__ call_stub(signature_handler_fd);
@@ -1020,8 +984,13 @@
// native result across the call. No oop is present.
__ mr(R3_ARG1, R16_thread);
+#if defined(ABI_ELFv2)
+ __ call_c(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans),
+ relocInfo::none);
+#else
__ call_c(CAST_FROM_FN_PTR(FunctionDescriptor*, JavaThread::check_special_condition_for_native_trans),
relocInfo::none);
+#endif
__ bind(sync_check_done);
@@ -1278,45 +1247,6 @@
return entry;
}
-// =============================================================================
-// Entry points
-
-address AbstractInterpreterGenerator::generate_method_entry(
- AbstractInterpreter::MethodKind kind) {
- // Determine code generation flags.
- bool synchronized = false;
- address entry_point = NULL;
-
- switch (kind) {
- case Interpreter::zerolocals : break;
- case Interpreter::zerolocals_synchronized: synchronized = true; break;
- case Interpreter::native : entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false); break;
- case Interpreter::native_synchronized : entry_point = ((InterpreterGenerator*) this)->generate_native_entry(true); break;
- case Interpreter::empty : entry_point = ((InterpreterGenerator*) this)->generate_empty_entry(); break;
- case Interpreter::accessor : entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry(); break;
- case Interpreter::abstract : entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry(); break;
-
- case Interpreter::java_lang_math_sin : // fall thru
- case Interpreter::java_lang_math_cos : // fall thru
- case Interpreter::java_lang_math_tan : // fall thru
- case Interpreter::java_lang_math_abs : // fall thru
- case Interpreter::java_lang_math_log : // fall thru
- case Interpreter::java_lang_math_log10 : // fall thru
- case Interpreter::java_lang_math_sqrt : // fall thru
- case Interpreter::java_lang_math_pow : // fall thru
- case Interpreter::java_lang_math_exp : entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind); break;
- case Interpreter::java_lang_ref_reference_get
- : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
- default : ShouldNotReachHere(); break;
- }
-
- if (entry_point) {
- return entry_point;
- }
-
- return ((InterpreterGenerator*) this)->generate_normal_entry(synchronized);
-}
-
// These should never be compiled since the interpreter will prefer
// the compiled version to the intrinsic version.
bool AbstractInterpreter::can_be_compiled(methodHandle m) {
@@ -1344,7 +1274,7 @@
int callee_locals,
bool is_top_frame) {
// Note: This calculation must exactly parallel the frame setup
- // in AbstractInterpreterGenerator::generate_method_entry.
+ // in InterpreterGenerator::generate_fixed_frame.
assert(Interpreter::stackElementWords == 1, "sanity");
const int max_alignment_space = StackAlignmentInBytes / Interpreter::stackElementSize;
const int abi_scratch = is_top_frame ? (frame::abi_reg_args_size / Interpreter::stackElementSize) :
diff --git a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
index 0b375da5..6a34053 100644
--- a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
+++ b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
@@ -189,8 +189,12 @@
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
assert(load_bc_into_bc_reg, "we use bc_reg as temp");
__ get_cache_and_index_at_bcp(Rtemp /* dst = cache */, 1);
- // Big Endian: ((*(cache+indices))>>((1+byte_no)*8))&0xFF
+ // ((*(cache+indices))>>((1+byte_no)*8))&0xFF:
+#if defined(VM_LITTLE_ENDIAN)
+ __ lbz(Rnew_bc, in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()) + 1 + byte_no, Rtemp);
+#else
__ lbz(Rnew_bc, in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()) + 7 - (1 + byte_no), Rtemp);
+#endif
__ cmpwi(CCR0, Rnew_bc, 0);
__ li(Rnew_bc, (unsigned int)(unsigned char)new_bc);
__ beq(CCR0, L_patch_done);
@@ -1839,8 +1843,8 @@
__ clrrdi(Rdef_offset_addr, Rdef_offset_addr, log2_long((jlong)BytesPerInt));
// Load lo & hi.
- __ lwz(Rlow_byte, BytesPerInt, Rdef_offset_addr);
- __ lwz(Rhigh_byte, BytesPerInt * 2, Rdef_offset_addr);
+ __ get_u4(Rlow_byte, Rdef_offset_addr, BytesPerInt, InterpreterMacroAssembler::Unsigned);
+ __ get_u4(Rhigh_byte, Rdef_offset_addr, 2 *BytesPerInt, InterpreterMacroAssembler::Unsigned);
// Check for default case (=index outside [low,high]).
__ cmpw(CCR0, R17_tos, Rlow_byte);
@@ -1854,12 +1858,17 @@
__ profile_switch_case(Rindex, Rhigh_byte /* scratch */, Rscratch1, Rscratch2);
__ sldi(Rindex, Rindex, LogBytesPerInt);
__ addi(Rindex, Rindex, 3 * BytesPerInt);
+#if defined(VM_LITTLE_ENDIAN)
+ __ lwbrx(Roffset, Rdef_offset_addr, Rindex);
+ __ extsw(Roffset, Roffset);
+#else
__ lwax(Roffset, Rdef_offset_addr, Rindex);
+#endif
__ b(Ldispatch);
__ bind(Ldefault_case);
__ profile_switch_default(Rhigh_byte, Rscratch1);
- __ lwa(Roffset, 0, Rdef_offset_addr);
+ __ get_u4(Roffset, Rdef_offset_addr, 0, InterpreterMacroAssembler::Signed);
__ bind(Ldispatch);
@@ -1875,12 +1884,11 @@
// Table switch using linear search through cases.
// Bytecode stream format:
// Bytecode (1) | 4-byte padding | default offset (4) | count (4) | value/offset pair1 (8) | value/offset pair2 (8) | ...
-// Note: Everything is big-endian format here. So on little endian machines, we have to revers offset and count and cmp value.
+// Note: Everything is big-endian format here.
void TemplateTable::fast_linearswitch() {
transition(itos, vtos);
- Label Lloop_entry, Lsearch_loop, Lfound, Lcontinue_execution, Ldefault_case;
-
+ Label Lloop_entry, Lsearch_loop, Lcontinue_execution, Ldefault_case;
Register Rcount = R3_ARG1,
Rcurrent_pair = R4_ARG2,
Rdef_offset_addr = R5_ARG3, // Is going to contain address of default offset.
@@ -1894,47 +1902,40 @@
__ clrrdi(Rdef_offset_addr, Rdef_offset_addr, log2_long((jlong)BytesPerInt));
// Setup loop counter and limit.
- __ lwz(Rcount, BytesPerInt, Rdef_offset_addr); // Load count.
+ __ get_u4(Rcount, Rdef_offset_addr, BytesPerInt, InterpreterMacroAssembler::Unsigned);
__ addi(Rcurrent_pair, Rdef_offset_addr, 2 * BytesPerInt); // Rcurrent_pair now points to first pair.
- // Set up search loop.
- __ cmpwi(CCR0, Rcount, 0);
- __ beq(CCR0, Ldefault_case);
-
__ mtctr(Rcount);
+ __ cmpwi(CCR0, Rcount, 0);
+ __ bne(CCR0, Lloop_entry);
- // linear table search
- __ bind(Lsearch_loop);
-
- __ lwz(Rvalue, 0, Rcurrent_pair);
- __ lwa(Roffset, 1 * BytesPerInt, Rcurrent_pair);
-
- __ cmpw(CCR0, Rvalue, Rcmp_value);
- __ beq(CCR0, Lfound);
-
- __ addi(Rcurrent_pair, Rcurrent_pair, 2 * BytesPerInt);
- __ bdnz(Lsearch_loop);
-
- // default case
+ // Default case
__ bind(Ldefault_case);
-
- __ lwa(Roffset, 0, Rdef_offset_addr);
+ __ get_u4(Roffset, Rdef_offset_addr, 0, InterpreterMacroAssembler::Signed);
if (ProfileInterpreter) {
__ profile_switch_default(Rdef_offset_addr, Rcount/* scratch */);
- __ b(Lcontinue_execution);
+ }
+ __ b(Lcontinue_execution);
+
+ // Next iteration
+ __ bind(Lsearch_loop);
+ __ bdz(Ldefault_case);
+ __ addi(Rcurrent_pair, Rcurrent_pair, 2 * BytesPerInt);
+ __ bind(Lloop_entry);
+ __ get_u4(Rvalue, Rcurrent_pair, 0, InterpreterMacroAssembler::Unsigned);
+ __ cmpw(CCR0, Rvalue, Rcmp_value);
+ __ bne(CCR0, Lsearch_loop);
+
+ // Found, load offset.
+ __ get_u4(Roffset, Rcurrent_pair, BytesPerInt, InterpreterMacroAssembler::Signed);
+ // Calculate case index and profile
+ __ mfctr(Rcurrent_pair);
+ if (ProfileInterpreter) {
+ __ sub(Rcurrent_pair, Rcount, Rcurrent_pair);
+ __ profile_switch_case(Rcurrent_pair, Rcount /*scratch*/, Rdef_offset_addr/*scratch*/, Rscratch);
}
- // Entry found, skip Roffset bytecodes and continue.
- __ bind(Lfound);
- if (ProfileInterpreter) {
- // Calc the num of the pair we hit. Careful, Rcurrent_pair points 2 ints
- // beyond the actual current pair due to the auto update load above!
- __ sub(Rcurrent_pair, Rcurrent_pair, Rdef_offset_addr);
- __ addi(Rcurrent_pair, Rcurrent_pair, - 2 * BytesPerInt);
- __ srdi(Rcurrent_pair, Rcurrent_pair, LogBytesPerInt + 1);
- __ profile_switch_case(Rcurrent_pair, Rcount /*scratch*/, Rdef_offset_addr/*scratch*/, Rscratch);
- __ bind(Lcontinue_execution);
- }
+ __ bind(Lcontinue_execution);
__ add(R14_bcp, Roffset, R14_bcp);
__ dispatch_next(vtos);
}
@@ -1990,7 +1991,7 @@
// initialize i & j
__ li(Ri,0);
- __ lwz(Rj, -BytesPerInt, Rarray);
+ __ get_u4(Rj, Rarray, -BytesPerInt, InterpreterMacroAssembler::Unsigned);
// and start.
Label entry;
@@ -2007,7 +2008,11 @@
// i = h;
// }
__ sldi(Rscratch, Rh, log_entry_size);
+#if defined(VM_LITTLE_ENDIAN)
+ __ lwbrx(Rscratch, Rscratch, Rarray);
+#else
__ lwzx(Rscratch, Rscratch, Rarray);
+#endif
// if (key < current value)
// Rh = Rj
@@ -2039,20 +2044,20 @@
// Ri = value offset
__ sldi(Ri, Ri, log_entry_size);
__ add(Ri, Ri, Rarray);
- __ lwz(Rscratch, 0, Ri);
+ __ get_u4(Rscratch, Ri, 0, InterpreterMacroAssembler::Unsigned);
Label not_found;
// Ri = offset offset
__ cmpw(CCR0, Rkey, Rscratch);
__ beq(CCR0, not_found);
// entry not found -> j = default offset
- __ lwz(Rj, -2 * BytesPerInt, Rarray);
+ __ get_u4(Rj, Rarray, -2 * BytesPerInt, InterpreterMacroAssembler::Unsigned);
__ b(default_case);
__ bind(not_found);
// entry found -> j = offset
__ profile_switch_case(Rh, Rj, Rscratch, Rkey);
- __ lwz(Rj, BytesPerInt, Ri);
+ __ get_u4(Rj, Ri, BytesPerInt, InterpreterMacroAssembler::Unsigned);
if (ProfileInterpreter) {
__ b(continue_execution);
@@ -2147,8 +2152,11 @@
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
// We are resolved if the indices offset contains the current bytecode.
- // Big Endian:
+#if defined(VM_LITTLE_ENDIAN)
+ __ lbz(Rscratch, in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()) + byte_no + 1, Rcache);
+#else
__ lbz(Rscratch, in_bytes(ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()) + 7 - (byte_no + 1), Rcache);
+#endif
// Acquire by cmp-br-isync (see below).
__ cmpdi(CCR0, Rscratch, (int)bytecode());
__ beq(CCR0, Lresolved);
diff --git a/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp b/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
index 75047c7..0e66115 100644
--- a/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
@@ -29,6 +29,7 @@
#include "compiler/disassembler.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/java.hpp"
+#include "runtime/os.hpp"
#include "runtime/stubCodeGenerator.hpp"
#include "utilities/defaultStream.hpp"
#include "vm_version_ppc.hpp"
@@ -108,7 +109,7 @@
(has_vand() ? " vand" : "")
// Make sure number of %s matches num_features!
);
- _features_str = strdup(buf);
+ _features_str = os::strdup(buf);
NOT_PRODUCT(if (Verbose) print_features(););
// PPC64 supports 8-byte compare-exchange operations (see
diff --git a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
index e532521..4a84b6c 100644
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterGenerator.hpp"
#include "interpreter/interpreterRuntime.hpp"
+#include "interpreter/interp_masm.hpp"
#include "oops/arrayOop.hpp"
#include "oops/methodData.hpp"
#include "oops/method.hpp"
@@ -68,9 +69,7 @@
#define STATE(field_name) Lstate, in_bytes(byte_offset_of(BytecodeInterpreter, field_name))
#define __ _masm->
-Label frame_manager_entry;
-Label fast_accessor_slow_entry_path; // fast accessor methods need to be able to jmp to unsynchronized
- // c++ interpreter entry point this holds that entry point label.
+Label frame_manager_entry; // c++ interpreter entry point this holds that entry point label.
static address unctrap_frame_manager_entry = NULL;
@@ -452,110 +451,6 @@
return NULL;
}
-// Call an accessor method (assuming it is resolved, otherwise drop into
-// vanilla (slow path) entry
-
-// Generates code to elide accessor methods
-// Uses G3_scratch and G1_scratch as scratch
-address InterpreterGenerator::generate_accessor_entry(void) {
-
- // Code: _aload_0, _(i|a)getfield, _(i|a)return or any rewrites thereof;
- // parameter size = 1
- // Note: We can only use this code if the getfield has been resolved
- // and if we don't have a null-pointer exception => check for
- // these conditions first and use slow path if necessary.
- address entry = __ pc();
- Label slow_path;
-
- if ( UseFastAccessorMethods) {
- // Check if we need to reach a safepoint and generate full interpreter
- // frame if so.
- AddressLiteral sync_state(SafepointSynchronize::address_of_state());
- __ load_contents(sync_state, G3_scratch);
- __ cmp(G3_scratch, SafepointSynchronize::_not_synchronized);
- __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
- __ delayed()->nop();
-
- // Check if local 0 != NULL
- __ ld_ptr(Gargs, G0, Otos_i ); // get local 0
- __ tst(Otos_i); // check if local 0 == NULL and go the slow path
- __ brx(Assembler::zero, false, Assembler::pn, slow_path);
- __ delayed()->nop();
-
-
- // read first instruction word and extract bytecode @ 1 and index @ 2
- // get first 4 bytes of the bytecodes (big endian!)
- __ ld_ptr(Address(G5_method, in_bytes(Method::const_offset())), G1_scratch);
- __ ld(Address(G1_scratch, in_bytes(ConstMethod::codes_offset())), G1_scratch);
-
- // move index @ 2 far left then to the right most two bytes.
- __ sll(G1_scratch, 2*BitsPerByte, G1_scratch);
- __ srl(G1_scratch, 2*BitsPerByte - exact_log2(in_words(
- ConstantPoolCacheEntry::size()) * BytesPerWord), G1_scratch);
-
- // get constant pool cache
- __ ld_ptr(G5_method, in_bytes(Method::const_offset()), G3_scratch);
- __ ld_ptr(G3_scratch, in_bytes(ConstMethod::constants_offset()), G3_scratch);
- __ ld_ptr(G3_scratch, ConstantPool::cache_offset_in_bytes(), G3_scratch);
-
- // get specific constant pool cache entry
- __ add(G3_scratch, G1_scratch, G3_scratch);
-
- // Check the constant Pool cache entry to see if it has been resolved.
- // If not, need the slow path.
- ByteSize cp_base_offset = ConstantPoolCache::base_offset();
- __ ld_ptr(G3_scratch, in_bytes(cp_base_offset + ConstantPoolCacheEntry::indices_offset()), G1_scratch);
- __ srl(G1_scratch, 2*BitsPerByte, G1_scratch);
- __ and3(G1_scratch, 0xFF, G1_scratch);
- __ cmp(G1_scratch, Bytecodes::_getfield);
- __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
- __ delayed()->nop();
-
- // Get the type and return field offset from the constant pool cache
- __ ld_ptr(G3_scratch, in_bytes(cp_base_offset + ConstantPoolCacheEntry::flags_offset()), G1_scratch);
- __ ld_ptr(G3_scratch, in_bytes(cp_base_offset + ConstantPoolCacheEntry::f2_offset()), G3_scratch);
-
- Label xreturn_path;
- // Need to differentiate between igetfield, agetfield, bgetfield etc.
- // because they are different sizes.
- // Get the type from the constant pool cache
- __ srl(G1_scratch, ConstantPoolCacheEntry::tos_state_shift, G1_scratch);
- // Make sure we don't need to mask G1_scratch after the above shift
- ConstantPoolCacheEntry::verify_tos_state_shift();
- __ cmp(G1_scratch, atos );
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ld_ptr(Otos_i, G3_scratch, Otos_i);
- __ cmp(G1_scratch, itos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ld(Otos_i, G3_scratch, Otos_i);
- __ cmp(G1_scratch, stos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ldsh(Otos_i, G3_scratch, Otos_i);
- __ cmp(G1_scratch, ctos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->lduh(Otos_i, G3_scratch, Otos_i);
-#ifdef ASSERT
- __ cmp(G1_scratch, btos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ldsb(Otos_i, G3_scratch, Otos_i);
- __ should_not_reach_here();
-#endif
- __ ldsb(Otos_i, G3_scratch, Otos_i);
- __ bind(xreturn_path);
-
- // _ireturn/_areturn
- __ retl(); // return from leaf routine
- __ delayed()->mov(O5_savedSP, SP);
-
- // Generate regular method entry
- __ bind(slow_path);
- __ ba(fast_accessor_slow_entry_path);
- __ delayed()->nop();
- return entry;
- }
- return NULL;
-}
-
address InterpreterGenerator::generate_Reference_get_entry(void) {
#if INCLUDE_ALL_GCS
if (UseG1GC) {
@@ -573,7 +468,7 @@
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
- return generate_accessor_entry();
+ return generate_jump_to_normal_entry();
}
//
@@ -1870,23 +1765,6 @@
__ ba(call_interpreter_2);
__ delayed()->st_ptr(O1, STATE(_stack));
-
- // Fast accessor methods share this entry point.
- // This works because frame manager is in the same codelet
- // This can either be an entry via call_stub/c1/c2 or a recursive interpreter call
- // we need to do a little register fixup here once we distinguish the two of them
- if (UseFastAccessorMethods && !synchronized) {
- // Call stub_return address still in O7
- __ bind(fast_accessor_slow_entry_path);
- __ set((intptr_t)return_from_native_method - 8, Gtmp1);
- __ cmp(Gtmp1, O7); // returning to interpreter?
- __ brx(Assembler::equal, true, Assembler::pt, re_dispatch); // yep
- __ delayed()->nop();
- __ ba(re_dispatch);
- __ delayed()->mov(G0, prevState); // initial entry
-
- }
-
// interpreter returning to native code (call_stub/c1/c2)
// convert result and unwind initial activation
// L2_scratch - scaled result type index
diff --git a/hotspot/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp b/hotspot/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp
index 0558b7b..de4997b 100644
--- a/hotspot/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,11 @@
address generate_normal_entry(bool synchronized);
address generate_native_entry(bool synchronized);
address generate_abstract_entry(void);
- address generate_math_entry(AbstractInterpreter::MethodKind kind);
- address generate_empty_entry(void);
- address generate_accessor_entry(void);
+ // there are no math intrinsics on sparc
+ address generate_math_entry(AbstractInterpreter::MethodKind kind) { return NULL; }
+ address generate_jump_to_normal_entry(void);
+ address generate_accessor_entry(void) { return generate_jump_to_normal_entry(); }
+ address generate_empty_entry(void) { return generate_jump_to_normal_entry(); }
address generate_Reference_get_entry(void);
void lock_method(void);
void save_native_result(void);
@@ -43,4 +45,7 @@
void generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue);
void generate_counter_overflow(Label& Lcontinue);
+ // Not supported
+ address generate_CRC32_update_entry() { return NULL; }
+ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) { return NULL; }
#endif // CPU_SPARC_VM_INTERPRETERGENERATOR_SPARC_HPP
diff --git a/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp
index debdaea..f8d8f59 100644
--- a/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp
@@ -241,6 +241,15 @@
// Various method entries
+address InterpreterGenerator::generate_jump_to_normal_entry(void) {
+ address entry = __ pc();
+ assert(Interpreter::entry_for_kind(Interpreter::zerolocals) != NULL, "should already be generated");
+ AddressLiteral al(Interpreter::entry_for_kind(Interpreter::zerolocals));
+ __ jump_to(al, G3_scratch);
+ __ delayed()->nop();
+ return entry;
+}
+
// Abstract method entry
// Attempt to execute abstract method. Throw exception
//
@@ -255,159 +264,6 @@
}
-
-//----------------------------------------------------------------------------------------------------
-// Entry points & stack frame layout
-//
-// Here we generate the various kind of entries into the interpreter.
-// The two main entry type are generic bytecode methods and native call method.
-// These both come in synchronized and non-synchronized versions but the
-// frame layout they create is very similar. The other method entry
-// types are really just special purpose entries that are really entry
-// and interpretation all in one. These are for trivial methods like
-// accessor, empty, or special math methods.
-//
-// When control flow reaches any of the entry types for the interpreter
-// the following holds ->
-//
-// C2 Calling Conventions:
-//
-// The entry code below assumes that the following registers are set
-// when coming in:
-// G5_method: holds the Method* of the method to call
-// Lesp: points to the TOS of the callers expression stack
-// after having pushed all the parameters
-//
-// The entry code does the following to setup an interpreter frame
-// pop parameters from the callers stack by adjusting Lesp
-// set O0 to Lesp
-// compute X = (max_locals - num_parameters)
-// bump SP up by X to accomadate the extra locals
-// compute X = max_expression_stack
-// + vm_local_words
-// + 16 words of register save area
-// save frame doing a save sp, -X, sp growing towards lower addresses
-// set Lbcp, Lmethod, LcpoolCache
-// set Llocals to i0
-// set Lmonitors to FP - rounded_vm_local_words
-// set Lesp to Lmonitors - 4
-//
-// The frame has now been setup to do the rest of the entry code
-
-// Try this optimization: Most method entries could live in a
-// "one size fits all" stack frame without all the dynamic size
-// calculations. It might be profitable to do all this calculation
-// statically and approximately for "small enough" methods.
-
-//-----------------------------------------------------------------------------------------------
-
-// C1 Calling conventions
-//
-// Upon method entry, the following registers are setup:
-//
-// g2 G2_thread: current thread
-// g5 G5_method: method to activate
-// g4 Gargs : pointer to last argument
-//
-//
-// Stack:
-//
-// +---------------+ <--- sp
-// | |
-// : reg save area :
-// | |
-// +---------------+ <--- sp + 0x40
-// | |
-// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
-// | |
-// +---------------+ <--- sp + 0x5c
-// | |
-// : free :
-// | |
-// +---------------+ <--- Gargs
-// | |
-// : arguments :
-// | |
-// +---------------+
-// | |
-//
-//
-//
-// AFTER FRAME HAS BEEN SETUP for method interpretation the stack looks like:
-//
-// +---------------+ <--- sp
-// | |
-// : reg save area :
-// | |
-// +---------------+ <--- sp + 0x40
-// | |
-// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
-// | |
-// +---------------+ <--- sp + 0x5c
-// | |
-// : :
-// | | <--- Lesp
-// +---------------+ <--- Lmonitors (fp - 0x18)
-// | VM locals |
-// +---------------+ <--- fp
-// | |
-// : reg save area :
-// | |
-// +---------------+ <--- fp + 0x40
-// | |
-// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
-// | |
-// +---------------+ <--- fp + 0x5c
-// | |
-// : free :
-// | |
-// +---------------+
-// | |
-// : nonarg locals :
-// | |
-// +---------------+
-// | |
-// : arguments :
-// | | <--- Llocals
-// +---------------+ <--- Gargs
-// | |
-
-address AbstractInterpreterGenerator::generate_method_entry(AbstractInterpreter::MethodKind kind) {
- // determine code generation flags
- bool synchronized = false;
- address entry_point = NULL;
-
- switch (kind) {
- case Interpreter::zerolocals : break;
- case Interpreter::zerolocals_synchronized: synchronized = true; break;
- case Interpreter::native : entry_point = ((InterpreterGenerator*)this)->generate_native_entry(false); break;
- case Interpreter::native_synchronized : entry_point = ((InterpreterGenerator*)this)->generate_native_entry(true); break;
- case Interpreter::empty : entry_point = ((InterpreterGenerator*)this)->generate_empty_entry(); break;
- case Interpreter::accessor : entry_point = ((InterpreterGenerator*)this)->generate_accessor_entry(); break;
- case Interpreter::abstract : entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); break;
-
- case Interpreter::java_lang_math_sin : break;
- case Interpreter::java_lang_math_cos : break;
- case Interpreter::java_lang_math_tan : break;
- case Interpreter::java_lang_math_sqrt : break;
- case Interpreter::java_lang_math_abs : break;
- case Interpreter::java_lang_math_log : break;
- case Interpreter::java_lang_math_log10 : break;
- case Interpreter::java_lang_math_pow : break;
- case Interpreter::java_lang_math_exp : break;
- case Interpreter::java_lang_ref_reference_get
- : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
- default:
- fatal(err_msg("unexpected method kind: %d", kind));
- break;
- }
-
- if (entry_point) return entry_point;
-
- return ((InterpreterGenerator*)this)->generate_normal_entry(synchronized);
-}
-
-
bool AbstractInterpreter::can_be_compiled(methodHandle m) {
// No special entry points that preclude compilation
return true;
diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad
index c261900..99ec878 100644
--- a/hotspot/src/cpu/sparc/vm/sparc.ad
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad
@@ -6184,7 +6184,11 @@
ins_cost(DEFAULT_COST * 3/2);
format %{ "SET $con,$dst\t! non-oop ptr" %}
ins_encode %{
- __ set($con$$constant, $dst$$Register);
+ if (_opnds[1]->constant_reloc() == relocInfo::metadata_type) {
+ __ set_metadata_constant((Metadata*)$con$$constant, $dst$$Register);
+ } else {
+ __ set($con$$constant, $dst$$Register);
+ }
%}
ins_pipe(loadConP);
%}
diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
index 1f85031..93f8780 100644
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
@@ -456,6 +456,115 @@
// Generate a fixed interpreter frame. This is identical setup for interpreted
// methods and for native methods hence the shared code.
+
+//----------------------------------------------------------------------------------------------------
+// Stack frame layout
+//
+// When control flow reaches any of the entry types for the interpreter
+// the following holds ->
+//
+// C2 Calling Conventions:
+//
+// The entry code below assumes that the following registers are set
+// when coming in:
+// G5_method: holds the Method* of the method to call
+// Lesp: points to the TOS of the callers expression stack
+// after having pushed all the parameters
+//
+// The entry code does the following to setup an interpreter frame
+// pop parameters from the callers stack by adjusting Lesp
+// set O0 to Lesp
+// compute X = (max_locals - num_parameters)
+// bump SP up by X to accomadate the extra locals
+// compute X = max_expression_stack
+// + vm_local_words
+// + 16 words of register save area
+// save frame doing a save sp, -X, sp growing towards lower addresses
+// set Lbcp, Lmethod, LcpoolCache
+// set Llocals to i0
+// set Lmonitors to FP - rounded_vm_local_words
+// set Lesp to Lmonitors - 4
+//
+// The frame has now been setup to do the rest of the entry code
+
+// Try this optimization: Most method entries could live in a
+// "one size fits all" stack frame without all the dynamic size
+// calculations. It might be profitable to do all this calculation
+// statically and approximately for "small enough" methods.
+
+//-----------------------------------------------------------------------------------------------
+
+// C1 Calling conventions
+//
+// Upon method entry, the following registers are setup:
+//
+// g2 G2_thread: current thread
+// g5 G5_method: method to activate
+// g4 Gargs : pointer to last argument
+//
+//
+// Stack:
+//
+// +---------------+ <--- sp
+// | |
+// : reg save area :
+// | |
+// +---------------+ <--- sp + 0x40
+// | |
+// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
+// | |
+// +---------------+ <--- sp + 0x5c
+// | |
+// : free :
+// | |
+// +---------------+ <--- Gargs
+// | |
+// : arguments :
+// | |
+// +---------------+
+// | |
+//
+//
+//
+// AFTER FRAME HAS BEEN SETUP for method interpretation the stack looks like:
+//
+// +---------------+ <--- sp
+// | |
+// : reg save area :
+// | |
+// +---------------+ <--- sp + 0x40
+// | |
+// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
+// | |
+// +---------------+ <--- sp + 0x5c
+// | |
+// : :
+// | | <--- Lesp
+// +---------------+ <--- Lmonitors (fp - 0x18)
+// | VM locals |
+// +---------------+ <--- fp
+// | |
+// : reg save area :
+// | |
+// +---------------+ <--- fp + 0x40
+// | |
+// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
+// | |
+// +---------------+ <--- fp + 0x5c
+// | |
+// : free :
+// | |
+// +---------------+
+// | |
+// : nonarg locals :
+// | |
+// +---------------+
+// | |
+// : arguments :
+// | | <--- Llocals
+// +---------------+ <--- Gargs
+// | |
+
void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
//
//
@@ -599,136 +708,6 @@
}
-// Empty method, generate a very fast return.
-
-address InterpreterGenerator::generate_empty_entry(void) {
-
- // A method that does nother but return...
-
- address entry = __ pc();
- Label slow_path;
-
- // do nothing for empty methods (do not even increment invocation counter)
- if ( UseFastEmptyMethods) {
- // If we need a safepoint check, generate full interpreter entry.
- AddressLiteral sync_state(SafepointSynchronize::address_of_state());
- __ set(sync_state, G3_scratch);
- __ cmp_and_br_short(G3_scratch, SafepointSynchronize::_not_synchronized, Assembler::notEqual, Assembler::pn, slow_path);
-
- // Code: _return
- __ retl();
- __ delayed()->mov(O5_savedSP, SP);
-
- __ bind(slow_path);
- (void) generate_normal_entry(false);
-
- return entry;
- }
- return NULL;
-}
-
-// Call an accessor method (assuming it is resolved, otherwise drop into
-// vanilla (slow path) entry
-
-// Generates code to elide accessor methods
-// Uses G3_scratch and G1_scratch as scratch
-address InterpreterGenerator::generate_accessor_entry(void) {
-
- // Code: _aload_0, _(i|a)getfield, _(i|a)return or any rewrites thereof;
- // parameter size = 1
- // Note: We can only use this code if the getfield has been resolved
- // and if we don't have a null-pointer exception => check for
- // these conditions first and use slow path if necessary.
- address entry = __ pc();
- Label slow_path;
-
-
- // XXX: for compressed oops pointer loading and decoding doesn't fit in
- // delay slot and damages G1
- if ( UseFastAccessorMethods && !UseCompressedOops ) {
- // Check if we need to reach a safepoint and generate full interpreter
- // frame if so.
- AddressLiteral sync_state(SafepointSynchronize::address_of_state());
- __ load_contents(sync_state, G3_scratch);
- __ cmp(G3_scratch, SafepointSynchronize::_not_synchronized);
- __ cmp_and_br_short(G3_scratch, SafepointSynchronize::_not_synchronized, Assembler::notEqual, Assembler::pn, slow_path);
-
- // Check if local 0 != NULL
- __ ld_ptr(Gargs, G0, Otos_i ); // get local 0
- // check if local 0 == NULL and go the slow path
- __ br_null_short(Otos_i, Assembler::pn, slow_path);
-
-
- // read first instruction word and extract bytecode @ 1 and index @ 2
- // get first 4 bytes of the bytecodes (big endian!)
- __ ld_ptr(G5_method, Method::const_offset(), G1_scratch);
- __ ld(G1_scratch, ConstMethod::codes_offset(), G1_scratch);
-
- // move index @ 2 far left then to the right most two bytes.
- __ sll(G1_scratch, 2*BitsPerByte, G1_scratch);
- __ srl(G1_scratch, 2*BitsPerByte - exact_log2(in_words(
- ConstantPoolCacheEntry::size()) * BytesPerWord), G1_scratch);
-
- // get constant pool cache
- __ ld_ptr(G5_method, Method::const_offset(), G3_scratch);
- __ ld_ptr(G3_scratch, ConstMethod::constants_offset(), G3_scratch);
- __ ld_ptr(G3_scratch, ConstantPool::cache_offset_in_bytes(), G3_scratch);
-
- // get specific constant pool cache entry
- __ add(G3_scratch, G1_scratch, G3_scratch);
-
- // Check the constant Pool cache entry to see if it has been resolved.
- // If not, need the slow path.
- ByteSize cp_base_offset = ConstantPoolCache::base_offset();
- __ ld_ptr(G3_scratch, cp_base_offset + ConstantPoolCacheEntry::indices_offset(), G1_scratch);
- __ srl(G1_scratch, 2*BitsPerByte, G1_scratch);
- __ and3(G1_scratch, 0xFF, G1_scratch);
- __ cmp_and_br_short(G1_scratch, Bytecodes::_getfield, Assembler::notEqual, Assembler::pn, slow_path);
-
- // Get the type and return field offset from the constant pool cache
- __ ld_ptr(G3_scratch, cp_base_offset + ConstantPoolCacheEntry::flags_offset(), G1_scratch);
- __ ld_ptr(G3_scratch, cp_base_offset + ConstantPoolCacheEntry::f2_offset(), G3_scratch);
-
- Label xreturn_path;
- // Need to differentiate between igetfield, agetfield, bgetfield etc.
- // because they are different sizes.
- // Get the type from the constant pool cache
- __ srl(G1_scratch, ConstantPoolCacheEntry::tos_state_shift, G1_scratch);
- // Make sure we don't need to mask G1_scratch after the above shift
- ConstantPoolCacheEntry::verify_tos_state_shift();
- __ cmp(G1_scratch, atos );
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ld_ptr(Otos_i, G3_scratch, Otos_i);
- __ cmp(G1_scratch, itos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ld(Otos_i, G3_scratch, Otos_i);
- __ cmp(G1_scratch, stos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ldsh(Otos_i, G3_scratch, Otos_i);
- __ cmp(G1_scratch, ctos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->lduh(Otos_i, G3_scratch, Otos_i);
-#ifdef ASSERT
- __ cmp(G1_scratch, btos);
- __ br(Assembler::equal, true, Assembler::pt, xreturn_path);
- __ delayed()->ldsb(Otos_i, G3_scratch, Otos_i);
- __ should_not_reach_here();
-#endif
- __ ldsb(Otos_i, G3_scratch, Otos_i);
- __ bind(xreturn_path);
-
- // _ireturn/_areturn
- __ retl(); // return from leaf routine
- __ delayed()->mov(O5_savedSP, SP);
-
- // Generate regular method entry
- __ bind(slow_path);
- (void) generate_normal_entry(false);
- return entry;
- }
- return NULL;
-}
-
// Method entry for java.lang.ref.Reference.get.
address InterpreterGenerator::generate_Reference_get_entry(void) {
#if INCLUDE_ALL_GCS
@@ -806,7 +785,7 @@
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
- return generate_accessor_entry();
+ return generate_jump_to_normal_entry();
}
//
@@ -1242,8 +1221,6 @@
// Generic method entry to (asm) interpreter
-//------------------------------------------------------------------------------------------------------------------------
-//
address InterpreterGenerator::generate_normal_entry(bool synchronized) {
address entry = __ pc();
@@ -1410,123 +1387,6 @@
return entry;
}
-
-//----------------------------------------------------------------------------------------------------
-// Entry points & stack frame layout
-//
-// Here we generate the various kind of entries into the interpreter.
-// The two main entry type are generic bytecode methods and native call method.
-// These both come in synchronized and non-synchronized versions but the
-// frame layout they create is very similar. The other method entry
-// types are really just special purpose entries that are really entry
-// and interpretation all in one. These are for trivial methods like
-// accessor, empty, or special math methods.
-//
-// When control flow reaches any of the entry types for the interpreter
-// the following holds ->
-//
-// C2 Calling Conventions:
-//
-// The entry code below assumes that the following registers are set
-// when coming in:
-// G5_method: holds the Method* of the method to call
-// Lesp: points to the TOS of the callers expression stack
-// after having pushed all the parameters
-//
-// The entry code does the following to setup an interpreter frame
-// pop parameters from the callers stack by adjusting Lesp
-// set O0 to Lesp
-// compute X = (max_locals - num_parameters)
-// bump SP up by X to accomadate the extra locals
-// compute X = max_expression_stack
-// + vm_local_words
-// + 16 words of register save area
-// save frame doing a save sp, -X, sp growing towards lower addresses
-// set Lbcp, Lmethod, LcpoolCache
-// set Llocals to i0
-// set Lmonitors to FP - rounded_vm_local_words
-// set Lesp to Lmonitors - 4
-//
-// The frame has now been setup to do the rest of the entry code
-
-// Try this optimization: Most method entries could live in a
-// "one size fits all" stack frame without all the dynamic size
-// calculations. It might be profitable to do all this calculation
-// statically and approximately for "small enough" methods.
-
-//-----------------------------------------------------------------------------------------------
-
-// C1 Calling conventions
-//
-// Upon method entry, the following registers are setup:
-//
-// g2 G2_thread: current thread
-// g5 G5_method: method to activate
-// g4 Gargs : pointer to last argument
-//
-//
-// Stack:
-//
-// +---------------+ <--- sp
-// | |
-// : reg save area :
-// | |
-// +---------------+ <--- sp + 0x40
-// | |
-// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
-// | |
-// +---------------+ <--- sp + 0x5c
-// | |
-// : free :
-// | |
-// +---------------+ <--- Gargs
-// | |
-// : arguments :
-// | |
-// +---------------+
-// | |
-//
-//
-//
-// AFTER FRAME HAS BEEN SETUP for method interpretation the stack looks like:
-//
-// +---------------+ <--- sp
-// | |
-// : reg save area :
-// | |
-// +---------------+ <--- sp + 0x40
-// | |
-// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
-// | |
-// +---------------+ <--- sp + 0x5c
-// | |
-// : :
-// | | <--- Lesp
-// +---------------+ <--- Lmonitors (fp - 0x18)
-// | VM locals |
-// +---------------+ <--- fp
-// | |
-// : reg save area :
-// | |
-// +---------------+ <--- fp + 0x40
-// | |
-// : extra 7 slots : note: these slots are not really needed for the interpreter (fix later)
-// | |
-// +---------------+ <--- fp + 0x5c
-// | |
-// : free :
-// | |
-// +---------------+
-// | |
-// : nonarg locals :
-// | |
-// +---------------+
-// | |
-// : arguments :
-// | | <--- Llocals
-// +---------------+ <--- Gargs
-// | |
-
static int size_activation_helper(int callee_extra_locals, int max_stack, int monitor_size) {
// Figure out the size of an interpreter frame (in words) given that we have a fully allocated
diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
index 79bf713..91a9f76 100644
--- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
@@ -26,6 +26,7 @@
#include "asm/macroAssembler.inline.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/java.hpp"
+#include "runtime/os.hpp"
#include "runtime/stubCodeGenerator.hpp"
#include "vm_version_sparc.hpp"
@@ -249,7 +250,7 @@
(!has_hardware_fsmuld() ? ", no-fsmuld" : ""));
// buf is started with ", " or is empty
- _features_str = strdup(strlen(buf) > 2 ? buf + 2 : buf);
+ _features_str = os::strdup(strlen(buf) > 2 ? buf + 2 : buf);
// There are three 64-bit SPARC families that do not overlap, e.g.,
// both is_ultra3() and is_sparc64() cannot be true at the same time.
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
index 64b8ce7..3421927 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
@@ -3854,6 +3854,15 @@
}
// Carry-Less Multiplication Quadword
+void Assembler::pclmulqdq(XMMRegister dst, XMMRegister src, int mask) {
+ assert(VM_Version::supports_clmul(), "");
+ int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_3A);
+ emit_int8(0x44);
+ emit_int8((unsigned char)(0xC0 | encode));
+ emit_int8((unsigned char)mask);
+}
+
+// Carry-Less Multiplication Quadword
void Assembler::vpclmulqdq(XMMRegister dst, XMMRegister nds, XMMRegister src, int mask) {
assert(VM_Version::supports_avx() && VM_Version::supports_clmul(), "");
bool vector256 = false;
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
index 12bc14e..8edf31c 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
@@ -1837,6 +1837,7 @@
void vpbroadcastd(XMMRegister dst, XMMRegister src);
// Carry-Less Multiplication Quadword
+ void pclmulqdq(XMMRegister dst, XMMRegister src, int mask);
void vpclmulqdq(XMMRegister dst, XMMRegister nds, XMMRegister src, int mask);
// AVX instruction which is used to clear upper 128 bits of YMM registers and
diff --git a/hotspot/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp b/hotspot/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp
index 2f9f1d4..9f81215 100644
--- a/hotspot/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,21 +27,6 @@
protected:
-#if 0
- address generate_asm_interpreter_entry(bool synchronized);
- address generate_native_entry(bool synchronized);
- address generate_abstract_entry(void);
- address generate_math_entry(AbstractInterpreter::MethodKind kind);
- address generate_empty_entry(void);
- address generate_accessor_entry(void);
- address generate_Reference_get_entry(void);
- void lock_method(void);
- void generate_stack_overflow_check(void);
-
- void generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue);
- void generate_counter_overflow(Label* do_continue);
-#endif
-
void generate_more_monitors();
void generate_deopt_handling();
address generate_interpreter_frame_manager(bool synchronized); // C++ interpreter only
diff --git a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
index 9eb1a6e..27f1b30 100644
--- a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,9 +66,6 @@
#define __ _masm->
#define STATE(field_name) (Address(state, byte_offset_of(BytecodeInterpreter, field_name)))
-Label fast_accessor_slow_entry_path; // fast accessor methods need to be able to jmp to unsynchronized
- // c++ interpreter entry point this holds that entry point label.
-
// default registers for state and sender_sp
// state and sender_sp are the same on 32bit because we have no choice.
// state could be rsi on 64bit but it is an arg reg and not callee save
@@ -660,7 +657,6 @@
// generate_method_entry) so the guard should work for them too.
//
- // monitor entry size: see picture of stack set (generate_method_entry) and frame_i486.hpp
const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
// total overhead size: entry_size + (saved rbp, thru expr stack bottom).
@@ -794,156 +790,6 @@
__ lock_object(monitor);
}
-// Call an accessor method (assuming it is resolved, otherwise drop into vanilla (slow path) entry
-
-address InterpreterGenerator::generate_accessor_entry(void) {
-
- // rbx: Method*
-
- // rsi/r13: senderSP must preserved for slow path, set SP to it on fast path
-
- Label xreturn_path;
-
- // do fastpath for resolved accessor methods
- if (UseFastAccessorMethods) {
-
- address entry_point = __ pc();
-
- Label slow_path;
- // If we need a safepoint check, generate full interpreter entry.
- ExternalAddress state(SafepointSynchronize::address_of_state());
- __ cmp32(ExternalAddress(SafepointSynchronize::address_of_state()),
- SafepointSynchronize::_not_synchronized);
-
- __ jcc(Assembler::notEqual, slow_path);
- // ASM/C++ Interpreter
- // Code: _aload_0, _(i|a)getfield, _(i|a)return or any rewrites thereof; parameter size = 1
- // Note: We can only use this code if the getfield has been resolved
- // and if we don't have a null-pointer exception => check for
- // these conditions first and use slow path if necessary.
- // rbx,: method
- // rcx: receiver
- __ movptr(rax, Address(rsp, wordSize));
-
- // check if local 0 != NULL and read field
- __ testptr(rax, rax);
- __ jcc(Assembler::zero, slow_path);
-
- // read first instruction word and extract bytecode @ 1 and index @ 2
- __ movptr(rdx, Address(rbx, Method::const_offset()));
- __ movptr(rdi, Address(rdx, ConstMethod::constants_offset()));
- __ movl(rdx, Address(rdx, ConstMethod::codes_offset()));
- // Shift codes right to get the index on the right.
- // The bytecode fetched looks like <index><0xb4><0x2a>
- __ shrl(rdx, 2*BitsPerByte);
- __ shll(rdx, exact_log2(in_words(ConstantPoolCacheEntry::size())));
- __ movptr(rdi, Address(rdi, ConstantPool::cache_offset_in_bytes()));
-
- // rax,: local 0
- // rbx,: method
- // rcx: receiver - do not destroy since it is needed for slow path!
- // rcx: scratch
- // rdx: constant pool cache index
- // rdi: constant pool cache
- // rsi/r13: sender sp
-
- // check if getfield has been resolved and read constant pool cache entry
- // check the validity of the cache entry by testing whether _indices field
- // contains Bytecode::_getfield in b1 byte.
- assert(in_words(ConstantPoolCacheEntry::size()) == 4, "adjust shift below");
- __ movl(rcx,
- Address(rdi,
- rdx,
- Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()));
- __ shrl(rcx, 2*BitsPerByte);
- __ andl(rcx, 0xFF);
- __ cmpl(rcx, Bytecodes::_getfield);
- __ jcc(Assembler::notEqual, slow_path);
-
- // Note: constant pool entry is not valid before bytecode is resolved
- __ movptr(rcx,
- Address(rdi,
- rdx,
- Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::f2_offset()));
- __ movl(rdx,
- Address(rdi,
- rdx,
- Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()));
-
- Label notByte, notShort, notChar;
- const Address field_address (rax, rcx, Address::times_1);
-
- // Need to differentiate between igetfield, agetfield, bgetfield etc.
- // because they are different sizes.
- // Use the type from the constant pool cache
- __ shrl(rdx, ConstantPoolCacheEntry::tos_state_shift);
- // Make sure we don't need to mask rdx after the above shift
- ConstantPoolCacheEntry::verify_tos_state_shift();
-#ifdef _LP64
- Label notObj;
- __ cmpl(rdx, atos);
- __ jcc(Assembler::notEqual, notObj);
- // atos
- __ movptr(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notObj);
-#endif // _LP64
- __ cmpl(rdx, btos);
- __ jcc(Assembler::notEqual, notByte);
- __ load_signed_byte(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notByte);
- __ cmpl(rdx, stos);
- __ jcc(Assembler::notEqual, notShort);
- __ load_signed_short(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notShort);
- __ cmpl(rdx, ctos);
- __ jcc(Assembler::notEqual, notChar);
- __ load_unsigned_short(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notChar);
-#ifdef ASSERT
- Label okay;
-#ifndef _LP64
- __ cmpl(rdx, atos);
- __ jcc(Assembler::equal, okay);
-#endif // _LP64
- __ cmpl(rdx, itos);
- __ jcc(Assembler::equal, okay);
- __ stop("what type is this?");
- __ bind(okay);
-#endif // ASSERT
- // All the rest are a 32 bit wordsize
- __ movl(rax, field_address);
-
- __ bind(xreturn_path);
-
- // _ireturn/_areturn
- __ pop(rdi); // get return address
- __ mov(rsp, sender_sp_on_entry); // set sp to sender sp
- __ jmp(rdi);
-
- // generate a vanilla interpreter entry as the slow path
- __ bind(slow_path);
- // We will enter c++ interpreter looking like it was
- // called by the call_stub this will cause it to return
- // a tosca result to the invoker which might have been
- // the c++ interpreter itself.
-
- __ jmp(fast_accessor_slow_entry_path);
- return entry_point;
-
- } else {
- return NULL;
- }
-
-}
-
address InterpreterGenerator::generate_Reference_get_entry(void) {
#if INCLUDE_ALL_GCS
if (UseG1GC) {
@@ -961,7 +807,7 @@
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
- return generate_accessor_entry();
+ return generate_jump_to_normal_entry();
}
//
@@ -1670,10 +1516,6 @@
address entry_point = __ pc();
- // Fast accessor methods share this entry point.
- // This works because frame manager is in the same codelet
- if (UseFastAccessorMethods && !synchronized) __ bind(fast_accessor_slow_entry_path);
-
Label dispatch_entry_2;
__ movptr(rcx, sender_sp_on_entry);
__ movptr(state, (int32_t)NULL_WORD); // no current activation
@@ -2212,40 +2054,6 @@
return entry_point;
}
-address AbstractInterpreterGenerator::generate_method_entry(AbstractInterpreter::MethodKind kind) {
- // determine code generation flags
- bool synchronized = false;
- address entry_point = NULL;
-
- switch (kind) {
- case Interpreter::zerolocals : break;
- case Interpreter::zerolocals_synchronized: synchronized = true; break;
- case Interpreter::native : entry_point = ((InterpreterGenerator*)this)->generate_native_entry(false); break;
- case Interpreter::native_synchronized : entry_point = ((InterpreterGenerator*)this)->generate_native_entry(true); break;
- case Interpreter::empty : entry_point = ((InterpreterGenerator*)this)->generate_empty_entry(); break;
- case Interpreter::accessor : entry_point = ((InterpreterGenerator*)this)->generate_accessor_entry(); break;
- case Interpreter::abstract : entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); break;
-
- case Interpreter::java_lang_math_sin : // fall thru
- case Interpreter::java_lang_math_cos : // fall thru
- case Interpreter::java_lang_math_tan : // fall thru
- case Interpreter::java_lang_math_abs : // fall thru
- case Interpreter::java_lang_math_log : // fall thru
- case Interpreter::java_lang_math_log10 : // fall thru
- case Interpreter::java_lang_math_sqrt : // fall thru
- case Interpreter::java_lang_math_pow : // fall thru
- case Interpreter::java_lang_math_exp : // fall thru
- entry_point = ((InterpreterGenerator*)this)->generate_math_entry(kind); break;
- case Interpreter::java_lang_ref_reference_get
- : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
- default : ShouldNotReachHere(); break;
- }
-
- if (entry_point) return entry_point;
-
- return ((InterpreterGenerator*)this)->generate_normal_entry(synchronized);
-
-}
InterpreterGenerator::InterpreterGenerator(StubQueue* code)
: CppInterpreterGenerator(code) {
diff --git a/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.cpp
new file mode 100644
index 0000000..229803a
--- /dev/null
+++ b/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterGenerator.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "interpreter/interp_masm.hpp"
+
+#define __ _masm->
+
+// Jump into normal path for accessor and empty entry to jump to normal entry
+// The "fast" optimization don't update compilation count therefore can disable inlining
+// for these functions that should be inlined.
+address InterpreterGenerator::generate_jump_to_normal_entry(void) {
+ address entry_point = __ pc();
+
+ assert(Interpreter::entry_for_kind(Interpreter::zerolocals) != NULL, "should already be generated");
+ __ jump(RuntimeAddress(Interpreter::entry_for_kind(Interpreter::zerolocals)));
+ return entry_point;
+}
+
+// Abstract method entry
+// Attempt to execute abstract method. Throw exception
+address InterpreterGenerator::generate_abstract_entry(void) {
+
+ address entry_point = __ pc();
+
+ // abstract method entry
+
+#ifndef CC_INTERP
+ // pop return address, reset last_sp to NULL
+ __ empty_expression_stack();
+ __ restore_bcp(); // rsi must be correct for exception handler (was destroyed)
+ __ restore_locals(); // make sure locals pointer is correct as well (was destroyed)
+#endif
+
+ // throw exception
+ __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError));
+ // the call_VM checks for exception, so we should never return here.
+ __ should_not_reach_here();
+
+ return entry_point;
+}
diff --git a/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.hpp b/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.hpp
index 08f4770..b802e9c 100644
--- a/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/interpreterGenerator_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,9 @@
address generate_native_entry(bool synchronized);
address generate_abstract_entry(void);
address generate_math_entry(AbstractInterpreter::MethodKind kind);
- address generate_empty_entry(void);
- address generate_accessor_entry(void);
+ address generate_jump_to_normal_entry(void);
+ address generate_accessor_entry(void) { return generate_jump_to_normal_entry(); }
+ address generate_empty_entry(void) { return generate_jump_to_normal_entry(); }
address generate_Reference_get_entry();
address generate_CRC32_update_entry();
address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind);
diff --git a/hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp
index abe3543..4a2903b 100644
--- a/hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp
@@ -67,45 +67,6 @@
}
-//
-// Various method entries (that c++ and asm interpreter agree upon)
-//------------------------------------------------------------------------------------------------------------------------
-//
-//
-
-// Empty method, generate a very fast return.
-
-address InterpreterGenerator::generate_empty_entry(void) {
-
- // rbx,: Method*
- // rcx: receiver (unused)
- // rsi: previous interpreter state (C++ interpreter) must preserve
- // rsi: sender sp must set sp to this value on return
-
- if (!UseFastEmptyMethods) return NULL;
-
- address entry_point = __ pc();
-
- // If we need a safepoint check, generate full interpreter entry.
- Label slow_path;
- ExternalAddress state(SafepointSynchronize::address_of_state());
- __ cmp32(ExternalAddress(SafepointSynchronize::address_of_state()),
- SafepointSynchronize::_not_synchronized);
- __ jcc(Assembler::notEqual, slow_path);
-
- // do nothing for empty methods (do not even increment invocation counter)
- // Code: _return
- // _return
- // return w/o popping parameters
- __ pop(rax);
- __ mov(rsp, rsi);
- __ jmp(rax);
-
- __ bind(slow_path);
- (void) generate_normal_entry(false);
- return entry_point;
-}
-
address InterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
// rbx,: Method*
@@ -216,36 +177,6 @@
}
-// Abstract method entry
-// Attempt to execute abstract method. Throw exception
-address InterpreterGenerator::generate_abstract_entry(void) {
-
- // rbx,: Method*
- // rcx: receiver (unused)
- // rsi: previous interpreter state (C++ interpreter) must preserve
-
- // rsi: sender SP
-
- address entry_point = __ pc();
-
- // abstract method entry
-
-#ifndef CC_INTERP
- // pop return address, reset last_sp to NULL
- __ empty_expression_stack();
- __ restore_bcp(); // rsi must be correct for exception handler (was destroyed)
- __ restore_locals(); // make sure locals pointer is correct as well (was destroyed)
-#endif
-
- // throw exception
- __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError));
- // the call_VM checks for exception, so we should never return here.
- __ should_not_reach_here();
-
- return entry_point;
-}
-
-
void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_array) {
// This code is sort of the equivalent of C2IAdapter::setup_stack_frame back in
diff --git a/hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp
index 65ffc6d..af4f7fa 100644
--- a/hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp
@@ -301,66 +301,6 @@
return entry_point;
}
-
-// Abstract method entry
-// Attempt to execute abstract method. Throw exception
-address InterpreterGenerator::generate_abstract_entry(void) {
- // rbx: Method*
- // r13: sender SP
-
- address entry_point = __ pc();
-
- // abstract method entry
-
-#ifndef CC_INTERP
- // pop return address, reset last_sp to NULL
- __ empty_expression_stack();
- __ restore_bcp(); // rsi must be correct for exception handler (was destroyed)
- __ restore_locals(); // make sure locals pointer is correct as well (was destroyed)
-#endif
-
- // throw exception
- __ call_VM(noreg, CAST_FROM_FN_PTR(address,
- InterpreterRuntime::throw_AbstractMethodError));
- // the call_VM checks for exception, so we should never return here.
- __ should_not_reach_here();
-
- return entry_point;
-}
-
-
-// Empty method, generate a very fast return.
-
-address InterpreterGenerator::generate_empty_entry(void) {
- // rbx: Method*
- // r13: sender sp must set sp to this value on return
-
- if (!UseFastEmptyMethods) {
- return NULL;
- }
-
- address entry_point = __ pc();
-
- // If we need a safepoint check, generate full interpreter entry.
- Label slow_path;
- __ cmp32(ExternalAddress(SafepointSynchronize::address_of_state()),
- SafepointSynchronize::_not_synchronized);
- __ jcc(Assembler::notEqual, slow_path);
-
- // do nothing for empty methods (do not even increment invocation counter)
- // Code: _return
- // _return
- // return w/o popping parameters
- __ pop(rax);
- __ mov(rsp, r13);
- __ jmp(rax);
-
- __ bind(slow_path);
- (void) generate_normal_entry(false);
- return entry_point;
-
-}
-
void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_array) {
// This code is sort of the equivalent of C2IAdapter::setup_stack_frame back in
diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
index 5b32412..7216c19 100644
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
@@ -7316,17 +7316,34 @@
* Fold 128-bit data chunk
*/
void MacroAssembler::fold_128bit_crc32(XMMRegister xcrc, XMMRegister xK, XMMRegister xtmp, Register buf, int offset) {
- vpclmulhdq(xtmp, xK, xcrc); // [123:64]
- vpclmulldq(xcrc, xK, xcrc); // [63:0]
- vpxor(xcrc, xcrc, Address(buf, offset), false /* vector256 */);
- pxor(xcrc, xtmp);
+ if (UseAVX > 0) {
+ vpclmulhdq(xtmp, xK, xcrc); // [123:64]
+ vpclmulldq(xcrc, xK, xcrc); // [63:0]
+ vpxor(xcrc, xcrc, Address(buf, offset), false /* vector256 */);
+ pxor(xcrc, xtmp);
+ } else {
+ movdqa(xtmp, xcrc);
+ pclmulhdq(xtmp, xK); // [123:64]
+ pclmulldq(xcrc, xK); // [63:0]
+ pxor(xcrc, xtmp);
+ movdqu(xtmp, Address(buf, offset));
+ pxor(xcrc, xtmp);
+ }
}
void MacroAssembler::fold_128bit_crc32(XMMRegister xcrc, XMMRegister xK, XMMRegister xtmp, XMMRegister xbuf) {
- vpclmulhdq(xtmp, xK, xcrc);
- vpclmulldq(xcrc, xK, xcrc);
- pxor(xcrc, xbuf);
- pxor(xcrc, xtmp);
+ if (UseAVX > 0) {
+ vpclmulhdq(xtmp, xK, xcrc);
+ vpclmulldq(xcrc, xK, xcrc);
+ pxor(xcrc, xbuf);
+ pxor(xcrc, xtmp);
+ } else {
+ movdqa(xtmp, xcrc);
+ pclmulhdq(xtmp, xK);
+ pclmulldq(xcrc, xK);
+ pxor(xcrc, xbuf);
+ pxor(xcrc, xtmp);
+ }
}
/**
@@ -7444,9 +7461,17 @@
// Fold 128 bits in xmm1 down into 32 bits in crc register.
BIND(L_fold_128b);
movdqu(xmm0, ExternalAddress(StubRoutines::x86::crc_by128_masks_addr()));
- vpclmulqdq(xmm2, xmm0, xmm1, 0x1);
- vpand(xmm3, xmm0, xmm2, false /* vector256 */);
- vpclmulqdq(xmm0, xmm0, xmm3, 0x1);
+ if (UseAVX > 0) {
+ vpclmulqdq(xmm2, xmm0, xmm1, 0x1);
+ vpand(xmm3, xmm0, xmm2, false /* vector256 */);
+ vpclmulqdq(xmm0, xmm0, xmm3, 0x1);
+ } else {
+ movdqa(xmm2, xmm0);
+ pclmulqdq(xmm2, xmm1, 0x1);
+ movdqa(xmm3, xmm0);
+ pand(xmm3, xmm2);
+ pclmulqdq(xmm0, xmm3, 0x1);
+ }
psrldq(xmm1, 8);
psrldq(xmm2, 4);
pxor(xmm0, xmm1);
diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
index 3d88026..3b3073e 100644
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
@@ -966,6 +966,16 @@
void mulss(XMMRegister dst, Address src) { Assembler::mulss(dst, src); }
void mulss(XMMRegister dst, AddressLiteral src);
+ // Carry-Less Multiplication Quadword
+ void pclmulldq(XMMRegister dst, XMMRegister src) {
+ // 0x00 - multiply lower 64 bits [0:63]
+ Assembler::pclmulqdq(dst, src, 0x00);
+ }
+ void pclmulhdq(XMMRegister dst, XMMRegister src) {
+ // 0x11 - multiply upper 64 bits [64:127]
+ Assembler::pclmulqdq(dst, src, 0x11);
+ }
+
void sqrtsd(XMMRegister dst, XMMRegister src) { Assembler::sqrtsd(dst, src); }
void sqrtsd(XMMRegister dst, Address src) { Assembler::sqrtsd(dst, src); }
void sqrtsd(XMMRegister dst, AddressLiteral src);
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86.cpp
index 23dcbee..7a12d82 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86.cpp
@@ -38,7 +38,7 @@
int callee_locals,
bool is_top_frame) {
// Note: This calculation must exactly parallel the frame setup
- // in AbstractInterpreterGenerator::generate_method_entry.
+ // in InterpreterGenerator::generate_fixed_frame.
// fixed size of an interpreter frame:
int overhead = frame::sender_sp_offset -
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
index e705dfb..93772f3 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
@@ -468,10 +468,10 @@
// rax,
// NOTE: since the additional locals are also always pushed (wasn't obvious in
- // generate_method_entry) so the guard should work for them too.
+ // generate_fixed_frame) so the guard should work for them too.
//
- // monitor entry size: see picture of stack set (generate_method_entry) and frame_x86.hpp
+ // monitor entry size: see picture of stack in frame_x86.hpp
const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
// total overhead size: entry_size + (saved rbp, thru expr stack bottom).
@@ -633,145 +633,6 @@
__ movptr(Address(rsp, 0), rsp); // set expression stack bottom
}
-// End of helpers
-
-//
-// Various method entries
-//------------------------------------------------------------------------------------------------------------------------
-//
-//
-
-// Call an accessor method (assuming it is resolved, otherwise drop into vanilla (slow path) entry
-
-address InterpreterGenerator::generate_accessor_entry(void) {
-
- // rbx,: Method*
- // rcx: receiver (preserve for slow entry into asm interpreter)
-
- // rsi: senderSP must preserved for slow path, set SP to it on fast path
-
- address entry_point = __ pc();
- Label xreturn_path;
-
- // do fastpath for resolved accessor methods
- if (UseFastAccessorMethods) {
- Label slow_path;
- // If we need a safepoint check, generate full interpreter entry.
- ExternalAddress state(SafepointSynchronize::address_of_state());
- __ cmp32(ExternalAddress(SafepointSynchronize::address_of_state()),
- SafepointSynchronize::_not_synchronized);
-
- __ jcc(Assembler::notEqual, slow_path);
- // ASM/C++ Interpreter
- // Code: _aload_0, _(i|a)getfield, _(i|a)return or any rewrites thereof; parameter size = 1
- // Note: We can only use this code if the getfield has been resolved
- // and if we don't have a null-pointer exception => check for
- // these conditions first and use slow path if necessary.
- // rbx,: method
- // rcx: receiver
- __ movptr(rax, Address(rsp, wordSize));
-
- // check if local 0 != NULL and read field
- __ testptr(rax, rax);
- __ jcc(Assembler::zero, slow_path);
-
- // read first instruction word and extract bytecode @ 1 and index @ 2
- __ movptr(rdx, Address(rbx, Method::const_offset()));
- __ movptr(rdi, Address(rdx, ConstMethod::constants_offset()));
- __ movl(rdx, Address(rdx, ConstMethod::codes_offset()));
- // Shift codes right to get the index on the right.
- // The bytecode fetched looks like <index><0xb4><0x2a>
- __ shrl(rdx, 2*BitsPerByte);
- __ shll(rdx, exact_log2(in_words(ConstantPoolCacheEntry::size())));
- __ movptr(rdi, Address(rdi, ConstantPool::cache_offset_in_bytes()));
-
- // rax,: local 0
- // rbx,: method
- // rcx: receiver - do not destroy since it is needed for slow path!
- // rcx: scratch
- // rdx: constant pool cache index
- // rdi: constant pool cache
- // rsi: sender sp
-
- // check if getfield has been resolved and read constant pool cache entry
- // check the validity of the cache entry by testing whether _indices field
- // contains Bytecode::_getfield in b1 byte.
- assert(in_words(ConstantPoolCacheEntry::size()) == 4, "adjust shift below");
- __ movl(rcx,
- Address(rdi,
- rdx,
- Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()));
- __ shrl(rcx, 2*BitsPerByte);
- __ andl(rcx, 0xFF);
- __ cmpl(rcx, Bytecodes::_getfield);
- __ jcc(Assembler::notEqual, slow_path);
-
- // Note: constant pool entry is not valid before bytecode is resolved
- __ movptr(rcx,
- Address(rdi,
- rdx,
- Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::f2_offset()));
- __ movl(rdx,
- Address(rdi,
- rdx,
- Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()));
-
- Label notByte, notShort, notChar;
- const Address field_address (rax, rcx, Address::times_1);
-
- // Need to differentiate between igetfield, agetfield, bgetfield etc.
- // because they are different sizes.
- // Use the type from the constant pool cache
- __ shrl(rdx, ConstantPoolCacheEntry::tos_state_shift);
- // Make sure we don't need to mask rdx after the above shift
- ConstantPoolCacheEntry::verify_tos_state_shift();
- __ cmpl(rdx, btos);
- __ jcc(Assembler::notEqual, notByte);
- __ load_signed_byte(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notByte);
- __ cmpl(rdx, stos);
- __ jcc(Assembler::notEqual, notShort);
- __ load_signed_short(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notShort);
- __ cmpl(rdx, ctos);
- __ jcc(Assembler::notEqual, notChar);
- __ load_unsigned_short(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notChar);
-#ifdef ASSERT
- Label okay;
- __ cmpl(rdx, atos);
- __ jcc(Assembler::equal, okay);
- __ cmpl(rdx, itos);
- __ jcc(Assembler::equal, okay);
- __ stop("what type is this?");
- __ bind(okay);
-#endif // ASSERT
- // All the rest are a 32 bit wordsize
- // This is ok for now. Since fast accessors should be going away
- __ movptr(rax, field_address);
-
- __ bind(xreturn_path);
-
- // _ireturn/_areturn
- __ pop(rdi); // get return address
- __ mov(rsp, rsi); // set sp to sender sp
- __ jmp(rdi);
-
- // generate a vanilla interpreter entry as the slow path
- __ bind(slow_path);
-
- (void) generate_normal_entry(false);
- return entry_point;
- }
- return NULL;
-
-}
// Method entry for java.lang.ref.Reference.get.
address InterpreterGenerator::generate_Reference_get_entry(void) {
@@ -862,7 +723,7 @@
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
- return generate_accessor_entry();
+ return generate_jump_to_normal_entry();
}
/**
@@ -1557,100 +1418,6 @@
return entry_point;
}
-//------------------------------------------------------------------------------------------------------------------------
-// Entry points
-//
-// Here we generate the various kind of entries into the interpreter.
-// The two main entry type are generic bytecode methods and native call method.
-// These both come in synchronized and non-synchronized versions but the
-// frame layout they create is very similar. The other method entry
-// types are really just special purpose entries that are really entry
-// and interpretation all in one. These are for trivial methods like
-// accessor, empty, or special math methods.
-//
-// When control flow reaches any of the entry types for the interpreter
-// the following holds ->
-//
-// Arguments:
-//
-// rbx,: Method*
-// rcx: receiver
-//
-//
-// Stack layout immediately at entry
-//
-// [ return address ] <--- rsp
-// [ parameter n ]
-// ...
-// [ parameter 1 ]
-// [ expression stack ] (caller's java expression stack)
-
-// Assuming that we don't go to one of the trivial specialized
-// entries the stack will look like below when we are ready to execute
-// the first bytecode (or call the native routine). The register usage
-// will be as the template based interpreter expects (see interpreter_x86.hpp).
-//
-// local variables follow incoming parameters immediately; i.e.
-// the return address is moved to the end of the locals).
-//
-// [ monitor entry ] <--- rsp
-// ...
-// [ monitor entry ]
-// [ expr. stack bottom ]
-// [ saved rsi ]
-// [ current rdi ]
-// [ Method* ]
-// [ saved rbp, ] <--- rbp,
-// [ return address ]
-// [ local variable m ]
-// ...
-// [ local variable 1 ]
-// [ parameter n ]
-// ...
-// [ parameter 1 ] <--- rdi
-
-address AbstractInterpreterGenerator::generate_method_entry(AbstractInterpreter::MethodKind kind) {
- // determine code generation flags
- bool synchronized = false;
- address entry_point = NULL;
- InterpreterGenerator* ig_this = (InterpreterGenerator*)this;
-
- switch (kind) {
- case Interpreter::zerolocals : break;
- case Interpreter::zerolocals_synchronized: synchronized = true; break;
- case Interpreter::native : entry_point = ig_this->generate_native_entry(false); break;
- case Interpreter::native_synchronized : entry_point = ig_this->generate_native_entry(true); break;
- case Interpreter::empty : entry_point = ig_this->generate_empty_entry(); break;
- case Interpreter::accessor : entry_point = ig_this->generate_accessor_entry(); break;
- case Interpreter::abstract : entry_point = ig_this->generate_abstract_entry(); break;
-
- case Interpreter::java_lang_math_sin : // fall thru
- case Interpreter::java_lang_math_cos : // fall thru
- case Interpreter::java_lang_math_tan : // fall thru
- case Interpreter::java_lang_math_abs : // fall thru
- case Interpreter::java_lang_math_log : // fall thru
- case Interpreter::java_lang_math_log10 : // fall thru
- case Interpreter::java_lang_math_sqrt : // fall thru
- case Interpreter::java_lang_math_pow : // fall thru
- case Interpreter::java_lang_math_exp : entry_point = ig_this->generate_math_entry(kind); break;
- case Interpreter::java_lang_ref_reference_get
- : entry_point = ig_this->generate_Reference_get_entry(); break;
- case Interpreter::java_util_zip_CRC32_update
- : entry_point = ig_this->generate_CRC32_update_entry(); break;
- case Interpreter::java_util_zip_CRC32_updateBytes
- : // fall thru
- case Interpreter::java_util_zip_CRC32_updateByteBuffer
- : entry_point = ig_this->generate_CRC32_updateBytes_entry(kind); break;
- default:
- fatal(err_msg("unexpected method kind: %d", kind));
- break;
- }
-
- if (entry_point) return entry_point;
-
- return ig_this->generate_normal_entry(synchronized);
-
-}
// These should never be compiled since the interpreter will prefer
// the compiled version to the intrinsic version.
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
index 9c81d67..f3390c9 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
@@ -400,7 +400,7 @@
// page mechanism will work for that.
//
// NOTE: Since the additional locals are also always pushed (wasn't
-// obvious in generate_method_entry) so the guard should work for them
+// obvious in generate_fixed_frame) so the guard should work for them
// too.
//
// Args:
@@ -411,8 +411,7 @@
// rax
void InterpreterGenerator::generate_stack_overflow_check(void) {
- // monitor entry size: see picture of stack set
- // (generate_method_entry) and frame_amd64.hpp
+ // monitor entry size: see picture of stack in frame_x86.hpp
const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
// total overhead size: entry_size + (saved rbp through expr stack
@@ -600,153 +599,6 @@
// End of helpers
-// Various method entries
-//------------------------------------------------------------------------------------------------------------------------
-//
-//
-
-// Call an accessor method (assuming it is resolved, otherwise drop
-// into vanilla (slow path) entry
-address InterpreterGenerator::generate_accessor_entry(void) {
- // rbx: Method*
-
- // r13: senderSP must preserver for slow path, set SP to it on fast path
-
- address entry_point = __ pc();
- Label xreturn_path;
-
- // do fastpath for resolved accessor methods
- if (UseFastAccessorMethods) {
- // Code: _aload_0, _(i|a)getfield, _(i|a)return or any rewrites
- // thereof; parameter size = 1
- // Note: We can only use this code if the getfield has been resolved
- // and if we don't have a null-pointer exception => check for
- // these conditions first and use slow path if necessary.
- Label slow_path;
- // If we need a safepoint check, generate full interpreter entry.
- __ cmp32(ExternalAddress(SafepointSynchronize::address_of_state()),
- SafepointSynchronize::_not_synchronized);
-
- __ jcc(Assembler::notEqual, slow_path);
- // rbx: method
- __ movptr(rax, Address(rsp, wordSize));
-
- // check if local 0 != NULL and read field
- __ testptr(rax, rax);
- __ jcc(Assembler::zero, slow_path);
-
- // read first instruction word and extract bytecode @ 1 and index @ 2
- __ movptr(rdx, Address(rbx, Method::const_offset()));
- __ movptr(rdi, Address(rdx, ConstMethod::constants_offset()));
- __ movl(rdx, Address(rdx, ConstMethod::codes_offset()));
- // Shift codes right to get the index on the right.
- // The bytecode fetched looks like <index><0xb4><0x2a>
- __ shrl(rdx, 2 * BitsPerByte);
- __ shll(rdx, exact_log2(in_words(ConstantPoolCacheEntry::size())));
- __ movptr(rdi, Address(rdi, ConstantPool::cache_offset_in_bytes()));
-
- // rax: local 0
- // rbx: method
- // rdx: constant pool cache index
- // rdi: constant pool cache
-
- // check if getfield has been resolved and read constant pool cache entry
- // check the validity of the cache entry by testing whether _indices field
- // contains Bytecode::_getfield in b1 byte.
- assert(in_words(ConstantPoolCacheEntry::size()) == 4,
- "adjust shift below");
- __ movl(rcx,
- Address(rdi,
- rdx,
- Address::times_8,
- ConstantPoolCache::base_offset() +
- ConstantPoolCacheEntry::indices_offset()));
- __ shrl(rcx, 2 * BitsPerByte);
- __ andl(rcx, 0xFF);
- __ cmpl(rcx, Bytecodes::_getfield);
- __ jcc(Assembler::notEqual, slow_path);
-
- // Note: constant pool entry is not valid before bytecode is resolved
- __ movptr(rcx,
- Address(rdi,
- rdx,
- Address::times_8,
- ConstantPoolCache::base_offset() +
- ConstantPoolCacheEntry::f2_offset()));
- // edx: flags
- __ movl(rdx,
- Address(rdi,
- rdx,
- Address::times_8,
- ConstantPoolCache::base_offset() +
- ConstantPoolCacheEntry::flags_offset()));
-
- Label notObj, notInt, notByte, notShort;
- const Address field_address(rax, rcx, Address::times_1);
-
- // Need to differentiate between igetfield, agetfield, bgetfield etc.
- // because they are different sizes.
- // Use the type from the constant pool cache
- __ shrl(rdx, ConstantPoolCacheEntry::tos_state_shift);
- // Make sure we don't need to mask edx after the above shift
- ConstantPoolCacheEntry::verify_tos_state_shift();
-
- __ cmpl(rdx, atos);
- __ jcc(Assembler::notEqual, notObj);
- // atos
- __ load_heap_oop(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notObj);
- __ cmpl(rdx, itos);
- __ jcc(Assembler::notEqual, notInt);
- // itos
- __ movl(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notInt);
- __ cmpl(rdx, btos);
- __ jcc(Assembler::notEqual, notByte);
- // btos
- __ load_signed_byte(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notByte);
- __ cmpl(rdx, stos);
- __ jcc(Assembler::notEqual, notShort);
- // stos
- __ load_signed_short(rax, field_address);
- __ jmp(xreturn_path);
-
- __ bind(notShort);
-#ifdef ASSERT
- Label okay;
- __ cmpl(rdx, ctos);
- __ jcc(Assembler::equal, okay);
- __ stop("what type is this?");
- __ bind(okay);
-#endif
- // ctos
- __ load_unsigned_short(rax, field_address);
-
- __ bind(xreturn_path);
-
- // _ireturn/_areturn
- __ pop(rdi);
- __ mov(rsp, r13);
- __ jmp(rdi);
- __ ret(0);
-
- // generate a vanilla interpreter entry as the slow path
- __ bind(slow_path);
- (void) generate_normal_entry(false);
- } else {
- (void) generate_normal_entry(false);
- }
-
- return entry_point;
-}
-
// Method entry for java.lang.ref.Reference.get.
address InterpreterGenerator::generate_Reference_get_entry(void) {
#if INCLUDE_ALL_GCS
@@ -773,8 +625,6 @@
// and so we don't need to call the G1 pre-barrier. Thus we can use the
// regular method entry code to generate the NPE.
//
- // This code is based on generate_accessor_enty.
- //
// rbx: Method*
// r13: senderSP must preserve for slow path, set SP to it on fast path
@@ -832,7 +682,7 @@
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
- return generate_accessor_entry();
+ return generate_jump_to_normal_entry();
}
/**
@@ -1566,100 +1416,6 @@
return entry_point;
}
-// Entry points
-//
-// Here we generate the various kind of entries into the interpreter.
-// The two main entry type are generic bytecode methods and native
-// call method. These both come in synchronized and non-synchronized
-// versions but the frame layout they create is very similar. The
-// other method entry types are really just special purpose entries
-// that are really entry and interpretation all in one. These are for
-// trivial methods like accessor, empty, or special math methods.
-//
-// When control flow reaches any of the entry types for the interpreter
-// the following holds ->
-//
-// Arguments:
-//
-// rbx: Method*
-//
-// Stack layout immediately at entry
-//
-// [ return address ] <--- rsp
-// [ parameter n ]
-// ...
-// [ parameter 1 ]
-// [ expression stack ] (caller's java expression stack)
-
-// Assuming that we don't go to one of the trivial specialized entries
-// the stack will look like below when we are ready to execute the
-// first bytecode (or call the native routine). The register usage
-// will be as the template based interpreter expects (see
-// interpreter_amd64.hpp).
-//
-// local variables follow incoming parameters immediately; i.e.
-// the return address is moved to the end of the locals).
-//
-// [ monitor entry ] <--- rsp
-// ...
-// [ monitor entry ]
-// [ expr. stack bottom ]
-// [ saved r13 ]
-// [ current r14 ]
-// [ Method* ]
-// [ saved ebp ] <--- rbp
-// [ return address ]
-// [ local variable m ]
-// ...
-// [ local variable 1 ]
-// [ parameter n ]
-// ...
-// [ parameter 1 ] <--- r14
-
-address AbstractInterpreterGenerator::generate_method_entry(
- AbstractInterpreter::MethodKind kind) {
- // determine code generation flags
- bool synchronized = false;
- address entry_point = NULL;
- InterpreterGenerator* ig_this = (InterpreterGenerator*)this;
-
- switch (kind) {
- case Interpreter::zerolocals : break;
- case Interpreter::zerolocals_synchronized: synchronized = true; break;
- case Interpreter::native : entry_point = ig_this->generate_native_entry(false); break;
- case Interpreter::native_synchronized : entry_point = ig_this->generate_native_entry(true); break;
- case Interpreter::empty : entry_point = ig_this->generate_empty_entry(); break;
- case Interpreter::accessor : entry_point = ig_this->generate_accessor_entry(); break;
- case Interpreter::abstract : entry_point = ig_this->generate_abstract_entry(); break;
-
- case Interpreter::java_lang_math_sin : // fall thru
- case Interpreter::java_lang_math_cos : // fall thru
- case Interpreter::java_lang_math_tan : // fall thru
- case Interpreter::java_lang_math_abs : // fall thru
- case Interpreter::java_lang_math_log : // fall thru
- case Interpreter::java_lang_math_log10 : // fall thru
- case Interpreter::java_lang_math_sqrt : // fall thru
- case Interpreter::java_lang_math_pow : // fall thru
- case Interpreter::java_lang_math_exp : entry_point = ig_this->generate_math_entry(kind); break;
- case Interpreter::java_lang_ref_reference_get
- : entry_point = ig_this->generate_Reference_get_entry(); break;
- case Interpreter::java_util_zip_CRC32_update
- : entry_point = ig_this->generate_CRC32_update_entry(); break;
- case Interpreter::java_util_zip_CRC32_updateBytes
- : // fall thru
- case Interpreter::java_util_zip_CRC32_updateByteBuffer
- : entry_point = ig_this->generate_CRC32_updateBytes_entry(kind); break;
- default:
- fatal(err_msg("unexpected method kind: %d", kind));
- break;
- }
-
- if (entry_point) {
- return entry_point;
- }
-
- return ig_this->generate_normal_entry(synchronized);
-}
// These should never be compiled since the interpreter will prefer
// the compiled version to the intrinsic version.
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
index 57a1545..5145d80 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
@@ -27,6 +27,7 @@
#include "asm/macroAssembler.inline.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/java.hpp"
+#include "runtime/os.hpp"
#include "runtime/stubCodeGenerator.hpp"
#include "vm_version_x86.hpp"
@@ -514,7 +515,7 @@
(supports_tscinv() ? ", tscinv": ""),
(supports_bmi1() ? ", bmi1" : ""),
(supports_bmi2() ? ", bmi2" : ""));
- _features_str = strdup(buf);
+ _features_str = os::strdup(buf);
// UseSSE is set to the smaller of what hardware supports and what
// the command line requires. I.e., you cannot set UseSSE to 2 on
@@ -559,7 +560,7 @@
FLAG_SET_DEFAULT(UseCLMUL, false);
}
- if (UseCLMUL && (UseAVX > 0) && (UseSSE > 2)) {
+ if (UseCLMUL && (UseSSE > 2)) {
if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
UseCRC32Intrinsics = true;
}
@@ -805,6 +806,21 @@
}
}
}
+ if ((cpu_family() == 0x06) &&
+ ((extended_cpu_model() == 0x36) || // Centerton
+ (extended_cpu_model() == 0x37) || // Silvermont
+ (extended_cpu_model() == 0x4D))) {
+#ifdef COMPILER2
+ if (FLAG_IS_DEFAULT(OptoScheduling)) {
+ OptoScheduling = true;
+ }
+#endif
+ if (supports_sse4_2()) { // Silvermont
+ if (FLAG_IS_DEFAULT(UseUnalignedLoadStores)) {
+ UseUnalignedLoadStores = true; // use movdqu on newest Intel cpus
+ }
+ }
+ }
}
// Use count leading zeros count instruction if available.
@@ -892,23 +908,25 @@
AllocatePrefetchDistance = allocate_prefetch_distance();
AllocatePrefetchStyle = allocate_prefetch_style();
- if( is_intel() && cpu_family() == 6 && supports_sse3() ) {
- if( AllocatePrefetchStyle == 2 ) { // watermark prefetching on Core
+ if (is_intel() && cpu_family() == 6 && supports_sse3()) {
+ if (AllocatePrefetchStyle == 2) { // watermark prefetching on Core
#ifdef _LP64
AllocatePrefetchDistance = 384;
#else
AllocatePrefetchDistance = 320;
#endif
}
- if( supports_sse4_2() && supports_ht() ) { // Nehalem based cpus
+ if (supports_sse4_2() && supports_ht()) { // Nehalem based cpus
AllocatePrefetchDistance = 192;
AllocatePrefetchLines = 4;
+ }
#ifdef COMPILER2
- if (AggressiveOpts && FLAG_IS_DEFAULT(UseFPUForSpilling)) {
+ if (supports_sse4_2()) {
+ if (FLAG_IS_DEFAULT(UseFPUForSpilling)) {
FLAG_SET_DEFAULT(UseFPUForSpilling, true);
}
-#endif
}
+#endif
}
assert(AllocatePrefetchDistance % AllocatePrefetchStepSize == 0, "invalid value");
diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
index fe9115b..929481c 100644
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -831,60 +831,6 @@
return generate_entry((address) CppInterpreter::normal_entry);
}
-address AbstractInterpreterGenerator::generate_method_entry(
- AbstractInterpreter::MethodKind kind) {
- address entry_point = NULL;
-
- switch (kind) {
- case Interpreter::zerolocals:
- case Interpreter::zerolocals_synchronized:
- break;
-
- case Interpreter::native:
- entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
- break;
-
- case Interpreter::native_synchronized:
- entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
- break;
-
- case Interpreter::empty:
- entry_point = ((InterpreterGenerator*) this)->generate_empty_entry();
- break;
-
- case Interpreter::accessor:
- entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry();
- break;
-
- case Interpreter::abstract:
- entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry();
- break;
-
- case Interpreter::java_lang_math_sin:
- case Interpreter::java_lang_math_cos:
- case Interpreter::java_lang_math_tan:
- case Interpreter::java_lang_math_abs:
- case Interpreter::java_lang_math_log:
- case Interpreter::java_lang_math_log10:
- case Interpreter::java_lang_math_sqrt:
- case Interpreter::java_lang_math_pow:
- case Interpreter::java_lang_math_exp:
- entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind);
- break;
-
- case Interpreter::java_lang_ref_reference_get:
- entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry();
- break;
-
- default:
- ShouldNotReachHere();
- }
-
- if (entry_point == NULL)
- entry_point = ((InterpreterGenerator*) this)->generate_normal_entry(false);
-
- return entry_point;
-}
InterpreterGenerator::InterpreterGenerator(StubQueue* code)
: CppInterpreterGenerator(code) {
diff --git a/hotspot/src/cpu/zero/vm/globals_zero.hpp b/hotspot/src/cpu/zero/vm/globals_zero.hpp
index 0f88bba..7698a7a 100644
--- a/hotspot/src/cpu/zero/vm/globals_zero.hpp
+++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -61,6 +61,12 @@
define_pd_global(uintx, TypeProfileLevel, 0);
-#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct)
+#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
+ product(bool, UseFastEmptyMethods, true, \
+ "Use fast method entry code for empty methods") \
+ \
+ product(bool, UseFastAccessorMethods, true, \
+ "Use fast method entry code for accessor methods") \
+ \
#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP
diff --git a/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp b/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp
index eb17037..68516b4 100644
--- a/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp
+++ b/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -39,4 +39,7 @@
address generate_accessor_entry();
address generate_Reference_get_entry();
+ // Not supported
+ address generate_CRC32_update_entry() { return NULL; }
+ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) { return NULL; }
#endif // CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP
diff --git a/hotspot/src/os/aix/vm/os_aix.cpp b/hotspot/src/os/aix/vm/os_aix.cpp
index 70ca91a..6d8c55b 100644
--- a/hotspot/src/os/aix/vm/os_aix.cpp
+++ b/hotspot/src/os/aix/vm/os_aix.cpp
@@ -58,6 +58,7 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/objectMonitor.hpp"
#include "runtime/orderAccess.inline.hpp"
+#include "runtime/os.hpp"
#include "runtime/osThread.hpp"
#include "runtime/perfMemory.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -378,10 +379,10 @@
// default should be 4K.
size_t data_page_size = SIZE_4K;
{
- void* p = ::malloc(SIZE_16M);
+ void* p = os::malloc(SIZE_16M, mtInternal);
guarantee(p != NULL, "malloc failed");
data_page_size = os::Aix::query_pagesize(p);
- ::free(p);
+ os::free(p);
}
// query default shm page size (LDR_CNTRL SHMPSIZE)
diff --git a/hotspot/src/os/aix/vm/porting_aix.cpp b/hotspot/src/os/aix/vm/porting_aix.cpp
index 5e6a78d..038693c 100644
--- a/hotspot/src/os/aix/vm/porting_aix.cpp
+++ b/hotspot/src/os/aix/vm/porting_aix.cpp
@@ -24,6 +24,8 @@
#include "asm/assembler.hpp"
#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/os.hpp"
#include "loadlib_aix.hpp"
#include "porting_aix.hpp"
#include "utilities/debug.hpp"
@@ -83,7 +85,7 @@
while (n) {
node* p = n;
n = n->next;
- free(p->v);
+ os::free(p->v);
delete p;
}
}
@@ -95,7 +97,7 @@
}
}
node* p = new node;
- p->v = strdup(s);
+ p->v = os::strdup_check_oom(s);
p->next = first;
first = p;
return p->v;
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index b0756b8..51e9f86 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -2439,23 +2439,25 @@
}
// The memory is committed
- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC);
return addr;
}
bool os::release_memory_special(char* base, size_t bytes) {
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
- // detaching the SHM segment will also delete it, see reserve_memory_special()
- int rslt = shmdt(base);
- if (rslt == 0) {
- tkr.record((address)base, bytes);
- return true;
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+ // detaching the SHM segment will also delete it, see reserve_memory_special()
+ int rslt = shmdt(base);
+ if (rslt == 0) {
+ tkr.record((address)base, bytes);
+ return true;
+ } else {
+ return false;
+ }
} else {
- tkr.discard();
- return false;
+ return shmdt(base) == 0;
}
-
}
size_t os::large_page_size() {
diff --git a/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp b/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
index e812a76..2737fe3 100644
--- a/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
@@ -753,7 +753,7 @@
(void)::memset((void*) mapAddress, 0, size);
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress, size, CURRENT_PC, mtInternal);
return mapAddress;
}
@@ -918,7 +918,7 @@
}
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress, size, CURRENT_PC, mtInternal);
*addr = mapAddress;
*sizep = size;
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index ed12d80..9668cb1 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -3504,9 +3504,12 @@
assert(is_ptr_aligned(start, alignment), "Must be");
- // os::reserve_memory_special will record this memory area.
- // Need to release it here to prevent overlapping reservations.
- MemTracker::record_virtual_memory_release((address)start, bytes);
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ // os::reserve_memory_special will record this memory area.
+ // Need to release it here to prevent overlapping reservations.
+ Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+ tkr.record((address)start, bytes);
+ }
char* end = start + bytes;
@@ -3601,7 +3604,7 @@
}
// The memory is committed
- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC);
}
return addr;
@@ -3617,24 +3620,30 @@
}
bool os::release_memory_special(char* base, size_t bytes) {
- assert(UseLargePages, "only for large pages");
-
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
-
bool res;
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+ res = os::Linux::release_memory_special_impl(base, bytes);
+ if (res) {
+ tkr.record((address)base, bytes);
+ }
+
+ } else {
+ res = os::Linux::release_memory_special_impl(base, bytes);
+ }
+ return res;
+}
+
+bool os::Linux::release_memory_special_impl(char* base, size_t bytes) {
+ assert(UseLargePages, "only for large pages");
+ bool res;
+
if (UseSHM) {
res = os::Linux::release_memory_special_shm(base, bytes);
} else {
assert(UseHugeTLBFS, "must be");
res = os::Linux::release_memory_special_huge_tlbfs(base, bytes);
}
-
- if (res) {
- tkr.record((address)base, bytes);
- } else {
- tkr.discard();
- }
-
return res;
}
diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/hotspot/src/os/linux/vm/os_linux.hpp
index 1b62f3f..cf9b71b 100644
--- a/hotspot/src/os/linux/vm/os_linux.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.hpp
@@ -108,6 +108,7 @@
static char* reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec);
static char* reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec);
+ static bool release_memory_special_impl(char* base, size_t bytes);
static bool release_memory_special_shm(char* base, size_t bytes);
static bool release_memory_special_huge_tlbfs(char* base, size_t bytes);
diff --git a/hotspot/src/os/linux/vm/perfMemory_linux.cpp b/hotspot/src/os/linux/vm/perfMemory_linux.cpp
index 9708734..2eef5da 100644
--- a/hotspot/src/os/linux/vm/perfMemory_linux.cpp
+++ b/hotspot/src/os/linux/vm/perfMemory_linux.cpp
@@ -753,7 +753,7 @@
(void)::memset((void*) mapAddress, 0, size);
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress, size, CURRENT_PC, mtInternal);
return mapAddress;
}
@@ -924,7 +924,7 @@
}
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress, size, CURRENT_PC, mtInternal);
*addr = mapAddress;
*sizep = size;
diff --git a/hotspot/src/os/posix/vm/os_posix.cpp b/hotspot/src/os/posix/vm/os_posix.cpp
index d17bc15..66ad5d8 100644
--- a/hotspot/src/os/posix/vm/os_posix.cpp
+++ b/hotspot/src/os/posix/vm/os_posix.cpp
@@ -75,21 +75,41 @@
VMError::report_coredump_status(buffer, success);
}
-address os::get_caller_pc(int n) {
+int os::get_native_stack(address* stack, int frames, int toSkip) {
#ifdef _NMT_NOINLINE_
- n ++;
+ toSkip++;
#endif
+
+ int frame_idx = 0;
+ int num_of_frames; // number of frames captured
frame fr = os::current_frame();
- while (n > 0 && fr.pc() &&
- !os::is_first_C_frame(&fr) && fr.sender_pc()) {
- fr = os::get_sender_for_C_frame(&fr);
- n --;
+ while (fr.pc() && frame_idx < frames) {
+ if (toSkip > 0) {
+ toSkip --;
+ } else {
+ stack[frame_idx ++] = fr.pc();
+ }
+ if (fr.fp() == NULL || os::is_first_C_frame(&fr)
+ ||fr.sender_pc() == NULL || fr.cb() != NULL) break;
+
+ if (fr.sender_pc() && !os::is_first_C_frame(&fr)) {
+ fr = os::get_sender_for_C_frame(&fr);
+ } else {
+ break;
+ }
}
- if (n == 0) {
- return fr.pc();
- } else {
- return NULL;
+ num_of_frames = frame_idx;
+ for (; frame_idx < frames; frame_idx ++) {
+ stack[frame_idx] = NULL;
}
+
+ return num_of_frames;
+}
+
+
+bool os::unsetenv(const char* name) {
+ assert(name != NULL, "Null pointer");
+ return (::unsetenv(name) == 0);
}
int os::get_last_error() {
diff --git a/hotspot/src/os/solaris/vm/attachListener_solaris.cpp b/hotspot/src/os/solaris/vm/attachListener_solaris.cpp
index bee98a1a..1426356 100644
--- a/hotspot/src/os/solaris/vm/attachListener_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/attachListener_solaris.cpp
@@ -199,23 +199,29 @@
// Calls from the door function to check that the client credentials
// match this process. Returns 0 if credentials okay, otherwise -1.
static int check_credentials() {
- door_cred_t cred_info;
+ ucred_t *cred_info = NULL;
+ int ret = -1; // deny by default
// get client credentials
- if (door_cred(&cred_info) == -1) {
- return -1; // unable to get them
+ if (door_ucred(&cred_info) == -1) {
+ return -1; // unable to get them, deny
}
// get our euid/eguid (probably could cache these)
uid_t euid = geteuid();
gid_t egid = getegid();
- // check that the effective uid/gid matches - discuss this with Jeff.
- if (cred_info.dc_euid == euid && cred_info.dc_egid == egid) {
- return 0; // okay
- } else {
- return -1; // denied
+ // get euid/egid from ucred_free
+ uid_t ucred_euid = ucred_geteuid(cred_info);
+ gid_t ucred_egid = ucred_getegid(cred_info);
+
+ // check that the effective uid/gid matches
+ if (ucred_euid == euid && ucred_egid == egid) {
+ ret = 0; // allow
}
+
+ ucred_free(cred_info);
+ return ret;
}
diff --git a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp b/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
index 1fa3001..2d279af 100644
--- a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
@@ -770,7 +770,8 @@
(void)::memset((void*) mapAddress, 0, size);
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress,
+ size, CURRENT_PC, mtInternal);
return mapAddress;
}
@@ -941,7 +942,8 @@
}
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress,
+ size, CURRENT_PC, mtInternal);
*addr = mapAddress;
*sizep = size;
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index d312b97..73055a8 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -138,9 +138,8 @@
// Workaround for issue when a custom launcher doesn't call
// DestroyJavaVM and NMT is trying to track memory when free is
// called from a static destructor
- if (MemTracker::is_on()) {
- MemTracker::shutdown(MemTracker::NMT_normal);
- }
+ MemTracker::shutdown();
+
break;
default:
break;
@@ -163,6 +162,10 @@
return result > 0 && result < len;
}
+bool os::unsetenv(const char* name) {
+ assert(name != NULL, "Null pointer");
+ return (SetEnvironmentVariable(name, NULL) == TRUE);
+}
// No setuid programs under Windows.
bool os::have_special_privileges() {
@@ -319,15 +322,16 @@
* So far, this method is only used by Native Memory Tracking, which is
* only supported on Windows XP or later.
*/
-address os::get_caller_pc(int n) {
+int os::get_native_stack(address* stack, int frames, int toSkip) {
#ifdef _NMT_NOINLINE_
- n++;
+ toSkip ++;
#endif
- address pc;
- if (os::Kernel32Dll::RtlCaptureStackBackTrace(n + 1, 1, (PVOID*)&pc, NULL) == 1) {
- return pc;
+ int captured = Kernel32Dll::RtlCaptureStackBackTrace(toSkip + 1, frames,
+ (PVOID*)stack, NULL);
+ for (int index = captured; index < frames; index ++) {
+ stack[index] = NULL;
}
- return NULL;
+ return captured;
}
@@ -2901,7 +2905,7 @@
PAGE_READWRITE);
// If reservation failed, return NULL
if (p_buf == NULL) return NULL;
- MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC);
os::release_memory(p_buf, bytes + chunk_size);
// we still need to round up to a page boundary (in case we are using large pages)
@@ -2967,7 +2971,7 @@
// need to create a dummy 'reserve' record to match
// the release.
MemTracker::record_virtual_memory_reserve((address)p_buf,
- bytes_to_release, mtNone, CALLER_PC);
+ bytes_to_release, CALLER_PC);
os::release_memory(p_buf, bytes_to_release);
}
#ifdef ASSERT
@@ -2986,11 +2990,10 @@
}
// Although the memory is allocated individually, it is returned as one.
// NMT records it as one block.
- address pc = CALLER_PC;
if ((flags & MEM_COMMIT) != 0) {
- MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, mtNone, pc);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC);
} else {
- MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, mtNone, pc);
+ MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC);
}
// made it this far, success
@@ -3188,8 +3191,7 @@
DWORD flag = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
char * res = (char *)VirtualAlloc(addr, bytes, flag, prot);
if (res != NULL) {
- address pc = CALLER_PC;
- MemTracker::record_virtual_memory_reserve_and_commit((address)res, bytes, mtNone, pc);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)res, bytes, CALLER_PC);
}
return res;
diff --git a/hotspot/src/os/windows/vm/perfMemory_windows.cpp b/hotspot/src/os/windows/vm/perfMemory_windows.cpp
index 1bf2729..e1b5925 100644
--- a/hotspot/src/os/windows/vm/perfMemory_windows.cpp
+++ b/hotspot/src/os/windows/vm/perfMemory_windows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
#include "oops/oop.inline.hpp"
#include "os_windows.inline.hpp"
#include "runtime/handles.inline.hpp"
+#include "runtime/os.hpp"
#include "runtime/perfMemory.hpp"
#include "services/memTracker.hpp"
#include "utilities/exceptions.hpp"
@@ -1388,7 +1389,7 @@
// the file has been successfully created and the file mapping
// object has been created.
sharedmem_fileHandle = fh;
- sharedmem_fileName = strdup(filename);
+ sharedmem_fileName = os::strdup(filename);
return fmh;
}
@@ -1498,7 +1499,8 @@
(void)memset(mapAddress, '\0', size);
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress,
+ size, CURRENT_PC, mtInternal);
return (char*) mapAddress;
}
@@ -1680,7 +1682,8 @@
}
// it does not go through os api, the operation has to record from here
- MemTracker::record_virtual_memory_reserve((address)mapAddress, size, mtInternal, CURRENT_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)mapAddress, size,
+ CURRENT_PC, mtInternal);
*addrp = (char*)mapAddress;
@@ -1834,10 +1837,14 @@
return;
}
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
- remove_file_mapping(addr);
- // it does not go through os api, the operation has to record from here
- tkr.record((address)addr, bytes);
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ // it does not go through os api, the operation has to record from here
+ Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+ remove_file_mapping(addr);
+ tkr.record((address)addr, bytes);
+ } else {
+ remove_file_mapping(addr);
+ }
}
char* PerfMemory::backing_store_filename() {
diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp b/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp
index 028e33f..56ccc72 100644
--- a/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp
@@ -23,6 +23,8 @@
*/
#include "precompiled.hpp"
+#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
#include "runtime/os.hpp"
#include "vm_version_sparc.hpp"
@@ -48,7 +50,7 @@
// All SI defines used below must be supported.
guarantee(bufsize != -1, "must be supported");
- char* buf = (char*) malloc(bufsize);
+ char* buf = (char*) os::malloc(bufsize, mtInternal);
if (buf == NULL)
return;
@@ -60,7 +62,7 @@
}
}
- free(buf);
+ os::free(buf);
}
int VM_Version::platform_features(int features) {
@@ -161,7 +163,7 @@
char tmp;
size_t bufsize = sysinfo(SI_ISALIST, &tmp, 1);
- char* buf = (char*) malloc(bufsize);
+ char* buf = (char*) os::malloc(bufsize, mtInternal);
if (buf != NULL) {
if (sysinfo(SI_ISALIST, buf, bufsize) == bufsize) {
@@ -184,7 +186,7 @@
if (vis[3] == '2') features |= vis2_instructions_m;
}
}
- free(buf);
+ os::free(buf);
}
}
@@ -228,7 +230,7 @@
}
#endif
// Convert to UPPER case before compare.
- char* impl = strdup(implementation);
+ char* impl = os::strdup_check_oom(implementation);
for (int i = 0; impl[i] != 0; i++)
impl[i] = (char)toupper((uint)impl[i]);
@@ -252,7 +254,7 @@
implementation = "SPARC";
}
}
- free((void*)impl);
+ os::free((void*)impl);
break;
}
} // for(
diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp
index 6169c8f..68e9238 100644
--- a/hotspot/src/share/vm/adlc/output_c.cpp
+++ b/hotspot/src/share/vm/adlc/output_c.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -997,7 +997,7 @@
int nopcnt = 0;
for ( _pipeline->_noplist.reset(); (nop = _pipeline->_noplist.iter()) != NULL; nopcnt++ );
- fprintf(fp_cpp, "void Bundle::initialize_nops(MachNode * nop_list[%d], Compile *C) {\n", nopcnt);
+ fprintf(fp_cpp, "void Bundle::initialize_nops(MachNode * nop_list[%d]) {\n", nopcnt);
int i = 0;
for ( _pipeline->_noplist.reset(); (nop = _pipeline->_noplist.iter()) != NULL; i++ ) {
fprintf(fp_cpp, " nop_list[%d] = (MachNode *) new %sNode();\n", i, nop);
@@ -1369,7 +1369,7 @@
fprintf(fp, " ra_->add_reference(root, inst%d);\n", inst_num);
fprintf(fp, " ra_->set_oop (root, ra_->is_oop(inst%d));\n", inst_num);
fprintf(fp, " ra_->set_pair(root->_idx, ra_->get_reg_second(inst%d), ra_->get_reg_first(inst%d));\n", inst_num, inst_num);
- fprintf(fp, " root->_opnds[0] = inst%d->_opnds[0]->clone(C); // result\n", inst_num);
+ fprintf(fp, " root->_opnds[0] = inst%d->_opnds[0]->clone(); // result\n", inst_num);
fprintf(fp, " // ----- Done with initial setup -----\n");
} else {
if( (op_form == NULL) || (op_form->is_base_constant(globals) == Form::none) ) {
@@ -1382,7 +1382,7 @@
} else {
fprintf(fp, " // no ideal edge for constants after matching\n");
}
- fprintf(fp, " root->_opnds[%d] = inst%d->_opnds[%d]->clone(C);\n",
+ fprintf(fp, " root->_opnds[%d] = inst%d->_opnds[%d]->clone();\n",
opnds_index, inst_num, inst_op_num );
}
++opnds_index;
@@ -1402,7 +1402,7 @@
// Define the Peephole method for an instruction node
void ArchDesc::definePeephole(FILE *fp, InstructForm *node) {
// Generate Peephole function header
- fprintf(fp, "MachNode *%sNode::peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C ) {\n", node->_ident);
+ fprintf(fp, "MachNode *%sNode::peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted) {\n", node->_ident);
fprintf(fp, " bool matches = true;\n");
// Identify the maximum instruction position,
@@ -1593,7 +1593,7 @@
}
const char *resultOper = new_inst->reduce_result();
- fprintf(fp," n%d->set_opnd_array(0, state->MachOperGenerator( %s, C ));\n",
+ fprintf(fp," n%d->set_opnd_array(0, state->MachOperGenerator(%s));\n",
cnt, machOperEnum(resultOper));
// get the formal operand NameList
@@ -1634,7 +1634,7 @@
// If there is no use of the created operand, just skip it
if (new_pos != NameList::Not_in_list) {
//Copy the operand from the original made above
- fprintf(fp," n%d->set_opnd_array(%d, op%d->clone(C)); // %s\n",
+ fprintf(fp," n%d->set_opnd_array(%d, op%d->clone()); // %s\n",
cnt, new_pos, exp_pos-node->num_opnds(), opid);
// Check for who defines this operand & add edge if needed
fprintf(fp," if(tmp%d != NULL)\n", exp_pos);
@@ -1662,7 +1662,7 @@
new_pos = new_inst->operand_position(parameter,Component::USE);
if (new_pos != -1) {
// Copy the operand from the ExpandNode to the new node
- fprintf(fp," n%d->set_opnd_array(%d, opnd_array(%d)->clone(C)); // %s\n",
+ fprintf(fp," n%d->set_opnd_array(%d, opnd_array(%d)->clone()); // %s\n",
cnt, new_pos, exp_pos, opid);
// For each operand add appropriate input edges by looking at tmp's
fprintf(fp," if(tmp%d == this) {\n", exp_pos);
@@ -1729,14 +1729,14 @@
declared_def = true;
}
if (op && op->_interface && op->_interface->is_RegInterface()) {
- fprintf(fp," def = new MachTempNode(state->MachOperGenerator( %s, C ));\n",
+ fprintf(fp," def = new MachTempNode(state->MachOperGenerator(%s));\n",
machOperEnum(op->_ident));
fprintf(fp," add_req(def);\n");
// The operand for TEMP is already constructed during
// this mach node construction, see buildMachNode().
//
// int idx = node->operand_position_format(comp->_name);
- // fprintf(fp," set_opnd_array(%d, state->MachOperGenerator( %s, C ));\n",
+ // fprintf(fp," set_opnd_array(%d, state->MachOperGenerator(%s));\n",
// idx, machOperEnum(op->_ident));
} else {
assert(false, "can't have temps which aren't registers");
@@ -1802,7 +1802,7 @@
uint j = node->unique_opnds_idx(i);
// unique_opnds_idx(i) is unique if unique_opnds_idx(j) is not unique.
if( j != node->unique_opnds_idx(j) ) {
- fprintf(fp," set_opnd_array(%d, opnd_array(%d)->clone(C)); // %s\n",
+ fprintf(fp," set_opnd_array(%d, opnd_array(%d)->clone()); // %s\n",
new_num_opnds, i, comp->_name);
// delete not unique edges here
fprintf(fp," for(unsigned i = 0; i < num%d; i++) {\n", i);
@@ -2839,12 +2839,12 @@
// generate code to create a clone for a class derived from MachOper
//
-// (0) MachOper *MachOperXOper::clone(Compile* C) const {
+// (0) MachOper *MachOperXOper::clone() const {
// (1) return new MachXOper( _ccode, _c0, _c1, ..., _cn);
// (2) }
//
static void defineClone(FILE *fp, FormDict &globalNames, OperandForm &oper) {
- fprintf(fp,"MachOper *%sOper::clone(Compile* C) const {\n", oper._ident);
+ fprintf(fp,"MachOper *%sOper::clone() const {\n", oper._ident);
// Check for constants that need to be copied over
const int num_consts = oper.num_consts(globalNames);
const bool is_ideal_bool = oper.is_ideal_bool();
@@ -3043,7 +3043,7 @@
static void define_fill_new_machnode(bool used, FILE *fp_cpp) {
fprintf(fp_cpp, "\n");
fprintf(fp_cpp, "// Copy _idx, inputs and operands to new node\n");
- fprintf(fp_cpp, "void MachNode::fill_new_machnode( MachNode* node, Compile* C) const {\n");
+ fprintf(fp_cpp, "void MachNode::fill_new_machnode(MachNode* node) const {\n");
if( !used ) {
fprintf(fp_cpp, " // This architecture does not have cisc or short branch instructions\n");
fprintf(fp_cpp, " ShouldNotCallThis();\n");
@@ -3064,7 +3064,7 @@
fprintf(fp_cpp, " MachOper **to = node->_opnds;\n");
fprintf(fp_cpp, " for( int i = 0; i < nopnds; i++ ) {\n");
fprintf(fp_cpp, " if( i != cisc_operand() ) \n");
- fprintf(fp_cpp, " to[i] = _opnds[i]->clone(C);\n");
+ fprintf(fp_cpp, " to[i] = _opnds[i]->clone();\n");
fprintf(fp_cpp, " }\n");
fprintf(fp_cpp, "}\n");
}
@@ -3105,7 +3105,7 @@
if ( strcmp(oper->_ident,"label") == 0 ) {
defineIn_RegMask(_CPP_MISC_file._fp, _globalNames, *oper);
- fprintf(fp,"MachOper *%sOper::clone(Compile* C) const {\n", oper->_ident);
+ fprintf(fp,"MachOper *%sOper::clone() const {\n", oper->_ident);
fprintf(fp," return new %sOper(_label, _block_num);\n", oper->_ident);
fprintf(fp,"}\n");
@@ -3124,7 +3124,7 @@
if ( strcmp(oper->_ident,"method") == 0 ) {
defineIn_RegMask(_CPP_MISC_file._fp, _globalNames, *oper);
- fprintf(fp,"MachOper *%sOper::clone(Compile* C) const {\n", oper->_ident);
+ fprintf(fp,"MachOper *%sOper::clone() const {\n", oper->_ident);
fprintf(fp," return new %sOper(_method);\n", oper->_ident);
fprintf(fp,"}\n");
@@ -3845,7 +3845,7 @@
"// that invokes 'new' on the corresponding class constructor.\n");
fprintf(fp_cpp, "\n");
fprintf(fp_cpp, "MachOper *State::MachOperGenerator");
- fprintf(fp_cpp, "(int opcode, Compile* C)");
+ fprintf(fp_cpp, "(int opcode)");
fprintf(fp_cpp, "{\n");
fprintf(fp_cpp, "\n");
fprintf(fp_cpp, " switch(opcode) {\n");
@@ -3921,7 +3921,7 @@
int index = clist.operand_position(comp->_name, comp->_usedef, inst);
const char *opcode = machOperEnum(comp->_type);
fprintf(fp_cpp, "%s node->set_opnd_array(%d, ", indent, index);
- fprintf(fp_cpp, "MachOperGenerator(%s, C));\n", opcode);
+ fprintf(fp_cpp, "MachOperGenerator(%s));\n", opcode);
}
}
else if ( inst->is_chain_of_constant(_globalNames, opType) ) {
@@ -3978,7 +3978,7 @@
InstructForm *inst_cisc = cisc_spill_alternate();
if (inst_cisc != NULL) {
fprintf(fp_hpp, " virtual int cisc_operand() const { return %d; }\n", cisc_spill_operand());
- fprintf(fp_hpp, " virtual MachNode *cisc_version(int offset, Compile* C);\n");
+ fprintf(fp_hpp, " virtual MachNode *cisc_version(int offset);\n");
fprintf(fp_hpp, " virtual void use_cisc_RegMask();\n");
fprintf(fp_hpp, " virtual const RegMask *cisc_RegMask() const { return _cisc_RegMask; }\n");
}
@@ -4008,7 +4008,7 @@
// Construct CISC version of this instruction
fprintf(fp_cpp, "\n");
fprintf(fp_cpp, "// Build CISC version of this instruction\n");
- fprintf(fp_cpp, "MachNode *%sNode::cisc_version( int offset, Compile* C ) {\n", this->_ident);
+ fprintf(fp_cpp, "MachNode *%sNode::cisc_version(int offset) {\n", this->_ident);
// Create the MachNode object
fprintf(fp_cpp, " %sNode *node = new %sNode();\n", name, name);
// Fill in the bottom_type where requested
@@ -4023,7 +4023,7 @@
fprintf(fp_cpp, "\n");
fprintf(fp_cpp, " // Copy _idx, inputs and operands to new node\n");
- fprintf(fp_cpp, " fill_new_machnode(node, C);\n");
+ fprintf(fp_cpp, " fill_new_machnode(node);\n");
// Construct operand to access [stack_pointer + offset]
fprintf(fp_cpp, " // Construct operand to access [stack_pointer + offset]\n");
fprintf(fp_cpp, " node->set_opnd_array(cisc_operand(), new %sOper(offset));\n", cisc_oper_name);
@@ -4042,7 +4042,7 @@
// Build prototypes for short branch methods
void InstructForm::declare_short_branch_methods(FILE *fp_hpp) {
if (has_short_branch_form()) {
- fprintf(fp_hpp, " virtual MachNode *short_branch_version(Compile* C);\n");
+ fprintf(fp_hpp, " virtual MachNode *short_branch_version();\n");
}
}
@@ -4055,7 +4055,7 @@
// Construct short_branch_version() method.
fprintf(fp_cpp, "// Build short branch version of this instruction\n");
- fprintf(fp_cpp, "MachNode *%sNode::short_branch_version(Compile* C) {\n", this->_ident);
+ fprintf(fp_cpp, "MachNode *%sNode::short_branch_version() {\n", this->_ident);
// Create the MachNode object
fprintf(fp_cpp, " %sNode *node = new %sNode();\n", name, name);
if( is_ideal_if() ) {
@@ -4071,7 +4071,7 @@
// Short branch version must use same node index for access
// through allocator's tables
fprintf(fp_cpp, " // Copy _idx, inputs and operands to new node\n");
- fprintf(fp_cpp, " fill_new_machnode(node, C);\n");
+ fprintf(fp_cpp, " fill_new_machnode(node);\n");
// Return result and exit scope
fprintf(fp_cpp, " return node;\n");
@@ -4097,7 +4097,7 @@
"// that invokes 'new' on the corresponding class constructor.\n");
fprintf(fp_cpp, "\n");
fprintf(fp_cpp, "MachNode *State::MachNodeGenerator");
- fprintf(fp_cpp, "(int opcode, Compile* C)");
+ fprintf(fp_cpp, "(int opcode)");
fprintf(fp_cpp, "{\n");
fprintf(fp_cpp, " switch(opcode) {\n");
diff --git a/hotspot/src/share/vm/adlc/output_h.cpp b/hotspot/src/share/vm/adlc/output_h.cpp
index 7e020fb..c204af9 100644
--- a/hotspot/src/share/vm/adlc/output_h.cpp
+++ b/hotspot/src/share/vm/adlc/output_h.cpp
@@ -1119,7 +1119,7 @@
fprintf(fp_hpp, " _nop_count = %d\n",
_pipeline->_nopcnt);
fprintf(fp_hpp, " };\n\n");
- fprintf(fp_hpp, " static void initialize_nops(MachNode *nop_list[%d], Compile* C);\n\n",
+ fprintf(fp_hpp, " static void initialize_nops(MachNode *nop_list[%d]);\n\n",
_pipeline->_nopcnt);
fprintf(fp_hpp, "#ifndef PRODUCT\n");
fprintf(fp_hpp, " void dump(outputStream *st = tty) const;\n");
@@ -1240,7 +1240,7 @@
constant_type, _globalNames);
// Clone function
- fprintf(fp," virtual MachOper *clone(Compile* C) const;\n");
+ fprintf(fp," virtual MachOper *clone() const;\n");
// Support setting a spill offset into a constant operand.
// We only support setting an 'int' offset, while in the
@@ -1718,7 +1718,7 @@
// If there is an explicit peephole rule, build it
if ( instr->peepholes() != NULL ) {
- fprintf(fp," virtual MachNode *peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile *C);\n");
+ fprintf(fp," virtual MachNode *peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted);\n");
}
// Output the declaration for number of relocation entries
@@ -1863,7 +1863,7 @@
}
if ( instr->num_post_match_opnds() != 0
|| instr->is_chain_of_constant(_globalNames) ) {
- fprintf(fp," friend MachNode *State::MachNodeGenerator(int opcode, Compile* C);\n");
+ fprintf(fp," friend MachNode *State::MachNodeGenerator(int opcode);\n");
}
if ( instr->rematerialize(_globalNames, get_registers()) ) {
fprintf(fp," // Rematerialize %s\n", instr->_ident);
@@ -2071,8 +2071,8 @@
fprintf(fp," DEBUG_ONLY( ~State(void); ) // Destructor\n");
fprintf(fp,"\n");
fprintf(fp," // Methods created by ADLC and invoked by Reduce\n");
- fprintf(fp," MachOper *MachOperGenerator( int opcode, Compile* C );\n");
- fprintf(fp," MachNode *MachNodeGenerator( int opcode, Compile* C );\n");
+ fprintf(fp," MachOper *MachOperGenerator(int opcode);\n");
+ fprintf(fp," MachNode *MachNodeGenerator(int opcode);\n");
fprintf(fp,"\n");
fprintf(fp," // Assign a state to a node, definition of method produced by ADLC\n");
fprintf(fp," bool DFA( int opcode, const Node *ideal );\n");
diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/hotspot/src/share/vm/asm/codeBuffer.cpp
index 9c4bc20..085330a 100644
--- a/hotspot/src/share/vm/asm/codeBuffer.cpp
+++ b/hotspot/src/share/vm/asm/codeBuffer.cpp
@@ -269,7 +269,7 @@
GrowableArray<int>* CodeBuffer::create_patch_overflow() {
if (_overflow_arena == NULL) {
- _overflow_arena = new (mtCode) Arena();
+ _overflow_arena = new (mtCode) Arena(mtCode);
}
return new (_overflow_arena) GrowableArray<int>(_overflow_arena, 8, 0, 0);
}
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.cpp b/hotspot/src/share/vm/c1/c1_Compiler.cpp
index f673b23..b547c1d 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.cpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.cpp
@@ -48,7 +48,7 @@
void Compiler::init_c1_runtime() {
BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
- Arena* arena = new (mtCompiler) Arena();
+ Arena* arena = new (mtCompiler) Arena(mtCompiler);
Runtime1::initialize(buffer_blob);
FrameMap::initialize();
// initialize data structures
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
index 48b5608..f2753cb 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
@@ -30,6 +30,7 @@
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_ValueStack.hpp"
#include "ci/ciInstance.hpp"
+#include "runtime/os.hpp"
void LIR_Assembler::patching_epilog(PatchingStub* patch, LIR_PatchCode patch_code, Register obj, CodeEmitInfo* info) {
// we must have enough patching space so that call can be inserted
@@ -848,7 +849,7 @@
stringStream st;
st.print("bad oop %s at %d", r->as_Register()->name(), _masm->offset());
#ifdef SPARC
- _masm->_verify_oop(r->as_Register(), strdup(st.as_string()), __FILE__, __LINE__);
+ _masm->_verify_oop(r->as_Register(), os::strdup(st.as_string(), mtCompiler), __FILE__, __LINE__);
#else
_masm->verify_oop(r->as_Register());
#endif
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
index afed1de..833b357 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
@@ -1613,25 +1613,22 @@
Interval* precolored_cpu_intervals, *not_precolored_cpu_intervals;
Interval* precolored_fpu_intervals, *not_precolored_fpu_intervals;
- create_unhandled_lists(&precolored_cpu_intervals, ¬_precolored_cpu_intervals, is_precolored_cpu_interval, is_virtual_cpu_interval);
- if (has_fpu_registers()) {
- create_unhandled_lists(&precolored_fpu_intervals, ¬_precolored_fpu_intervals, is_precolored_fpu_interval, is_virtual_fpu_interval);
-#ifdef ASSERT
- } else {
- // fpu register allocation is omitted because no virtual fpu registers are present
- // just check this again...
- create_unhandled_lists(&precolored_fpu_intervals, ¬_precolored_fpu_intervals, is_precolored_fpu_interval, is_virtual_fpu_interval);
- assert(not_precolored_fpu_intervals == Interval::end(), "missed an uncolored fpu interval");
-#endif
- }
-
// allocate cpu registers
+ create_unhandled_lists(&precolored_cpu_intervals, ¬_precolored_cpu_intervals,
+ is_precolored_cpu_interval, is_virtual_cpu_interval);
+
+ // allocate fpu registers
+ create_unhandled_lists(&precolored_fpu_intervals, ¬_precolored_fpu_intervals,
+ is_precolored_fpu_interval, is_virtual_fpu_interval);
+
+ // the fpu interval allocation cannot be moved down below with the fpu section as
+ // the cpu_lsw.walk() changes interval positions.
+
LinearScanWalker cpu_lsw(this, precolored_cpu_intervals, not_precolored_cpu_intervals);
cpu_lsw.walk();
cpu_lsw.finish_allocation();
if (has_fpu_registers()) {
- // allocate fpu registers
LinearScanWalker fpu_lsw(this, precolored_fpu_intervals, not_precolored_fpu_intervals);
fpu_lsw.walk();
fpu_lsw.finish_allocation();
diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp
index 310b4c2..5353a61 100644
--- a/hotspot/src/share/vm/ci/ciEnv.cpp
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp
@@ -86,7 +86,8 @@
// ------------------------------------------------------------------
// ciEnv::ciEnv
-ciEnv::ciEnv(CompileTask* task, int system_dictionary_modification_counter) {
+ciEnv::ciEnv(CompileTask* task, int system_dictionary_modification_counter)
+ : _ciEnv_arena(mtCompiler) {
VM_ENTRY_MARK;
// Set up ciEnv::current immediately, for the sake of ciObjectFactory, etc.
@@ -144,7 +145,7 @@
_jvmti_can_pop_frame = false;
}
-ciEnv::ciEnv(Arena* arena) {
+ciEnv::ciEnv(Arena* arena) : _ciEnv_arena(mtCompiler) {
ASSERT_IN_VM;
// Set up ciEnv::current immediately, for the sake of ciObjectFactory, etc.
diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.cpp b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
index 6bacf2b..aaa607f 100644
--- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -112,7 +112,7 @@
// This Arena is long lived and exists in the resource mark of the
// compiler thread that initializes the initial ciObjectFactory which
// creates the shared ciObjects that all later ciObjectFactories use.
- Arena* arena = new (mtCompiler) Arena();
+ Arena* arena = new (mtCompiler) Arena(mtCompiler);
ciEnv initial(arena);
ciEnv* env = ciEnv::current();
env->_factory->init_shared_objects();
diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp
index 1664411..1467462 100644
--- a/hotspot/src/share/vm/classfile/classLoader.cpp
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp
@@ -273,13 +273,17 @@
}
LazyClassPathEntry::LazyClassPathEntry(char* path, const struct stat* st) : ClassPathEntry() {
- _path = strdup(path);
+ _path = os::strdup_check_oom(path);
_st = *st;
_meta_index = NULL;
_resolved_entry = NULL;
_has_error = false;
}
+LazyClassPathEntry::~LazyClassPathEntry() {
+ os::free(_path);
+}
+
bool LazyClassPathEntry::is_jar_file() {
return ((_st.st_mode & S_IFREG) == S_IFREG);
}
@@ -416,7 +420,7 @@
default:
{
if (!skipCurrentJar && cur_entry != NULL) {
- char* new_name = strdup(package_name);
+ char* new_name = os::strdup_check_oom(package_name);
boot_class_path_packages.append(new_name);
}
}
@@ -438,7 +442,7 @@
void ClassLoader::setup_bootstrap_search_path() {
assert(_first_entry == NULL, "should not setup bootstrap class search path twice");
- char* sys_class_path = os::strdup(Arguments::get_sysclasspath());
+ char* sys_class_path = os::strdup_check_oom(Arguments::get_sysclasspath());
if (TraceClassLoading && Verbose) {
tty->print_cr("[Bootstrap loader class path=%s]", sys_class_path);
}
@@ -460,6 +464,7 @@
end++;
}
}
+ os::free(sys_class_path);
}
ClassPathEntry* ClassLoader::create_class_path_entry(char *path, const struct stat* st, bool lazy, TRAPS) {
diff --git a/hotspot/src/share/vm/classfile/classLoader.hpp b/hotspot/src/share/vm/classfile/classLoader.hpp
index 2cfcde6..4a7a841 100644
--- a/hotspot/src/share/vm/classfile/classLoader.hpp
+++ b/hotspot/src/share/vm/classfile/classLoader.hpp
@@ -128,6 +128,8 @@
bool is_jar_file();
const char* name() { return _path; }
LazyClassPathEntry(char* path, const struct stat* st);
+ virtual ~LazyClassPathEntry();
+
ClassFileStream* open_stream(const char* name, TRAPS);
void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; }
virtual bool is_lazy();
diff --git a/hotspot/src/share/vm/classfile/stackMapFrame.cpp b/hotspot/src/share/vm/classfile/stackMapFrame.cpp
index c3f6946..9cb1d30 100644
--- a/hotspot/src/share/vm/classfile/stackMapFrame.cpp
+++ b/hotspot/src/share/vm/classfile/stackMapFrame.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,21 +54,6 @@
return frame;
}
-bool StackMapFrame::has_new_object() const {
- int32_t i;
- for (i = 0; i < _max_locals; i++) {
- if (_locals[i].is_uninitialized()) {
- return true;
- }
- }
- for (i = 0; i < _stack_size; i++) {
- if (_stack[i].is_uninitialized()) {
- return true;
- }
- }
- return false;
-}
-
void StackMapFrame::initialize_object(
VerificationType old_object, VerificationType new_object) {
int32_t i;
diff --git a/hotspot/src/share/vm/classfile/stackMapFrame.hpp b/hotspot/src/share/vm/classfile/stackMapFrame.hpp
index 237acce..53582c1 100644
--- a/hotspot/src/share/vm/classfile/stackMapFrame.hpp
+++ b/hotspot/src/share/vm/classfile/stackMapFrame.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -155,10 +155,6 @@
const methodHandle m, VerificationType thisKlass, TRAPS);
// Search local variable type array and stack type array.
- // Return true if an uninitialized object is found.
- bool has_new_object() const;
-
- // Search local variable type array and stack type array.
// Set every element with type of old_object to new_object.
void initialize_object(
VerificationType old_object, VerificationType new_object);
diff --git a/hotspot/src/share/vm/classfile/stackMapTable.cpp b/hotspot/src/share/vm/classfile/stackMapTable.cpp
index feb5ae2..f74adbe 100644
--- a/hotspot/src/share/vm/classfile/stackMapTable.cpp
+++ b/hotspot/src/share/vm/classfile/stackMapTable.cpp
@@ -70,24 +70,26 @@
bool StackMapTable::match_stackmap(
StackMapFrame* frame, int32_t target,
- bool match, bool update, ErrorContext* ctx, TRAPS) const {
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
int index = get_index_from_offset(target);
- return match_stackmap(frame, target, index, match, update, ctx, THREAD);
+ return match_stackmap(frame, target, index, match, update, handler, ctx, THREAD);
}
// Match and/or update current_frame to the frame in stackmap table with
// specified offset and frame index. Return true if the two frames match.
+// handler is true if the frame in stackmap_table is for an exception handler.
//
-// The values of match and update are: _match__update_
+// The values of match and update are: _match__update__handler
//
-// checking a branch target/exception handler: true false
+// checking a branch target: true false false
+// checking an exception handler: true false true
// linear bytecode verification following an
-// unconditional branch: false true
+// unconditional branch: false true false
// linear bytecode verification not following an
-// unconditional branch: true true
+// unconditional branch: true true false
bool StackMapTable::match_stackmap(
StackMapFrame* frame, int32_t target, int32_t frame_index,
- bool match, bool update, ErrorContext* ctx, TRAPS) const {
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
if (frame_index < 0 || frame_index >= _frame_count) {
*ctx = ErrorContext::missing_stackmap(frame->offset());
frame->verifier()->verify_error(
@@ -98,11 +100,9 @@
StackMapFrame *stackmap_frame = _frame_array[frame_index];
bool result = true;
if (match) {
- // when checking handler target, match == true && update == false
- bool is_exception_handler = !update;
// Has direct control flow from last instruction, need to match the two
// frames.
- result = frame->is_assignable_to(stackmap_frame, is_exception_handler,
+ result = frame->is_assignable_to(stackmap_frame, handler,
ctx, CHECK_VERIFY_(frame->verifier(), result));
}
if (update) {
@@ -126,24 +126,10 @@
StackMapFrame* frame, int32_t target, TRAPS) const {
ErrorContext ctx;
bool match = match_stackmap(
- frame, target, true, false, &ctx, CHECK_VERIFY(frame->verifier()));
+ frame, target, true, false, false, &ctx, CHECK_VERIFY(frame->verifier()));
if (!match || (target < 0 || target >= _code_length)) {
frame->verifier()->verify_error(ctx,
"Inconsistent stackmap frames at branch target %d", target);
- return;
- }
- // check if uninitialized objects exist on backward branches
- check_new_object(frame, target, CHECK_VERIFY(frame->verifier()));
- frame->verifier()->update_furthest_jump(target);
-}
-
-void StackMapTable::check_new_object(
- const StackMapFrame* frame, int32_t target, TRAPS) const {
- if (frame->offset() > target && frame->has_new_object()) {
- frame->verifier()->verify_error(
- ErrorContext::bad_code(frame->offset()),
- "Uninitialized object exists on backward branch %d", target);
- return;
}
}
diff --git a/hotspot/src/share/vm/classfile/stackMapTable.hpp b/hotspot/src/share/vm/classfile/stackMapTable.hpp
index 385aef3..590adda 100644
--- a/hotspot/src/share/vm/classfile/stackMapTable.hpp
+++ b/hotspot/src/share/vm/classfile/stackMapTable.hpp
@@ -60,12 +60,12 @@
// specified offset. Return true if the two frames match.
bool match_stackmap(
StackMapFrame* current_frame, int32_t offset,
- bool match, bool update, ErrorContext* ctx, TRAPS) const;
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
// Match and/or update current_frame to the frame in stackmap table with
// specified offset and frame index. Return true if the two frames match.
bool match_stackmap(
StackMapFrame* current_frame, int32_t offset, int32_t frame_index,
- bool match, bool update, ErrorContext* ctx, TRAPS) const;
+ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
// Check jump instructions. Make sure there are no uninitialized
// instances on backward branch.
@@ -76,10 +76,6 @@
// Returns the frame array index where the frame with offset is stored.
int get_index_from_offset(int32_t offset) const;
- // Make sure that there's no uninitialized object exist on backward branch.
- void check_new_object(
- const StackMapFrame* frame, int32_t target, TRAPS) const;
-
void print_on(outputStream* str) const;
};
diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp
index 00761e4..d688235 100644
--- a/hotspot/src/share/vm/classfile/symbolTable.cpp
+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp
@@ -70,9 +70,9 @@
void SymbolTable::initialize_symbols(int arena_alloc_size) {
// Initialize the arena for global symbols, size passed in depends on CDS.
if (arena_alloc_size == 0) {
- _arena = new (mtSymbol) Arena();
+ _arena = new (mtSymbol) Arena(mtSymbol);
} else {
- _arena = new (mtSymbol) Arena(arena_alloc_size);
+ _arena = new (mtSymbol) Arena(mtSymbol, arena_alloc_size);
}
}
diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp
index 6fc9ed23..89d9d8b 100644
--- a/hotspot/src/share/vm/classfile/verifier.cpp
+++ b/hotspot/src/share/vm/classfile/verifier.cpp
@@ -620,8 +620,6 @@
// flow from current instruction to the next
// instruction in sequence
- set_furthest_jump(0);
-
Bytecodes::Code opcode;
while (!bcs.is_last_bytecode()) {
// Check for recursive re-verification before each bytecode.
@@ -1780,7 +1778,7 @@
// If matched, current_frame will be updated by this method.
bool matches = stackmap_table->match_stackmap(
current_frame, this_offset, stackmap_index,
- !no_control_flow, true, &ctx, CHECK_VERIFY_(this, 0));
+ !no_control_flow, true, false, &ctx, CHECK_VERIFY_(this, 0));
if (!matches) {
// report type error
verify_error(ctx, "Instruction type does not match stack map");
@@ -1827,7 +1825,7 @@
}
ErrorContext ctx;
bool matches = stackmap_table->match_stackmap(
- new_frame, handler_pc, true, false, &ctx, CHECK_VERIFY(this));
+ new_frame, handler_pc, true, false, true, &ctx, CHECK_VERIFY(this));
if (!matches) {
verify_error(ctx, "Stack map does not match the one at "
"exception handler %d", handler_pc);
@@ -2219,6 +2217,181 @@
}
}
+// Look at the method's handlers. If the bci is in the handler's try block
+// then check if the handler_pc is already on the stack. If not, push it.
+void ClassVerifier::push_handlers(ExceptionTable* exhandlers,
+ GrowableArray<u4>* handler_stack,
+ u4 bci) {
+ int exlength = exhandlers->length();
+ for(int x = 0; x < exlength; x++) {
+ if (bci >= exhandlers->start_pc(x) && bci < exhandlers->end_pc(x)) {
+ handler_stack->append_if_missing(exhandlers->handler_pc(x));
+ }
+ }
+}
+
+// Return TRUE if all code paths starting with start_bc_offset end in
+// bytecode athrow or loop.
+bool ClassVerifier::ends_in_athrow(u4 start_bc_offset) {
+ ResourceMark rm;
+ // Create bytecode stream.
+ RawBytecodeStream bcs(method());
+ u4 code_length = method()->code_size();
+ bcs.set_start(start_bc_offset);
+ u4 target;
+ // Create stack for storing bytecode start offsets for if* and *switch.
+ GrowableArray<u4>* bci_stack = new GrowableArray<u4>(30);
+ // Create stack for handlers for try blocks containing this handler.
+ GrowableArray<u4>* handler_stack = new GrowableArray<u4>(30);
+ // Create list of visited branch opcodes (goto* and if*).
+ GrowableArray<u4>* visited_branches = new GrowableArray<u4>(30);
+ ExceptionTable exhandlers(_method());
+
+ while (true) {
+ if (bcs.is_last_bytecode()) {
+ // if no more starting offsets to parse or if at the end of the
+ // method then return false.
+ if ((bci_stack->is_empty()) || ((u4)bcs.end_bci() == code_length))
+ return false;
+ // Pop a bytecode starting offset and scan from there.
+ bcs.set_start(bci_stack->pop());
+ }
+ Bytecodes::Code opcode = bcs.raw_next();
+ u4 bci = bcs.bci();
+
+ // If the bytecode is in a TRY block, push its handlers so they
+ // will get parsed.
+ push_handlers(&exhandlers, handler_stack, bci);
+
+ switch (opcode) {
+ case Bytecodes::_if_icmpeq:
+ case Bytecodes::_if_icmpne:
+ case Bytecodes::_if_icmplt:
+ case Bytecodes::_if_icmpge:
+ case Bytecodes::_if_icmpgt:
+ case Bytecodes::_if_icmple:
+ case Bytecodes::_ifeq:
+ case Bytecodes::_ifne:
+ case Bytecodes::_iflt:
+ case Bytecodes::_ifge:
+ case Bytecodes::_ifgt:
+ case Bytecodes::_ifle:
+ case Bytecodes::_if_acmpeq:
+ case Bytecodes::_if_acmpne:
+ case Bytecodes::_ifnull:
+ case Bytecodes::_ifnonnull:
+ target = bcs.dest();
+ if (visited_branches->contains(bci)) {
+ if (bci_stack->is_empty()) return true;
+ // Pop a bytecode starting offset and scan from there.
+ bcs.set_start(bci_stack->pop());
+ } else {
+ if (target > bci) { // forward branch
+ if (target >= code_length) return false;
+ // Push the branch target onto the stack.
+ bci_stack->push(target);
+ // then, scan bytecodes starting with next.
+ bcs.set_start(bcs.next_bci());
+ } else { // backward branch
+ // Push bytecode offset following backward branch onto the stack.
+ bci_stack->push(bcs.next_bci());
+ // Check bytecodes starting with branch target.
+ bcs.set_start(target);
+ }
+ // Record target so we don't branch here again.
+ visited_branches->append(bci);
+ }
+ break;
+
+ case Bytecodes::_goto:
+ case Bytecodes::_goto_w:
+ target = (opcode == Bytecodes::_goto ? bcs.dest() : bcs.dest_w());
+ if (visited_branches->contains(bci)) {
+ if (bci_stack->is_empty()) return true;
+ // Been here before, pop new starting offset from stack.
+ bcs.set_start(bci_stack->pop());
+ } else {
+ if (target >= code_length) return false;
+ // Continue scanning from the target onward.
+ bcs.set_start(target);
+ // Record target so we don't branch here again.
+ visited_branches->append(bci);
+ }
+ break;
+
+ // Check that all switch alternatives end in 'athrow' bytecodes. Since it
+ // is difficult to determine where each switch alternative ends, parse
+ // each switch alternative until either hit a 'return', 'athrow', or reach
+ // the end of the method's bytecodes. This is gross but should be okay
+ // because:
+ // 1. tableswitch and lookupswitch byte codes in handlers for ctor explicit
+ // constructor invocations should be rare.
+ // 2. if each switch alternative ends in an athrow then the parsing should be
+ // short. If there is no athrow then it is bogus code, anyway.
+ case Bytecodes::_lookupswitch:
+ case Bytecodes::_tableswitch:
+ {
+ address aligned_bcp = (address) round_to((intptr_t)(bcs.bcp() + 1), jintSize);
+ u4 default_offset = Bytes::get_Java_u4(aligned_bcp) + bci;
+ int keys, delta;
+ if (opcode == Bytecodes::_tableswitch) {
+ jint low = (jint)Bytes::get_Java_u4(aligned_bcp + jintSize);
+ jint high = (jint)Bytes::get_Java_u4(aligned_bcp + 2*jintSize);
+ // This is invalid, but let the regular bytecode verifier
+ // report this because the user will get a better error message.
+ if (low > high) return true;
+ keys = high - low + 1;
+ delta = 1;
+ } else {
+ keys = (int)Bytes::get_Java_u4(aligned_bcp + jintSize);
+ delta = 2;
+ }
+ // Invalid, let the regular bytecode verifier deal with it.
+ if (keys < 0) return true;
+
+ // Push the offset of the next bytecode onto the stack.
+ bci_stack->push(bcs.next_bci());
+
+ // Push the switch alternatives onto the stack.
+ for (int i = 0; i < keys; i++) {
+ u4 target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize);
+ if (target > code_length) return false;
+ bci_stack->push(target);
+ }
+
+ // Start bytecode parsing for the switch at the default alternative.
+ if (default_offset > code_length) return false;
+ bcs.set_start(default_offset);
+ break;
+ }
+
+ case Bytecodes::_return:
+ return false;
+
+ case Bytecodes::_athrow:
+ {
+ if (bci_stack->is_empty()) {
+ if (handler_stack->is_empty()) {
+ return true;
+ } else {
+ // Parse the catch handlers for try blocks containing athrow.
+ bcs.set_start(handler_stack->pop());
+ }
+ } else {
+ // Pop a bytecode offset and starting scanning from there.
+ bcs.set_start(bci_stack->pop());
+ }
+ }
+ break;
+
+ default:
+ ;
+ } // end switch
+ } // end while loop
+
+ return false;
+}
+
void ClassVerifier::verify_invoke_init(
RawBytecodeStream* bcs, u2 ref_class_index, VerificationType ref_class_type,
StackMapFrame* current_frame, u4 code_length, bool *this_uninit,
@@ -2238,25 +2411,26 @@
return;
}
- // Make sure that this call is not jumped over.
- if (bci < furthest_jump()) {
- verify_error(ErrorContext::bad_code(bci),
- "Bad <init> method call from inside of a branch");
- return;
- }
-
- // Make sure that this call is not done from within a TRY block because
- // that can result in returning an incomplete object. Simply checking
- // (bci >= start_pc) also ensures that this call is not done after a TRY
- // block. That is also illegal because this call must be the first Java
- // statement in the constructor.
+ // Check if this call is done from inside of a TRY block. If so, make
+ // sure that all catch clause paths end in a throw. Otherwise, this
+ // can result in returning an incomplete object.
ExceptionTable exhandlers(_method());
int exlength = exhandlers.length();
for(int i = 0; i < exlength; i++) {
- if (bci >= exhandlers.start_pc(i)) {
- verify_error(ErrorContext::bad_code(bci),
- "Bad <init> method call from after the start of a try block");
- return;
+ u2 start_pc = exhandlers.start_pc(i);
+ u2 end_pc = exhandlers.end_pc(i);
+
+ if (bci >= start_pc && bci < end_pc) {
+ if (!ends_in_athrow(exhandlers.handler_pc(i))) {
+ verify_error(ErrorContext::bad_code(bci),
+ "Bad <init> method call from after the start of a try block");
+ return;
+ } else if (VerboseVerification) {
+ ResourceMark rm;
+ tty->print_cr(
+ "Survived call to ends_in_athrow(): %s",
+ current_class()->name()->as_C_string());
+ }
}
}
diff --git a/hotspot/src/share/vm/classfile/verifier.hpp b/hotspot/src/share/vm/classfile/verifier.hpp
index 6eecd4b..4c8b589 100644
--- a/hotspot/src/share/vm/classfile/verifier.hpp
+++ b/hotspot/src/share/vm/classfile/verifier.hpp
@@ -30,6 +30,7 @@
#include "oops/klass.hpp"
#include "oops/method.hpp"
#include "runtime/handles.hpp"
+#include "utilities/growableArray.hpp"
#include "utilities/exceptions.hpp"
// The verifier class
@@ -258,9 +259,6 @@
ErrorContext _error_context; // contains information about an error
- // Used to detect illegal jumps over calls to super() nd this() in ctors.
- int32_t _furthest_jump;
-
void verify_method(methodHandle method, TRAPS);
char* generate_code_data(methodHandle m, u4 code_length, TRAPS);
void verify_exception_handler_table(u4 code_length, char* code_data,
@@ -306,6 +304,16 @@
StackMapFrame* current_frame, u4 code_length, bool* this_uninit,
constantPoolHandle cp, TRAPS);
+ // Used by ends_in_athrow() to push all handlers that contain bci onto
+ // the handler_stack, if the handler is not already on the stack.
+ void push_handlers(ExceptionTable* exhandlers,
+ GrowableArray<u4>* handler_stack,
+ u4 bci);
+
+ // Returns true if all paths starting with start_bc_offset end in athrow
+ // bytecode or loop.
+ bool ends_in_athrow(u4 start_bc_offset);
+
void verify_invoke_instructions(
RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
bool* this_uninit, VerificationType return_type,
@@ -407,19 +415,6 @@
TypeOrigin ref_ctx(const char* str, TRAPS);
- // Keep track of the furthest branch done in a method to make sure that
- // there are no branches over calls to super() or this() from inside of
- // a constructor.
- int32_t furthest_jump() { return _furthest_jump; }
-
- void set_furthest_jump(int32_t target) {
- _furthest_jump = target;
- }
-
- void update_furthest_jump(int32_t target) {
- if (target > _furthest_jump) _furthest_jump = target;
- }
-
};
inline int ClassVerifier::change_sig_to_verificationType(
diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/hotspot/src/share/vm/code/dependencies.cpp
index 0f50425..9761d8d 100644
--- a/hotspot/src/share/vm/code/dependencies.cpp
+++ b/hotspot/src/share/vm/code/dependencies.cpp
@@ -407,56 +407,66 @@
// for the sake of the compiler log, print out current dependencies:
void Dependencies::log_all_dependencies() {
if (log() == NULL) return;
- ciBaseObject* args[max_arg_count];
+ ResourceMark rm;
for (int deptv = (int)FIRST_TYPE; deptv < (int)TYPE_LIMIT; deptv++) {
DepType dept = (DepType)deptv;
GrowableArray<ciBaseObject*>* deps = _deps[dept];
- if (deps->length() == 0) continue;
+ int deplen = deps->length();
+ if (deplen == 0) {
+ continue;
+ }
int stride = dep_args(dept);
+ GrowableArray<ciBaseObject*>* ciargs = new GrowableArray<ciBaseObject*>(stride);
for (int i = 0; i < deps->length(); i += stride) {
for (int j = 0; j < stride; j++) {
// flush out the identities before printing
- args[j] = deps->at(i+j);
+ ciargs->push(deps->at(i+j));
}
- write_dependency_to(log(), dept, stride, args);
+ write_dependency_to(log(), dept, ciargs);
+ ciargs->clear();
}
+ guarantee(deplen == deps->length(), "deps array cannot grow inside nested ResoureMark scope");
}
}
void Dependencies::write_dependency_to(CompileLog* log,
DepType dept,
- int nargs, DepArgument args[],
+ GrowableArray<DepArgument>* args,
Klass* witness) {
if (log == NULL) {
return;
}
+ ResourceMark rm;
ciEnv* env = ciEnv::current();
- ciBaseObject* ciargs[max_arg_count];
- assert(nargs <= max_arg_count, "oob");
- for (int j = 0; j < nargs; j++) {
- if (args[j].is_oop()) {
- ciargs[j] = env->get_object(args[j].oop_value());
+ GrowableArray<ciBaseObject*>* ciargs = new GrowableArray<ciBaseObject*>(args->length());
+ for (GrowableArrayIterator<DepArgument> it = args->begin(); it != args->end(); ++it) {
+ DepArgument arg = *it;
+ if (arg.is_oop()) {
+ ciargs->push(env->get_object(arg.oop_value()));
} else {
- ciargs[j] = env->get_metadata(args[j].metadata_value());
+ ciargs->push(env->get_metadata(arg.metadata_value()));
}
}
- Dependencies::write_dependency_to(log, dept, nargs, ciargs, witness);
+ int argslen = ciargs->length();
+ Dependencies::write_dependency_to(log, dept, ciargs, witness);
+ guarantee(argslen == ciargs->length(), "ciargs array cannot grow inside nested ResoureMark scope");
}
void Dependencies::write_dependency_to(CompileLog* log,
DepType dept,
- int nargs, ciBaseObject* args[],
+ GrowableArray<ciBaseObject*>* args,
Klass* witness) {
- if (log == NULL) return;
- assert(nargs <= max_arg_count, "oob");
- int argids[max_arg_count];
- int ctxkj = dep_context_arg(dept); // -1 if no context arg
- int j;
- for (j = 0; j < nargs; j++) {
- if (args[j]->is_object()) {
- argids[j] = log->identify(args[j]->as_object());
+ if (log == NULL) {
+ return;
+ }
+ ResourceMark rm;
+ GrowableArray<int>* argids = new GrowableArray<int>(args->length());
+ for (GrowableArrayIterator<ciBaseObject*> it = args->begin(); it != args->end(); ++it) {
+ ciBaseObject* obj = *it;
+ if (obj->is_object()) {
+ argids->push(log->identify(obj->as_object()));
} else {
- argids[j] = log->identify(args[j]->as_metadata());
+ argids->push(log->identify(obj->as_metadata()));
}
}
if (witness != NULL) {
@@ -465,16 +475,17 @@
log->begin_elem("dependency");
}
log->print(" type='%s'", dep_name(dept));
- if (ctxkj >= 0) {
- log->print(" ctxk='%d'", argids[ctxkj]);
+ const int ctxkj = dep_context_arg(dept); // -1 if no context arg
+ if (ctxkj >= 0 && ctxkj < argids->length()) {
+ log->print(" ctxk='%d'", argids->at(ctxkj));
}
// write remaining arguments, if any.
- for (j = 0; j < nargs; j++) {
+ for (int j = 0; j < argids->length(); j++) {
if (j == ctxkj) continue; // already logged
if (j == 1) {
- log->print( " x='%d'", argids[j]);
+ log->print( " x='%d'", argids->at(j));
} else {
- log->print(" x%d='%d'", j, argids[j]);
+ log->print(" x%d='%d'", j, argids->at(j));
}
}
if (witness != NULL) {
@@ -486,9 +497,12 @@
void Dependencies::write_dependency_to(xmlStream* xtty,
DepType dept,
- int nargs, DepArgument args[],
+ GrowableArray<DepArgument>* args,
Klass* witness) {
- if (xtty == NULL) return;
+ if (xtty == NULL) {
+ return;
+ }
+ ResourceMark rm;
ttyLocker ttyl;
int ctxkj = dep_context_arg(dept); // -1 if no context arg
if (witness != NULL) {
@@ -498,23 +512,24 @@
}
xtty->print(" type='%s'", dep_name(dept));
if (ctxkj >= 0) {
- xtty->object("ctxk", args[ctxkj].metadata_value());
+ xtty->object("ctxk", args->at(ctxkj).metadata_value());
}
// write remaining arguments, if any.
- for (int j = 0; j < nargs; j++) {
+ for (int j = 0; j < args->length(); j++) {
if (j == ctxkj) continue; // already logged
+ DepArgument arg = args->at(j);
if (j == 1) {
- if (args[j].is_oop()) {
- xtty->object("x", args[j].oop_value());
+ if (arg.is_oop()) {
+ xtty->object("x", arg.oop_value());
} else {
- xtty->object("x", args[j].metadata_value());
+ xtty->object("x", arg.metadata_value());
}
} else {
char xn[10]; sprintf(xn, "x%d", j);
- if (args[j].is_oop()) {
- xtty->object(xn, args[j].oop_value());
+ if (arg.is_oop()) {
+ xtty->object(xn, arg.oop_value());
} else {
- xtty->object(xn, args[j].metadata_value());
+ xtty->object(xn, arg.metadata_value());
}
}
}
@@ -525,7 +540,7 @@
xtty->end_elem();
}
-void Dependencies::print_dependency(DepType dept, int nargs, DepArgument args[],
+void Dependencies::print_dependency(DepType dept, GrowableArray<DepArgument>* args,
Klass* witness) {
ResourceMark rm;
ttyLocker ttyl; // keep the following output all in one block
@@ -534,8 +549,8 @@
dep_name(dept));
// print arguments
int ctxkj = dep_context_arg(dept); // -1 if no context arg
- for (int j = 0; j < nargs; j++) {
- DepArgument arg = args[j];
+ for (int j = 0; j < args->length(); j++) {
+ DepArgument arg = args->at(j);
bool put_star = false;
if (arg.is_null()) continue;
const char* what;
@@ -571,31 +586,33 @@
void Dependencies::DepStream::log_dependency(Klass* witness) {
if (_deps == NULL && xtty == NULL) return; // fast cutout for runtime
ResourceMark rm;
- int nargs = argument_count();
- DepArgument args[max_arg_count];
+ const int nargs = argument_count();
+ GrowableArray<DepArgument>* args = new GrowableArray<DepArgument>(nargs);
for (int j = 0; j < nargs; j++) {
if (type() == call_site_target_value) {
- args[j] = argument_oop(j);
+ args->push(argument_oop(j));
} else {
- args[j] = argument(j);
+ args->push(argument(j));
}
}
+ int argslen = args->length();
if (_deps != NULL && _deps->log() != NULL) {
- Dependencies::write_dependency_to(_deps->log(),
- type(), nargs, args, witness);
+ Dependencies::write_dependency_to(_deps->log(), type(), args, witness);
} else {
- Dependencies::write_dependency_to(xtty,
- type(), nargs, args, witness);
+ Dependencies::write_dependency_to(xtty, type(), args, witness);
}
+ guarantee(argslen == args->length(), "args array cannot grow inside nested ResoureMark scope");
}
void Dependencies::DepStream::print_dependency(Klass* witness, bool verbose) {
+ ResourceMark rm;
int nargs = argument_count();
- DepArgument args[max_arg_count];
+ GrowableArray<DepArgument>* args = new GrowableArray<DepArgument>(nargs);
for (int j = 0; j < nargs; j++) {
- args[j] = argument(j);
+ args->push(argument(j));
}
- Dependencies::print_dependency(type(), nargs, args, witness);
+ int argslen = args->length();
+ Dependencies::print_dependency(type(), args, witness);
if (verbose) {
if (_code != NULL) {
tty->print(" code: ");
@@ -603,6 +620,7 @@
tty->cr();
}
}
+ guarantee(argslen == args->length(), "args array cannot grow inside nested ResoureMark scope");
}
diff --git a/hotspot/src/share/vm/code/dependencies.hpp b/hotspot/src/share/vm/code/dependencies.hpp
index 3501b57..ff4ff32 100644
--- a/hotspot/src/share/vm/code/dependencies.hpp
+++ b/hotspot/src/share/vm/code/dependencies.hpp
@@ -369,20 +369,36 @@
void copy_to(nmethod* nm);
void log_all_dependencies();
- void log_dependency(DepType dept, int nargs, ciBaseObject* args[]) {
- write_dependency_to(log(), dept, nargs, args);
+
+ void log_dependency(DepType dept, GrowableArray<ciBaseObject*>* args) {
+ ResourceMark rm;
+ int argslen = args->length();
+ write_dependency_to(log(), dept, args);
+ guarantee(argslen == args->length(),
+ "args array cannot grow inside nested ResoureMark scope");
}
+
void log_dependency(DepType dept,
ciBaseObject* x0,
ciBaseObject* x1 = NULL,
ciBaseObject* x2 = NULL) {
- if (log() == NULL) return;
- ciBaseObject* args[max_arg_count];
- args[0] = x0;
- args[1] = x1;
- args[2] = x2;
- assert(2 < max_arg_count, "");
- log_dependency(dept, dep_args(dept), args);
+ if (log() == NULL) {
+ return;
+ }
+ ResourceMark rm;
+ GrowableArray<ciBaseObject*>* ciargs =
+ new GrowableArray<ciBaseObject*>(dep_args(dept));
+ assert (x0 != NULL, "no log x0");
+ ciargs->push(x0);
+
+ if (x1 != NULL) {
+ ciargs->push(x1);
+ }
+ if (x2 != NULL) {
+ ciargs->push(x2);
+ }
+ assert(ciargs->length() == dep_args(dept), "");
+ log_dependency(dept, ciargs);
}
class DepArgument : public ResourceObj {
@@ -405,20 +421,8 @@
Metadata* metadata_value() const { assert(!_is_oop && _valid, "must be"); return (Metadata*) _value; }
};
- static void write_dependency_to(CompileLog* log,
- DepType dept,
- int nargs, ciBaseObject* args[],
- Klass* witness = NULL);
- static void write_dependency_to(CompileLog* log,
- DepType dept,
- int nargs, DepArgument args[],
- Klass* witness = NULL);
- static void write_dependency_to(xmlStream* xtty,
- DepType dept,
- int nargs, DepArgument args[],
- Klass* witness = NULL);
static void print_dependency(DepType dept,
- int nargs, DepArgument args[],
+ GrowableArray<DepArgument>* args,
Klass* witness = NULL);
private:
@@ -427,6 +431,18 @@
static Klass* ctxk_encoded_as_null(DepType dept, Metadata* x);
+ static void write_dependency_to(CompileLog* log,
+ DepType dept,
+ GrowableArray<ciBaseObject*>* args,
+ Klass* witness = NULL);
+ static void write_dependency_to(CompileLog* log,
+ DepType dept,
+ GrowableArray<DepArgument>* args,
+ Klass* witness = NULL);
+ static void write_dependency_to(xmlStream* xtty,
+ DepType dept,
+ GrowableArray<DepArgument>* args,
+ Klass* witness = NULL);
public:
// Use this to iterate over an nmethod's dependency set.
// Works on new and old dependency sets.
diff --git a/hotspot/src/share/vm/compiler/compilerOracle.cpp b/hotspot/src/share/vm/compiler/compilerOracle.cpp
index b646158..7cf3be6 100644
--- a/hotspot/src/share/vm/compiler/compilerOracle.cpp
+++ b/hotspot/src/share/vm/compiler/compilerOracle.cpp
@@ -33,6 +33,7 @@
#include "oops/symbol.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
+#include "runtime/os.hpp"
class MethodMatcher : public CHeapObj<mtCompiler> {
public:
@@ -175,7 +176,11 @@
Symbol* method_name, Mode method_mode,
Symbol* signature, const char * opt, MethodMatcher* next):
MethodMatcher(class_name, class_mode, method_name, method_mode, signature, next) {
- option = opt;
+ option = os::strdup_check_oom(opt);
+ }
+
+ virtual ~MethodOptionMatcher() {
+ os::free((void*)option);
}
bool match(methodHandle method, const char* opt) {
@@ -498,7 +503,7 @@
tty->print("CompilerOracle: %s ", command_names[command]);
match->print();
}
- match = add_option_string(c_name, c_match, m_name, m_match, signature, strdup(option));
+ match = add_option_string(c_name, c_match, m_name, m_match, signature, option);
line += bytes_read;
}
} else {
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
index c2df7a2..aed7290 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,8 @@
}
void ConcurrentMarkSweepPolicy::initialize_generations() {
- _generations = NEW_C_HEAP_ARRAY3(GenerationSpecPtr, number_of_generations(), mtGC, 0, AllocFailStrategy::RETURN_NULL);
+ _generations = NEW_C_HEAP_ARRAY3(GenerationSpecPtr, number_of_generations(), mtGC,
+ CURRENT_PC, AllocFailStrategy::RETURN_NULL);
if (_generations == NULL)
vm_exit_during_initialization("Unable to allocate gen spec");
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index 7dbc7f1..a530038 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -5987,6 +5987,8 @@
};
void CMSRefProcTaskProxy::work(uint worker_id) {
+ ResourceMark rm;
+ HandleMark hm;
assert(_collector->_span.equals(_span), "Inconsistency in _span");
CMSParKeepAliveClosure par_keep_alive(_collector, _span,
_mark_bit_map,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index 3b9c0aa..7376921 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -2167,7 +2167,9 @@
g1h->increment_total_collections();
// Clean out dead classes and update Metaspace sizes.
- ClassLoaderDataGraph::purge();
+ if (ClassUnloadingWithConcurrentMark) {
+ ClassLoaderDataGraph::purge();
+ }
MetaspaceGC::compute_new_size();
// We reclaimed old regions so we should calculate the sizes to make
@@ -2403,6 +2405,8 @@
}
virtual void work(uint worker_id) {
+ ResourceMark rm;
+ HandleMark hm;
CMTask* task = _cm->task(worker_id);
G1CMIsAliveClosure g1_is_alive(_g1h);
G1CMKeepAliveAndDrainClosure g1_par_keep_alive(_cm, task, false /* is_serial */);
@@ -2595,24 +2599,27 @@
assert(_markStack.isEmpty(), "Marking should have completed");
// Unload Klasses, String, Symbols, Code Cache, etc.
-
- G1RemarkGCTraceTime trace("Unloading", G1Log::finer());
-
- bool purged_classes;
-
{
- G1RemarkGCTraceTime trace("System Dictionary Unloading", G1Log::finest());
- purged_classes = SystemDictionary::do_unloading(&g1_is_alive);
- }
+ G1RemarkGCTraceTime trace("Unloading", G1Log::finer());
- {
- G1RemarkGCTraceTime trace("Parallel Unloading", G1Log::finest());
- weakRefsWorkParallelPart(&g1_is_alive, purged_classes);
- }
+ if (ClassUnloadingWithConcurrentMark) {
+ bool purged_classes;
- if (G1StringDedup::is_enabled()) {
- G1RemarkGCTraceTime trace("String Deduplication Unlink", G1Log::finest());
- G1StringDedup::unlink(&g1_is_alive);
+ {
+ G1RemarkGCTraceTime trace("System Dictionary Unloading", G1Log::finest());
+ purged_classes = SystemDictionary::do_unloading(&g1_is_alive);
+ }
+
+ {
+ G1RemarkGCTraceTime trace("Parallel Unloading", G1Log::finest());
+ weakRefsWorkParallelPart(&g1_is_alive, purged_classes);
+ }
+ }
+
+ if (G1StringDedup::is_enabled()) {
+ G1RemarkGCTraceTime trace("String Deduplication Unlink", G1Log::finest());
+ G1StringDedup::unlink(&g1_is_alive);
+ }
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index db56c33..326cf04 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -1926,6 +1926,8 @@
_secondary_free_list("Secondary Free List", new SecondaryFreeRegionListMtSafeChecker()),
_old_set("Old Set", false /* humongous */, new OldRegionSetMtSafeChecker()),
_humongous_set("Master Humongous Set", true /* humongous */, new HumongousRegionSetMtSafeChecker()),
+ _humongous_is_live(),
+ _has_humongous_reclaim_candidates(false),
_free_regions_coming(false),
_young_list(new YoungList(this)),
_gc_time_stamp(0),
@@ -2082,6 +2084,7 @@
_g1h = this;
_in_cset_fast_test.initialize(_g1_reserved.start(), _g1_reserved.end(), HeapRegion::GrainBytes);
+ _humongous_is_live.initialize(_g1_reserved.start(), _g1_reserved.end(), HeapRegion::GrainBytes);
// Create the ConcurrentMark data structure and thread.
// (Must do this late, so that "max_regions" is defined.)
@@ -2177,6 +2180,11 @@
}
}
+void G1CollectedHeap::clear_humongous_is_live_table() {
+ guarantee(G1ReclaimDeadHumongousObjectsAtYoungGC, "Should only be called if true");
+ _humongous_is_live.clear();
+}
+
size_t G1CollectedHeap::conservative_max_heap_alignment() {
return HeapRegion::max_region_size();
}
@@ -2574,15 +2582,12 @@
// Iteration functions.
-// Iterates an OopClosure over all ref-containing fields of objects
-// within a HeapRegion.
+// Applies an ExtendedOopClosure onto all references of objects within a HeapRegion.
class IterateOopClosureRegionClosure: public HeapRegionClosure {
- MemRegion _mr;
ExtendedOopClosure* _cl;
public:
- IterateOopClosureRegionClosure(MemRegion mr, ExtendedOopClosure* cl)
- : _mr(mr), _cl(cl) {}
+ IterateOopClosureRegionClosure(ExtendedOopClosure* cl) : _cl(cl) {}
bool doHeapRegion(HeapRegion* r) {
if (!r->continuesHumongous()) {
r->oop_iterate(_cl);
@@ -2592,12 +2597,7 @@
};
void G1CollectedHeap::oop_iterate(ExtendedOopClosure* cl) {
- IterateOopClosureRegionClosure blk(_g1_committed, cl);
- heap_region_iterate(&blk);
-}
-
-void G1CollectedHeap::oop_iterate(MemRegion mr, ExtendedOopClosure* cl) {
- IterateOopClosureRegionClosure blk(mr, cl);
+ IterateOopClosureRegionClosure blk(cl);
heap_region_iterate(&blk);
}
@@ -3771,6 +3771,61 @@
return g1_rem_set()->cardsScanned();
}
+bool G1CollectedHeap::humongous_region_is_always_live(uint index) {
+ HeapRegion* region = region_at(index);
+ assert(region->startsHumongous(), "Must start a humongous object");
+ return oop(region->bottom())->is_objArray() || !region->rem_set()->is_empty();
+}
+
+class RegisterHumongousWithInCSetFastTestClosure : public HeapRegionClosure {
+ private:
+ size_t _total_humongous;
+ size_t _candidate_humongous;
+ public:
+ RegisterHumongousWithInCSetFastTestClosure() : _total_humongous(0), _candidate_humongous(0) {
+ }
+
+ virtual bool doHeapRegion(HeapRegion* r) {
+ if (!r->startsHumongous()) {
+ return false;
+ }
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+
+ uint region_idx = r->hrs_index();
+ bool is_candidate = !g1h->humongous_region_is_always_live(region_idx);
+ // Is_candidate already filters out humongous regions with some remembered set.
+ // This will not lead to humongous object that we mistakenly keep alive because
+ // during young collection the remembered sets will only be added to.
+ if (is_candidate) {
+ g1h->register_humongous_region_with_in_cset_fast_test(region_idx);
+ _candidate_humongous++;
+ }
+ _total_humongous++;
+
+ return false;
+ }
+
+ size_t total_humongous() const { return _total_humongous; }
+ size_t candidate_humongous() const { return _candidate_humongous; }
+};
+
+void G1CollectedHeap::register_humongous_regions_with_in_cset_fast_test() {
+ if (!G1ReclaimDeadHumongousObjectsAtYoungGC) {
+ g1_policy()->phase_times()->record_fast_reclaim_humongous_stats(0, 0);
+ return;
+ }
+
+ RegisterHumongousWithInCSetFastTestClosure cl;
+ heap_region_iterate(&cl);
+ g1_policy()->phase_times()->record_fast_reclaim_humongous_stats(cl.total_humongous(),
+ cl.candidate_humongous());
+ _has_humongous_reclaim_candidates = cl.candidate_humongous() > 0;
+
+ if (_has_humongous_reclaim_candidates) {
+ clear_humongous_is_live_table();
+ }
+}
+
void
G1CollectedHeap::setup_surviving_young_words() {
assert(_surviving_young_words == NULL, "pre-condition");
@@ -4058,6 +4113,8 @@
g1_policy()->finalize_cset(target_pause_time_ms, evacuation_info);
+ register_humongous_regions_with_in_cset_fast_test();
+
_cm->note_start_of_gc();
// We should not verify the per-thread SATB buffers given that
// we have not filtered them yet (we'll do so during the
@@ -4108,6 +4165,9 @@
true /* verify_fingers */);
free_collection_set(g1_policy()->collection_set(), evacuation_info);
+
+ eagerly_reclaim_humongous_regions();
+
g1_policy()->clear_collection_set();
cleanup_surviving_young_words();
@@ -4608,7 +4668,9 @@
assert(_worker_id == _par_scan_state->queue_num(), "sanity");
- if (_g1->in_cset_fast_test(obj)) {
+ G1CollectedHeap::in_cset_state_t state = _g1->in_cset_state(obj);
+
+ if (state == G1CollectedHeap::InCSet) {
oop forwardee;
if (obj->is_forwarded()) {
forwardee = obj->forwardee();
@@ -4627,6 +4689,9 @@
do_klass_barrier(p, forwardee);
}
} else {
+ if (state == G1CollectedHeap::IsHumongous) {
+ _g1->set_humongous_is_live(obj);
+ }
// The object is not in collection set. If we're a root scanning
// closure during an initial mark pause then attempt to mark the object.
if (do_mark_object == G1MarkFromRoot) {
@@ -4719,11 +4784,6 @@
Mutex _stats_lock;
Mutex* stats_lock() { return &_stats_lock; }
- size_t getNCards() {
- return (_g1h->capacity() + G1BlockOffsetSharedArray::N_bytes - 1)
- / G1BlockOffsetSharedArray::N_bytes;
- }
-
public:
G1ParTask(G1CollectedHeap* g1h, RefToScanQueueSet *task_queues)
: AbstractGangTask("G1 collection"),
@@ -4847,10 +4907,15 @@
if (_g1h->g1_policy()->during_initial_mark_pause()) {
// We also need to mark copied objects.
strong_root_cl = &scan_mark_root_cl;
- weak_root_cl = &scan_mark_weak_root_cl;
strong_cld_cl = &scan_mark_cld_cl;
- weak_cld_cl = &scan_mark_weak_cld_cl;
strong_code_cl = &scan_mark_code_cl;
+ if (ClassUnloadingWithConcurrentMark) {
+ weak_root_cl = &scan_mark_weak_root_cl;
+ weak_cld_cl = &scan_mark_weak_cld_cl;
+ } else {
+ weak_root_cl = &scan_mark_root_cl;
+ weak_cld_cl = &scan_mark_cld_cl;
+ }
} else {
strong_root_cl = &scan_only_root_cl;
weak_root_cl = &scan_only_root_cl;
@@ -4921,6 +4986,7 @@
double closure_app_time_sec = 0.0;
bool during_im = _g1h->g1_policy()->during_initial_mark_pause();
+ bool trace_metadata = during_im && ClassUnloadingWithConcurrentMark;
BufferingOopClosure buf_scan_non_heap_roots(scan_non_heap_roots);
BufferingOopClosure buf_scan_non_heap_weak_roots(scan_non_heap_weak_roots);
@@ -4930,8 +4996,8 @@
&buf_scan_non_heap_roots,
&buf_scan_non_heap_weak_roots,
scan_strong_clds,
- // Initial Mark handles the weak CLDs separately.
- (during_im ? NULL : scan_weak_clds),
+ // Unloading Initial Marks handle the weak CLDs separately.
+ (trace_metadata ? NULL : scan_weak_clds),
scan_strong_code);
// Now the CM ref_processor roots.
@@ -4943,7 +5009,7 @@
ref_processor_cm()->weak_oops_do(&buf_scan_non_heap_roots);
}
- if (during_im) {
+ if (trace_metadata) {
// Barrier to make sure all workers passed
// the strong CLD and strong nmethods phases.
active_strong_roots_scope()->wait_until_all_workers_done_with_threads(n_par_threads());
@@ -5450,12 +5516,21 @@
public:
G1KeepAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
- void do_oop( oop* p) {
+ void do_oop(oop* p) {
oop obj = *p;
- if (_g1->obj_in_cs(obj)) {
+ G1CollectedHeap::in_cset_state_t cset_state = _g1->in_cset_state(obj);
+ if (obj == NULL || cset_state == G1CollectedHeap::InNeither) {
+ return;
+ }
+ if (cset_state == G1CollectedHeap::InCSet) {
assert( obj->is_forwarded(), "invariant" );
*p = obj->forwardee();
+ } else {
+ assert(!obj->is_forwarded(), "invariant" );
+ assert(cset_state == G1CollectedHeap::IsHumongous,
+ err_msg("Only allowed InCSet state is IsHumongous, but is %d", cset_state));
+ _g1->set_humongous_is_live(obj);
}
}
};
@@ -5485,7 +5560,7 @@
template <class T> void do_oop_work(T* p) {
oop obj = oopDesc::load_decode_heap_oop(p);
- if (_g1h->obj_in_cs(obj)) {
+ if (_g1h->is_in_cset_or_humongous(obj)) {
// If the referent object has been forwarded (either copied
// to a new location or to itself in the event of an
// evacuation failure) then we need to update the reference
@@ -5510,10 +5585,10 @@
assert(!Metaspace::contains((const void*)p),
err_msg("Unexpectedly found a pointer from metadata: "
PTR_FORMAT, p));
- _copy_non_heap_obj_cl->do_oop(p);
- }
+ _copy_non_heap_obj_cl->do_oop(p);
}
}
+ }
};
// Serial drain queue closure. Called as the 'complete_gc'
@@ -6435,6 +6510,154 @@
policy->phase_times()->record_non_young_free_cset_time_ms(non_young_time_ms);
}
+class G1FreeHumongousRegionClosure : public HeapRegionClosure {
+ private:
+ FreeRegionList* _free_region_list;
+ HeapRegionSet* _proxy_set;
+ HeapRegionSetCount _humongous_regions_removed;
+ size_t _freed_bytes;
+ public:
+
+ G1FreeHumongousRegionClosure(FreeRegionList* free_region_list) :
+ _free_region_list(free_region_list), _humongous_regions_removed(), _freed_bytes(0) {
+ }
+
+ virtual bool doHeapRegion(HeapRegion* r) {
+ if (!r->startsHumongous()) {
+ return false;
+ }
+
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+
+ oop obj = (oop)r->bottom();
+ CMBitMap* next_bitmap = g1h->concurrent_mark()->nextMarkBitMap();
+
+ // The following checks whether the humongous object is live are sufficient.
+ // The main additional check (in addition to having a reference from the roots
+ // or the young gen) is whether the humongous object has a remembered set entry.
+ //
+ // A humongous object cannot be live if there is no remembered set for it
+ // because:
+ // - there can be no references from within humongous starts regions referencing
+ // the object because we never allocate other objects into them.
+ // (I.e. there are no intra-region references that may be missed by the
+ // remembered set)
+ // - as soon there is a remembered set entry to the humongous starts region
+ // (i.e. it has "escaped" to an old object) this remembered set entry will stay
+ // until the end of a concurrent mark.
+ //
+ // It is not required to check whether the object has been found dead by marking
+ // or not, in fact it would prevent reclamation within a concurrent cycle, as
+ // all objects allocated during that time are considered live.
+ // SATB marking is even more conservative than the remembered set.
+ // So if at this point in the collection there is no remembered set entry,
+ // nobody has a reference to it.
+ // At the start of collection we flush all refinement logs, and remembered sets
+ // are completely up-to-date wrt to references to the humongous object.
+ //
+ // Other implementation considerations:
+ // - never consider object arrays: while they are a valid target, they have not
+ // been observed to be used as temporary objects.
+ // - they would also pose considerable effort for cleaning up the the remembered
+ // sets.
+ // While this cleanup is not strictly necessary to be done (or done instantly),
+ // given that their occurrence is very low, this saves us this additional
+ // complexity.
+ uint region_idx = r->hrs_index();
+ if (g1h->humongous_is_live(region_idx) ||
+ g1h->humongous_region_is_always_live(region_idx)) {
+
+ if (G1TraceReclaimDeadHumongousObjectsAtYoungGC) {
+ gclog_or_tty->print_cr("Live humongous %d region %d with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d live-other %d obj array %d",
+ r->isHumongous(),
+ region_idx,
+ r->rem_set()->occupied(),
+ r->rem_set()->strong_code_roots_list_length(),
+ next_bitmap->isMarked(r->bottom()),
+ g1h->humongous_is_live(region_idx),
+ obj->is_objArray()
+ );
+ }
+
+ return false;
+ }
+
+ guarantee(!obj->is_objArray(),
+ err_msg("Eagerly reclaiming object arrays is not supported, but the object "PTR_FORMAT" is.",
+ r->bottom()));
+
+ if (G1TraceReclaimDeadHumongousObjectsAtYoungGC) {
+ gclog_or_tty->print_cr("Reclaim humongous region %d start "PTR_FORMAT" region %d length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d live-other %d obj array %d",
+ r->isHumongous(),
+ r->bottom(),
+ region_idx,
+ r->region_num(),
+ r->rem_set()->occupied(),
+ r->rem_set()->strong_code_roots_list_length(),
+ next_bitmap->isMarked(r->bottom()),
+ g1h->humongous_is_live(region_idx),
+ obj->is_objArray()
+ );
+ }
+ // Need to clear mark bit of the humongous object if already set.
+ if (next_bitmap->isMarked(r->bottom())) {
+ next_bitmap->clear(r->bottom());
+ }
+ _freed_bytes += r->used();
+ r->set_containing_set(NULL);
+ _humongous_regions_removed.increment(1u, r->capacity());
+ g1h->free_humongous_region(r, _free_region_list, false);
+
+ return false;
+ }
+
+ HeapRegionSetCount& humongous_free_count() {
+ return _humongous_regions_removed;
+ }
+
+ size_t bytes_freed() const {
+ return _freed_bytes;
+ }
+
+ size_t humongous_reclaimed() const {
+ return _humongous_regions_removed.length();
+ }
+};
+
+void G1CollectedHeap::eagerly_reclaim_humongous_regions() {
+ assert_at_safepoint(true);
+
+ if (!G1ReclaimDeadHumongousObjectsAtYoungGC || !_has_humongous_reclaim_candidates) {
+ g1_policy()->phase_times()->record_fast_reclaim_humongous_time_ms(0.0, 0);
+ return;
+ }
+
+ double start_time = os::elapsedTime();
+
+ FreeRegionList local_cleanup_list("Local Humongous Cleanup List");
+
+ G1FreeHumongousRegionClosure cl(&local_cleanup_list);
+ heap_region_iterate(&cl);
+
+ HeapRegionSetCount empty_set;
+ remove_from_old_sets(empty_set, cl.humongous_free_count());
+
+ G1HRPrinter* hr_printer = _g1h->hr_printer();
+ if (hr_printer->is_active()) {
+ FreeRegionListIterator iter(&local_cleanup_list);
+ while (iter.more_available()) {
+ HeapRegion* hr = iter.get_next();
+ hr_printer->cleanup(hr);
+ }
+ }
+
+ prepend_to_freelist(&local_cleanup_list);
+ decrement_summary_bytes(cl.bytes_freed());
+
+ g1_policy()->phase_times()->record_fast_reclaim_humongous_time_ms((os::elapsedTime() - start_time) * 1000.0,
+ cl.humongous_reclaimed());
+}
+
// This routine is similar to the above but does not record
// any policy statistics or update free lists; we are abandoning
// the current incremental collection set in preparation of a
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
index 9f51eaf..ae00d56 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
@@ -197,16 +197,6 @@
bool do_object_b(oop p);
};
-// Instances of this class are used for quick tests on whether a reference points
-// into the collection set. Each of the array's elements denotes whether the
-// corresponding region is in the collection set.
-class G1FastCSetBiasedMappedArray : public G1BiasedMappedArray<bool> {
- protected:
- bool default_value() const { return false; }
- public:
- void clear() { G1BiasedMappedArray<bool>::clear(); }
-};
-
class RefineCardTableEntryClosure;
class G1CollectedHeap : public SharedHeap {
@@ -237,6 +227,7 @@
friend class EvacPopObjClosure;
friend class G1ParCleanupCTTask;
+ friend class G1FreeHumongousRegionClosure;
// Other related classes.
friend class G1MarkSweep;
@@ -267,6 +258,9 @@
// It keeps track of the humongous regions.
HeapRegionSet _humongous_set;
+ void clear_humongous_is_live_table();
+ void eagerly_reclaim_humongous_regions();
+
// The number of regions we could create by expansion.
uint _expansion_regions;
@@ -367,10 +361,25 @@
// than the current allocation region.
size_t _summary_bytes_used;
- // This array is used for a quick test on whether a reference points into
- // the collection set or not. Each of the array's elements denotes whether the
- // corresponding region is in the collection set or not.
- G1FastCSetBiasedMappedArray _in_cset_fast_test;
+ // Records whether the region at the given index is kept live by roots or
+ // references from the young generation.
+ class HumongousIsLiveBiasedMappedArray : public G1BiasedMappedArray<bool> {
+ protected:
+ bool default_value() const { return false; }
+ public:
+ void clear() { G1BiasedMappedArray<bool>::clear(); }
+ void set_live(uint region) {
+ set_by_index(region, true);
+ }
+ bool is_live(uint region) {
+ return get_by_index(region);
+ }
+ };
+
+ HumongousIsLiveBiasedMappedArray _humongous_is_live;
+ // Stores whether during humongous object registration we found candidate regions.
+ // If not, we can skip a few steps.
+ bool _has_humongous_reclaim_candidates;
volatile unsigned _gc_time_stamp;
@@ -690,10 +699,24 @@
virtual void gc_prologue(bool full);
virtual void gc_epilogue(bool full);
+ inline void set_humongous_is_live(oop obj);
+
+ bool humongous_is_live(uint region) {
+ return _humongous_is_live.is_live(region);
+ }
+
+ // Returns whether the given region (which must be a humongous (start) region)
+ // is to be considered conservatively live regardless of any other conditions.
+ bool humongous_region_is_always_live(uint index);
+ // Register the given region to be part of the collection set.
+ inline void register_humongous_region_with_in_cset_fast_test(uint index);
+ // Register regions with humongous objects (actually on the start region) in
+ // the in_cset_fast_test table.
+ void register_humongous_regions_with_in_cset_fast_test();
// We register a region with the fast "in collection set" test. We
// simply set to true the array slot corresponding to this region.
void register_region_with_in_cset_fast_test(HeapRegion* r) {
- _in_cset_fast_test.set_by_index(r->hrs_index(), true);
+ _in_cset_fast_test.set_in_cset(r->hrs_index());
}
// This is a fast test on whether a reference points into the
@@ -1283,9 +1306,61 @@
virtual bool is_in(const void* p) const;
// Return "TRUE" iff the given object address is within the collection
- // set.
+ // set. Slow implementation.
inline bool obj_in_cs(oop obj);
+ inline bool is_in_cset(oop obj);
+
+ inline bool is_in_cset_or_humongous(const oop obj);
+
+ enum in_cset_state_t {
+ InNeither, // neither in collection set nor humongous
+ InCSet, // region is in collection set only
+ IsHumongous // region is a humongous start region
+ };
+ private:
+ // Instances of this class are used for quick tests on whether a reference points
+ // into the collection set or is a humongous object (points into a humongous
+ // object).
+ // Each of the array's elements denotes whether the corresponding region is in
+ // the collection set or a humongous region.
+ // We use this to quickly reclaim humongous objects: by making a humongous region
+ // succeed this test, we sort-of add it to the collection set. During the reference
+ // iteration closures, when we see a humongous region, we simply mark it as
+ // referenced, i.e. live.
+ class G1FastCSetBiasedMappedArray : public G1BiasedMappedArray<char> {
+ protected:
+ char default_value() const { return G1CollectedHeap::InNeither; }
+ public:
+ void set_humongous(uintptr_t index) {
+ assert(get_by_index(index) != InCSet, "Should not overwrite InCSet values");
+ set_by_index(index, G1CollectedHeap::IsHumongous);
+ }
+
+ void clear_humongous(uintptr_t index) {
+ set_by_index(index, G1CollectedHeap::InNeither);
+ }
+
+ void set_in_cset(uintptr_t index) {
+ assert(get_by_index(index) != G1CollectedHeap::IsHumongous, "Should not overwrite IsHumongous value");
+ set_by_index(index, G1CollectedHeap::InCSet);
+ }
+
+ bool is_in_cset_or_humongous(HeapWord* addr) const { return get_by_address(addr) != G1CollectedHeap::InNeither; }
+ bool is_in_cset(HeapWord* addr) const { return get_by_address(addr) == G1CollectedHeap::InCSet; }
+ G1CollectedHeap::in_cset_state_t at(HeapWord* addr) const { return (G1CollectedHeap::in_cset_state_t)get_by_address(addr); }
+ void clear() { G1BiasedMappedArray<char>::clear(); }
+ };
+
+ // This array is used for a quick test on whether a reference points into
+ // the collection set or not. Each of the array's elements denotes whether the
+ // corresponding region is in the collection set or not.
+ G1FastCSetBiasedMappedArray _in_cset_fast_test;
+
+ public:
+
+ inline in_cset_state_t in_cset_state(const oop obj);
+
// Return "TRUE" iff the given object address is in the reserved
// region of g1.
bool is_in_g1_reserved(const void* p) const {
@@ -1320,9 +1395,6 @@
// "cl.do_oop" on each.
virtual void oop_iterate(ExtendedOopClosure* cl);
- // Same as above, restricted to a memory region.
- void oop_iterate(MemRegion mr, ExtendedOopClosure* cl);
-
// Iterate over all objects, calling "cl.do_object" on each.
virtual void object_iterate(ObjectClosure* cl);
@@ -1340,6 +1412,10 @@
// Return the region with the given index. It assumes the index is valid.
inline HeapRegion* region_at(uint index) const;
+ // Calculate the region index of the given address. Given address must be
+ // within the heap.
+ inline uint addr_to_region(HeapWord* addr) const;
+
// Divide the heap region sequence into "chunks" of some size (the number
// of regions divided by the number of parallel threads times some
// overpartition factor, currently 4). Assumes that this will be called
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
index 7d5e530..2ea0cba 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
@@ -40,6 +40,13 @@
// Return the region with the given index. It assumes the index is valid.
inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrs.at(index); }
+inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
+ assert(is_in_reserved(addr),
+ err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
+ p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
+ return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
+}
+
template <class T>
inline HeapRegion*
G1CollectedHeap::heap_region_containing_raw(const T addr) const {
@@ -172,12 +179,11 @@
return _cm->nextMarkBitMap()->isMarked((HeapWord *)obj);
}
-
// This is a fast test on whether a reference points into the
// collection set or not. Assume that the reference
// points into the heap.
-inline bool G1CollectedHeap::in_cset_fast_test(oop obj) {
- bool ret = _in_cset_fast_test.get_by_address((HeapWord*)obj);
+inline bool G1CollectedHeap::is_in_cset(oop obj) {
+ bool ret = _in_cset_fast_test.is_in_cset((HeapWord*)obj);
// let's make sure the result is consistent with what the slower
// test returns
assert( ret || !obj_in_cs(obj), "sanity");
@@ -185,6 +191,18 @@
return ret;
}
+bool G1CollectedHeap::is_in_cset_or_humongous(const oop obj) {
+ return _in_cset_fast_test.is_in_cset_or_humongous((HeapWord*)obj);
+}
+
+G1CollectedHeap::in_cset_state_t G1CollectedHeap::in_cset_state(const oop obj) {
+ return _in_cset_fast_test.at((HeapWord*)obj);
+}
+
+void G1CollectedHeap::register_humongous_region_with_in_cset_fast_test(uint index) {
+ _in_cset_fast_test.set_humongous(index);
+}
+
#ifndef PRODUCT
// Support for G1EvacuationFailureALot
@@ -288,4 +306,22 @@
return is_obj_ill(obj, heap_region_containing(obj));
}
+inline void G1CollectedHeap::set_humongous_is_live(oop obj) {
+ uint region = addr_to_region((HeapWord*)obj);
+ // We not only set the "live" flag in the humongous_is_live table, but also
+ // reset the entry in the _in_cset_fast_test table so that subsequent references
+ // to the same humongous object do not go into the slow path again.
+ // This is racy, as multiple threads may at the same time enter here, but this
+ // is benign.
+ // During collection we only ever set the "live" flag, and only ever clear the
+ // entry in the in_cset_fast_table.
+ // We only ever evaluate the contents of these tables (in the VM thread) after
+ // having synchronized the worker threads with the VM thread, or in the same
+ // thread (i.e. within the VM thread).
+ if (!_humongous_is_live.is_live(region)) {
+ _humongous_is_live.set_live(region);
+ _in_cset_fast_test.clear_humongous(region);
+ }
+}
+
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
index 49232d6..4e3fde8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
@@ -237,8 +237,10 @@
_last_gc_worker_times_ms.verify();
_last_gc_worker_other_times_ms.verify();
- _last_redirty_logged_cards_time_ms.verify();
- _last_redirty_logged_cards_processed_cards.verify();
+ if (G1DeferredRSUpdate) {
+ _last_redirty_logged_cards_time_ms.verify();
+ _last_redirty_logged_cards_processed_cards.verify();
+ }
}
void G1GCPhaseTimes::note_string_dedup_fixup_start() {
@@ -255,6 +257,10 @@
LineBuffer(level).append_and_print_cr("[%s: %.1lf ms]", str, value);
}
+void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
+ LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
+}
+
void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
LineBuffer(level).append_and_print_cr("[%s: %.1lf ms, GC Workers: %u]", str, value, workers);
}
@@ -357,6 +363,14 @@
_last_redirty_logged_cards_processed_cards.print(3, "Redirtied Cards");
}
}
+ if (G1ReclaimDeadHumongousObjectsAtYoungGC) {
+ print_stats(2, "Humongous Reclaim", _cur_fast_reclaim_humongous_time_ms);
+ if (G1Log::finest()) {
+ print_stats(3, "Humongous Total", _cur_fast_reclaim_humongous_total);
+ print_stats(3, "Humongous Candidate", _cur_fast_reclaim_humongous_candidates);
+ print_stats(3, "Humongous Reclaimed", _cur_fast_reclaim_humongous_reclaimed);
+ }
+ }
print_stats(2, "Free CSet",
(_recorded_young_free_cset_time_ms +
_recorded_non_young_free_cset_time_ms));
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp
index 12a3a7d..4237c97 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp
@@ -157,11 +157,17 @@
double _recorded_young_free_cset_time_ms;
double _recorded_non_young_free_cset_time_ms;
+ double _cur_fast_reclaim_humongous_time_ms;
+ size_t _cur_fast_reclaim_humongous_total;
+ size_t _cur_fast_reclaim_humongous_candidates;
+ size_t _cur_fast_reclaim_humongous_reclaimed;
+
double _cur_verify_before_time_ms;
double _cur_verify_after_time_ms;
// Helper methods for detailed logging
void print_stats(int level, const char* str, double value);
+ void print_stats(int level, const char* str, size_t value);
void print_stats(int level, const char* str, double value, uint workers);
public:
@@ -282,6 +288,16 @@
_recorded_non_young_free_cset_time_ms = time_ms;
}
+ void record_fast_reclaim_humongous_stats(size_t total, size_t candidates) {
+ _cur_fast_reclaim_humongous_total = total;
+ _cur_fast_reclaim_humongous_candidates = candidates;
+ }
+
+ void record_fast_reclaim_humongous_time_ms(double value, size_t reclaimed) {
+ _cur_fast_reclaim_humongous_time_ms = value;
+ _cur_fast_reclaim_humongous_reclaimed = reclaimed;
+ }
+
void record_young_cset_choice_time_ms(double time_ms) {
_recorded_young_cset_choice_time_ms = time_ms;
}
@@ -348,6 +364,10 @@
return _recorded_non_young_free_cset_time_ms;
}
+ double fast_reclaim_humongous_time_ms() {
+ return _cur_fast_reclaim_humongous_time_ms;
+ }
+
double average_last_update_rs_time() {
return _last_update_rs_times_ms.average();
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
index 2db5b9b..ecdb194 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
@@ -44,7 +44,7 @@
inline void FilterIntoCSClosure::do_oop_nv(T* p) {
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop) &&
- _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop))) {
+ _g1->is_in_cset_or_humongous(oopDesc::decode_heap_oop_not_null(heap_oop))) {
_oc->do_oop(p);
}
}
@@ -67,7 +67,8 @@
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
- if (_g1->in_cset_fast_test(obj)) {
+ G1CollectedHeap::in_cset_state_t state = _g1->in_cset_state(obj);
+ if (state == G1CollectedHeap::InCSet) {
// We're not going to even bother checking whether the object is
// already forwarded or not, as this usually causes an immediate
// stall. We'll try to prefetch the object (for write, given that
@@ -86,6 +87,9 @@
_par_scan_state->push_on_queue(p);
} else {
+ if (state == G1CollectedHeap::IsHumongous) {
+ _g1->set_humongous_is_live(obj);
+ }
_par_scan_state->update_rs(_from, p, _worker_id);
}
}
@@ -97,12 +101,14 @@
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
- if (_g1->in_cset_fast_test(obj)) {
+ if (_g1->is_in_cset_or_humongous(obj)) {
Prefetch::write(obj->mark_addr(), 0);
Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
// Place on the references queue
_par_scan_state->push_on_queue(p);
+ } else {
+ assert(!_g1->obj_in_cs(obj), "checking");
}
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp
index 89e3e81..bf5824f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp
@@ -288,7 +288,12 @@
}
HeapWord* G1ParScanThreadState::allocate(GCAllocPurpose purpose, size_t word_sz) {
- HeapWord* obj = alloc_buffer(purpose)->allocate(word_sz);
+ HeapWord* obj = NULL;
+ if (purpose == GCAllocForSurvived) {
+ obj = alloc_buffer(GCAllocForSurvived)->allocate_aligned(word_sz, SurvivorAlignmentInBytes);
+ } else {
+ obj = alloc_buffer(GCAllocForTenured)->allocate(word_sz);
+ }
if (obj != NULL) {
return obj;
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp
index fc2fbe3..75517fb 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp
@@ -52,15 +52,20 @@
// set, due to (benign) races in the claim mechanism during RSet scanning more
// than one thread might claim the same card. So the same card may be
// processed multiple times. So redo this check.
- if (_g1h->in_cset_fast_test(obj)) {
+ G1CollectedHeap::in_cset_state_t in_cset_state = _g1h->in_cset_state(obj);
+ if (in_cset_state == G1CollectedHeap::InCSet) {
oop forwardee;
if (obj->is_forwarded()) {
forwardee = obj->forwardee();
} else {
forwardee = copy_to_survivor_space(obj);
}
- assert(forwardee != NULL, "forwardee should not be NULL");
oopDesc::encode_store_heap_oop(p, forwardee);
+ } else if (in_cset_state == G1CollectedHeap::IsHumongous) {
+ _g1h->set_humongous_is_live(obj);
+ } else {
+ assert(in_cset_state == G1CollectedHeap::InNeither,
+ err_msg("In_cset_state must be InNeither here, but is %d", in_cset_state));
}
assert(obj != NULL, "Must be");
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
index 69b17c5..96f885a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
@@ -349,23 +349,8 @@
assert((ParallelGCThreads > 0) || worker_i == 0, "invariant");
- // The two flags below were introduced temporarily to serialize
- // the updating and scanning of remembered sets. There are some
- // race conditions when these two operations are done in parallel
- // and they are causing failures. When we resolve said race
- // conditions, we'll revert back to parallel remembered set
- // updating and scanning. See CRs 6677707 and 6677708.
- if (G1UseParallelRSetUpdating || (worker_i == 0)) {
- updateRS(&into_cset_dcq, worker_i);
- } else {
- _g1p->phase_times()->record_update_rs_processed_buffers(worker_i, 0);
- _g1p->phase_times()->record_update_rs_time(worker_i, 0.0);
- }
- if (G1UseParallelRSetScanning || (worker_i == 0)) {
- scanRS(oc, code_root_cl, worker_i);
- } else {
- _g1p->phase_times()->record_scan_rs_time(worker_i, 0.0);
- }
+ updateRS(&into_cset_dcq, worker_i);
+ scanRS(oc, code_root_cl, worker_i);
// We now clear the cached values of _cset_rs_update_cl for this worker
_cset_rs_update_cl[worker_i] = NULL;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
index f50eaa1..17ae309 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
@@ -220,14 +220,6 @@
product(uintx, G1HeapRegionSize, 0, \
"Size of the G1 regions.") \
\
- experimental(bool, G1UseParallelRSetUpdating, true, \
- "Enables the parallelization of remembered set updating " \
- "during evacuation pauses") \
- \
- experimental(bool, G1UseParallelRSetScanning, true, \
- "Enables the parallelization of remembered set scanning " \
- "during evacuation pauses") \
- \
product(uintx, G1ConcRefinementThreads, 0, \
"If non-0 is the number of parallel rem set update threads, " \
"otherwise the value is determined ergonomically.") \
@@ -289,6 +281,13 @@
"The amount of code root chunks that should be kept at most " \
"as percentage of already allocated.") \
\
+ experimental(bool, G1ReclaimDeadHumongousObjectsAtYoungGC, true, \
+ "Try to reclaim dead large objects at every young GC.") \
+ \
+ experimental(bool, G1TraceReclaimDeadHumongousObjectsAtYoungGC, false, \
+ "Print some information about large object liveness " \
+ "at every young GC.") \
+ \
experimental(uintx, G1OldCSetRegionThresholdPercent, 10, \
"An upper bound for the number of old CSet regions expressed " \
"as a percentage of the heap size.") \
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
index ebe4c06..62ae230f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
@@ -94,26 +94,37 @@
inline bool
HeapRegion::block_is_obj(const HeapWord* p) const {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
- return !g1h->is_obj_dead(oop(p), this);
+ if (ClassUnloadingWithConcurrentMark) {
+ return !g1h->is_obj_dead(oop(p), this);
+ }
+ return p < top();
}
inline size_t
HeapRegion::block_size(const HeapWord *addr) const {
+ if (addr == top()) {
+ return pointer_delta(end(), addr);
+ }
+
+ if (block_is_obj(addr)) {
+ return oop(addr)->size();
+ }
+
+ assert(ClassUnloadingWithConcurrentMark,
+ err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
+ "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
+ "addr: " PTR_FORMAT,
+ p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
+
// Old regions' dead objects may have dead classes
// We need to find the next live object in some other
// manner than getting the oop size
G1CollectedHeap* g1h = G1CollectedHeap::heap();
- if (g1h->is_obj_dead(oop(addr), this)) {
- HeapWord* next = g1h->concurrent_mark()->prevMarkBitMap()->
- getNextMarkedWordAddress(addr, prev_top_at_mark_start());
+ HeapWord* next = g1h->concurrent_mark()->prevMarkBitMap()->
+ getNextMarkedWordAddress(addr, prev_top_at_mark_start());
- assert(next > addr, "must get the next live object");
-
- return pointer_delta(next, addr);
- } else if (addr == top()) {
- return pointer_delta(end(), addr);
- }
- return oop(addr)->size();
+ assert(next > addr, "must get the next live object");
+ return pointer_delta(next, addr);
}
inline HeapWord* HeapRegion::par_allocate_no_bot_updates(size_t word_size) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
index df65940..5093327 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
@@ -289,7 +289,7 @@
}
_fine_grain_regions = NEW_C_HEAP_ARRAY3(PerRegionTablePtr, _max_fine_entries,
- mtGC, 0, AllocFailStrategy::RETURN_NULL);
+ mtGC, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
if (_fine_grain_regions == NULL) {
vm_exit_out_of_memory(sizeof(void*)*_max_fine_entries, OOM_MALLOC_ERROR,
@@ -695,6 +695,9 @@
clear_fcc();
}
+bool OtherRegionsTable::is_empty() const {
+ return occ_sparse() == 0 && occ_coarse() == 0 && _first_all_fine_prts == NULL;
+}
size_t OtherRegionsTable::occupied() const {
size_t sum = occ_fine();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
index 64a02ea..1ac1bb4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
@@ -185,6 +185,9 @@
// objects.
void scrub(CardTableModRefBS* ctbs, BitMap* region_bm, BitMap* card_bm);
+ // Returns whether this remembered set (and all sub-sets) contain no entries.
+ bool is_empty() const;
+
size_t occupied() const;
size_t occ_fine() const;
size_t occ_coarse() const;
@@ -269,6 +272,10 @@
return _other_regions.hr();
}
+ bool is_empty() const {
+ return (strong_code_roots_list_length() == 0) && _other_regions.is_empty();
+ }
+
size_t occupied() {
MutexLockerEx x(&_m, Mutex::_no_safepoint_check_flag);
return occupied_locked();
@@ -371,7 +378,7 @@
void strong_code_roots_do(CodeBlobClosure* blk) const;
// Returns the number of elements in the strong code roots list
- size_t strong_code_roots_list_length() {
+ size_t strong_code_roots_list_length() const {
return _code_roots.length();
}
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
index bddc6f6..cc86629 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
@@ -28,12 +28,12 @@
#include "gc_implementation/parNew/parOopClosures.inline.hpp"
#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
#include "gc_implementation/shared/ageTable.hpp"
-#include "gc_implementation/shared/parGCAllocBuffer.hpp"
+#include "gc_implementation/shared/copyFailedInfo.hpp"
#include "gc_implementation/shared/gcHeapSummary.hpp"
#include "gc_implementation/shared/gcTimer.hpp"
#include "gc_implementation/shared/gcTrace.hpp"
#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
+#include "gc_implementation/shared/parGCAllocBuffer.inline.hpp"
#include "gc_implementation/shared/spaceDecorator.hpp"
#include "memory/defNewGeneration.inline.hpp"
#include "memory/genCollectedHeap.hpp"
@@ -252,7 +252,7 @@
plab->set_word_size(buf_size);
plab->set_buf(buf_space);
record_survivor_plab(buf_space, buf_size);
- obj = plab->allocate(word_sz);
+ obj = plab->allocate_aligned(word_sz, SurvivorAlignmentInBytes);
// Note that we cannot compare buf_size < word_sz below
// because of AlignmentReserve (see ParGCAllocBuffer::allocate()).
assert(obj != NULL || plab->words_remaining() < word_sz,
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
index bde15f7..7685353 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
@@ -168,7 +168,7 @@
HeapWord* alloc_in_to_space_slow(size_t word_sz);
HeapWord* alloc_in_to_space(size_t word_sz) {
- HeapWord* obj = to_space_alloc_buffer()->allocate(word_sz);
+ HeapWord* obj = to_space_alloc_buffer()->allocate_aligned(word_sz, SurvivorAlignmentInBytes);
if (obj != NULL) return obj;
else return alloc_in_to_space_slow(word_sz);
}
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
index e87529c..05c27a3 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
@@ -26,6 +26,7 @@
#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP
#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
+#include "gc_interface/collectedHeap.inline.hpp"
#include "memory/allocation.hpp"
//
@@ -94,23 +95,9 @@
PSYoungPromotionLAB() { }
// Not MT safe
- HeapWord* allocate(size_t size) {
- // Can't assert this, when young fills, we keep the LAB around, but flushed.
- // assert(_state != flushed, "Sanity");
- HeapWord* obj = top();
- HeapWord* new_top = obj + size;
- // The 'new_top>obj' check is needed to detect overflow of obj+size.
- if (new_top > obj && new_top <= end()) {
- set_top(new_top);
- assert(is_object_aligned((intptr_t)obj) && is_object_aligned((intptr_t)new_top),
- "checking alignment");
- return obj;
- }
+ inline HeapWord* allocate(size_t size);
- return NULL;
- }
-
- debug_only(virtual bool lab_is_valid(MemRegion lab));
+ debug_only(virtual bool lab_is_valid(MemRegion lab);)
};
class PSOldPromotionLAB : public PSPromotionLAB {
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp
new file mode 100644
index 0000000..0e5d7e7
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_INLINE_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_INLINE_HPP
+
+#include "gc_implementation/parallelScavenge/psPromotionLAB.hpp"
+#include "gc_interface/collectedHeap.inline.hpp"
+
+HeapWord* PSYoungPromotionLAB::allocate(size_t size) {
+ // Can't assert this, when young fills, we keep the LAB around, but flushed.
+ // assert(_state != flushed, "Sanity");
+ HeapWord* obj = CollectedHeap::align_allocation_or_fail(top(), end(), SurvivorAlignmentInBytes);
+ if (obj == NULL) {
+ return NULL;
+ }
+
+ HeapWord* new_top = obj + size;
+ // The 'new_top>obj' check is needed to detect overflow of obj+size.
+ if (new_top > obj && new_top <= end()) {
+ set_top(new_top);
+ assert(is_ptr_aligned(obj, SurvivorAlignmentInBytes) && is_object_aligned((intptr_t)new_top),
+ "checking alignment");
+ return obj;
+ } else {
+ set_top(obj);
+ return NULL;
+ }
+}
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
index 356c258..b2de74d 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
@@ -27,6 +27,7 @@
#include "gc_implementation/parallelScavenge/psOldGen.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
+#include "gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
#include "oops/oop.psgc.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
index 3677ee2..6f1c5eb 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
@@ -24,7 +24,7 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP
#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP
-
+#include "gc_interface/collectedHeap.hpp"
#include "memory/allocation.hpp"
#include "memory/blockOffsetTable.hpp"
#include "memory/threadLocalAllocBuffer.hpp"
@@ -84,6 +84,9 @@
}
}
+ // Allocate the object aligned to "alignment_in_bytes".
+ HeapWord* allocate_aligned(size_t word_sz, unsigned short alignment_in_bytes);
+
// Undo the last allocation in the buffer, which is required to be of the
// "obj" of the given "word_sz".
void undo_allocation(HeapWord* obj, size_t word_sz) {
diff --git a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp
new file mode 100644
index 0000000..352ce05
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_PARGCALLOCBUFFER_INLINE_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_SHARED_PARGCALLOCBUFFER_INLINE_HPP
+
+#include "gc_implementation/shared/parGCAllocBuffer.hpp"
+#include "gc_interface/collectedHeap.inline.hpp"
+
+HeapWord* ParGCAllocBuffer::allocate_aligned(size_t word_sz, unsigned short alignment_in_bytes) {
+
+ HeapWord* res = CollectedHeap::align_allocation_or_fail(_top, _end, alignment_in_bytes);
+ if (res == NULL) {
+ return NULL;
+ }
+
+ // Set _top so that allocate(), which expects _top to be correctly set,
+ // can be used below.
+ _top = res;
+ return allocate(word_sz);
+}
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_PARGCALLOCBUFFER_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
index bb7028e..b80332b 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
@@ -195,6 +195,7 @@
gch->do_full_collection(gch->must_clear_all_soft_refs(), _max_level);
}
+// Returns true iff concurrent GCs unloads metadata.
bool VM_CollectForMetadataAllocation::initiate_concurrent_GC() {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC && CMSClassUnloadingEnabled) {
@@ -202,7 +203,7 @@
return true;
}
- if (UseG1GC) {
+ if (UseG1GC && ClassUnloadingWithConcurrentMark) {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
g1h->g1_policy()->set_initiate_conc_mark_if_possible();
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
index d3c2fba..d4fa7ff 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
@@ -351,6 +351,12 @@
fill_with_object(start, pointer_delta(end, start), zap);
}
+ // Return the address "addr" aligned by "alignment_in_bytes" if such
+ // an address is below "end". Return NULL otherwise.
+ inline static HeapWord* align_allocation_or_fail(HeapWord* addr,
+ HeapWord* end,
+ unsigned short alignment_in_bytes);
+
// Some heaps may offer a contiguous region for shared non-blocking
// allocation, via inlined code (by exporting the address of the top and
// end fields defining the extent of the contiguous allocation region.)
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
index 89315a9..302d0c7 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
@@ -241,6 +241,44 @@
oop_iterate(&no_header_cl);
}
+
+inline HeapWord* CollectedHeap::align_allocation_or_fail(HeapWord* addr,
+ HeapWord* end,
+ unsigned short alignment_in_bytes) {
+ if (alignment_in_bytes <= ObjectAlignmentInBytes) {
+ return addr;
+ }
+
+ assert(is_ptr_aligned(addr, HeapWordSize),
+ err_msg("Address " PTR_FORMAT " is not properly aligned.", p2i(addr)));
+ assert(is_size_aligned(alignment_in_bytes, HeapWordSize),
+ err_msg("Alignment size %u is incorrect.", alignment_in_bytes));
+
+ HeapWord* new_addr = (HeapWord*) align_pointer_up(addr, alignment_in_bytes);
+ size_t padding = pointer_delta(new_addr, addr);
+
+ if (padding == 0) {
+ return addr;
+ }
+
+ if (padding < CollectedHeap::min_fill_size()) {
+ padding += alignment_in_bytes / HeapWordSize;
+ assert(padding >= CollectedHeap::min_fill_size(),
+ err_msg("alignment_in_bytes %u is expect to be larger "
+ "than the minimum object size", alignment_in_bytes));
+ new_addr = addr + padding;
+ }
+
+ assert(new_addr > addr, err_msg("Unexpected arithmetic overflow "
+ PTR_FORMAT " not greater than " PTR_FORMAT, p2i(new_addr), p2i(addr)));
+ if(new_addr < end) {
+ CollectedHeap::fill_with_object(addr, padding);
+ return new_addr;
+ } else {
+ return NULL;
+ }
+}
+
#ifndef PRODUCT
inline bool
diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
index 783066e..de54137 100644
--- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
+++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
@@ -280,9 +280,6 @@
address generate_result_handler_for(BasicType type);
address generate_slow_signature_handler();
- // entry point generator
- address generate_method_entry(AbstractInterpreter::MethodKind kind);
-
void bang_stack_shadow_pages(bool native_call);
void generate_all();
diff --git a/hotspot/src/share/vm/interpreter/cppInterpreter.cpp b/hotspot/src/share/vm/interpreter/cppInterpreter.cpp
index 0007aa8..c154a74 100644
--- a/hotspot/src/share/vm/interpreter/cppInterpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/cppInterpreter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,7 @@
}
-#define method_entry(kind) Interpreter::_entry_table[Interpreter::kind] = generate_method_entry(Interpreter::kind)
+#define method_entry(kind) Interpreter::_entry_table[Interpreter::kind] = ((InterpreterGenerator*)this)->generate_method_entry(Interpreter::kind)
{ CodeletMark cm(_masm, "(kind = frame_manager)");
// all non-native method kinds
diff --git a/hotspot/src/share/vm/interpreter/interpreter.cpp b/hotspot/src/share/vm/interpreter/interpreter.cpp
index 4807cd0..00c1162 100644
--- a/hotspot/src/share/vm/interpreter/interpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreter.cpp
@@ -29,6 +29,7 @@
#include "interpreter/bytecodeHistogram.hpp"
#include "interpreter/bytecodeInterpreter.hpp"
#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterGenerator.hpp"
#include "interpreter/interpreterRuntime.hpp"
#include "interpreter/interp_masm.hpp"
#include "interpreter/templateTable.hpp"
@@ -261,7 +262,7 @@
// Special intrinsic method?
// Note: This test must come _after_ the test for native methods,
// otherwise we will run into problems with JDK 1.2, see also
- // AbstractInterpreterGenerator::generate_method_entry() for
+ // InterpreterGenerator::generate_method_entry() for
// for details.
switch (m->intrinsic_id()) {
case vmIntrinsics::_dsin : return java_lang_math_sin ;
@@ -521,3 +522,50 @@
Interpreter::_entry_table[kind] = Interpreter::_entry_table[Interpreter::abstract];
}
}
+
+// Generate method entries
+address InterpreterGenerator::generate_method_entry(
+ AbstractInterpreter::MethodKind kind) {
+ // determine code generation flags
+ bool synchronized = false;
+ address entry_point = NULL;
+
+ switch (kind) {
+ case Interpreter::zerolocals : break;
+ case Interpreter::zerolocals_synchronized: synchronized = true; break;
+ case Interpreter::native : entry_point = generate_native_entry(false); break;
+ case Interpreter::native_synchronized : entry_point = generate_native_entry(true); break;
+ case Interpreter::empty : entry_point = generate_empty_entry(); break;
+ case Interpreter::accessor : entry_point = generate_accessor_entry(); break;
+ case Interpreter::abstract : entry_point = generate_abstract_entry(); break;
+
+ case Interpreter::java_lang_math_sin : // fall thru
+ case Interpreter::java_lang_math_cos : // fall thru
+ case Interpreter::java_lang_math_tan : // fall thru
+ case Interpreter::java_lang_math_abs : // fall thru
+ case Interpreter::java_lang_math_log : // fall thru
+ case Interpreter::java_lang_math_log10 : // fall thru
+ case Interpreter::java_lang_math_sqrt : // fall thru
+ case Interpreter::java_lang_math_pow : // fall thru
+ case Interpreter::java_lang_math_exp : entry_point = generate_math_entry(kind); break;
+ case Interpreter::java_lang_ref_reference_get
+ : entry_point = generate_Reference_get_entry(); break;
+#ifndef CC_INTERP
+ case Interpreter::java_util_zip_CRC32_update
+ : entry_point = generate_CRC32_update_entry(); break;
+ case Interpreter::java_util_zip_CRC32_updateBytes
+ : // fall thru
+ case Interpreter::java_util_zip_CRC32_updateByteBuffer
+ : entry_point = generate_CRC32_updateBytes_entry(kind); break;
+#endif // CC_INTERP
+ default:
+ fatal(err_msg("unexpected method kind: %d", kind));
+ break;
+ }
+
+ if (entry_point) {
+ return entry_point;
+ }
+
+ return generate_normal_entry(synchronized);
+}
diff --git a/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp b/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp
index 7bc43ec..5c4242d 100644
--- a/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp
+++ b/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,11 @@
class InterpreterGenerator: public CC_INTERP_ONLY(CppInterpreterGenerator)
NOT_CC_INTERP(TemplateInterpreterGenerator) {
-public:
+ public:
-InterpreterGenerator(StubQueue* _code);
+ InterpreterGenerator(StubQueue* _code);
+ // entry point generator
+ address generate_method_entry(AbstractInterpreter::MethodKind kind);
#ifdef TARGET_ARCH_x86
# include "interpreterGenerator_x86.hpp"
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index 23d4bdd..ee74860 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -987,17 +987,6 @@
int index = cp_entry->field_index();
if ((ik->field_access_flags(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return;
- switch(cp_entry->flag_state()) {
- case btos: // fall through
- case ctos: // fall through
- case stos: // fall through
- case itos: // fall through
- case ftos: // fall through
- case ltos: // fall through
- case dtos: // fall through
- case atos: break;
- default: ShouldNotReachHere(); return;
- }
bool is_static = (obj == NULL);
HandleMark hm(thread);
diff --git a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
index 9f28e20..d42da31 100644
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
@@ -364,7 +364,7 @@
#define method_entry(kind) \
{ CodeletMark cm(_masm, "method entry point (kind = " #kind ")"); \
- Interpreter::_entry_table[Interpreter::kind] = generate_method_entry(Interpreter::kind); \
+ Interpreter::_entry_table[Interpreter::kind] = ((InterpreterGenerator*)this)->generate_method_entry(Interpreter::kind); \
}
// all non-native method kinds
diff --git a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
index ee1b0f5..e3740c4 100644
--- a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
+++ b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,9 +59,6 @@
address generate_safept_entry_for(TosState state, address runtime_entry);
void generate_throw_exception();
- // entry point generator
-// address generate_method_entry(AbstractInterpreter::MethodKind kind);
-
// Instruction generation
void generate_and_dispatch (Template* t, TosState tos_out = ilgl);
void set_vtos_entry_points (Template* t, address& bep, address& cep, address& sep, address& aep, address& iep, address& lep, address& fep, address& dep, address& vep);
diff --git a/hotspot/src/share/vm/memory/allocation.cpp b/hotspot/src/share/vm/memory/allocation.cpp
index ac9ff11..ec9a849 100644
--- a/hotspot/src/share/vm/memory/allocation.cpp
+++ b/hotspot/src/share/vm/memory/allocation.cpp
@@ -422,26 +422,23 @@
}
//------------------------------Arena------------------------------------------
-NOT_PRODUCT(volatile jint Arena::_instance_count = 0;)
-Arena::Arena(size_t init_size) {
+Arena::Arena(MEMFLAGS flag, size_t init_size) : _flags(flag), _size_in_bytes(0) {
size_t round_size = (sizeof (char *)) - 1;
init_size = (init_size+round_size) & ~round_size;
_first = _chunk = new (AllocFailStrategy::EXIT_OOM, init_size) Chunk(init_size);
_hwm = _chunk->bottom(); // Save the cached hwm, max
_max = _chunk->top();
- _size_in_bytes = 0;
+ MemTracker::record_new_arena(flag);
set_size_in_bytes(init_size);
- NOT_PRODUCT(Atomic::inc(&_instance_count);)
}
-Arena::Arena() {
+Arena::Arena(MEMFLAGS flag) : _flags(flag), _size_in_bytes(0) {
_first = _chunk = new (AllocFailStrategy::EXIT_OOM, Chunk::init_size) Chunk(Chunk::init_size);
_hwm = _chunk->bottom(); // Save the cached hwm, max
_max = _chunk->top();
- _size_in_bytes = 0;
+ MemTracker::record_new_arena(flag);
set_size_in_bytes(Chunk::init_size);
- NOT_PRODUCT(Atomic::inc(&_instance_count);)
}
Arena *Arena::move_contents(Arena *copy) {
@@ -463,7 +460,7 @@
Arena::~Arena() {
destruct_contents();
- NOT_PRODUCT(Atomic::dec(&_instance_count);)
+ MemTracker::record_arena_free(_flags);
}
void* Arena::operator new(size_t size) throw() {
@@ -479,21 +476,21 @@
// dynamic memory type binding
void* Arena::operator new(size_t size, MEMFLAGS flags) throw() {
#ifdef ASSERT
- void* p = (void*)AllocateHeap(size, flags|otArena, CALLER_PC);
+ void* p = (void*)AllocateHeap(size, flags, CALLER_PC);
if (PrintMallocFree) trace_heap_malloc(size, "Arena-new", p);
return p;
#else
- return (void *) AllocateHeap(size, flags|otArena, CALLER_PC);
+ return (void *) AllocateHeap(size, flags, CALLER_PC);
#endif
}
void* Arena::operator new(size_t size, const std::nothrow_t& nothrow_constant, MEMFLAGS flags) throw() {
#ifdef ASSERT
- void* p = os::malloc(size, flags|otArena, CALLER_PC);
+ void* p = os::malloc(size, flags, CALLER_PC);
if (PrintMallocFree) trace_heap_malloc(size, "Arena-new", p);
return p;
#else
- return os::malloc(size, flags|otArena, CALLER_PC);
+ return os::malloc(size, flags, CALLER_PC);
#endif
}
@@ -518,8 +515,9 @@
// change the size
void Arena::set_size_in_bytes(size_t size) {
if (_size_in_bytes != size) {
+ long delta = (long)(size - size_in_bytes());
_size_in_bytes = size;
- MemTracker::record_arena_size((address)this, size);
+ MemTracker::record_arena_size_change(delta, _flags);
}
}
diff --git a/hotspot/src/share/vm/memory/allocation.hpp b/hotspot/src/share/vm/memory/allocation.hpp
index fbfff65..adb72e8 100644
--- a/hotspot/src/share/vm/memory/allocation.hpp
+++ b/hotspot/src/share/vm/memory/allocation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -133,51 +133,34 @@
/*
- * MemoryType bitmap layout:
- * | 16 15 14 13 12 11 10 09 | 08 07 06 05 | 04 03 02 01 |
- * | memory type | object | reserved |
- * | | type | |
+ * Memory types
*/
enum MemoryType {
// Memory type by sub systems. It occupies lower byte.
- mtNone = 0x0000, // undefined
- mtClass = 0x0100, // memory class for Java classes
- mtThread = 0x0200, // memory for thread objects
- mtThreadStack = 0x0300,
- mtCode = 0x0400, // memory for generated code
- mtGC = 0x0500, // memory for GC
- mtCompiler = 0x0600, // memory for compiler
- mtInternal = 0x0700, // memory used by VM, but does not belong to
+ mtJavaHeap = 0x00, // Java heap
+ mtClass = 0x01, // memory class for Java classes
+ mtThread = 0x02, // memory for thread objects
+ mtThreadStack = 0x03,
+ mtCode = 0x04, // memory for generated code
+ mtGC = 0x05, // memory for GC
+ mtCompiler = 0x06, // memory for compiler
+ mtInternal = 0x07, // memory used by VM, but does not belong to
// any of above categories, and not used for
// native memory tracking
- mtOther = 0x0800, // memory not used by VM
- mtSymbol = 0x0900, // symbol
- mtNMT = 0x0A00, // memory used by native memory tracking
- mtChunk = 0x0B00, // chunk that holds content of arenas
- mtJavaHeap = 0x0C00, // Java heap
- mtClassShared = 0x0D00, // class data sharing
- mtTest = 0x0E00, // Test type for verifying NMT
- mtTracing = 0x0F00, // memory used for Tracing
- mt_number_of_types = 0x000F, // number of memory types (mtDontTrack
+ mtOther = 0x08, // memory not used by VM
+ mtSymbol = 0x09, // symbol
+ mtNMT = 0x0A, // memory used by native memory tracking
+ mtClassShared = 0x0B, // class data sharing
+ mtChunk = 0x0C, // chunk that holds content of arenas
+ mtTest = 0x0D, // Test type for verifying NMT
+ mtTracing = 0x0E, // memory used for Tracing
+ mtNone = 0x0F, // undefined
+ mt_number_of_types = 0x10 // number of memory types (mtDontTrack
// is not included as validate type)
- mtDontTrack = 0x0F00, // memory we do not or cannot track
- mt_masks = 0x7F00,
-
- // object type mask
- otArena = 0x0010, // an arena object
- otNMTRecorder = 0x0020, // memory recorder object
- ot_masks = 0x00F0
};
-#define IS_MEMORY_TYPE(flags, type) ((flags & mt_masks) == type)
-#define HAS_VALID_MEMORY_TYPE(flags)((flags & mt_masks) != mtNone)
-#define FLAGS_TO_MEMORY_TYPE(flags) (flags & mt_masks)
+typedef MemoryType MEMFLAGS;
-#define IS_ARENA_OBJ(flags) ((flags & ot_masks) == otArena)
-#define IS_NMT_RECORDER(flags) ((flags & ot_masks) == otNMTRecorder)
-#define NMT_CAN_TRACK(flags) (!IS_NMT_RECORDER(flags) && !(IS_MEMORY_TYPE(flags, mtDontTrack)))
-
-typedef unsigned short MEMFLAGS;
#if INCLUDE_NMT
@@ -189,27 +172,23 @@
#endif // INCLUDE_NMT
-// debug build does not inline
-#if defined(_NMT_NOINLINE_)
- #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0)
- #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)
- #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)
-#else
- #define CURRENT_PC (NMT_track_callsite? os::get_caller_pc(0) : 0)
- #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0)
- #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)
-#endif
-
+class NativeCallStack;
template <MEMFLAGS F> class CHeapObj ALLOCATION_SUPER_CLASS_SPEC {
public:
- _NOINLINE_ void* operator new(size_t size, address caller_pc = 0) throw();
+ _NOINLINE_ void* operator new(size_t size, const NativeCallStack& stack) throw();
+ _NOINLINE_ void* operator new(size_t size) throw();
_NOINLINE_ void* operator new (size_t size, const std::nothrow_t& nothrow_constant,
- address caller_pc = 0) throw();
- _NOINLINE_ void* operator new [](size_t size, address caller_pc = 0) throw();
+ const NativeCallStack& stack) throw();
+ _NOINLINE_ void* operator new (size_t size, const std::nothrow_t& nothrow_constant)
+ throw();
+ _NOINLINE_ void* operator new [](size_t size, const NativeCallStack& stack) throw();
+ _NOINLINE_ void* operator new [](size_t size) throw();
_NOINLINE_ void* operator new [](size_t size, const std::nothrow_t& nothrow_constant,
- address caller_pc = 0) throw();
+ const NativeCallStack& stack) throw();
+ _NOINLINE_ void* operator new [](size_t size, const std::nothrow_t& nothrow_constant)
+ throw();
void operator delete(void* p);
void operator delete [] (void* p);
};
@@ -384,13 +363,15 @@
//------------------------------Arena------------------------------------------
// Fast allocation of memory
-class Arena : public CHeapObj<mtNone|otArena> {
+class Arena : public CHeapObj<mtNone> {
protected:
friend class ResourceMark;
friend class HandleMark;
friend class NoHandleMark;
friend class VMStructs;
+ MEMFLAGS _flags; // Memory tracking flags
+
Chunk *_first; // First chunk
Chunk *_chunk; // current chunk
char *_hwm, *_max; // High water mark and max in current chunk
@@ -418,8 +399,8 @@
}
public:
- Arena();
- Arena(size_t init_size);
+ Arena(MEMFLAGS memflag);
+ Arena(MEMFLAGS memflag, size_t init_size);
~Arena();
void destruct_contents();
char* hwm() const { return _hwm; }
@@ -518,8 +499,6 @@
static void free_malloced_objects(Chunk* chunk, char* hwm, char* max, char* hwm2) PRODUCT_RETURN;
static void free_all(char** start, char** end) PRODUCT_RETURN;
- // how many arena instances
- NOT_PRODUCT(static volatile jint _instance_count;)
private:
// Reset this Arena to empty, access will trigger grow if necessary
void reset(void) {
@@ -681,7 +660,7 @@
NEW_C_HEAP_ARRAY3(type, (size), memflags, pc, AllocFailStrategy::RETURN_NULL)
#define NEW_C_HEAP_ARRAY_RETURN_NULL(type, size, memflags)\
- NEW_C_HEAP_ARRAY3(type, (size), memflags, (address)0, AllocFailStrategy::RETURN_NULL)
+ NEW_C_HEAP_ARRAY3(type, (size), memflags, CURRENT_PC, AllocFailStrategy::RETURN_NULL)
#define REALLOC_C_HEAP_ARRAY(type, old, size, memflags)\
(type*) (ReallocateHeap((char*)(old), (size) * sizeof(type), memflags))
diff --git a/hotspot/src/share/vm/memory/allocation.inline.hpp b/hotspot/src/share/vm/memory/allocation.inline.hpp
index 806088b..ddce9f5 100644
--- a/hotspot/src/share/vm/memory/allocation.inline.hpp
+++ b/hotspot/src/share/vm/memory/allocation.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
#include "runtime/atomic.inline.hpp"
#include "runtime/os.hpp"
+#include "services/memTracker.hpp"
// Explicit C-heap memory management
@@ -49,12 +50,10 @@
#endif
// allocate using malloc; will fail if no memory available
-inline char* AllocateHeap(size_t size, MEMFLAGS flags, address pc = 0,
+inline char* AllocateHeap(size_t size, MEMFLAGS flags,
+ const NativeCallStack& stack,
AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
- if (pc == 0) {
- pc = CURRENT_PC;
- }
- char* p = (char*) os::malloc(size, flags, pc);
+ char* p = (char*) os::malloc(size, flags, stack);
#ifdef ASSERT
if (PrintMallocFree) trace_heap_malloc(size, "AllocateHeap", p);
#endif
@@ -63,10 +62,14 @@
}
return p;
}
-
-inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flags,
+inline char* AllocateHeap(size_t size, MEMFLAGS flags,
AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
- char* p = (char*) os::realloc(old, size, flags, CURRENT_PC);
+ return AllocateHeap(size, flags, CURRENT_PC, alloc_failmode);
+}
+
+inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flag,
+ AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
+ char* p = (char*) os::realloc(old, size, flag, CURRENT_PC);
#ifdef ASSERT
if (PrintMallocFree) trace_heap_malloc(size, "ReallocateHeap", p);
#endif
@@ -85,8 +88,22 @@
template <MEMFLAGS F> void* CHeapObj<F>::operator new(size_t size,
- address caller_pc) throw() {
- void* p = (void*)AllocateHeap(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC));
+ const NativeCallStack& stack) throw() {
+ void* p = (void*)AllocateHeap(size, F, stack);
+#ifdef ASSERT
+ if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p);
+#endif
+ return p;
+}
+
+template <MEMFLAGS F> void* CHeapObj<F>::operator new(size_t size) throw() {
+ return CHeapObj<F>::operator new(size, CALLER_PC);
+}
+
+template <MEMFLAGS F> void* CHeapObj<F>::operator new (size_t size,
+ const std::nothrow_t& nothrow_constant, const NativeCallStack& stack) throw() {
+ void* p = (void*)AllocateHeap(size, F, stack,
+ AllocFailStrategy::RETURN_NULL);
#ifdef ASSERT
if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p);
#endif
@@ -94,23 +111,28 @@
}
template <MEMFLAGS F> void* CHeapObj<F>::operator new (size_t size,
- const std::nothrow_t& nothrow_constant, address caller_pc) throw() {
- void* p = (void*)AllocateHeap(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC),
- AllocFailStrategy::RETURN_NULL);
-#ifdef ASSERT
- if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p);
-#endif
- return p;
+ const std::nothrow_t& nothrow_constant) throw() {
+ return CHeapObj<F>::operator new(size, nothrow_constant, CALLER_PC);
}
template <MEMFLAGS F> void* CHeapObj<F>::operator new [](size_t size,
- address caller_pc) throw() {
- return CHeapObj<F>::operator new(size, caller_pc);
+ const NativeCallStack& stack) throw() {
+ return CHeapObj<F>::operator new(size, stack);
+}
+
+template <MEMFLAGS F> void* CHeapObj<F>::operator new [](size_t size)
+ throw() {
+ return CHeapObj<F>::operator new(size, CALLER_PC);
}
template <MEMFLAGS F> void* CHeapObj<F>::operator new [](size_t size,
- const std::nothrow_t& nothrow_constant, address caller_pc) throw() {
- return CHeapObj<F>::operator new(size, nothrow_constant, caller_pc);
+ const std::nothrow_t& nothrow_constant, const NativeCallStack& stack) throw() {
+ return CHeapObj<F>::operator new(size, nothrow_constant, stack);
+}
+
+template <MEMFLAGS F> void* CHeapObj<F>::operator new [](size_t size,
+ const std::nothrow_t& nothrow_constant) throw() {
+ return CHeapObj<F>::operator new(size, nothrow_constant, CALLER_PC);
}
template <MEMFLAGS F> void CHeapObj<F>::operator delete(void* p){
diff --git a/hotspot/src/share/vm/memory/cardTableRS.cpp b/hotspot/src/share/vm/memory/cardTableRS.cpp
index 7c9d361..078c22b 100644
--- a/hotspot/src/share/vm/memory/cardTableRS.cpp
+++ b/hotspot/src/share/vm/memory/cardTableRS.cpp
@@ -56,7 +56,7 @@
#endif
set_bs(_ct_bs);
_last_cur_val_in_gen = NEW_C_HEAP_ARRAY3(jbyte, GenCollectedHeap::max_gens + 1,
- mtGC, 0, AllocFailStrategy::RETURN_NULL);
+ mtGC, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
if (_last_cur_val_in_gen == NULL) {
vm_exit_during_initialization("Could not create last_cur_val_in_gen array.");
}
diff --git a/hotspot/src/share/vm/memory/collectorPolicy.cpp b/hotspot/src/share/vm/memory/collectorPolicy.cpp
index af6e39d..6589766 100644
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp
@@ -176,13 +176,9 @@
size_t alignment = GenRemSet::max_alignment_constraint();
- // Parallel GC does its own alignment of the generations to avoid requiring a
- // large page (256M on some platforms) for the permanent generation. The
- // other collectors should also be updated to do their own alignment and then
- // this use of lcm() should be removed.
- if (UseLargePages && !UseParallelGC) {
+ if (UseLargePages) {
// In presence of large pages we have to make sure that our
- // alignment is large page aware
+ // alignment is large page aware.
alignment = lcm(os::large_page_size(), alignment);
}
@@ -909,7 +905,8 @@
}
void MarkSweepPolicy::initialize_generations() {
- _generations = NEW_C_HEAP_ARRAY3(GenerationSpecPtr, number_of_generations(), mtGC, 0, AllocFailStrategy::RETURN_NULL);
+ _generations = NEW_C_HEAP_ARRAY3(GenerationSpecPtr, number_of_generations(), mtGC, CURRENT_PC,
+ AllocFailStrategy::RETURN_NULL);
if (_generations == NULL) {
vm_exit_during_initialization("Unable to allocate gen spec");
}
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp
index 281228d..0271b04 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp
@@ -790,7 +790,7 @@
// Try allocating obj in to-space (unless too old)
if (old->age() < tenuring_threshold()) {
- obj = (oop) to()->allocate(s);
+ obj = (oop) to()->allocate_aligned(s);
}
// Otherwise try allocating obj tenured
diff --git a/hotspot/src/share/vm/memory/heapInspection.cpp b/hotspot/src/share/vm/memory/heapInspection.cpp
index 7a4c6fc..cc8f4fc 100644
--- a/hotspot/src/share/vm/memory/heapInspection.cpp
+++ b/hotspot/src/share/vm/memory/heapInspection.cpp
@@ -135,7 +135,7 @@
_ref = (HeapWord*) Universe::boolArrayKlassObj();
_buckets =
(KlassInfoBucket*) AllocateHeap(sizeof(KlassInfoBucket) * _num_buckets,
- mtInternal, 0, AllocFailStrategy::RETURN_NULL);
+ mtInternal, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
if (_buckets != NULL) {
_size = _num_buckets;
for (int index = 0; index < _size; index++) {
diff --git a/hotspot/src/share/vm/memory/memRegion.cpp b/hotspot/src/share/vm/memory/memRegion.cpp
index 9eb2be5..8c33ddc 100644
--- a/hotspot/src/share/vm/memory/memRegion.cpp
+++ b/hotspot/src/share/vm/memory/memRegion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -103,11 +103,13 @@
}
void* MemRegion::operator new(size_t size) throw() {
- return (address)AllocateHeap(size, mtGC, 0, AllocFailStrategy::RETURN_NULL);
+ return (address)AllocateHeap(size, mtGC, CURRENT_PC,
+ AllocFailStrategy::RETURN_NULL);
}
void* MemRegion::operator new [](size_t size) throw() {
- return (address)AllocateHeap(size, mtGC, 0, AllocFailStrategy::RETURN_NULL);
+ return (address)AllocateHeap(size, mtGC, CURRENT_PC,
+ AllocFailStrategy::RETURN_NULL);
}
void MemRegion::operator delete(void* p) {
FreeHeap(p, mtGC);
diff --git a/hotspot/src/share/vm/memory/resourceArea.hpp b/hotspot/src/share/vm/memory/resourceArea.hpp
index e1cafe7..02dffc7 100644
--- a/hotspot/src/share/vm/memory/resourceArea.hpp
+++ b/hotspot/src/share/vm/memory/resourceArea.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,11 +49,11 @@
debug_only(static int _warned;) // to suppress multiple warnings
public:
- ResourceArea() {
+ ResourceArea() : Arena(mtThread) {
debug_only(_nesting = 0;)
}
- ResourceArea(size_t init_size) : Arena(init_size) {
+ ResourceArea(size_t init_size) : Arena(mtThread, init_size) {
debug_only(_nesting = 0;);
}
@@ -64,7 +64,7 @@
if (UseMallocOnly) {
// use malloc, but save pointer in res. area for later freeing
char** save = (char**)internal_malloc_4(sizeof(char*));
- return (*save = (char*)os::malloc(size, mtThread));
+ return (*save = (char*)os::malloc(size, mtThread, CURRENT_PC));
}
#endif
return (char*)Amalloc(size, alloc_failmode);
diff --git a/hotspot/src/share/vm/memory/sharedHeap.cpp b/hotspot/src/share/vm/memory/sharedHeap.cpp
index e0a5d99..5d268c3 100644
--- a/hotspot/src/share/vm/memory/sharedHeap.cpp
+++ b/hotspot/src/share/vm/memory/sharedHeap.cpp
@@ -159,9 +159,9 @@
Monitor* SharedHeap::StrongRootsScope::_lock = new Monitor(Mutex::leaf, "StrongRootsScope lock", false);
void SharedHeap::StrongRootsScope::mark_worker_done_with_threads(uint n_workers) {
- // The Thread work barrier is only needed by G1.
+ // The Thread work barrier is only needed by G1 Class Unloading.
// No need to use the barrier if this is single-threaded code.
- if (UseG1GC && n_workers > 0) {
+ if (UseG1GC && ClassUnloadingWithConcurrentMark && n_workers > 0) {
uint new_value = (uint)Atomic::add(1, &_n_workers_done_with_threads);
if (new_value == n_workers) {
// This thread is last. Notify the others.
@@ -172,6 +172,9 @@
}
void SharedHeap::StrongRootsScope::wait_until_all_workers_done_with_threads(uint n_workers) {
+ assert(UseG1GC, "Currently only used by G1");
+ assert(ClassUnloadingWithConcurrentMark, "Currently only needed when doing G1 Class Unloading");
+
// No need to use the barrier if this is single-threaded code.
if (n_workers > 0 && (uint)_n_workers_done_with_threads != n_workers) {
MonitorLockerEx ml(_lock, Mutex::_no_safepoint_check_flag);
diff --git a/hotspot/src/share/vm/memory/space.cpp b/hotspot/src/share/vm/memory/space.cpp
index 330dd3f..41f1a72 100644
--- a/hotspot/src/share/vm/memory/space.cpp
+++ b/hotspot/src/share/vm/memory/space.cpp
@@ -28,6 +28,7 @@
#include "gc_implementation/shared/liveRange.hpp"
#include "gc_implementation/shared/markSweep.hpp"
#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc_interface/collectedHeap.inline.hpp"
#include "memory/blockOffsetTable.inline.hpp"
#include "memory/defNewGeneration.hpp"
#include "memory/genCollectedHeap.hpp"
@@ -720,6 +721,27 @@
} while (true);
}
+HeapWord* ContiguousSpace::allocate_aligned(size_t size) {
+ assert(Heap_lock->owned_by_self() || (SafepointSynchronize::is_at_safepoint() && Thread::current()->is_VM_thread()), "not locked");
+ HeapWord* end_value = end();
+
+ HeapWord* obj = CollectedHeap::align_allocation_or_fail(top(), end_value, SurvivorAlignmentInBytes);
+ if (obj == NULL) {
+ return NULL;
+ }
+
+ if (pointer_delta(end_value, obj) >= size) {
+ HeapWord* new_top = obj + size;
+ set_top(new_top);
+ assert(is_ptr_aligned(obj, SurvivorAlignmentInBytes) && is_aligned(new_top),
+ "checking alignment");
+ return obj;
+ } else {
+ set_top(obj);
+ return NULL;
+ }
+}
+
// Requires locking.
HeapWord* ContiguousSpace::allocate(size_t size) {
return allocate_impl(size, end());
diff --git a/hotspot/src/share/vm/memory/space.hpp b/hotspot/src/share/vm/memory/space.hpp
index 0653884..f78a8c7 100644
--- a/hotspot/src/share/vm/memory/space.hpp
+++ b/hotspot/src/share/vm/memory/space.hpp
@@ -526,6 +526,7 @@
// Allocation (return NULL if full)
virtual HeapWord* allocate(size_t word_size);
virtual HeapWord* par_allocate(size_t word_size);
+ HeapWord* allocate_aligned(size_t word_size);
// Iteration
void oop_iterate(ExtendedOopClosure* cl);
diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp
index 54fa43a..589d758 100644
--- a/hotspot/src/share/vm/oops/method.cpp
+++ b/hotspot/src/share/vm/oops/method.cpp
@@ -283,6 +283,13 @@
return bcp;
}
+address Method::bcp_from(address bcp) const {
+ if (is_native() && bcp == NULL) {
+ return code_base();
+ } else {
+ return bcp;
+ }
+}
int Method::size(bool is_native) {
// If native, then include pointers for native_function and signature_handler
diff --git a/hotspot/src/share/vm/oops/method.hpp b/hotspot/src/share/vm/oops/method.hpp
index 23752b4..16e7f7a 100644
--- a/hotspot/src/share/vm/oops/method.hpp
+++ b/hotspot/src/share/vm/oops/method.hpp
@@ -648,7 +648,8 @@
// Returns the byte code index from the byte code pointer
int bci_from(address bcp) const;
- address bcp_from(int bci) const;
+ address bcp_from(int bci) const;
+ address bcp_from(address bcp) const;
int validate_bci_from_bcp(address bcp) const;
int validate_bci(int bci) const;
diff --git a/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp b/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp
index 5a8d4d0..b613e4e 100644
--- a/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp
+++ b/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp
@@ -55,8 +55,6 @@
klass()->oop_follow_contents(cm, this);
}
-// Used by parallel old GC.
-
inline oop oopDesc::forward_to_atomic(oop p) {
assert(ParNewGeneration::is_legal_forward_ptr(p),
"illegal forwarding pointer value.");
diff --git a/hotspot/src/share/vm/opto/callGenerator.cpp b/hotspot/src/share/vm/opto/callGenerator.cpp
index 2464461..0b3ee7a 100644
--- a/hotspot/src/share/vm/opto/callGenerator.cpp
+++ b/hotspot/src/share/vm/opto/callGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -357,7 +357,7 @@
// Make sure the state is a MergeMem for parsing.
if (!map->in(TypeFunc::Memory)->is_MergeMem()) {
- Node* mem = MergeMemNode::make(C, map->in(TypeFunc::Memory));
+ Node* mem = MergeMemNode::make(map->in(TypeFunc::Memory));
C->initial_gvn()->set_type_bottom(mem);
map->set_req(TypeFunc::Memory, mem);
}
diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp
index 275052b..3ee8124 100644
--- a/hotspot/src/share/vm/opto/callnode.cpp
+++ b/hotspot/src/share/vm/opto/callnode.cpp
@@ -688,7 +688,7 @@
return new MachProjNode(this,proj->_con,RegMask::Empty,MachProjNode::unmatched_proj);
case TypeFunc::Parms+1: // For LONG & DOUBLE returns
- assert(tf()->_range->field_at(TypeFunc::Parms+1) == Type::HALF, "");
+ assert(tf()->range()->field_at(TypeFunc::Parms+1) == Type::HALF, "");
// 2nd half of doubles and longs
return new MachProjNode(this,proj->_con, RegMask::Empty, (uint)OptoReg::Bad);
@@ -778,7 +778,7 @@
}
// Returns the unique CheckCastPP of a call
-// or 'this' if there are several CheckCastPP
+// or 'this' if there are several CheckCastPP or unexpected uses
// or returns NULL if there is no one.
Node *CallNode::result_cast() {
Node *cast = NULL;
@@ -794,6 +794,13 @@
return this; // more than 1 CheckCastPP
}
cast = use;
+ } else if (!use->is_Initialize() &&
+ !use->is_AddP()) {
+ // Expected uses are restricted to a CheckCastPP, an Initialize
+ // node, and AddP nodes. If we encounter any other use (a Phi
+ // node can be seen in rare cases) return this to prevent
+ // incorrect optimizations.
+ return this;
}
}
return cast;
diff --git a/hotspot/src/share/vm/opto/cfgnode.cpp b/hotspot/src/share/vm/opto/cfgnode.cpp
index d99118e..ab633c1 100644
--- a/hotspot/src/share/vm/opto/cfgnode.cpp
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -108,6 +108,7 @@
rreq++; // One more input to Region
} // Found a region to merge into Region
+ igvn->_worklist.push(r);
// Clobber pointer to the now dead 'r'
region->set_req(i, phase->C->top());
}
@@ -449,6 +450,7 @@
// Remove TOP or NULL input paths. If only 1 input path remains, this Region
// degrades to a copy.
bool add_to_worklist = false;
+ bool modified = false;
int cnt = 0; // Count of values merging
DEBUG_ONLY( int cnt_orig = req(); ) // Save original inputs count
int del_it = 0; // The last input path we delete
@@ -459,6 +461,7 @@
// Remove useless control copy inputs
if( n->is_Region() && n->as_Region()->is_copy() ) {
set_req(i, n->nonnull_req());
+ modified = true;
i--;
continue;
}
@@ -466,12 +469,14 @@
Node *call = n->in(0);
if (call->is_Call() && call->as_Call()->entry_point() == OptoRuntime::rethrow_stub()) {
set_req(i, call->in(0));
+ modified = true;
i--;
continue;
}
}
if( phase->type(n) == Type::TOP ) {
set_req(i, NULL); // Ignore TOP inputs
+ modified = true;
i--;
continue;
}
@@ -691,7 +696,7 @@
}
}
- return NULL;
+ return modified ? this : NULL;
}
@@ -1871,7 +1876,7 @@
igvn->register_new_node_with_optimizer(new_base);
hook->add_req(new_base);
}
- MergeMemNode* result = MergeMemNode::make(phase->C, new_base);
+ MergeMemNode* result = MergeMemNode::make(new_base);
for (uint i = 1; i < req(); ++i) {
Node *ii = in(i);
if (ii->is_MergeMem()) {
diff --git a/hotspot/src/share/vm/opto/chaitin.cpp b/hotspot/src/share/vm/opto/chaitin.cpp
index 822d83a..50c7d59 100644
--- a/hotspot/src/share/vm/opto/chaitin.cpp
+++ b/hotspot/src/share/vm/opto/chaitin.cpp
@@ -1620,7 +1620,7 @@
C->check_node_count(0, "out of nodes fixing spills");
if (C->failing()) return;
// Transform node
- MachNode *cisc = mach->cisc_version(stk_offset, C)->as_Mach();
+ MachNode *cisc = mach->cisc_version(stk_offset)->as_Mach();
cisc->set_req(inp,fp); // Base register is frame pointer
if( cisc->oper_input_base() > 1 && mach->oper_input_base() <= 1 ) {
assert( cisc->oper_input_base() == 2, "Only adding one edge");
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 585f931..9bf539d 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -647,6 +647,10 @@
_printer(IdealGraphPrinter::printer()),
#endif
_congraph(NULL),
+ _comp_arena(mtCompiler),
+ _node_arena(mtCompiler),
+ _old_arena(mtCompiler),
+ _Compile_types(mtCompiler),
_replay_inline_data(NULL),
_late_inlines(comp_arena(), 2, 0, NULL),
_string_late_inlines(comp_arena(), 2, 0, NULL),
@@ -954,6 +958,10 @@
_in_dump_cnt(0),
_printer(NULL),
#endif
+ _comp_arena(mtCompiler),
+ _node_arena(mtCompiler),
+ _old_arena(mtCompiler),
+ _Compile_types(mtCompiler),
_dead_node_list(comp_arena()),
_dead_node_count(0),
_congraph(NULL),
@@ -1039,6 +1047,7 @@
_node_note_array = NULL;
_default_node_notes = NULL;
+ DEBUG_ONLY( _modified_nodes = NULL; ) // Used in Optimize()
_immutable_memory = NULL; // filled in at first inquiry
@@ -1247,6 +1256,18 @@
}
}
}
+void Compile::record_modified_node(Node* n) {
+ if (_modified_nodes != NULL && !_inlining_incrementally &&
+ n->outcnt() != 0 && !n->is_Con()) {
+ _modified_nodes->push(n);
+ }
+}
+
+void Compile::remove_modified_node(Node* n) {
+ if (_modified_nodes != NULL) {
+ _modified_nodes->remove(n);
+ }
+}
#endif
#ifndef PRODUCT
@@ -2035,6 +2056,9 @@
// Iterative Global Value Numbering, including ideal transforms
// Initialize IterGVN with types and values from parse-time GVN
PhaseIterGVN igvn(initial_gvn());
+#ifdef ASSERT
+ _modified_nodes = new (comp_arena()) Unique_Node_List(comp_arena());
+#endif
{
NOT_PRODUCT( TracePhase t2("iterGVN", &_t_iterGVN, TimeCompiler); )
igvn.optimize();
@@ -2197,6 +2221,7 @@
}
}
+ DEBUG_ONLY( _modified_nodes = NULL; )
} // (End scope of igvn; run destructor if necessary for asserts.)
process_print_inlining();
@@ -2825,7 +2850,7 @@
// oops implicit null check is not generated.
// This will allow to generate normal oop implicit null check.
if (Matcher::gen_narrow_oop_implicit_null_checks())
- new_in2 = ConNode::make(this, TypeNarrowOop::NULL_PTR);
+ new_in2 = ConNode::make(TypeNarrowOop::NULL_PTR);
//
// This transformation together with CastPP transformation above
// will generated code for implicit NULL checks for compressed oops.
@@ -2864,9 +2889,9 @@
// NullCheck base_reg
//
} else if (t->isa_oopptr()) {
- new_in2 = ConNode::make(this, t->make_narrowoop());
+ new_in2 = ConNode::make(t->make_narrowoop());
} else if (t->isa_klassptr()) {
- new_in2 = ConNode::make(this, t->make_narrowklass());
+ new_in2 = ConNode::make(t->make_narrowklass());
}
}
if (new_in2 != NULL) {
@@ -2899,11 +2924,11 @@
const Type* t = in1->bottom_type();
if (t == TypePtr::NULL_PTR) {
assert(t->isa_oopptr(), "null klass?");
- n->subsume_by(ConNode::make(this, TypeNarrowOop::NULL_PTR), this);
+ n->subsume_by(ConNode::make(TypeNarrowOop::NULL_PTR), this);
} else if (t->isa_oopptr()) {
- n->subsume_by(ConNode::make(this, t->make_narrowoop()), this);
+ n->subsume_by(ConNode::make(t->make_narrowoop()), this);
} else if (t->isa_klassptr()) {
- n->subsume_by(ConNode::make(this, t->make_narrowklass()), this);
+ n->subsume_by(ConNode::make(t->make_narrowklass()), this);
}
}
if (in1->outcnt() == 0) {
@@ -2964,7 +2989,7 @@
if (d) {
// Replace them with a fused divmod if supported
if (Matcher::has_match_rule(Op_DivModI)) {
- DivModINode* divmod = DivModINode::make(this, n);
+ DivModINode* divmod = DivModINode::make(n);
d->subsume_by(divmod->div_proj(), this);
n->subsume_by(divmod->mod_proj(), this);
} else {
@@ -2984,7 +3009,7 @@
if (d) {
// Replace them with a fused divmod if supported
if (Matcher::has_match_rule(Op_DivModL)) {
- DivModLNode* divmod = DivModLNode::make(this, n);
+ DivModLNode* divmod = DivModLNode::make(n);
d->subsume_by(divmod->div_proj(), this);
n->subsume_by(divmod->mod_proj(), this);
} else {
@@ -3010,7 +3035,7 @@
if (n->req()-1 > 2) {
// Replace many operand PackNodes with a binary tree for matching
PackNode* p = (PackNode*) n;
- Node* btp = p->binary_tree_pack(this, 1, n->req());
+ Node* btp = p->binary_tree_pack(1, n->req());
n->subsume_by(btp, this);
}
break;
@@ -3035,11 +3060,11 @@
if (t != NULL && t->is_con()) {
juint shift = t->get_con();
if (shift > mask) { // Unsigned cmp
- n->set_req(2, ConNode::make(this, TypeInt::make(shift & mask)));
+ n->set_req(2, ConNode::make(TypeInt::make(shift & mask)));
}
} else {
if (t == NULL || t->_lo < 0 || t->_hi > (int)mask) {
- Node* shift = new AndINode(in2, ConNode::make(this, TypeInt::make(mask)));
+ Node* shift = new AndINode(in2, ConNode::make(TypeInt::make(mask)));
n->set_req(2, shift);
}
}
@@ -4031,6 +4056,7 @@
int j = 0;
int identical = 0;
int i = 0;
+ bool modified = false;
for (; i < _expensive_nodes->length()-1; i++) {
assert(j <= i, "can't write beyond current index");
if (_expensive_nodes->at(i)->Opcode() == _expensive_nodes->at(i+1)->Opcode()) {
@@ -4043,20 +4069,23 @@
identical = 0;
} else {
Node* n = _expensive_nodes->at(i);
- igvn.hash_delete(n);
- n->set_req(0, NULL);
+ igvn.replace_input_of(n, 0, NULL);
igvn.hash_insert(n);
+ modified = true;
}
}
if (identical > 0) {
_expensive_nodes->at_put(j++, _expensive_nodes->at(i));
} else if (_expensive_nodes->length() >= 1) {
Node* n = _expensive_nodes->at(i);
- igvn.hash_delete(n);
- n->set_req(0, NULL);
+ igvn.replace_input_of(n, 0, NULL);
igvn.hash_insert(n);
+ modified = true;
}
_expensive_nodes->trunc_to(j);
+ if (modified) {
+ igvn.optimize();
+ }
}
void Compile::add_expensive_node(Node * n) {
diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp
index 29380e1..d9af09a 100644
--- a/hotspot/src/share/vm/opto/compile.hpp
+++ b/hotspot/src/share/vm/opto/compile.hpp
@@ -344,6 +344,8 @@
VectorSet _dead_node_list; // Set of dead nodes
uint _dead_node_count; // Number of dead nodes; VectorSet::Size() is O(N).
// So use this to keep count and make the call O(1).
+ DEBUG_ONLY( Unique_Node_List* _modified_nodes; ) // List of nodes which inputs were modified
+
debug_only(static int _debug_idx;) // Monotonic counter (not reset), use -XX:BreakAtNode=<idx>
Arena _node_arena; // Arena for new-space Nodes
Arena _old_arena; // Arena for old-space Nodes, lifetime during xform
@@ -766,6 +768,11 @@
void print_missing_nodes();
#endif
+ // Record modified nodes to check that they are put on IGVN worklist
+ void record_modified_node(Node* n) NOT_DEBUG_RETURN;
+ void remove_modified_node(Node* n) NOT_DEBUG_RETURN;
+ DEBUG_ONLY( Unique_Node_List* modified_nodes() const { return _modified_nodes; } )
+
// Constant table
ConstantTable& constant_table() { return _constant_table; }
diff --git a/hotspot/src/share/vm/opto/connode.cpp b/hotspot/src/share/vm/opto/connode.cpp
index 485e8df..fa074f97 100644
--- a/hotspot/src/share/vm/opto/connode.cpp
+++ b/hotspot/src/share/vm/opto/connode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
}
//------------------------------make-------------------------------------------
-ConNode *ConNode::make( Compile* C, const Type *t ) {
+ConNode *ConNode::make(const Type *t) {
switch( t->basic_type() ) {
case T_INT: return new ConINode( t->is_int() );
case T_LONG: return new ConLNode( t->is_long() );
diff --git a/hotspot/src/share/vm/opto/connode.hpp b/hotspot/src/share/vm/opto/connode.hpp
index 446b807..d1c6886 100644
--- a/hotspot/src/share/vm/opto/connode.hpp
+++ b/hotspot/src/share/vm/opto/connode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
virtual const RegMask &in_RegMask(uint) const { return RegMask::Empty; }
// Polymorphic factory method:
- static ConNode* make( Compile* C, const Type *t );
+ static ConNode* make(const Type *t);
};
//------------------------------ConINode---------------------------------------
@@ -57,7 +57,7 @@
virtual int Opcode() const;
// Factory method:
- static ConINode* make( Compile* C, int con ) {
+ static ConINode* make(int con) {
return new ConINode( TypeInt::make(con) );
}
@@ -71,7 +71,7 @@
virtual int Opcode() const;
// Factory methods:
- static ConPNode* make( Compile *C ,address con ) {
+ static ConPNode* make(address con) {
if (con == NULL)
return new ConPNode( TypePtr::NULL_PTR ) ;
else
@@ -105,7 +105,7 @@
virtual int Opcode() const;
// Factory method:
- static ConLNode* make( Compile *C ,jlong con ) {
+ static ConLNode* make(jlong con) {
return new ConLNode( TypeLong::make(con) );
}
@@ -119,7 +119,7 @@
virtual int Opcode() const;
// Factory method:
- static ConFNode* make( Compile *C, float con ) {
+ static ConFNode* make(float con) {
return new ConFNode( TypeF::make(con) );
}
@@ -133,7 +133,7 @@
virtual int Opcode() const;
// Factory method:
- static ConDNode* make( Compile *C, double con ) {
+ static ConDNode* make(double con) {
return new ConDNode( TypeD::make(con) );
}
diff --git a/hotspot/src/share/vm/opto/divnode.cpp b/hotspot/src/share/vm/opto/divnode.cpp
index 8a27c24..4677d00 100644
--- a/hotspot/src/share/vm/opto/divnode.cpp
+++ b/hotspot/src/share/vm/opto/divnode.cpp
@@ -479,7 +479,10 @@
if (i == 0) return NULL; // Dividing by zero constant does not idealize
- set_req(0,NULL); // Dividing by a not-zero constant; no faulting
+ if (in(0) != NULL) {
+ phase->igvn_rehash_node_delayed(this);
+ set_req(0, NULL); // Dividing by a not-zero constant; no faulting
+ }
// Dividing by MININT does not optimize as a power-of-2 shift.
if( i == min_jint ) return NULL;
@@ -578,7 +581,10 @@
if (l == 0) return NULL; // Dividing by zero constant does not idealize
- set_req(0,NULL); // Dividing by a not-zero constant; no faulting
+ if (in(0) != NULL) {
+ phase->igvn_rehash_node_delayed(this);
+ set_req(0, NULL); // Dividing by a not-zero constant; no faulting
+ }
// Dividing by MINLONG does not optimize as a power-of-2 shift.
if( l == min_jlong ) return NULL;
@@ -1274,7 +1280,7 @@
}
//------------------------------make------------------------------------------
-DivModINode* DivModINode::make(Compile* C, Node* div_or_mod) {
+DivModINode* DivModINode::make(Node* div_or_mod) {
Node* n = div_or_mod;
assert(n->Opcode() == Op_DivI || n->Opcode() == Op_ModI,
"only div or mod input pattern accepted");
@@ -1286,7 +1292,7 @@
}
//------------------------------make------------------------------------------
-DivModLNode* DivModLNode::make(Compile* C, Node* div_or_mod) {
+DivModLNode* DivModLNode::make(Node* div_or_mod) {
Node* n = div_or_mod;
assert(n->Opcode() == Op_DivL || n->Opcode() == Op_ModL,
"only div or mod input pattern accepted");
diff --git a/hotspot/src/share/vm/opto/divnode.hpp b/hotspot/src/share/vm/opto/divnode.hpp
index 03f5be5..195803e 100644
--- a/hotspot/src/share/vm/opto/divnode.hpp
+++ b/hotspot/src/share/vm/opto/divnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -168,7 +168,7 @@
virtual Node *match( const ProjNode *proj, const Matcher *m );
// Make a divmod and associated projections from a div or mod.
- static DivModINode* make(Compile* C, Node* div_or_mod);
+ static DivModINode* make(Node* div_or_mod);
};
//------------------------------DivModLNode---------------------------------------
@@ -181,7 +181,7 @@
virtual Node *match( const ProjNode *proj, const Matcher *m );
// Make a divmod and associated projections from a div or mod.
- static DivModLNode* make(Compile* C, Node* div_or_mod);
+ static DivModLNode* make(Node* div_or_mod);
};
#endif // SHARE_VM_OPTO_DIVNODE_HPP
diff --git a/hotspot/src/share/vm/opto/escape.cpp b/hotspot/src/share/vm/opto/escape.cpp
index 10791a5..a4c84b6 100644
--- a/hotspot/src/share/vm/opto/escape.cpp
+++ b/hotspot/src/share/vm/opto/escape.cpp
@@ -1452,7 +1452,6 @@
return 0;
InitializeNode* ini = alloc->as_Allocate()->initialization();
- Compile* C = _compile;
bool visited_bottom_offset = false;
GrowableArray<int> offsets_worklist;
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index e7269aa..8228aad 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -591,7 +591,7 @@
C->log()->elem("hot_throw preallocated='1' reason='%s'",
Deoptimization::trap_reason_name(reason));
const TypeInstPtr* ex_con = TypeInstPtr::make(ex_obj);
- Node* ex_node = _gvn.transform( ConNode::make(C, ex_con) );
+ Node* ex_node = _gvn.transform(ConNode::make(ex_con));
// Clear the detail message of the preallocated exception object.
// Weblogic sometimes mutates the detail message of exceptions
@@ -706,7 +706,7 @@
if (map() == NULL) return NULL;
// Clone the memory edge first
- Node* mem = MergeMemNode::make(C, map()->memory());
+ Node* mem = MergeMemNode::make(map()->memory());
gvn().set_type_bottom(mem);
SafePointNode *clonemap = (SafePointNode*)map()->clone();
@@ -1135,7 +1135,7 @@
return longcon((julong) offset_con);
}
Node* conv = _gvn.transform( new ConvI2LNode(offset));
- Node* mask = _gvn.transform( ConLNode::make(C, (julong) max_juint) );
+ Node* mask = _gvn.transform(ConLNode::make((julong) max_juint));
return _gvn.transform( new AndLNode(conv, mask) );
}
@@ -1435,7 +1435,7 @@
//------------------------------set_all_memory---------------------------------
void GraphKit::set_all_memory(Node* newmem) {
- Node* mergemem = MergeMemNode::make(C, newmem);
+ Node* mergemem = MergeMemNode::make(newmem);
gvn().set_type_bottom(mergemem);
map()->set_memory(mergemem);
}
@@ -1464,9 +1464,9 @@
Node* mem = memory(adr_idx);
Node* ld;
if (require_atomic_access && bt == T_LONG) {
- ld = LoadLNode::make_atomic(C, ctl, mem, adr, adr_type, t, mo);
+ ld = LoadLNode::make_atomic(ctl, mem, adr, adr_type, t, mo);
} else if (require_atomic_access && bt == T_DOUBLE) {
- ld = LoadDNode::make_atomic(C, ctl, mem, adr, adr_type, t, mo);
+ ld = LoadDNode::make_atomic(ctl, mem, adr, adr_type, t, mo);
} else {
ld = LoadNode::make(_gvn, ctl, mem, adr, adr_type, t, bt, mo);
}
@@ -1488,9 +1488,9 @@
Node *mem = memory(adr_idx);
Node* st;
if (require_atomic_access && bt == T_LONG) {
- st = StoreLNode::make_atomic(C, ctl, mem, adr, adr_type, val, mo);
+ st = StoreLNode::make_atomic(ctl, mem, adr, adr_type, val, mo);
} else if (require_atomic_access && bt == T_DOUBLE) {
- st = StoreDNode::make_atomic(C, ctl, mem, adr, adr_type, val, mo);
+ st = StoreDNode::make_atomic(ctl, mem, adr, adr_type, val, mo);
} else {
st = StoreNode::make(_gvn, ctl, mem, adr, adr_type, val, bt, mo);
}
@@ -2084,9 +2084,9 @@
void GraphKit::round_double_arguments(ciMethod* dest_method) {
// (Note: TypeFunc::make has a cache that makes this fast.)
const TypeFunc* tf = TypeFunc::make(dest_method);
- int nargs = tf->_domain->_cnt - TypeFunc::Parms;
+ int nargs = tf->domain()->cnt() - TypeFunc::Parms;
for (int j = 0; j < nargs; j++) {
- const Type *targ = tf->_domain->field_at(j + TypeFunc::Parms);
+ const Type *targ = tf->domain()->field_at(j + TypeFunc::Parms);
if( targ->basic_type() == T_DOUBLE ) {
// If any parameters are doubles, they must be rounded before
// the call, dstore_rounding does gvn.transform
@@ -2188,10 +2188,10 @@
return;
}
const TypeFunc* tf = TypeFunc::make(dest_method);
- int nargs = tf->_domain->_cnt - TypeFunc::Parms;
+ int nargs = tf->domain()->cnt() - TypeFunc::Parms;
int skip = Bytecodes::has_receiver(bc) ? 1 : 0;
for (int j = skip, i = 0; j < nargs && i < TypeProfileArgsLimit; j++) {
- const Type *targ = tf->_domain->field_at(j + TypeFunc::Parms);
+ const Type *targ = tf->domain()->field_at(j + TypeFunc::Parms);
if (targ->basic_type() == T_OBJECT || targ->basic_type() == T_ARRAY) {
bool maybe_null = true;
ciKlass* better_type = NULL;
@@ -3364,7 +3364,7 @@
// This will allow us to observe initializations when they occur,
// and link them properly (as a group) to the InitializeNode.
assert(init->in(InitializeNode::Memory) == malloc, "");
- MergeMemNode* minit_in = MergeMemNode::make(C, malloc);
+ MergeMemNode* minit_in = MergeMemNode::make(malloc);
init->set_req(InitializeNode::Memory, minit_in);
record_for_igvn(minit_in); // fold it up later, if possible
Node* minit_out = memory(rawidx);
diff --git a/hotspot/src/share/vm/opto/idealKit.cpp b/hotspot/src/share/vm/opto/idealKit.cpp
index a0a9cbe..3038982 100644
--- a/hotspot/src/share/vm/opto/idealKit.cpp
+++ b/hotspot/src/share/vm/opto/idealKit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -320,7 +320,7 @@
Node* ns = new_cvstate();
for (uint i = 0; i < ns->req(); i++) ns->init_req(i, _cvstate->in(i));
// We must clone memory since it will be updated as we do stores.
- ns->set_req(TypeFunc::Memory, MergeMemNode::make(C, ns->in(TypeFunc::Memory)));
+ ns->set_req(TypeFunc::Memory, MergeMemNode::make(ns->in(TypeFunc::Memory)));
return ns;
}
@@ -359,7 +359,7 @@
Node* mem = memory(adr_idx);
Node* ld;
if (require_atomic_access && bt == T_LONG) {
- ld = LoadLNode::make_atomic(C, ctl, mem, adr, adr_type, t, MemNode::unordered);
+ ld = LoadLNode::make_atomic(ctl, mem, adr, adr_type, t, MemNode::unordered);
} else {
ld = LoadNode::make(_gvn, ctl, mem, adr, adr_type, t, bt, MemNode::unordered);
}
@@ -375,7 +375,7 @@
Node *mem = memory(adr_idx);
Node* st;
if (require_atomic_access && bt == T_LONG) {
- st = StoreLNode::make_atomic(C, ctl, mem, adr, adr_type, val, mo);
+ st = StoreLNode::make_atomic(ctl, mem, adr, adr_type, val, mo);
} else {
st = StoreNode::make(_gvn, ctl, mem, adr, adr_type, val, bt, mo);
}
diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp
index a601752..187d269 100644
--- a/hotspot/src/share/vm/opto/lcm.cpp
+++ b/hotspot/src/share/vm/opto/lcm.cpp
@@ -464,7 +464,9 @@
iop == Op_CreateEx || // Create-exception must start block
iop == Op_CheckCastPP
) {
- worklist.map(i,worklist.pop());
+ // select the node n
+ // remove n from worklist and retain the order of remaining nodes
+ worklist.remove((uint)i);
return n;
}
@@ -550,7 +552,9 @@
assert(idx >= 0, "index should be set");
Node *n = worklist[(uint)idx]; // Get the winner
- worklist.map((uint)idx, worklist.pop()); // Compress worklist
+ // select the node n
+ // remove n from worklist and retain the order of remaining nodes
+ worklist.remove((uint)idx);
return n;
}
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index 8e01709..1cfa17b 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -1905,7 +1905,7 @@
Node *bolyplus1 = _gvn.transform(new BoolNode( cmpyplus1, BoolTest::eq ));
Node* correctedsign = NULL;
if (ConditionalMoveLimit != 0) {
- correctedsign = _gvn.transform( CMoveNode::make(C, NULL, bolyplus1, signnode, longcon(0), TypeLong::LONG));
+ correctedsign = _gvn.transform(CMoveNode::make(NULL, bolyplus1, signnode, longcon(0), TypeLong::LONG));
} else {
IfNode *ifyplus1 = create_and_xform_if(ylong_path,bolyplus1, PROB_FAIR, COUNT_UNKNOWN);
RegionNode *r = new RegionNode(3);
@@ -1934,7 +1934,7 @@
// (1&(long)y)==1?-DPow(abs(x), y):DPow(abs(x), y)
Node *signresult = NULL;
if (ConditionalMoveLimit != 0) {
- signresult = _gvn.transform( CMoveNode::make(C, NULL, bol3, absxpowy, negabsxpowy, Type::DOUBLE));
+ signresult = _gvn.transform(CMoveNode::make(NULL, bol3, absxpowy, negabsxpowy, Type::DOUBLE));
} else {
IfNode *ifyeven = create_and_xform_if(ylong_path,bol3, PROB_FAIR, COUNT_UNKNOWN);
RegionNode *r = new RegionNode(3);
@@ -2268,7 +2268,7 @@
// which could hinder other optimizations.
// Since Math.min/max is often used with arraycopy, we want
// tightly_coupled_allocation to be able to see beyond min/max expressions.
- Node* cmov = CMoveNode::make(C, NULL, best_bol,
+ Node* cmov = CMoveNode::make(NULL, best_bol,
answer_if_false, answer_if_true,
TypeInt::make(lo, hi, widen));
diff --git a/hotspot/src/share/vm/opto/loopPredicate.cpp b/hotspot/src/share/vm/opto/loopPredicate.cpp
index 4f2ddd3..a55f73d 100644
--- a/hotspot/src/share/vm/opto/loopPredicate.cpp
+++ b/hotspot/src/share/vm/opto/loopPredicate.cpp
@@ -107,8 +107,7 @@
rgn = new RegionNode(1);
rgn->add_req(uncommon_proj);
register_control(rgn, loop, uncommon_proj);
- _igvn.hash_delete(call);
- call->set_req(0, rgn);
+ _igvn.replace_input_of(call, 0, rgn);
// When called from beautify_loops() idom is not constructed yet.
if (_idom != NULL) {
set_idom(call, rgn, dom_depth(rgn));
@@ -166,8 +165,7 @@
if (new_entry == NULL) {
// Attach if_cont to iff
- _igvn.hash_delete(iff);
- iff->set_req(0, if_cont);
+ _igvn.replace_input_of(iff, 0, if_cont);
if (_idom != NULL) {
set_idom(iff, if_cont, dom_depth(iff));
}
@@ -194,8 +192,7 @@
rgn = new RegionNode(1);
register_new_node_with_optimizer(rgn);
rgn->add_req(uncommon_proj);
- hash_delete(call);
- call->set_req(0, rgn);
+ replace_input_of(call, 0, rgn);
} else {
// Find region's edge corresponding to uncommon_proj
for (; proj_index < rgn->req(); proj_index++)
diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp
index 73ec061..9701cfd 100644
--- a/hotspot/src/share/vm/opto/loopTransform.cpp
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp
@@ -924,15 +924,13 @@
if( bol->outcnt() != 1 ) {
bol = bol->clone();
register_new_node(bol,main_end->in(CountedLoopEndNode::TestControl));
- _igvn.hash_delete(main_end);
- main_end->set_req(CountedLoopEndNode::TestValue, bol);
+ _igvn.replace_input_of(main_end, CountedLoopEndNode::TestValue, bol);
}
// Need only 1 user of 'cmp' because I will be hacking the loop bounds.
if( cmp->outcnt() != 1 ) {
cmp = cmp->clone();
register_new_node(cmp,main_end->in(CountedLoopEndNode::TestControl));
- _igvn.hash_delete(bol);
- bol->set_req(1, cmp);
+ _igvn.replace_input_of(bol, 1, cmp);
}
//------------------------------
@@ -1118,8 +1116,7 @@
Node* pre_bol = pre_end->in(CountedLoopEndNode::TestValue)->as_Bool();
BoolNode* new_bol0 = new BoolNode(pre_bol->in(1), new_test);
register_new_node( new_bol0, pre_head->in(0) );
- _igvn.hash_delete(pre_end);
- pre_end->set_req(CountedLoopEndNode::TestValue, new_bol0);
+ _igvn.replace_input_of(pre_end, CountedLoopEndNode::TestValue, new_bol0);
// Modify main loop guard condition
assert(min_iff->in(CountedLoopEndNode::TestValue) == min_bol, "guard okay");
BoolNode* new_bol1 = new BoolNode(min_bol->in(1), new_test);
@@ -1130,8 +1127,7 @@
BoolNode* main_bol = main_end->in(CountedLoopEndNode::TestValue)->as_Bool();
BoolNode* new_bol2 = new BoolNode(main_bol->in(1), new_test);
register_new_node( new_bol2, main_end->in(CountedLoopEndNode::TestControl) );
- _igvn.hash_delete(main_end);
- main_end->set_req(CountedLoopEndNode::TestValue, new_bol2);
+ _igvn.replace_input_of(main_end, CountedLoopEndNode::TestValue, new_bol2);
}
// Flag main loop
@@ -1346,8 +1342,7 @@
Node* bol2 = loop_end->in(1)->clone();
bol2->set_req(1, cmp2);
register_new_node(bol2, ctrl2);
- _igvn.hash_delete(loop_end);
- loop_end->set_req(1, bol2);
+ _igvn.replace_input_of(loop_end, 1, bol2);
}
// Step 3: Find the min-trip test guaranteed before a 'main' loop.
// Make it a 1-trip test (means at least 2 trips).
@@ -1356,8 +1351,7 @@
// can edit it's inputs directly. Hammer in the new limit for the
// minimum-trip guard.
assert(opaq->outcnt() == 1, "");
- _igvn.hash_delete(opaq);
- opaq->set_req(1, new_limit);
+ _igvn.replace_input_of(opaq, 1, new_limit);
}
// Adjust max trip count. The trip count is intentionally rounded
@@ -1407,8 +1401,7 @@
register_new_node( cmp2, ctrl2 );
Node *bol2 = new BoolNode( cmp2, loop_end->test_trip() );
register_new_node( bol2, ctrl2 );
- _igvn.hash_delete(loop_end);
- loop_end->set_req(CountedLoopEndNode::TestValue, bol2);
+ _igvn.replace_input_of(loop_end, CountedLoopEndNode::TestValue, bol2);
// Step 3: Find the min-trip test guaranteed before a 'main' loop.
// Make it a 1-trip test (means at least 2 trips).
@@ -1997,8 +1990,7 @@
: (Node*)new MaxINode(pre_limit, orig_limit);
register_new_node(pre_limit, pre_ctrl);
}
- _igvn.hash_delete(pre_opaq);
- pre_opaq->set_req(1, pre_limit);
+ _igvn.replace_input_of(pre_opaq, 1, pre_limit);
// Note:: we are making the main loop limit no longer precise;
// need to round up based on stride.
@@ -2027,10 +2019,9 @@
Node *main_bol = main_cle->in(1);
// Hacking loop bounds; need private copies of exit test
if( main_bol->outcnt() > 1 ) {// BoolNode shared?
- _igvn.hash_delete(main_cle);
main_bol = main_bol->clone();// Clone a private BoolNode
register_new_node( main_bol, main_cle->in(0) );
- main_cle->set_req(1,main_bol);
+ _igvn.replace_input_of(main_cle, 1, main_bol);
}
Node *main_cmp = main_bol->in(1);
if( main_cmp->outcnt() > 1 ) { // CmpNode shared?
diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp
index 5ee44d0..5ca0ab0 100644
--- a/hotspot/src/share/vm/opto/loopnode.cpp
+++ b/hotspot/src/share/vm/opto/loopnode.cpp
@@ -133,7 +133,7 @@
// Return earliest legal location
assert(early == find_non_split_ctrl(early), "unexpected early control");
- if (n->is_expensive()) {
+ if (n->is_expensive() && !_verify_only && !_verify_me) {
assert(n->in(0), "should have control input");
early = get_early_ctrl_for_expensive(n, early);
}
@@ -226,8 +226,7 @@
}
if (ctl != n->in(0)) {
- _igvn.hash_delete(n);
- n->set_req(0, ctl);
+ _igvn.replace_input_of(n, 0, ctl);
_igvn.hash_insert(n);
}
@@ -521,8 +520,7 @@
assert(check_iff->in(1)->Opcode() == Op_Conv2B &&
check_iff->in(1)->in(1)->Opcode() == Op_Opaque1, "");
Node* opq = check_iff->in(1)->in(1);
- _igvn.hash_delete(opq);
- opq->set_req(1, bol);
+ _igvn.replace_input_of(opq, 1, bol);
// Update ctrl.
set_ctrl(opq, check_iff->in(0));
set_ctrl(check_iff->in(1), check_iff->in(0));
@@ -690,7 +688,7 @@
incr->set_req(2,stride);
incr = _igvn.register_new_node_with_optimizer(incr);
set_early_ctrl( incr );
- _igvn.hash_delete(phi);
+ _igvn.rehash_node_delayed(phi);
phi->set_req_X( LoopNode::LoopBackControl, incr, &_igvn );
// If phi type is more restrictive than Int, raise to
@@ -743,8 +741,8 @@
iffalse = iff2;
iftrue = ift2;
} else {
- _igvn.hash_delete(iffalse);
- _igvn.hash_delete(iftrue);
+ _igvn.rehash_node_delayed(iffalse);
+ _igvn.rehash_node_delayed(iftrue);
iffalse->set_req_X( 0, le, &_igvn );
iftrue ->set_req_X( 0, le, &_igvn );
}
@@ -1257,6 +1255,7 @@
_head->del_req(i);
}
}
+ igvn.rehash_node_delayed(_head);
// Transform landing pad
igvn.register_new_node_with_optimizer(landing_pad, _head);
// Insert landing pad into the header
@@ -1397,7 +1396,7 @@
igvn.register_new_node_with_optimizer(r, _head);
// Plug region into end of loop _head, followed by hot_tail
while( _head->req() > 3 ) _head->del_req( _head->req()-1 );
- _head->set_req(2, r);
+ igvn.replace_input_of(_head, 2, r);
if( hot_idx ) _head->add_req(hot_tail);
// Split all the Phis up between '_head' loop and the Region 'r'
@@ -1419,7 +1418,7 @@
igvn.register_new_node_with_optimizer(phi, n);
// Add the merge phi to the old Phi
while( n->req() > 3 ) n->del_req( n->req()-1 );
- n->set_req(2, phi);
+ igvn.replace_input_of(n, 2, phi);
if( hot_idx ) n->add_req(hot_phi);
}
}
@@ -1495,13 +1494,14 @@
if( fall_in_cnt > 1 ) {
// Since I am just swapping inputs I do not need to update def-use info
Node *tmp = _head->in(1);
+ igvn.rehash_node_delayed(_head);
_head->set_req( 1, _head->in(fall_in_cnt) );
_head->set_req( fall_in_cnt, tmp );
// Swap also all Phis
for (DUIterator_Fast imax, i = _head->fast_outs(imax); i < imax; i++) {
Node* phi = _head->fast_out(i);
if( phi->is_Phi() ) {
- igvn.hash_delete(phi); // Yank from hash before hacking edges
+ igvn.rehash_node_delayed(phi); // Yank from hash before hacking edges
tmp = phi->in(1);
phi->set_req( 1, phi->in(fall_in_cnt) );
phi->set_req( fall_in_cnt, tmp );
@@ -2905,6 +2905,7 @@
uint k = 0; // Probably cfg->in(0)
while( cfg->in(k) != m ) k++; // But check incase cfg is a Region
cfg->set_req( k, if_t ); // Now point to NeverBranch
+ _igvn._worklist.push(cfg);
// Now create the never-taken loop exit
Node *if_f = new CProjNode( iff, 1 );
diff --git a/hotspot/src/share/vm/opto/loopopts.cpp b/hotspot/src/share/vm/opto/loopopts.cpp
index e25a6b0..20ad4ff 100644
--- a/hotspot/src/share/vm/opto/loopopts.cpp
+++ b/hotspot/src/share/vm/opto/loopopts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -625,7 +625,7 @@
set_ctrl(inp, cmov_ctrl);
}
}
- Node *cmov = CMoveNode::make( C, cmov_ctrl, iff->in(1), phi->in(1+flip), phi->in(2-flip), _igvn.type(phi) );
+ Node *cmov = CMoveNode::make(cmov_ctrl, iff->in(1), phi->in(1+flip), phi->in(2-flip), _igvn.type(phi));
register_new_node( cmov, cmov_ctrl );
_igvn.replace_node( phi, cmov );
#ifndef PRODUCT
@@ -2574,7 +2574,7 @@
new_head->set_unswitch_count(head->unswitch_count()); // Preserve
_igvn.register_new_node_with_optimizer(new_head);
assert(first_not_peeled->in(0) == last_peel, "last_peel <- first_not_peeled");
- first_not_peeled->set_req(0, new_head);
+ _igvn.replace_input_of(first_not_peeled, 0, new_head);
set_loop(new_head, loop);
loop->_body.push(new_head);
not_peel.set(new_head->_idx);
diff --git a/hotspot/src/share/vm/opto/machnode.cpp b/hotspot/src/share/vm/opto/machnode.cpp
index 69139e1..a211219 100644
--- a/hotspot/src/share/vm/opto/machnode.cpp
+++ b/hotspot/src/share/vm/opto/machnode.cpp
@@ -178,7 +178,7 @@
}
// Return an equivalent instruction using memory for cisc_operand position
-MachNode *MachNode::cisc_version(int offset, Compile* C) {
+MachNode *MachNode::cisc_version(int offset) {
ShouldNotCallThis();
return NULL;
}
@@ -411,7 +411,7 @@
//------------------------------peephole---------------------------------------
// Apply peephole rule(s) to this instruction
-MachNode *MachNode::peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C ) {
+MachNode *MachNode::peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted) {
return NULL;
}
diff --git a/hotspot/src/share/vm/opto/machnode.hpp b/hotspot/src/share/vm/opto/machnode.hpp
index 78ab196..a557c02 100644
--- a/hotspot/src/share/vm/opto/machnode.hpp
+++ b/hotspot/src/share/vm/opto/machnode.hpp
@@ -152,7 +152,7 @@
virtual uint cmp( const MachOper &oper ) const;
// Virtual clone, since I do not know how big the MachOper is.
- virtual MachOper *clone(Compile* C) const = 0;
+ virtual MachOper *clone() const = 0;
// Return ideal Type from simple operands. Fail for complex operands.
virtual const Type *type() const;
@@ -202,10 +202,10 @@
// Copy inputs and operands to new node of instruction.
// Called from cisc_version() and short_branch_version().
// !!!! The method's body is defined in ad_<arch>.cpp file.
- void fill_new_machnode(MachNode *n, Compile* C) const;
+ void fill_new_machnode(MachNode *n) const;
// Return an equivalent instruction using memory for cisc_operand position
- virtual MachNode *cisc_version(int offset, Compile* C);
+ virtual MachNode *cisc_version(int offset);
// Modify this instruction's register mask to use stack version for cisc_operand
virtual void use_cisc_RegMask();
@@ -317,7 +317,7 @@
virtual const class TypePtr *adr_type() const;
// Apply peephole rule(s) to this instruction
- virtual MachNode *peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C );
+ virtual MachNode *peephole(Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted);
// Top-level ideal Opcode matched
virtual int ideal_Opcode() const { return Op_Node; }
@@ -627,7 +627,7 @@
virtual void save_label(Label** label, uint* block_num) = 0;
// Support for short branches
- virtual MachNode *short_branch_version(Compile* C) { return NULL; }
+ virtual MachNode *short_branch_version() { return NULL; }
virtual bool pinned() const { return true; };
};
@@ -985,7 +985,7 @@
labelOper(labelOper* l) : _label(l->_label) , _block_num(l->_block_num) {}
- virtual MachOper *clone(Compile* C) const;
+ virtual MachOper *clone() const;
virtual Label *label() const { assert(_label != NULL, "need Label"); return _label; }
@@ -1012,7 +1012,7 @@
methodOper() : _method(0) {}
methodOper(intptr_t method) : _method(method) {}
- virtual MachOper *clone(Compile* C) const;
+ virtual MachOper *clone() const;
virtual intptr_t method() const { return _method; }
diff --git a/hotspot/src/share/vm/opto/macro.cpp b/hotspot/src/share/vm/opto/macro.cpp
index 5b1f439..33e8083 100644
--- a/hotspot/src/share/vm/opto/macro.cpp
+++ b/hotspot/src/share/vm/opto/macro.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -702,6 +702,7 @@
ciType* elem_type;
Node* res = alloc->result_cast();
+ assert(res == NULL || res->is_CheckCastPP(), "unexpected AllocateNode result");
const TypeOopPtr* res_type = NULL;
if (res != NULL) { // Could be NULL when there are no users
res_type = _igvn.type(res)->isa_oopptr();
@@ -791,6 +792,7 @@
for (int k = 0; k < j; k++) {
sfpt->del_req(last--);
}
+ _igvn._worklist.push(sfpt);
// rollback processed safepoints
while (safepoints_done.length() > 0) {
SafePointNode* sfpt_done = safepoints_done.pop();
@@ -815,6 +817,7 @@
}
}
}
+ _igvn._worklist.push(sfpt_done);
}
#ifndef PRODUCT
if (PrintEliminateAllocations) {
@@ -855,6 +858,7 @@
int start = jvms->debug_start();
int end = jvms->debug_end();
sfpt->replace_edges_in_range(res, sobj, start, end);
+ _igvn._worklist.push(sfpt);
safepoints_done.append_if_missing(sfpt); // keep it for rollback
}
return true;
@@ -1034,6 +1038,8 @@
return false;
}
+ assert(boxing->result_cast() == NULL, "unexpected boxing node result");
+
extract_call_projections(boxing);
const TypeTuple* r = boxing->tf()->range();
@@ -1775,6 +1781,7 @@
Node *pf_region = new RegionNode(3);
Node *pf_phi_rawmem = new PhiNode( pf_region, Type::MEMORY,
TypeRawPtr::BOTTOM );
+ transform_later(pf_region);
// Generate several prefetch instructions.
uint lines = (length != NULL) ? AllocatePrefetchLines : AllocateInstancePrefetchLines;
diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp
index cce4a73..8ecb54b 100644
--- a/hotspot/src/share/vm/opto/matcher.cpp
+++ b/hotspot/src/share/vm/opto/matcher.cpp
@@ -305,7 +305,7 @@
// to avoid false sharing if the corresponding mach node is not used.
// The corresponding mach node is only used in rare cases for derived
// pointers.
- Node* new_ideal_null = ConNode::make(C, TypePtr::NULL_PTR);
+ Node* new_ideal_null = ConNode::make(TypePtr::NULL_PTR);
// Swap out to old-space; emptying new-space
Arena *old = C->node_arena()->move_contents(C->old_arena());
@@ -1643,8 +1643,8 @@
}
// Build the object to represent this state & prepare for recursive calls
- MachNode *mach = s->MachNodeGenerator( rule, C );
- mach->_opnds[0] = s->MachOperGenerator( _reduceOp[rule], C );
+ MachNode *mach = s->MachNodeGenerator(rule);
+ mach->_opnds[0] = s->MachOperGenerator(_reduceOp[rule]);
assert( mach->_opnds[0] != NULL, "Missing result operand" );
Node *leaf = s->_leaf;
// Check for instruction or instruction chain rule
@@ -1756,13 +1756,13 @@
assert( 0 <= opnd_class_instance && opnd_class_instance < NUM_OPERANDS,
"Bad AD file: Instruction chain rule must chain from operand");
// Insert operand into array of operands for this instruction
- mach->_opnds[1] = s->MachOperGenerator( opnd_class_instance, C );
+ mach->_opnds[1] = s->MachOperGenerator(opnd_class_instance);
ReduceOper( s, newrule, mem, mach );
} else {
// Chain from the result of an instruction
assert( newrule >= _LAST_MACH_OPER, "Do NOT chain from internal operand");
- mach->_opnds[1] = s->MachOperGenerator( _reduceOp[catch_op], C );
+ mach->_opnds[1] = s->MachOperGenerator(_reduceOp[catch_op]);
Node *mem1 = (Node*)1;
debug_only(Node *save_mem_node = _mem_node;)
mach->add_req( ReduceInst(s, newrule, mem1) );
@@ -1807,7 +1807,7 @@
if( newrule < NUM_OPERANDS ) { // Operand/operandClass or internalOp/instruction?
// Operand/operandClass
// Insert operand into array of operands for this instruction
- mach->_opnds[num_opnds++] = newstate->MachOperGenerator( opnd_class_instance, C );
+ mach->_opnds[num_opnds++] = newstate->MachOperGenerator(opnd_class_instance);
ReduceOper( newstate, newrule, mem, mach );
} else { // Child is internal operand or new instruction
@@ -1818,7 +1818,7 @@
} else {
// instruction --> call build operand( ) to catch result
// --> ReduceInst( newrule )
- mach->_opnds[num_opnds++] = s->MachOperGenerator( _reduceOp[catch_op], C );
+ mach->_opnds[num_opnds++] = s->MachOperGenerator(_reduceOp[catch_op]);
Node *mem1 = (Node*)1;
debug_only(Node *save_mem_node = _mem_node;)
mach->add_req( ReduceInst( newstate, newrule, mem1 ) );
diff --git a/hotspot/src/share/vm/opto/mathexactnode.cpp b/hotspot/src/share/vm/opto/mathexactnode.cpp
index 00466ad..a966568 100644
--- a/hotspot/src/share/vm/opto/mathexactnode.cpp
+++ b/hotspot/src/share/vm/opto/mathexactnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -191,7 +191,7 @@
NativeType val1 = TypeClass::as_self(type1)->get_con();
NativeType val2 = TypeClass::as_self(type2)->get_con();
if (node->will_overflow(val1, val2) == false) {
- Node* con_result = ConINode::make(phase->C, 0);
+ Node* con_result = ConINode::make(0);
return con_result;
}
return NULL;
diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/hotspot/src/share/vm/opto/memnode.cpp
index 1c4d2bd..694a1ec 100644
--- a/hotspot/src/share/vm/opto/memnode.cpp
+++ b/hotspot/src/share/vm/opto/memnode.cpp
@@ -933,12 +933,12 @@
return (LoadNode*)NULL;
}
-LoadLNode* LoadLNode::make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, const Type* rt, MemOrd mo) {
+LoadLNode* LoadLNode::make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, const Type* rt, MemOrd mo) {
bool require_atomic = true;
return new LoadLNode(ctl, mem, adr, adr_type, rt->is_long(), mo, require_atomic);
}
-LoadDNode* LoadDNode::make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, const Type* rt, MemOrd mo) {
+LoadDNode* LoadDNode::make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, const Type* rt, MemOrd mo) {
bool require_atomic = true;
return new LoadDNode(ctl, mem, adr, adr_type, rt, mo, require_atomic);
}
@@ -1471,6 +1471,7 @@
Node* ctrl = in(MemNode::Control);
Node* address = in(MemNode::Address);
+ bool progress = false;
// Skip up past a SafePoint control. Cannot do this for Stores because
// pointer stores & cardmarks must stay on the same side of a SafePoint.
@@ -1478,6 +1479,7 @@
phase->C->get_alias_index(phase->type(address)->is_ptr()) != Compile::AliasIdxRaw ) {
ctrl = ctrl->in(0);
set_req(MemNode::Control,ctrl);
+ progress = true;
}
intptr_t ignore = 0;
@@ -1490,6 +1492,7 @@
&& all_controls_dominate(base, phase->C->start())) {
// A method-invariant, non-null address (constant or 'this' argument).
set_req(MemNode::Control, NULL);
+ progress = true;
}
}
@@ -1550,7 +1553,7 @@
}
}
- return NULL; // No further progress
+ return progress ? this : NULL;
}
// Helper to recognize certain Klass fields which are invariant across
@@ -2014,7 +2017,6 @@
//----------------------------LoadKlassNode::make------------------------------
// Polymorphic factory method:
Node *LoadKlassNode::make( PhaseGVN& gvn, Node *mem, Node *adr, const TypePtr* at, const TypeKlassPtr *tk ) {
- Compile* C = gvn.C;
Node *ctl = NULL;
// sanity check the alias category against the created node type
const TypePtr *adr_type = adr->bottom_type()->isa_ptr();
@@ -2379,12 +2381,12 @@
return (StoreNode*)NULL;
}
-StoreLNode* StoreLNode::make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo) {
+StoreLNode* StoreLNode::make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo) {
bool require_atomic = true;
return new StoreLNode(ctl, mem, adr, adr_type, val, mo, require_atomic);
}
-StoreDNode* StoreDNode::make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo) {
+StoreDNode* StoreDNode::make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo) {
bool require_atomic = true;
return new StoreDNode(ctl, mem, adr, adr_type, val, mo, require_atomic);
}
@@ -2460,7 +2462,7 @@
// and I need to disappear.
if (moved != NULL) {
// %%% hack to ensure that Ideal returns a new node:
- mem = MergeMemNode::make(phase->C, mem);
+ mem = MergeMemNode::make(mem);
return mem; // fold me away
}
}
@@ -2820,7 +2822,6 @@
intptr_t start_offset,
Node* end_offset,
PhaseGVN* phase) {
- Compile* C = phase->C;
intptr_t offset = start_offset;
int unit = BytesPerLong;
@@ -2847,7 +2848,6 @@
return mem;
}
- Compile* C = phase->C;
int unit = BytesPerLong;
Node* zbase = start_offset;
Node* zend = end_offset;
@@ -2875,7 +2875,6 @@
return mem;
}
- Compile* C = phase->C;
assert((end_offset % BytesPerInt) == 0, "odd end offset");
intptr_t done_offset = end_offset;
if ((done_offset % BytesPerLong) != 0) {
@@ -2944,6 +2943,7 @@
return NULL;
}
+ bool progress = false;
// Eliminate volatile MemBars for scalar replaced objects.
if (can_reshape && req() == (Precedent+1)) {
bool eliminate = false;
@@ -2966,6 +2966,7 @@
phase->is_IterGVN()->_worklist.push(my_mem); // remove dead node later
my_mem = NULL;
}
+ progress = true;
}
if (my_mem != NULL && my_mem->is_Mem()) {
const TypeOopPtr* t_oop = my_mem->in(MemNode::Address)->bottom_type()->isa_oopptr();
@@ -2995,7 +2996,7 @@
return new ConINode(TypeInt::ZERO);
}
}
- return NULL;
+ return progress ? this : NULL;
}
//------------------------------Value------------------------------------------
@@ -3497,6 +3498,7 @@
// if it redundantly stored the same value (or zero to fresh memory).
// In any case, wire it in:
+ phase->igvn_rehash_node_delayed(this);
set_req(i, new_st);
// The caller may now kill the old guy.
@@ -4126,7 +4128,7 @@
// Make a new, untransformed MergeMem with the same base as 'mem'.
// If mem is itself a MergeMem, populate the result with the same edges.
-MergeMemNode* MergeMemNode::make(Compile* C, Node* mem) {
+MergeMemNode* MergeMemNode::make(Node* mem) {
return new MergeMemNode(mem);
}
diff --git a/hotspot/src/share/vm/opto/memnode.hpp b/hotspot/src/share/vm/opto/memnode.hpp
index 000ccdc..4a7064a 100644
--- a/hotspot/src/share/vm/opto/memnode.hpp
+++ b/hotspot/src/share/vm/opto/memnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -333,7 +333,7 @@
virtual int store_Opcode() const { return Op_StoreL; }
virtual BasicType memory_type() const { return T_LONG; }
bool require_atomic_access() const { return _require_atomic_access; }
- static LoadLNode* make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type,
+ static LoadLNode* make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type,
const Type* rt, MemOrd mo);
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const {
@@ -384,7 +384,7 @@
virtual int store_Opcode() const { return Op_StoreD; }
virtual BasicType memory_type() const { return T_DOUBLE; }
bool require_atomic_access() const { return _require_atomic_access; }
- static LoadDNode* make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type,
+ static LoadDNode* make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type,
const Type* rt, MemOrd mo);
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const {
@@ -593,7 +593,7 @@
virtual int Opcode() const;
virtual BasicType memory_type() const { return T_LONG; }
bool require_atomic_access() const { return _require_atomic_access; }
- static StoreLNode* make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo);
+ static StoreLNode* make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo);
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const {
StoreNode::dump_spec(st);
@@ -629,7 +629,7 @@
virtual int Opcode() const;
virtual BasicType memory_type() const { return T_DOUBLE; }
bool require_atomic_access() const { return _require_atomic_access; }
- static StoreDNode* make_atomic(Compile *C, Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo);
+ static StoreDNode* make_atomic(Node* ctl, Node* mem, Node* adr, const TypePtr* adr_type, Node* val, MemOrd mo);
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const {
StoreNode::dump_spec(st);
@@ -1138,7 +1138,7 @@
// If the input is a whole memory state, clone it with all its slices intact.
// Otherwise, make a new memory state with just that base memory input.
// In either case, the result is a newly created MergeMem.
- static MergeMemNode* make(Compile* C, Node* base_memory);
+ static MergeMemNode* make(Node* base_memory);
virtual int Opcode() const;
virtual Node *Identity( PhaseTransform *phase );
diff --git a/hotspot/src/share/vm/opto/movenode.cpp b/hotspot/src/share/vm/opto/movenode.cpp
index b7e32de..234cdeb 100644
--- a/hotspot/src/share/vm/opto/movenode.cpp
+++ b/hotspot/src/share/vm/opto/movenode.cpp
@@ -88,7 +88,7 @@
if( in(Condition)->is_Bool() ) {
BoolNode* b = in(Condition)->as_Bool();
BoolNode* b2 = b->negate(phase);
- return make( phase->C, in(Control), phase->transform(b2), in(IfTrue), in(IfFalse), _type );
+ return make(in(Control), phase->transform(b2), in(IfTrue), in(IfFalse), _type);
}
}
return NULL;
@@ -158,7 +158,7 @@
//------------------------------make-------------------------------------------
// Make a correctly-flavored CMove. Since _type is directly determined
// from the inputs we do not need to specify it here.
-CMoveNode *CMoveNode::make( Compile *C, Node *c, Node *bol, Node *left, Node *right, const Type *t ) {
+CMoveNode *CMoveNode::make(Node *c, Node *bol, Node *left, Node *right, const Type *t) {
switch( t->basic_type() ) {
case T_INT: return new CMoveINode( bol, left, right, t->is_int() );
case T_FLOAT: return new CMoveFNode( bol, left, right, t );
@@ -196,7 +196,7 @@
if( in(Condition)->is_Bool() ) {
BoolNode* b = in(Condition)->as_Bool();
BoolNode* b2 = b->negate(phase);
- return make( phase->C, in(Control), phase->transform(b2), in(IfTrue), in(IfFalse), _type );
+ return make(in(Control), phase->transform(b2), in(IfTrue), in(IfFalse), _type);
}
}
diff --git a/hotspot/src/share/vm/opto/movenode.hpp b/hotspot/src/share/vm/opto/movenode.hpp
index 8aac944..bb99f7b 100644
--- a/hotspot/src/share/vm/opto/movenode.hpp
+++ b/hotspot/src/share/vm/opto/movenode.hpp
@@ -47,7 +47,7 @@
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
virtual const Type *Value( PhaseTransform *phase ) const;
virtual Node *Identity( PhaseTransform *phase );
- static CMoveNode *make( Compile *C, Node *c, Node *bol, Node *left, Node *right, const Type *t );
+ static CMoveNode *make(Node *c, Node *bol, Node *left, Node *right, const Type *t);
// Helper function to spot cmove graph shapes
static Node *is_cmove_id( PhaseTransform *phase, Node *cmp, Node *t, Node *f, BoolNode *b );
};
diff --git a/hotspot/src/share/vm/opto/node.cpp b/hotspot/src/share/vm/opto/node.cpp
index f48e87c..dd60260 100644
--- a/hotspot/src/share/vm/opto/node.cpp
+++ b/hotspot/src/share/vm/opto/node.cpp
@@ -507,7 +507,7 @@
(const void*)(&mthis->_opnds), 1));
mach->_opnds = to;
for ( uint i = 0; i < nopnds; ++i ) {
- to[i] = from[i]->clone(C);
+ to[i] = from[i]->clone();
}
}
// cloning CallNode may need to clone JVMState
@@ -620,6 +620,7 @@
*(address*)this = badAddress; // smash the C++ vtbl, probably
_in = _out = (Node**) badAddress;
_max = _cnt = _outmax = _outcnt = 0;
+ compile->remove_modified_node(this);
#endif
}
@@ -765,6 +766,7 @@
if (n != NULL) n->del_out((Node *)this);
_in[idx] = in(--_cnt); // Compact the array
_in[_cnt] = NULL; // NULL out emptied slot
+ Compile::current()->record_modified_node(this);
}
//------------------------------del_req_ordered--------------------------------
@@ -780,6 +782,7 @@
Copy::conjoint_words_to_lower((HeapWord*)&_in[idx+1], (HeapWord*)&_in[idx], ((_cnt-idx-1)*sizeof(Node*)));
}
_in[--_cnt] = NULL; // NULL out emptied slot
+ Compile::current()->record_modified_node(this);
}
//------------------------------ins_req----------------------------------------
@@ -1297,6 +1300,7 @@
// Done with outputs.
igvn->hash_delete(dead);
igvn->_worklist.remove(dead);
+ igvn->C->remove_modified_node(dead);
igvn->set_type(dead, Type::TOP);
if (dead->is_macro()) {
igvn->C->remove_macro_node(dead);
diff --git a/hotspot/src/share/vm/opto/node.hpp b/hotspot/src/share/vm/opto/node.hpp
index 5bb9c68..b483e36 100644
--- a/hotspot/src/share/vm/opto/node.hpp
+++ b/hotspot/src/share/vm/opto/node.hpp
@@ -398,6 +398,7 @@
if (*p != NULL) (*p)->del_out((Node *)this);
(*p) = n;
if (n != NULL) n->add_out((Node *)this);
+ Compile::current()->record_modified_node(this);
}
// Light version of set_req() to init inputs after node creation.
void init_req( uint i, Node *n ) {
@@ -409,6 +410,7 @@
assert( _in[i] == NULL, "sanity");
_in[i] = n;
if (n != NULL) n->add_out((Node *)this);
+ Compile::current()->record_modified_node(this);
}
// Find first occurrence of n among my edges:
int find_edge(Node* n);
diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp
index 15bf30b..16ec69c 100644
--- a/hotspot/src/share/vm/opto/output.cpp
+++ b/hotspot/src/share/vm/opto/output.cpp
@@ -526,7 +526,7 @@
if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
// We've got a winner. Replace this branch.
- MachNode* replacement = mach->as_MachBranch()->short_branch_version(this);
+ MachNode* replacement = mach->as_MachBranch()->short_branch_version();
// Update the jmp_size.
int new_size = replacement->size(_regalloc);
@@ -785,9 +785,10 @@
// grow downwards in all implementations.
// (If, on some machine, the interpreter's Java locals or stack
// were to grow upwards, the embedded doubles would be word-swapped.)
- jint *dp = (jint*)&d;
- array->append(new ConstantIntValue(dp[1]));
- array->append(new ConstantIntValue(dp[0]));
+ jlong_accessor acc;
+ acc.long_value = jlong_cast(d);
+ array->append(new ConstantIntValue(acc.words[1]));
+ array->append(new ConstantIntValue(acc.words[0]));
#endif
break;
}
@@ -804,9 +805,10 @@
// grow downwards in all implementations.
// (If, on some machine, the interpreter's Java locals or stack
// were to grow upwards, the embedded doubles would be word-swapped.)
- jint *dp = (jint*)&d;
- array->append(new ConstantIntValue(dp[1]));
- array->append(new ConstantIntValue(dp[0]));
+ jlong_accessor acc;
+ acc.long_value = d;
+ array->append(new ConstantIntValue(acc.words[1]));
+ array->append(new ConstantIntValue(acc.words[0]));
#endif
break;
}
@@ -1174,7 +1176,7 @@
// fill in the nop array for bundling computations
MachNode *_nop_list[Bundle::_nop_count];
- Bundle::initialize_nops(_nop_list, this);
+ Bundle::initialize_nops(_nop_list);
return cb;
}
@@ -1408,7 +1410,7 @@
if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
// We've got a winner. Replace this branch.
- MachNode* replacement = mach->as_MachBranch()->short_branch_version(this);
+ MachNode* replacement = mach->as_MachBranch()->short_branch_version();
// Update the jmp_size.
int new_size = replacement->size(_regalloc);
diff --git a/hotspot/src/share/vm/opto/parse1.cpp b/hotspot/src/share/vm/opto/parse1.cpp
index a758f72..118cb62 100644
--- a/hotspot/src/share/vm/opto/parse1.cpp
+++ b/hotspot/src/share/vm/opto/parse1.cpp
@@ -575,12 +575,13 @@
decrement_age();
}
}
- if (depth() == 1) {
+
+ if (depth() == 1 && !failing()) {
// Add check to deoptimize the nmethod if RTM state was changed
rtm_deopt();
}
- // Check for bailouts during method entry.
+ // Check for bailouts during method entry or RTM state check setup.
if (failing()) {
if (log) log->done("parse");
C->set_default_node_notes(caller_nn);
@@ -1756,7 +1757,7 @@
if (remerge == NULL) {
assert(base != NULL, "");
assert(base->in(0) != NULL, "should not be xformed away");
- remerge = MergeMemNode::make(C, base->in(pnum));
+ remerge = MergeMemNode::make(base->in(pnum));
gvn().set_type(remerge, Type::MEMORY);
base->set_req(pnum, remerge);
}
@@ -2199,7 +2200,7 @@
// down below a SafePoint.
// Clone the current memory state
- Node* mem = MergeMemNode::make(C, map()->memory());
+ Node* mem = MergeMemNode::make(map()->memory());
mem = _gvn.transform(mem);
@@ -2213,7 +2214,7 @@
// Create a node for the polling address
if( add_poll_param ) {
- Node *polladr = ConPNode::make(C, (address)os::get_polling_page());
+ Node *polladr = ConPNode::make((address)os::get_polling_page());
sfpnt->init_req(TypeFunc::Parms+0, _gvn.transform(polladr));
}
diff --git a/hotspot/src/share/vm/opto/parseHelper.cpp b/hotspot/src/share/vm/opto/parseHelper.cpp
index 45d627d..a71fb8f 100644
--- a/hotspot/src/share/vm/opto/parseHelper.cpp
+++ b/hotspot/src/share/vm/opto/parseHelper.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
// Get method
const TypePtr* method_type = TypeMetadataPtr::make(method);
- Node *method_node = _gvn.transform( ConNode::make(C, method_type) );
+ Node *method_node = _gvn.transform(ConNode::make(method_type));
kill_dead_locals();
diff --git a/hotspot/src/share/vm/opto/phaseX.cpp b/hotspot/src/share/vm/opto/phaseX.cpp
index b4470dc..3e063ae 100644
--- a/hotspot/src/share/vm/opto/phaseX.cpp
+++ b/hotspot/src/share/vm/opto/phaseX.cpp
@@ -615,7 +615,7 @@
// Make an idealized constant - one of ConINode, ConPNode, etc.
ConNode* PhaseValues::uncached_makecon(const Type *t) {
assert(t->singleton(), "must be a constant");
- ConNode* x = ConNode::make(C, t);
+ ConNode* x = ConNode::make(t);
ConNode* k = (ConNode*)hash_find_insert(x); // Value numbering
if (k == NULL) {
set_type(x, t); // Missed, provide type mapping
@@ -933,9 +933,32 @@
for (int i = 0; i < _verify_window_size; i++) {
_verify_window[i] = NULL;
}
+#ifdef ASSERT
+ // Verify that all modified nodes are on _worklist
+ Unique_Node_List* modified_list = C->modified_nodes();
+ while (modified_list != NULL && modified_list->size()) {
+ Node* n = modified_list->pop();
+ if (n->outcnt() != 0 && !n->is_Con() && !_worklist.member(n)) {
+ n->dump();
+ assert(false, "modified node is not on IGVN._worklist");
+ }
+ }
+#endif
}
void PhaseIterGVN::verify_PhaseIterGVN() {
+#ifdef ASSERT
+ // Verify nodes with changed inputs.
+ Unique_Node_List* modified_list = C->modified_nodes();
+ while (modified_list != NULL && modified_list->size()) {
+ Node* n = modified_list->pop();
+ if (n->outcnt() != 0 && !n->is_Con()) { // skip dead and Con nodes
+ n->dump();
+ assert(false, "modified node was not processed by IGVN.transform_old()");
+ }
+ }
+#endif
+
C->verify_graph_edges();
if( VerifyOpto && allow_progress() ) {
// Must turn off allow_progress to enable assert and break recursion
@@ -964,6 +987,14 @@
(int) _verify_counter, (int) _verify_full_passes);
}
}
+
+#ifdef ASSERT
+ while (modified_list->size()) {
+ Node* n = modified_list->pop();
+ n->dump();
+ assert(false, "VerifyIterativeGVN: new modified node was added");
+ }
+#endif
}
#endif /* PRODUCT */
@@ -1066,6 +1097,7 @@
Node* k = n;
DEBUG_ONLY(dead_loop_check(k);)
DEBUG_ONLY(bool is_new = (k->outcnt() == 0);)
+ C->remove_modified_node(k);
Node* i = k->Ideal(this, /*can_reshape=*/true);
assert(i != k || is_new || i->outcnt() > 0, "don't return dead nodes");
#ifndef PRODUCT
@@ -1107,6 +1139,7 @@
DEBUG_ONLY(dead_loop_check(k);)
// Try idealizing again
DEBUG_ONLY(is_new = (k->outcnt() == 0);)
+ C->remove_modified_node(k);
i = k->Ideal(this, /*can_reshape=*/true);
assert(i != k || is_new || (i->outcnt() > 0), "don't return dead nodes");
#ifndef PRODUCT
@@ -1259,6 +1292,7 @@
_stack.pop();
// Remove dead node from iterative worklist
_worklist.remove(dead);
+ C->remove_modified_node(dead);
// Constant node that has no out-edges and has only one in-edge from
// root is usually dead. However, sometimes reshaping walk makes
// it reachable by adding use edges. So, we will NOT count Con nodes
@@ -1288,7 +1322,7 @@
for (DUIterator_Last imin, i = old->last_outs(imin); i >= imin; ) {
Node* use = old->last_out(i); // for each use...
// use might need re-hashing (but it won't if it's a new node)
- bool is_in_table = _table.hash_delete( use );
+ rehash_node_delayed(use);
// Update use-def info as well
// We remove all occurrences of old within use->in,
// so as to avoid rehashing any node more than once.
@@ -1300,11 +1334,6 @@
++num_edges;
}
}
- // Insert into GVN hash table if unique
- // If a duplicate, 'use' will be cleaned up when pulled off worklist
- if( is_in_table ) {
- hash_find_insert(use);
- }
i -= num_edges; // we deleted 1 or more copies of this edge
}
@@ -1599,7 +1628,7 @@
if( t == Type::TOP ) {
// cache my top node on the Compile instance
if( C->cached_top_node() == NULL || C->cached_top_node()->in(0) == NULL ) {
- C->set_cached_top_node( ConNode::make(C, Type::TOP) );
+ C->set_cached_top_node(ConNode::make(Type::TOP));
set_type(C->top(), Type::TOP);
}
nn = C->top();
@@ -1725,7 +1754,7 @@
MachNode *m = n->as_Mach();
int deleted_count = 0;
// check for peephole opportunities
- MachNode *m2 = m->peephole( block, instruction_index, _regalloc, deleted_count, C );
+ MachNode *m2 = m->peephole(block, instruction_index, _regalloc, deleted_count);
if( m2 != NULL ) {
#ifndef PRODUCT
if( PrintOptoPeephole ) {
diff --git a/hotspot/src/share/vm/opto/phaseX.hpp b/hotspot/src/share/vm/opto/phaseX.hpp
index ccb2481..53b7a03 100644
--- a/hotspot/src/share/vm/opto/phaseX.hpp
+++ b/hotspot/src/share/vm/opto/phaseX.hpp
@@ -311,6 +311,9 @@
const Type* limit_type) const
{ ShouldNotCallThis(); return NULL; }
+ // Delayed node rehash if this is an IGVN phase
+ virtual void igvn_rehash_node_delayed(Node* n) {}
+
#ifndef PRODUCT
void dump_old2new_map() const;
void dump_new( uint new_lidx ) const;
@@ -488,6 +491,10 @@
_worklist.push(n);
}
+ void igvn_rehash_node_delayed(Node* n) {
+ rehash_node_delayed(n);
+ }
+
// Replace ith edge of "n" with "in"
void replace_input_of(Node* n, int i, Node* in) {
rehash_node_delayed(n);
diff --git a/hotspot/src/share/vm/opto/rootnode.cpp b/hotspot/src/share/vm/opto/rootnode.cpp
index 56775ed..4cf5152 100644
--- a/hotspot/src/share/vm/opto/rootnode.cpp
+++ b/hotspot/src/share/vm/opto/rootnode.cpp
@@ -35,10 +35,12 @@
//------------------------------Ideal------------------------------------------
// Remove dead inputs
Node *RootNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+ bool modified = false;
for( uint i = 1; i < req(); i++ ) { // For all inputs
// Check for and remove dead inputs
if( phase->type(in(i)) == Type::TOP ) {
del_req(i--); // Delete TOP inputs
+ modified = true;
}
}
@@ -56,7 +58,7 @@
// If we want to get the rest of the win later, we should pattern match
// simple recursive call trees to closed-form solutions.
- return NULL; // No further opportunities exposed
+ return modified ? this : NULL;
}
//=============================================================================
diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp
index 2a2fb13..0bf5c9d 100644
--- a/hotspot/src/share/vm/opto/runtime.cpp
+++ b/hotspot/src/share/vm/opto/runtime.cpp
@@ -1381,11 +1381,11 @@
}
NamedCounter* c;
if (tag == NamedCounter::BiasedLockingCounter) {
- c = new BiasedLockingNamedCounter(strdup(st.as_string()));
+ c = new BiasedLockingNamedCounter(st.as_string());
} else if (tag == NamedCounter::RTMLockingCounter) {
- c = new RTMLockingNamedCounter(strdup(st.as_string()));
+ c = new RTMLockingNamedCounter(st.as_string());
} else {
- c = new NamedCounter(strdup(st.as_string()), tag);
+ c = new NamedCounter(st.as_string(), tag);
}
// atomically add the new counter to the head of the list. We only
diff --git a/hotspot/src/share/vm/opto/runtime.hpp b/hotspot/src/share/vm/opto/runtime.hpp
index b5e8bc3..612afc5 100644
--- a/hotspot/src/share/vm/opto/runtime.hpp
+++ b/hotspot/src/share/vm/opto/runtime.hpp
@@ -75,11 +75,17 @@
public:
NamedCounter(const char *n, CounterTag tag = NoTag):
- _name(n),
+ _name(n == NULL ? NULL : os::strdup(n)),
_count(0),
_next(NULL),
_tag(tag) {}
+ ~NamedCounter() {
+ if (_name != NULL) {
+ os::free((void*)_name);
+ }
+ }
+
const char * name() const { return _name; }
int count() const { return _count; }
address addr() { return (address)&_count; }
diff --git a/hotspot/src/share/vm/opto/stringopts.cpp b/hotspot/src/share/vm/opto/stringopts.cpp
index fcca468..1d9bae5 100644
--- a/hotspot/src/share/vm/opto/stringopts.cpp
+++ b/hotspot/src/share/vm/opto/stringopts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1438,7 +1438,7 @@
}
// Make sure the memory state is a MergeMem for parsing.
if (!map->in(TypeFunc::Memory)->is_MergeMem()) {
- map->set_req(TypeFunc::Memory, MergeMemNode::make(C, map->in(TypeFunc::Memory)));
+ map->set_req(TypeFunc::Memory, MergeMemNode::make(map->in(TypeFunc::Memory)));
}
jvms->set_map(map);
diff --git a/hotspot/src/share/vm/opto/subnode.cpp b/hotspot/src/share/vm/opto/subnode.cpp
index e5f24b6..c659354 100644
--- a/hotspot/src/share/vm/opto/subnode.cpp
+++ b/hotspot/src/share/vm/opto/subnode.cpp
@@ -1168,7 +1168,6 @@
Node* BoolNode::make_predicate(Node* test_value, PhaseGVN* phase) {
if (test_value->is_Con()) return test_value;
if (test_value->is_Bool()) return test_value;
- Compile* C = phase->C;
if (test_value->is_CMove() &&
test_value->in(CMoveNode::Condition)->is_Bool()) {
BoolNode* bol = test_value->in(CMoveNode::Condition)->as_Bool();
@@ -1191,7 +1190,7 @@
//--------------------------------as_int_value---------------------------------
Node* BoolNode::as_int_value(PhaseGVN* phase) {
// Inverse to make_predicate. The CMove probably boils down to a Conv2B.
- Node* cmov = CMoveNode::make(phase->C, NULL, this,
+ Node* cmov = CMoveNode::make(NULL, this,
phase->intcon(0), phase->intcon(1),
TypeInt::BOOL);
return phase->transform(cmov);
@@ -1199,7 +1198,6 @@
//----------------------------------negate-------------------------------------
BoolNode* BoolNode::negate(PhaseGVN* phase) {
- Compile* C = phase->C;
return new BoolNode(in(1), _test.negate());
}
diff --git a/hotspot/src/share/vm/opto/superword.cpp b/hotspot/src/share/vm/opto/superword.cpp
index 72fabf9..e20a187 100644
--- a/hotspot/src/share/vm/opto/superword.cpp
+++ b/hotspot/src/share/vm/opto/superword.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1378,9 +1378,23 @@
if (n->is_Load()) {
Node* ctl = n->in(MemNode::Control);
Node* mem = first->in(MemNode::Memory);
+ SWPointer p1(n->as_Mem(), this);
+ // Identify the memory dependency for the new loadVector node by
+ // walking up through memory chain.
+ // This is done to give flexibility to the new loadVector node so that
+ // it can move above independent storeVector nodes.
+ while (mem->is_StoreVector()) {
+ SWPointer p2(mem->as_Mem(), this);
+ int cmp = p1.cmp(p2);
+ if (SWPointer::not_equal(cmp) || !SWPointer::comparable(cmp)) {
+ mem = mem->in(MemNode::Memory);
+ } else {
+ break; // dependent memory
+ }
+ }
Node* adr = low_adr->in(MemNode::Address);
const TypePtr* atyp = n->adr_type();
- vn = LoadVectorNode::make(C, opc, ctl, mem, adr, atyp, vlen, velt_basic_type(n));
+ vn = LoadVectorNode::make(opc, ctl, mem, adr, atyp, vlen, velt_basic_type(n));
vlen_in_bytes = vn->as_LoadVector()->memory_size();
} else if (n->is_Store()) {
// Promote value to be stored to vector
@@ -1389,7 +1403,7 @@
Node* mem = first->in(MemNode::Memory);
Node* adr = low_adr->in(MemNode::Address);
const TypePtr* atyp = n->adr_type();
- vn = StoreVectorNode::make(C, opc, ctl, mem, adr, atyp, val, vlen);
+ vn = StoreVectorNode::make(opc, ctl, mem, adr, atyp, val, vlen);
vlen_in_bytes = vn->as_StoreVector()->memory_size();
} else if (n->req() == 3) {
// Promote operands to vector
@@ -1401,7 +1415,7 @@
in1 = in2;
in2 = tmp;
}
- vn = VectorNode::make(C, opc, in1, in2, vlen, velt_basic_type(n));
+ vn = VectorNode::make(opc, in1, in2, vlen, velt_basic_type(n));
vlen_in_bytes = vn->as_Vector()->length_in_bytes();
} else {
ShouldNotReachHere();
@@ -1450,11 +1464,11 @@
if (t != NULL && t->is_con()) {
juint shift = t->get_con();
if (shift > mask) { // Unsigned cmp
- cnt = ConNode::make(C, TypeInt::make(shift & mask));
+ cnt = ConNode::make(TypeInt::make(shift & mask));
}
} else {
if (t == NULL || t->_lo < 0 || t->_hi > (int)mask) {
- cnt = ConNode::make(C, TypeInt::make(mask));
+ cnt = ConNode::make(TypeInt::make(mask));
_igvn.register_new_node_with_optimizer(cnt);
cnt = new AndINode(opd, cnt);
_igvn.register_new_node_with_optimizer(cnt);
@@ -1462,7 +1476,7 @@
}
assert(opd->bottom_type()->isa_int(), "int type only");
// Move non constant shift count into vector register.
- cnt = VectorNode::shift_count(C, p0, cnt, vlen, velt_basic_type(p0));
+ cnt = VectorNode::shift_count(p0, cnt, vlen, velt_basic_type(p0));
}
if (cnt != opd) {
_igvn.register_new_node_with_optimizer(cnt);
@@ -1475,7 +1489,7 @@
// p0's vector. Use p0's type because size of operand's container in
// vector should match p0's size regardless operand's size.
const Type* p0_t = velt_type(p0);
- VectorNode* vn = VectorNode::scalar2vector(_phase->C, opd, vlen, p0_t);
+ VectorNode* vn = VectorNode::scalar2vector(opd, vlen, p0_t);
_igvn.register_new_node_with_optimizer(vn);
_phase->set_ctrl(vn, _phase->get_ctrl(opd));
@@ -1490,7 +1504,7 @@
// Insert pack operation
BasicType bt = velt_basic_type(p0);
- PackNode* pk = PackNode::make(_phase->C, opd, vlen, bt);
+ PackNode* pk = PackNode::make(opd, vlen, bt);
DEBUG_ONLY( const BasicType opd_bt = opd->bottom_type()->basic_type(); )
for (uint i = 1; i < vlen; i++) {
@@ -1546,7 +1560,7 @@
_igvn.hash_delete(def);
int def_pos = alignment(def) / data_size(def);
- Node* ex = ExtractNode::make(_phase->C, def, def_pos, velt_basic_type(def));
+ Node* ex = ExtractNode::make(def, def_pos, velt_basic_type(def));
_igvn.register_new_node_with_optimizer(ex);
_phase->set_ctrl(ex, _phase->get_ctrl(def));
_igvn.replace_input_of(use, idx, ex);
diff --git a/hotspot/src/share/vm/opto/type.cpp b/hotspot/src/share/vm/opto/type.cpp
index 3966264..8a5eddf 100644
--- a/hotspot/src/share/vm/opto/type.cpp
+++ b/hotspot/src/share/vm/opto/type.cpp
@@ -265,7 +265,7 @@
// locking.
Arena* save = current->type_arena();
- Arena* shared_type_arena = new (mtCompiler)Arena();
+ Arena* shared_type_arena = new (mtCompiler)Arena(mtCompiler);
current->set_type_arena(shared_type_arena);
_shared_type_dict =
@@ -5087,11 +5087,11 @@
// Dump Function Type
#ifndef PRODUCT
void TypeFunc::dump2( Dict &d, uint depth, outputStream *st ) const {
- if( _range->_cnt <= Parms )
+ if( _range->cnt() <= Parms )
st->print("void");
else {
uint i;
- for (i = Parms; i < _range->_cnt-1; i++) {
+ for (i = Parms; i < _range->cnt()-1; i++) {
_range->field_at(i)->dump2(d,depth,st);
st->print("/");
}
@@ -5104,9 +5104,9 @@
return;
}
d.Insert((void*)this,(void*)this); // Stop recursion
- if (Parms < _domain->_cnt)
+ if (Parms < _domain->cnt())
_domain->field_at(Parms)->dump2(d,depth-1,st);
- for (uint i = Parms+1; i < _domain->_cnt; i++) {
+ for (uint i = Parms+1; i < _domain->cnt(); i++) {
st->print(", ");
_domain->field_at(i)->dump2(d,depth-1,st);
}
diff --git a/hotspot/src/share/vm/opto/type.hpp b/hotspot/src/share/vm/opto/type.hpp
index e4340df..e0aeba1 100644
--- a/hotspot/src/share/vm/opto/type.hpp
+++ b/hotspot/src/share/vm/opto/type.hpp
@@ -609,16 +609,16 @@
// signature types.
class TypeTuple : public Type {
TypeTuple( uint cnt, const Type **fields ) : Type(Tuple), _cnt(cnt), _fields(fields) { }
+
+ const uint _cnt; // Count of fields
+ const Type ** const _fields; // Array of field types
+
public:
virtual bool eq( const Type *t ) const;
virtual int hash() const; // Type specific hashing
virtual bool singleton(void) const; // TRUE if type is a singleton
virtual bool empty(void) const; // TRUE if type is vacuous
-public:
- const uint _cnt; // Count of fields
- const Type ** const _fields; // Array of field types
-
// Accessors:
uint cnt() const { return _cnt; }
const Type* field_at(uint i) const {
@@ -1447,6 +1447,10 @@
virtual int hash() const; // Type specific hashing
virtual bool singleton(void) const; // TRUE if type is a singleton
virtual bool empty(void) const; // TRUE if type is vacuous
+
+ const TypeTuple* const _domain; // Domain of inputs
+ const TypeTuple* const _range; // Range of results
+
public:
// Constants are shared among ADLC and VM
enum { Control = AdlcVMDeps::Control,
@@ -1457,8 +1461,6 @@
Parms = AdlcVMDeps::Parms
};
- const TypeTuple* const _domain; // Domain of inputs
- const TypeTuple* const _range; // Range of results
// Accessors:
const TypeTuple* domain() const { return _domain; }
diff --git a/hotspot/src/share/vm/opto/vectornode.cpp b/hotspot/src/share/vm/opto/vectornode.cpp
index 21b51e5..b4a0779 100644
--- a/hotspot/src/share/vm/opto/vectornode.cpp
+++ b/hotspot/src/share/vm/opto/vectornode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -245,7 +245,7 @@
}
// Return the vector version of a scalar operation node.
-VectorNode* VectorNode::make(Compile* C, int opc, Node* n1, Node* n2, uint vlen, BasicType bt) {
+VectorNode* VectorNode::make(int opc, Node* n1, Node* n2, uint vlen, BasicType bt) {
const TypeVect* vt = TypeVect::make(bt, vlen);
int vopc = VectorNode::opcode(opc, bt);
// This method should not be called for unimplemented vectors.
@@ -299,7 +299,7 @@
}
// Scalar promotion
-VectorNode* VectorNode::scalar2vector(Compile* C, Node* s, uint vlen, const Type* opd_t) {
+VectorNode* VectorNode::scalar2vector(Node* s, uint vlen, const Type* opd_t) {
BasicType bt = opd_t->array_element_basic_type();
const TypeVect* vt = opd_t->singleton() ? TypeVect::make(opd_t, vlen)
: TypeVect::make(bt, vlen);
@@ -323,7 +323,7 @@
return NULL;
}
-VectorNode* VectorNode::shift_count(Compile* C, Node* shift, Node* cnt, uint vlen, BasicType bt) {
+VectorNode* VectorNode::shift_count(Node* shift, Node* cnt, uint vlen, BasicType bt) {
assert(VectorNode::is_shift(shift) && !cnt->is_Con(), "only variable shift count");
// Match shift count type with shift vector type.
const TypeVect* vt = TypeVect::make(bt, vlen);
@@ -342,7 +342,7 @@
}
// Return initial Pack node. Additional operands added with add_opd() calls.
-PackNode* PackNode::make(Compile* C, Node* s, uint vlen, BasicType bt) {
+PackNode* PackNode::make(Node* s, uint vlen, BasicType bt) {
const TypeVect* vt = TypeVect::make(bt, vlen);
switch (bt) {
case T_BOOLEAN:
@@ -365,18 +365,18 @@
}
// Create a binary tree form for Packs. [lo, hi) (half-open) range
-PackNode* PackNode::binary_tree_pack(Compile* C, int lo, int hi) {
+PackNode* PackNode::binary_tree_pack(int lo, int hi) {
int ct = hi - lo;
assert(is_power_of_2(ct), "power of 2");
if (ct == 2) {
- PackNode* pk = PackNode::make(C, in(lo), 2, vect_type()->element_basic_type());
+ PackNode* pk = PackNode::make(in(lo), 2, vect_type()->element_basic_type());
pk->add_opd(in(lo+1));
return pk;
} else {
int mid = lo + ct/2;
- PackNode* n1 = binary_tree_pack(C, lo, mid);
- PackNode* n2 = binary_tree_pack(C, mid, hi );
+ PackNode* n1 = binary_tree_pack(lo, mid);
+ PackNode* n2 = binary_tree_pack(mid, hi );
BasicType bt = n1->vect_type()->element_basic_type();
assert(bt == n2->vect_type()->element_basic_type(), "should be the same");
@@ -402,23 +402,23 @@
}
// Return the vector version of a scalar load node.
-LoadVectorNode* LoadVectorNode::make(Compile* C, int opc, Node* ctl, Node* mem,
+LoadVectorNode* LoadVectorNode::make(int opc, Node* ctl, Node* mem,
Node* adr, const TypePtr* atyp, uint vlen, BasicType bt) {
const TypeVect* vt = TypeVect::make(bt, vlen);
return new LoadVectorNode(ctl, mem, adr, atyp, vt);
}
// Return the vector version of a scalar store node.
-StoreVectorNode* StoreVectorNode::make(Compile* C, int opc, Node* ctl, Node* mem,
+StoreVectorNode* StoreVectorNode::make(int opc, Node* ctl, Node* mem,
Node* adr, const TypePtr* atyp, Node* val,
uint vlen) {
return new StoreVectorNode(ctl, mem, adr, atyp, val);
}
// Extract a scalar element of vector.
-Node* ExtractNode::make(Compile* C, Node* v, uint position, BasicType bt) {
+Node* ExtractNode::make(Node* v, uint position, BasicType bt) {
assert((int)position < Matcher::max_vector_size(bt), "pos in range");
- ConINode* pos = ConINode::make(C, (int)position);
+ ConINode* pos = ConINode::make((int)position);
switch (bt) {
case T_BOOLEAN:
return new ExtractUBNode(v, pos);
diff --git a/hotspot/src/share/vm/opto/vectornode.hpp b/hotspot/src/share/vm/opto/vectornode.hpp
index 0b95a10..759d724 100644
--- a/hotspot/src/share/vm/opto/vectornode.hpp
+++ b/hotspot/src/share/vm/opto/vectornode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,9 +52,9 @@
virtual uint ideal_reg() const { return Matcher::vector_ideal_reg(vect_type()->length_in_bytes()); }
- static VectorNode* scalar2vector(Compile* C, Node* s, uint vlen, const Type* opd_t);
- static VectorNode* shift_count(Compile* C, Node* shift, Node* cnt, uint vlen, BasicType bt);
- static VectorNode* make(Compile* C, int opc, Node* n1, Node* n2, uint vlen, BasicType bt);
+ static VectorNode* scalar2vector(Node* s, uint vlen, const Type* opd_t);
+ static VectorNode* shift_count(Node* shift, Node* cnt, uint vlen, BasicType bt);
+ static VectorNode* make(int opc, Node* n1, Node* n2, uint vlen, BasicType bt);
static int opcode(int opc, BasicType bt);
static bool implemented(int opc, uint vlen, BasicType bt);
@@ -371,7 +371,7 @@
virtual int store_Opcode() const { return Op_StoreVector; }
- static LoadVectorNode* make(Compile* C, int opc, Node* ctl, Node* mem,
+ static LoadVectorNode* make(int opc, Node* ctl, Node* mem,
Node* adr, const TypePtr* atyp, uint vlen, BasicType bt);
};
@@ -394,7 +394,7 @@
virtual BasicType memory_type() const { return T_VOID; }
virtual int memory_size() const { return vect_type()->length_in_bytes(); }
- static StoreVectorNode* make(Compile* C, int opc, Node* ctl, Node* mem,
+ static StoreVectorNode* make(int opc, Node* ctl, Node* mem,
Node* adr, const TypePtr* atyp, Node* val,
uint vlen);
};
@@ -465,9 +465,9 @@
}
// Create a binary tree form for Packs. [lo, hi) (half-open) range
- PackNode* binary_tree_pack(Compile* C, int lo, int hi);
+ PackNode* binary_tree_pack(int lo, int hi);
- static PackNode* make(Compile* C, Node* s, uint vlen, BasicType bt);
+ static PackNode* make(Node* s, uint vlen, BasicType bt);
};
//------------------------------PackBNode--------------------------------------
@@ -552,7 +552,7 @@
virtual int Opcode() const;
uint pos() const { return in(2)->get_int(); }
- static Node* make(Compile* C, Node* v, uint position, BasicType bt);
+ static Node* make(Node* v, uint position, BasicType bt);
};
//------------------------------ExtractBNode-----------------------------------
diff --git a/hotspot/src/share/vm/precompiled/precompiled.hpp b/hotspot/src/share/vm/precompiled/precompiled.hpp
index be70cff..121c8aa 100644
--- a/hotspot/src/share/vm/precompiled/precompiled.hpp
+++ b/hotspot/src/share/vm/precompiled/precompiled.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -222,10 +222,17 @@
# include "runtime/vmThread.hpp"
# include "runtime/vm_operations.hpp"
# include "runtime/vm_version.hpp"
+# include "services/allocationSite.hpp"
# include "services/lowMemoryDetector.hpp"
+# include "services/mallocTracker.hpp"
+# include "services/memBaseline.hpp"
# include "services/memoryPool.hpp"
# include "services/memoryService.hpp"
# include "services/memoryUsage.hpp"
+# include "services/memReporter.hpp"
+# include "services/memTracker.hpp"
+# include "services/nmtCommon.hpp"
+# include "services/virtualMemoryTracker.hpp"
# include "utilities/accessFlags.hpp"
# include "utilities/array.hpp"
# include "utilities/bitMap.hpp"
@@ -240,6 +247,7 @@
# include "utilities/hashtable.hpp"
# include "utilities/histogram.hpp"
# include "utilities/macros.hpp"
+# include "utilities/nativeCallStack.hpp"
# include "utilities/numberSeq.hpp"
# include "utilities/ostream.hpp"
# include "utilities/preserveException.hpp"
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index 51548ac..a64f3c2 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -74,6 +74,7 @@
#include "runtime/signature.hpp"
#include "runtime/thread.inline.hpp"
#include "runtime/vm_operations.hpp"
+#include "services/memTracker.hpp"
#include "services/runtimeService.hpp"
#include "trace/tracing.hpp"
#include "utilities/defaultStream.hpp"
@@ -2697,6 +2698,7 @@
if (bad_address != NULL) {
os::protect_memory(bad_address, size, os::MEM_PROT_READ,
/*is_committed*/false);
+ MemTracker::record_virtual_memory_type((void*)bad_address, mtInternal);
}
}
return bad_address;
@@ -3857,6 +3859,7 @@
void TestKlass_test();
void TestBitMap_test();
void TestAsUtf8();
+void Test_linked_list();
#if INCLUDE_ALL_GCS
void TestOldFreeSpaceCalculation_test();
void TestG1BiasedArray_test();
@@ -3887,6 +3890,7 @@
run_unit_test(TestBitMap_test());
run_unit_test(TestAsUtf8());
run_unit_test(ObjectMonitor::sanity_checks());
+ run_unit_test(Test_linked_list());
#if INCLUDE_VM_STRUCTS
run_unit_test(VMStructs::test());
#endif
diff --git a/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp b/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp
index d2dab57..b614b5a 100644
--- a/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -316,6 +316,7 @@
avail.can_generate_frame_pop_events ||
avail.can_generate_method_entry_events ||
avail.can_generate_method_exit_events;
+#ifdef ZERO
bool enter_all_methods =
interp_events ||
avail.can_generate_breakpoint_events;
@@ -324,6 +325,7 @@
UseFastEmptyMethods = false;
UseFastAccessorMethods = false;
}
+#endif // ZERO
if (avail.can_generate_breakpoint_events) {
RewriteFrequentPairs = false;
diff --git a/hotspot/src/share/vm/prims/whitebox.cpp b/hotspot/src/share/vm/prims/whitebox.cpp
index e6805b1..d8971a4 100644
--- a/hotspot/src/share/vm/prims/whitebox.cpp
+++ b/hotspot/src/share/vm/prims/whitebox.cpp
@@ -52,8 +52,10 @@
#include "gc_implementation/g1/heapRegionRemSet.hpp"
#endif // INCLUDE_ALL_GCS
-#ifdef INCLUDE_NMT
+#if INCLUDE_NMT
+#include "services/mallocSiteTable.hpp"
#include "services/memTracker.hpp"
+#include "utilities/nativeCallStack.hpp"
#endif // INCLUDE_NMT
#include "compiler/compileBroker.hpp"
@@ -255,14 +257,18 @@
// NMT picks it up correctly
WB_ENTRY(jlong, WB_NMTMalloc(JNIEnv* env, jobject o, jlong size))
jlong addr = 0;
-
- if (MemTracker::is_on() && !MemTracker::shutdown_in_progress()) {
addr = (jlong)(uintptr_t)os::malloc(size, mtTest);
- }
-
return addr;
WB_END
+// Alloc memory with pseudo call stack. The test can create psudo malloc
+// allocation site to stress the malloc tracking.
+WB_ENTRY(jlong, WB_NMTMallocWithPseudoStack(JNIEnv* env, jobject o, jlong size, jint pseudo_stack))
+ address pc = (address)(size_t)pseudo_stack;
+ NativeCallStack stack(&pc, 1);
+ return (jlong)os::malloc(size, mtTest, stack);
+WB_END
+
// Free the memory allocated by NMTAllocTest
WB_ENTRY(void, WB_NMTFree(JNIEnv* env, jobject o, jlong mem))
os::free((void*)(uintptr_t)mem, mtTest);
@@ -271,10 +277,8 @@
WB_ENTRY(jlong, WB_NMTReserveMemory(JNIEnv* env, jobject o, jlong size))
jlong addr = 0;
- if (MemTracker::is_on() && !MemTracker::shutdown_in_progress()) {
addr = (jlong)(uintptr_t)os::reserve_memory(size);
MemTracker::record_virtual_memory_type((address)addr, mtTest);
- }
return addr;
WB_END
@@ -293,20 +297,20 @@
os::release_memory((char *)(uintptr_t)addr, size);
WB_END
-// Block until the current generation of NMT data to be merged, used to reliably test the NMT feature
-WB_ENTRY(jboolean, WB_NMTWaitForDataMerge(JNIEnv* env))
-
- if (!MemTracker::is_on() || MemTracker::shutdown_in_progress()) {
- return false;
- }
-
- return MemTracker::wbtest_wait_for_data_merge();
-WB_END
-
WB_ENTRY(jboolean, WB_NMTIsDetailSupported(JNIEnv* env))
- return MemTracker::tracking_level() == MemTracker::NMT_detail;
+ return MemTracker::tracking_level() == NMT_detail;
WB_END
+WB_ENTRY(void, WB_NMTOverflowHashBucket(JNIEnv* env, jobject o, jlong num))
+ address pc = (address)1;
+ for (jlong index = 0; index < num; index ++) {
+ NativeCallStack stack(&pc, 1);
+ os::malloc(0, mtTest, stack);
+ pc += MallocSiteTable::hash_buckets();
+ }
+WB_END
+
+
#endif // INCLUDE_NMT
static jmethodID reflected_method_to_jmid(JavaThread* thread, JNIEnv* env, jobject method) {
@@ -597,6 +601,15 @@
return NULL;
WB_END
+WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
+ uintx result;
+ if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
+ ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
+ return longBox(thread, env, result);
+ }
+ return NULL;
+WB_END
+
WB_ENTRY(jobject, WB_GetDoubleVMFlag(JNIEnv* env, jobject o, jstring name))
double result;
if (GetVMFlag <double> (thread, env, name, &result, &CommandLineFlags::doubleAt)) {
@@ -637,6 +650,11 @@
SetVMFlag <uint64_t> (thread, env, name, &result, &CommandLineFlags::uint64_tAtPut);
WB_END
+WB_ENTRY(void, WB_SetSizeTVMFlag(JNIEnv* env, jobject o, jstring name, jlong value))
+ size_t result = value;
+ SetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAtPut);
+WB_END
+
WB_ENTRY(void, WB_SetDoubleVMFlag(JNIEnv* env, jobject o, jstring name, jdouble value))
double result = value;
SetVMFlag <double> (thread, env, name, &result, &CommandLineFlags::doubleAtPut);
@@ -843,12 +861,13 @@
#endif // INCLUDE_ALL_GCS
#if INCLUDE_NMT
{CC"NMTMalloc", CC"(J)J", (void*)&WB_NMTMalloc },
+ {CC"NMTMallocWithPseudoStack", CC"(JI)J", (void*)&WB_NMTMallocWithPseudoStack},
{CC"NMTFree", CC"(J)V", (void*)&WB_NMTFree },
{CC"NMTReserveMemory", CC"(J)J", (void*)&WB_NMTReserveMemory },
{CC"NMTCommitMemory", CC"(JJ)V", (void*)&WB_NMTCommitMemory },
{CC"NMTUncommitMemory", CC"(JJ)V", (void*)&WB_NMTUncommitMemory },
{CC"NMTReleaseMemory", CC"(JJ)V", (void*)&WB_NMTReleaseMemory },
- {CC"NMTWaitForDataMerge", CC"()Z", (void*)&WB_NMTWaitForDataMerge},
+ {CC"NMTOverflowHashBucket", CC"(J)V", (void*)&WB_NMTOverflowHashBucket},
{CC"NMTIsDetailSupported",CC"()Z", (void*)&WB_NMTIsDetailSupported},
#endif // INCLUDE_NMT
{CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
@@ -880,6 +899,7 @@
{CC"setIntxVMFlag", CC"(Ljava/lang/String;J)V",(void*)&WB_SetIntxVMFlag},
{CC"setUintxVMFlag", CC"(Ljava/lang/String;J)V",(void*)&WB_SetUintxVMFlag},
{CC"setUint64VMFlag", CC"(Ljava/lang/String;J)V",(void*)&WB_SetUint64VMFlag},
+ {CC"setSizeTVMFlag", CC"(Ljava/lang/String;J)V",(void*)&WB_SetSizeTVMFlag},
{CC"setDoubleVMFlag", CC"(Ljava/lang/String;D)V",(void*)&WB_SetDoubleVMFlag},
{CC"setStringVMFlag", CC"(Ljava/lang/String;Ljava/lang/String;)V",
(void*)&WB_SetStringVMFlag},
@@ -891,6 +911,8 @@
(void*)&WB_GetUintxVMFlag},
{CC"getUint64VMFlag", CC"(Ljava/lang/String;)Ljava/lang/Long;",
(void*)&WB_GetUint64VMFlag},
+ {CC"getSizeTVMFlag", CC"(Ljava/lang/String;)Ljava/lang/Long;",
+ (void*)&WB_GetSizeTVMFlag},
{CC"getDoubleVMFlag", CC"(Ljava/lang/String;)Ljava/lang/Double;",
(void*)&WB_GetDoubleVMFlag},
{CC"getStringVMFlag", CC"(Ljava/lang/String;)Ljava/lang/String;",
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 3f0bff02..0b7b2ca 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -300,6 +300,11 @@
{ "UseNewReflection", JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "ReflectionWrapResolutionErrors",JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "VerifyReflectionBytecodes", JDK_Version::jdk(9), JDK_Version::jdk(10) },
+ { "AutoShutdownNMT", JDK_Version::jdk(9), JDK_Version::jdk(10) },
+#ifndef ZERO
+ { "UseFastAccessorMethods", JDK_Version::jdk(9), JDK_Version::jdk(10) },
+ { "UseFastEmptyMethods", JDK_Version::jdk(9), JDK_Version::jdk(10) },
+#endif // ZERO
{ NULL, JDK_Version(0), JDK_Version(0) }
};
@@ -686,6 +691,10 @@
if (!is_neg && CommandLineFlags::uint64_tAtPut(name, &uint64_t_v, origin)) {
return true;
}
+ size_t size_t_v = (size_t) v;
+ if (!is_neg && CommandLineFlags::size_tAtPut(name, &size_t_v, origin)) {
+ return true;
+ }
return false;
}
@@ -799,7 +808,7 @@
} else {
*bldarray = REALLOC_C_HEAP_ARRAY(char*, *bldarray, new_count, mtInternal);
}
- (*bldarray)[*count] = strdup(arg);
+ (*bldarray)[*count] = os::strdup_check_oom(arg);
*count = new_count;
}
@@ -1070,16 +1079,6 @@
UseCompiler = true;
UseLoopCounter = true;
-#ifndef ZERO
- // Turn these off for mixed and comp. Leave them on for Zero.
- if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) {
- UseFastAccessorMethods = (mode == _int);
- }
- if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) {
- UseFastEmptyMethods = (mode == _int);
- }
-#endif
-
// Default values may be platform/compiler dependent -
// use the saved values
ClipInlining = Arguments::_ClipInlining;
@@ -1431,6 +1430,22 @@
(int)ObjectAlignmentInBytes, os::vm_page_size());
return false;
}
+ if(SurvivorAlignmentInBytes == 0) {
+ SurvivorAlignmentInBytes = ObjectAlignmentInBytes;
+ } else {
+ if (!is_power_of_2(SurvivorAlignmentInBytes)) {
+ jio_fprintf(defaultStream::error_stream(),
+ "error: SurvivorAlignmentInBytes=%d must be power of 2\n",
+ (int)SurvivorAlignmentInBytes);
+ return false;
+ }
+ if (SurvivorAlignmentInBytes < ObjectAlignmentInBytes) {
+ jio_fprintf(defaultStream::error_stream(),
+ "error: SurvivorAlignmentInBytes=%d must be greater than ObjectAlignmentInBytes=%d \n",
+ (int)SurvivorAlignmentInBytes, (int)ObjectAlignmentInBytes);
+ return false;
+ }
+ }
return true;
}
@@ -1869,7 +1884,7 @@
}
void Arguments::process_java_launcher_argument(const char* launcher, void* extra_info) {
- _sun_java_launcher = strdup(launcher);
+ _sun_java_launcher = os::strdup_check_oom(launcher);
}
bool Arguments::created_by_java_launcher() {
@@ -2372,7 +2387,7 @@
if (PrintNMTStatistics) {
#if INCLUDE_NMT
- if (MemTracker::tracking_level() == MemTracker::NMT_off) {
+ if (MemTracker::tracking_level() == NMT_off) {
#endif // INCLUDE_NMT
warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled");
PrintNMTStatistics = false;
@@ -2979,7 +2994,7 @@
// Redirect GC output to the file. -Xloggc:<filename>
// ostream_init_log(), when called will use this filename
// to initialize a fileStream.
- _gc_log_filename = strdup(tail);
+ _gc_log_filename = os::strdup_check_oom(tail);
if (!is_filename_valid(_gc_log_filename)) {
jio_fprintf(defaultStream::output_stream(),
"Invalid file name for use with -Xloggc: Filename can only contain the "
@@ -3582,15 +3597,24 @@
CommandLineFlags::printFlags(tty, false);
vm_exit(0);
}
- if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
#if INCLUDE_NMT
- MemTracker::init_tracking_options(tail);
-#else
- jio_fprintf(defaultStream::error_stream(),
- "Native Memory Tracking is not supported in this VM\n");
- return JNI_ERR;
-#endif
+ if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
+ // The launcher did not setup nmt environment variable properly.
+// if (!MemTracker::check_launcher_nmt_support(tail)) {
+// warning("Native Memory Tracking did not setup properly, using wrong launcher?");
+// }
+
+ // Verify if nmt option is valid.
+ if (MemTracker::verify_nmt_option()) {
+ // Late initialization, still in single-threaded mode.
+ if (MemTracker::tracking_level() >= NMT_summary) {
+ MemTracker::init();
+ }
+ } else {
+ vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
+ }
}
+#endif
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/hotspot/src/share/vm/runtime/deoptimization.cpp
index a7ad943..f630d5d 100644
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp
@@ -661,7 +661,7 @@
(iframe->interpreter_frame_expression_stack_size() == (next_mask_expression_stack_size -
top_frame_expression_stack_adjustment))) ||
(is_top_frame && (exec_mode == Unpack_exception) && iframe->interpreter_frame_expression_stack_size() == 0) ||
- (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute) &&
+ (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute || el->should_reexecute()) &&
(iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + cur_invoke_parameter_size))
)) {
ttyLocker ttyl;
diff --git a/hotspot/src/share/vm/runtime/fprofiler.cpp b/hotspot/src/share/vm/runtime/fprofiler.cpp
index aec7626..7f741fe 100644
--- a/hotspot/src/share/vm/runtime/fprofiler.cpp
+++ b/hotspot/src/share/vm/runtime/fprofiler.cpp
@@ -629,10 +629,16 @@
}
vmNode(const char* name, const TickPosition where) : ProfilerNode() {
- _name = name;
+ _name = os::strdup(name);
update(where);
}
+ ~vmNode() {
+ if (_name != NULL) {
+ os::free((void*)_name);
+ }
+ }
+
const char *name() const { return _name; }
bool is_compiled() const { return true; }
@@ -784,7 +790,7 @@
assert(index >= 0, "Must be positive");
// Note that we call strdup below since the symbol may be resource allocated
if (!table[index]) {
- table[index] = new (this) vmNode(os::strdup(name), where);
+ table[index] = new (this) vmNode(name, where);
} else {
ProfilerNode* prev = table[index];
for(ProfilerNode* node = prev; node; node = node->next()) {
@@ -794,7 +800,7 @@
}
prev = node;
}
- prev->set_next(new (this) vmNode(os::strdup(name), where));
+ prev->set_next(new (this) vmNode(name, where));
}
}
diff --git a/hotspot/src/share/vm/runtime/frame.cpp b/hotspot/src/share/vm/runtime/frame.cpp
index d076896..8701b9c 100644
--- a/hotspot/src/share/vm/runtime/frame.cpp
+++ b/hotspot/src/share/vm/runtime/frame.cpp
@@ -407,7 +407,8 @@
address frame::interpreter_frame_bcp() const {
assert(is_interpreted_frame(), "interpreted frame expected");
- return (address)*interpreter_frame_bcp_addr();
+ address bcp = (address)*interpreter_frame_bcp_addr();
+ return interpreter_frame_method()->bcp_from(bcp);
}
void frame::interpreter_frame_set_bcp(address bcp) {
diff --git a/hotspot/src/share/vm/runtime/globals.cpp b/hotspot/src/share/vm/runtime/globals.cpp
index 928f713..b20ef79 100644
--- a/hotspot/src/share/vm/runtime/globals.cpp
+++ b/hotspot/src/share/vm/runtime/globals.cpp
@@ -131,6 +131,19 @@
*((uint64_t*) _addr) = value;
}
+bool Flag::is_size_t() const {
+ return strcmp(_type, "size_t") == 0;
+}
+
+size_t Flag::get_size_t() const {
+ return *((size_t*) _addr);
+}
+
+void Flag::set_size_t(size_t value) {
+ check_writable();
+ *((size_t*) _addr) = value;
+}
+
bool Flag::is_double() const {
return strcmp(_type, "double") == 0;
}
@@ -306,6 +319,9 @@
if (is_uint64_t()) {
st->print("%-16lu", get_uint64_t());
}
+ if (is_size_t()) {
+ st->print(SIZE_FORMAT_W(-16), get_size_t());
+ }
if (is_double()) {
st->print("%-16f", get_double());
}
@@ -395,6 +411,8 @@
st->print("-XX:%s=" UINTX_FORMAT, _name, get_uintx());
} else if (is_uint64_t()) {
st->print("-XX:%s=" UINT64_FORMAT, _name, get_uint64_t());
+ } else if (is_size_t()) {
+ st->print("-XX:%s=" SIZE_FORMAT, _name, get_size_t());
} else if (is_double()) {
st->print("-XX:%s=%f", _name, get_double());
} else if (is_ccstr()) {
@@ -723,6 +741,34 @@
faddr->set_origin(origin);
}
+bool CommandLineFlags::size_tAt(const char* name, size_t len, size_t* value) {
+ Flag* result = Flag::find_flag(name, len);
+ if (result == NULL) return false;
+ if (!result->is_size_t()) return false;
+ *value = result->get_size_t();
+ return true;
+}
+
+bool CommandLineFlags::size_tAtPut(const char* name, size_t len, size_t* value, Flag::Flags origin) {
+ Flag* result = Flag::find_flag(name, len);
+ if (result == NULL) return false;
+ if (!result->is_size_t()) return false;
+ size_t old_value = result->get_size_t();
+ trace_flag_changed<EventUnsignedLongFlagChanged, u8>(name, old_value, *value, origin);
+ result->set_size_t(*value);
+ *value = old_value;
+ result->set_origin(origin);
+ return true;
+}
+
+void CommandLineFlagsEx::size_tAtPut(CommandLineFlagWithType flag, size_t value, Flag::Flags origin) {
+ Flag* faddr = address_of_flag(flag);
+ guarantee(faddr != NULL && faddr->is_size_t(), "wrong flag type");
+ trace_flag_changed<EventUnsignedLongFlagChanged, u8>(faddr->_name, faddr->get_size_t(), value, origin);
+ faddr->set_size_t(value);
+ faddr->set_origin(origin);
+}
+
bool CommandLineFlags::doubleAt(const char* name, size_t len, double* value) {
Flag* result = Flag::find_flag(name, len);
if (result == NULL) return false;
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index 2d1805e..3534ee4 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -275,6 +275,10 @@
uint64_t get_uint64_t() const;
void set_uint64_t(uint64_t value);
+ bool is_size_t() const;
+ size_t get_size_t() const;
+ void set_size_t(size_t value);
+
bool is_double() const;
double get_double() const;
void set_double(double value);
@@ -350,7 +354,6 @@
~UIntFlagSetting() { *flag = val; }
};
-
class DoubleFlagSetting {
double val;
double* flag;
@@ -359,6 +362,14 @@
~DoubleFlagSetting() { *flag = val; }
};
+class SizeTFlagSetting {
+ size_t val;
+ size_t* flag;
+ public:
+ SizeTFlagSetting(size_t& fl, size_t newValue) { flag = &fl; val = fl; fl = newValue; }
+ ~SizeTFlagSetting() { *flag = val; }
+};
+
class CommandLineFlags {
public:
@@ -377,6 +388,11 @@
static bool uintxAtPut(const char* name, size_t len, uintx* value, Flag::Flags origin);
static bool uintxAtPut(const char* name, uintx* value, Flag::Flags origin) { return uintxAtPut(name, strlen(name), value, origin); }
+ static bool size_tAt(const char* name, size_t len, size_t* value);
+ static bool size_tAt(const char* name, size_t* value) { return size_tAt(name, strlen(name), value); }
+ static bool size_tAtPut(const char* name, size_t len, size_t* value, Flag::Flags origin);
+ static bool size_tAtPut(const char* name, size_t* value, Flag::Flags origin) { return size_tAtPut(name, strlen(name), value, origin); }
+
static bool uint64_tAt(const char* name, size_t len, uint64_t* value);
static bool uint64_tAt(const char* name, uint64_t* value) { return uint64_tAt(name, strlen(name), value); }
static bool uint64_tAtPut(const char* name, size_t len, uint64_t* value, Flag::Flags origin);
@@ -945,11 +961,6 @@
diagnostic(bool, PrintNMTStatistics, false, \
"Print native memory tracking summary data if it is on") \
\
- diagnostic(bool, AutoShutdownNMT, true, \
- "Automatically shutdown native memory tracking under stress " \
- "situations. When set to false, native memory tracking tries to " \
- "stay alive at the expense of JVM performance") \
- \
diagnostic(bool, LogCompilation, false, \
"Log compilation activity in detail to LogFile") \
\
@@ -1078,6 +1089,9 @@
product(bool, ClassUnloading, true, \
"Do unloading of classes") \
\
+ product(bool, ClassUnloadingWithConcurrentMark, true, \
+ "Do unloading of classes with a concurrent marking cycle") \
+ \
develop(bool, DisableStartThread, false, \
"Disable starting of additional Java threads " \
"(for debugging only)") \
@@ -2786,12 +2800,6 @@
product(bool, UseLoopCounter, true, \
"Increment invocation counter on backward branch") \
\
- product(bool, UseFastEmptyMethods, true, \
- "Use fast method entry code for empty methods") \
- \
- product(bool, UseFastAccessorMethods, true, \
- "Use fast method entry code for accessor methods") \
- \
product_pd(bool, UseOnStackReplacement, \
"Use on stack replacement, calls runtime if invoc. counter " \
"overflows in loop") \
@@ -3871,14 +3879,17 @@
product(bool, PrintGCCause, true, \
"Include GC cause in GC logging") \
\
+ experimental(intx, SurvivorAlignmentInBytes, 0, \
+ "Default survivor space alignment in bytes") \
+ \
product(bool , AllowNonVirtualCalls, false, \
"Obey the ACC_SUPER flag and allow invokenonvirtual calls") \
\
diagnostic(ccstr, SharedArchiveFile, NULL, \
"Override the default location of the CDS archive file") \
\
- experimental(uintx, ArrayAllocatorMallocLimit, \
- SOLARIS_ONLY(64*K) NOT_SOLARIS(max_uintx), \
+ experimental(size_t, ArrayAllocatorMallocLimit, \
+ SOLARIS_ONLY(64*K) NOT_SOLARIS((size_t)-1), \
"Allocation less than this value will be allocated " \
"using malloc. Larger allocations will use mmap.") \
\
diff --git a/hotspot/src/share/vm/runtime/globals_extension.hpp b/hotspot/src/share/vm/runtime/globals_extension.hpp
index 468d4bb..99c1977 100644
--- a/hotspot/src/share/vm/runtime/globals_extension.hpp
+++ b/hotspot/src/share/vm/runtime/globals_extension.hpp
@@ -200,6 +200,7 @@
static void intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin);
static void uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin);
static void uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin);
+ static void size_tAtPut(CommandLineFlagWithType flag, size_t value, Flag::Flags origin);
static void doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin);
// Contract: Flag will make private copy of the incoming value
static void ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin);
diff --git a/hotspot/src/share/vm/runtime/handles.hpp b/hotspot/src/share/vm/runtime/handles.hpp
index e721221..3eef0ad 100644
--- a/hotspot/src/share/vm/runtime/handles.hpp
+++ b/hotspot/src/share/vm/runtime/handles.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -227,7 +227,7 @@
HandleArea* _prev; // link to outer (older) area
public:
// Constructor
- HandleArea(HandleArea* prev) : Arena(Chunk::tiny_size) {
+ HandleArea(HandleArea* prev) : Arena(mtThread, Chunk::tiny_size) {
debug_only(_handle_mark_nesting = 0);
debug_only(_no_handle_mark_nesting = 0);
_prev = prev;
diff --git a/hotspot/src/share/vm/runtime/init.cpp b/hotspot/src/share/vm/runtime/init.cpp
index 6c654d2..68c8845 100644
--- a/hotspot/src/share/vm/runtime/init.cpp
+++ b/hotspot/src/share/vm/runtime/init.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,10 @@
#include "runtime/init.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/sharedRuntime.hpp"
+#include "services/memTracker.hpp"
#include "utilities/macros.hpp"
+
// Initialization done by VM thread in vm_init_globals()
void check_ThreadShadow();
void eventlog_init();
@@ -131,6 +133,12 @@
javaClasses_init(); // must happen after vtable initialization
stubRoutines_init2(); // note: StubRoutines need 2-phase init
+#if INCLUDE_NMT
+ // Solaris stack is walkable only after stubRoutines are set up.
+ // On Other platforms, the stack is always walkable.
+ NMT_stack_walkable = true;
+#endif // INCLUDE_NMT
+
// All the flags that get adjusted by VM_Version_init and os::init_2
// have been set so dump the flags now.
if (PrintFlagsFinal) {
diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
index cfecf0a..881d808 100644
--- a/hotspot/src/share/vm/runtime/java.cpp
+++ b/hotspot/src/share/vm/runtime/java.cpp
@@ -57,7 +57,6 @@
#include "runtime/thread.inline.hpp"
#include "runtime/timer.hpp"
#include "runtime/vm_operations.hpp"
-#include "services/memReporter.hpp"
#include "services/memTracker.hpp"
#include "trace/tracing.hpp"
#include "utilities/dtrace.hpp"
@@ -349,12 +348,7 @@
#endif // ENABLE_ZAP_DEAD_LOCALS
// Native memory tracking data
if (PrintNMTStatistics) {
- if (MemTracker::is_on()) {
- BaselineTTYOutputer outputer(tty);
- MemTracker::print_memory_usage(outputer, K, false);
- } else {
- tty->print_cr("%s", MemTracker::reason());
- }
+ MemTracker::final_report(tty);
}
}
@@ -390,12 +384,7 @@
// Native memory tracking data
if (PrintNMTStatistics) {
- if (MemTracker::is_on()) {
- BaselineTTYOutputer outputer(tty);
- MemTracker::print_memory_usage(outputer, K, false);
- } else {
- tty->print_cr("%s", MemTracker::reason());
- }
+ MemTracker::final_report(tty);
}
}
@@ -544,10 +533,6 @@
BeforeExit_lock->notify_all();
}
- // Shutdown NMT before exit. Otherwise,
- // it will run into trouble when system destroys static variables.
- MemTracker::shutdown(MemTracker::NMT_normal);
-
if (VerifyStringTableAtExit) {
int fail_cnt = 0;
{
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index 6c682a7..3b3bc44 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -52,6 +52,7 @@
#include "runtime/thread.inline.hpp"
#include "runtime/vm_version.hpp"
#include "services/attachListener.hpp"
+#include "services/nmtCommon.hpp"
#include "services/memTracker.hpp"
#include "services/threadService.hpp"
#include "utilities/defaultStream.hpp"
@@ -516,6 +517,14 @@
return dup_str;
}
+char* os::strdup_check_oom(const char* str, MEMFLAGS flags) {
+ char* p = os::strdup(str, flags);
+ if (p == NULL) {
+ vm_exit_out_of_memory(strlen(str) + 1, OOM_MALLOC_ERROR, "os::strdup_check_oom");
+ }
+ return p;
+}
+
#define paranoid 0 /* only set to 1 if you suspect checking code has bug */
@@ -553,7 +562,11 @@
return ptr;
}
-void* os::malloc(size_t size, MEMFLAGS memflags, address caller) {
+void* os::malloc(size_t size, MEMFLAGS flags) {
+ return os::malloc(size, flags, CALLER_PC);
+}
+
+void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
@@ -579,11 +592,15 @@
size = 1;
}
+ // NMT support
+ NMT_TrackingLevel level = MemTracker::tracking_level();
+ size_t nmt_header_size = MemTracker::malloc_header_size(level);
+
#ifndef ASSERT
- const size_t alloc_size = size;
+ const size_t alloc_size = size + nmt_header_size;
#else
- const size_t alloc_size = GuardedMemory::get_total_size(size);
- if (size > alloc_size) { // Check for rollover.
+ const size_t alloc_size = GuardedMemory::get_total_size(size + nmt_header_size);
+ if (size + nmt_header_size > alloc_size) { // Check for rollover.
return NULL;
}
#endif
@@ -602,7 +619,7 @@
return NULL;
}
// Wrap memory with guard
- GuardedMemory guarded(ptr, size);
+ GuardedMemory guarded(ptr, size + nmt_header_size);
ptr = guarded.get_user_ptr();
#endif
if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) {
@@ -615,48 +632,50 @@
}
// we do not track guard memory
- MemTracker::record_malloc((address)ptr, size, memflags, caller == 0 ? CALLER_PC : caller);
-
- return ptr;
+ return MemTracker::record_malloc((address)ptr, size, memflags, stack, level);
}
+void* os::realloc(void *memblock, size_t size, MEMFLAGS flags) {
+ return os::realloc(memblock, size, flags, CALLER_PC);
+}
-void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, address caller) {
+void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
#ifndef ASSERT
NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
- MemTracker::Tracker tkr = MemTracker::get_realloc_tracker();
- void* ptr = ::realloc(memblock, size);
- if (ptr != NULL) {
- tkr.record((address)memblock, (address)ptr, size, memflags,
- caller == 0 ? CALLER_PC : caller);
- } else {
- tkr.discard();
- }
- return ptr;
+ // NMT support
+ void* membase = MemTracker::record_free(memblock);
+ NMT_TrackingLevel level = MemTracker::tracking_level();
+ size_t nmt_header_size = MemTracker::malloc_header_size(level);
+ void* ptr = ::realloc(membase, size + nmt_header_size);
+ return MemTracker::record_malloc(ptr, size, memflags, stack, level);
#else
if (memblock == NULL) {
- return os::malloc(size, memflags, (caller == 0 ? CALLER_PC : caller));
+ return os::malloc(size, memflags, stack);
}
if ((intptr_t)memblock == (intptr_t)MallocCatchPtr) {
tty->print_cr("os::realloc caught " PTR_FORMAT, memblock);
breakpoint();
}
- verify_memory(memblock);
+ // NMT support
+ void* membase = MemTracker::malloc_base(memblock);
+ verify_memory(membase);
NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap());
if (size == 0) {
return NULL;
}
// always move the block
- void* ptr = os::malloc(size, memflags, caller == 0 ? CALLER_PC : caller);
+ void* ptr = os::malloc(size, memflags, stack);
if (PrintMalloc) {
tty->print_cr("os::remalloc " SIZE_FORMAT " bytes, " PTR_FORMAT " --> " PTR_FORMAT, size, memblock, ptr);
}
// Copy to new memory if malloc didn't fail
if ( ptr != NULL ) {
- GuardedMemory guarded(memblock);
- memcpy(ptr, memblock, MIN2(size, guarded.get_user_size()));
- if (paranoid) verify_memory(ptr);
+ GuardedMemory guarded(MemTracker::malloc_base(memblock));
+ // Guard's user data contains NMT header
+ size_t memblock_size = guarded.get_user_size() - MemTracker::malloc_header_size(memblock);
+ memcpy(ptr, memblock, MIN2(size, memblock_size));
+ if (paranoid) verify_memory(MemTracker::malloc_base(ptr));
if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) {
tty->print_cr("os::realloc caught, " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, ptr);
breakpoint();
@@ -669,7 +688,6 @@
void os::free(void *memblock, MEMFLAGS memflags) {
- address trackp = (address) memblock;
NOT_PRODUCT(inc_stat_counter(&num_frees, 1));
#ifdef ASSERT
if (memblock == NULL) return;
@@ -677,20 +695,22 @@
if (tty != NULL) tty->print_cr("os::free caught " PTR_FORMAT, memblock);
breakpoint();
}
- verify_memory(memblock);
+ void* membase = MemTracker::record_free(memblock);
+ verify_memory(membase);
NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap());
- GuardedMemory guarded(memblock);
+ GuardedMemory guarded(membase);
size_t size = guarded.get_user_size();
inc_stat_counter(&free_bytes, size);
- memblock = guarded.release_for_freeing();
+ membase = guarded.release_for_freeing();
if (PrintMalloc && tty != NULL) {
- fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, (uintptr_t)memblock);
+ fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, (uintptr_t)membase);
}
+ ::free(membase);
+#else
+ void* membase = MemTracker::record_free(memblock);
+ ::free(membase);
#endif
- MemTracker::record_free(trackp, memflags);
-
- ::free(memblock);
}
void os::init_random(long initval) {
@@ -1478,7 +1498,7 @@
char* os::reserve_memory(size_t bytes, char* addr, size_t alignment_hint) {
char* result = pd_reserve_memory(bytes, addr, alignment_hint);
if (result != NULL) {
- MemTracker::record_virtual_memory_reserve((address)result, bytes, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
}
return result;
@@ -1488,7 +1508,7 @@
MEMFLAGS flags) {
char* result = pd_reserve_memory(bytes, addr, alignment_hint);
if (result != NULL) {
- MemTracker::record_virtual_memory_reserve((address)result, bytes, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
MemTracker::record_virtual_memory_type((address)result, flags);
}
@@ -1498,7 +1518,7 @@
char* os::attempt_reserve_memory_at(size_t bytes, char* addr) {
char* result = pd_attempt_reserve_memory_at(bytes, addr);
if (result != NULL) {
- MemTracker::record_virtual_memory_reserve((address)result, bytes, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
}
return result;
}
@@ -1538,23 +1558,29 @@
}
bool os::uncommit_memory(char* addr, size_t bytes) {
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_uncommit_tracker();
- bool res = pd_uncommit_memory(addr, bytes);
- if (res) {
- tkr.record((address)addr, bytes);
+ bool res;
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ Tracker tkr = MemTracker::get_virtual_memory_uncommit_tracker();
+ res = pd_uncommit_memory(addr, bytes);
+ if (res) {
+ tkr.record((address)addr, bytes);
+ }
} else {
- tkr.discard();
+ res = pd_uncommit_memory(addr, bytes);
}
return res;
}
bool os::release_memory(char* addr, size_t bytes) {
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
- bool res = pd_release_memory(addr, bytes);
- if (res) {
- tkr.record((address)addr, bytes);
+ bool res;
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+ res = pd_release_memory(addr, bytes);
+ if (res) {
+ tkr.record((address)addr, bytes);
+ }
} else {
- tkr.discard();
+ res = pd_release_memory(addr, bytes);
}
return res;
}
@@ -1565,7 +1591,7 @@
bool allow_exec) {
char* result = pd_map_memory(fd, file_name, file_offset, addr, bytes, read_only, allow_exec);
if (result != NULL) {
- MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, mtNone, CALLER_PC);
+ MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, CALLER_PC);
}
return result;
}
@@ -1578,12 +1604,15 @@
}
bool os::unmap_memory(char *addr, size_t bytes) {
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
- bool result = pd_unmap_memory(addr, bytes);
- if (result) {
- tkr.record((address)addr, bytes);
+ bool result;
+ if (MemTracker::tracking_level() > NMT_minimal) {
+ Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+ result = pd_unmap_memory(addr, bytes);
+ if (result) {
+ tkr.record((address)addr, bytes);
+ }
} else {
- tkr.discard();
+ result = pd_unmap_memory(addr, bytes);
}
return result;
}
diff --git a/hotspot/src/share/vm/runtime/os.hpp b/hotspot/src/share/vm/runtime/os.hpp
index b65e7ab..5029a23 100644
--- a/hotspot/src/share/vm/runtime/os.hpp
+++ b/hotspot/src/share/vm/runtime/os.hpp
@@ -65,6 +65,8 @@
class Event;
class DLL;
class FileHandle;
+class NativeCallStack;
+
template<class E> class GrowableArray;
// %%%%% Moved ThreadState, START_FN, OSThread to new osThread.hpp. -- Rose
@@ -96,9 +98,11 @@
// Typedef for structured exception handling support
typedef void (*java_call_t)(JavaValue* value, methodHandle* method, JavaCallArguments* args, Thread* thread);
+class MallocTracker;
+
class os: AllStatic {
friend class VMStructs;
-
+ friend class MallocTracker;
public:
enum { page_sizes_max = 9 }; // Size of _page_sizes array (8 plus a sentinel)
@@ -160,7 +164,10 @@
// Override me as needed
static int file_name_strcmp(const char* s1, const char* s2);
+ // get/unset environment variable
static bool getenv(const char* name, char* buffer, int len);
+ static bool unsetenv(const char* name);
+
static bool have_special_privileges();
static jlong javaTimeMillis();
@@ -207,8 +214,13 @@
// Interface for detecting multiprocessor system
static inline bool is_MP() {
+#if !INCLUDE_NMT
assert(_processor_count > 0, "invalid processor count");
return _processor_count > 1 || AssumeMP;
+#else
+ // NMT needs atomic operations before this initialization.
+ return true;
+#endif
}
static julong available_memory();
static julong physical_memory();
@@ -635,15 +647,25 @@
static void* thread_local_storage_at(int index);
static void free_thread_local_storage(int index);
- // Stack walk
- static address get_caller_pc(int n = 0);
+ // Retrieve native stack frames.
+ // Parameter:
+ // stack: an array to storage stack pointers.
+ // frames: size of above array.
+ // toSkip: number of stack frames to skip at the beginning.
+ // Return: number of stack frames captured.
+ static int get_native_stack(address* stack, int size, int toSkip = 0);
// General allocation (must be MT-safe)
- static void* malloc (size_t size, MEMFLAGS flags, address caller_pc = 0);
- static void* realloc (void *memblock, size_t size, MEMFLAGS flags, address caller_pc = 0);
+ static void* malloc (size_t size, MEMFLAGS flags, const NativeCallStack& stack);
+ static void* malloc (size_t size, MEMFLAGS flags);
+ static void* realloc (void *memblock, size_t size, MEMFLAGS flag, const NativeCallStack& stack);
+ static void* realloc (void *memblock, size_t size, MEMFLAGS flag);
+
static void free (void *memblock, MEMFLAGS flags = mtNone);
static bool check_heap(bool force = false); // verify C heap integrity
static char* strdup(const char *, MEMFLAGS flags = mtInternal); // Like strdup
+ // Like strdup, but exit VM when strdup() returns NULL
+ static char* strdup_check_oom(const char*, MEMFLAGS flags = mtInternal);
#ifndef PRODUCT
static julong num_mallocs; // # of calls to malloc/realloc
diff --git a/hotspot/src/share/vm/runtime/safepoint.cpp b/hotspot/src/share/vm/runtime/safepoint.cpp
index 4b16f6b..05460b8 100644
--- a/hotspot/src/share/vm/runtime/safepoint.cpp
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp
@@ -52,7 +52,6 @@
#include "runtime/sweeper.hpp"
#include "runtime/synchronizer.hpp"
#include "runtime/thread.inline.hpp"
-#include "services/memTracker.hpp"
#include "services/runtimeService.hpp"
#include "utilities/events.hpp"
#include "utilities/macros.hpp"
@@ -527,10 +526,6 @@
TraceTime t7("purging class loader data graph", TraceSafepointCleanupTime);
ClassLoaderDataGraph::purge_if_needed();
}
-
- if (MemTracker::is_on()) {
- MemTracker::sync();
- }
}
diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeMath.hpp b/hotspot/src/share/vm/runtime/sharedRuntimeMath.hpp
index 4259227..26c9147 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntimeMath.hpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntimeMath.hpp
@@ -27,20 +27,51 @@
#include <math.h>
-// VM_LITTLE_ENDIAN is #defined appropriately in the Makefiles
-// [jk] this is not 100% correct because the float word order may different
-// from the byte order (e.g. on ARM FPA)
+// Used to access the lower/higher 32 bits of a double
+typedef union {
+ double d;
+ struct {
#ifdef VM_LITTLE_ENDIAN
-# define __HI(x) *(1+(int*)&x)
-# define __LO(x) *(int*)&x
+ int lo;
+ int hi;
#else
-# define __HI(x) *(int*)&x
-# define __LO(x) *(1+(int*)&x)
+ int hi;
+ int lo;
#endif
+ } split;
+} DoubleIntConv;
+
+static inline int high(double d) {
+ DoubleIntConv x;
+ x.d = d;
+ return x.split.hi;
+}
+
+static inline int low(double d) {
+ DoubleIntConv x;
+ x.d = d;
+ return x.split.lo;
+}
+
+static inline void set_high(double* d, int high) {
+ DoubleIntConv conv;
+ conv.d = *d;
+ conv.split.hi = high;
+ *d = conv.d;
+}
+
+static inline void set_low(double* d, int low) {
+ DoubleIntConv conv;
+ conv.d = *d;
+ conv.split.lo = low;
+ *d = conv.d;
+}
static double copysignA(double x, double y) {
- __HI(x) = (__HI(x)&0x7fffffff)|(__HI(y)&0x80000000);
- return x;
+ DoubleIntConv convX;
+ convX.d = x;
+ convX.split.hi = (convX.split.hi & 0x7fffffff) | (high(y) & 0x80000000);
+ return convX.d;
}
/*
@@ -67,30 +98,32 @@
hugeX = 1.0e+300,
tiny = 1.0e-300;
-static double scalbnA (double x, int n) {
+static double scalbnA(double x, int n) {
int k,hx,lx;
- hx = __HI(x);
- lx = __LO(x);
+ hx = high(x);
+ lx = low(x);
k = (hx&0x7ff00000)>>20; /* extract exponent */
if (k==0) { /* 0 or subnormal x */
if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
x *= two54;
- hx = __HI(x);
+ hx = high(x);
k = ((hx&0x7ff00000)>>20) - 54;
if (n< -50000) return tiny*x; /*underflow*/
}
if (k==0x7ff) return x+x; /* NaN or Inf */
k = k+n;
- if (k > 0x7fe) return hugeX*copysignA(hugeX,x); /* overflow */
- if (k > 0) /* normal result */
- {__HI(x) = (hx&0x800fffff)|(k<<20); return x;}
+ if (k > 0x7fe) return hugeX*copysignA(hugeX,x); /* overflow */
+ if (k > 0) { /* normal result */
+ set_high(&x, (hx&0x800fffff)|(k<<20));
+ return x;
+ }
if (k <= -54) {
if (n > 50000) /* in case integer overflow in n+k */
return hugeX*copysignA(hugeX,x); /*overflow*/
else return tiny*copysignA(tiny,x); /*underflow*/
}
k += 54; /* subnormal result */
- __HI(x) = (hx&0x800fffff)|(k<<20);
+ set_high(&x, (hx&0x800fffff)|(k<<20));
return x*twom54;
}
diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp b/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp
index 69feb28..3b8c8a3 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp
@@ -40,6 +40,7 @@
// generated; can not figure out how to turn down optimization for one
// file in the IDE on Windows
#ifdef WIN32
+# pragma warning( disable: 4748 ) // /GS can not protect parameters and local variables from local buffer overrun because optimizations are disabled in function
# pragma optimize ( "", off )
#endif
@@ -114,8 +115,8 @@
int k,hx,i,j;
unsigned lx;
- hx = __HI(x); /* high word of x */
- lx = __LO(x); /* low word of x */
+ hx = high(x); /* high word of x */
+ lx = low(x); /* low word of x */
k=0;
if (hx < 0x00100000) { /* x < 2**-1022 */
@@ -123,13 +124,13 @@
return -two54/zero; /* log(+-0)=-inf */
if (hx<0) return (x-x)/zero; /* log(-#) = NaN */
k -= 54; x *= two54; /* subnormal number, scale up x */
- hx = __HI(x); /* high word of x */
+ hx = high(x); /* high word of x */
}
if (hx >= 0x7ff00000) return x+x;
k += (hx>>20)-1023;
hx &= 0x000fffff;
i = (hx+0x95f64)&0x100000;
- __HI(x) = hx|(i^0x3ff00000); /* normalize x or x/2 */
+ set_high(&x, hx|(i^0x3ff00000)); /* normalize x or x/2 */
k += (i>>20);
f = x-1.0;
if((0x000fffff&(2+hx))<3) { /* |f| < 2**-20 */
@@ -208,8 +209,8 @@
int i,k,hx;
unsigned lx;
- hx = __HI(x); /* high word of x */
- lx = __LO(x); /* low word of x */
+ hx = high(x); /* high word of x */
+ lx = low(x); /* low word of x */
k=0;
if (hx < 0x00100000) { /* x < 2**-1022 */
@@ -217,14 +218,14 @@
return -two54/zero; /* log(+-0)=-inf */
if (hx<0) return (x-x)/zero; /* log(-#) = NaN */
k -= 54; x *= two54; /* subnormal number, scale up x */
- hx = __HI(x); /* high word of x */
+ hx = high(x); /* high word of x */
}
if (hx >= 0x7ff00000) return x+x;
k += (hx>>20)-1023;
i = ((unsigned)k&0x80000000)>>31;
hx = (hx&0x000fffff)|((0x3ff-i)<<20);
y = (double)(k+i);
- __HI(x) = hx;
+ set_high(&x, hx);
z = y*log10_2lo + ivln10*__ieee754_log(x);
return z+y*log10_2hi;
}
@@ -319,14 +320,14 @@
int k=0,xsb;
unsigned hx;
- hx = __HI(x); /* high word of x */
+ hx = high(x); /* high word of x */
xsb = (hx>>31)&1; /* sign bit of x */
hx &= 0x7fffffff; /* high word of |x| */
/* filter out non-finite argument */
if(hx >= 0x40862E42) { /* if |x|>=709.78... */
if(hx>=0x7ff00000) {
- if(((hx&0xfffff)|__LO(x))!=0)
+ if(((hx&0xfffff)|low(x))!=0)
return x+x; /* NaN */
else return (xsb==0)? x:0.0; /* exp(+-inf)={inf,0} */
}
@@ -357,10 +358,10 @@
if(k==0) return one-((x*c)/(c-2.0)-x);
else y = one-((lo-(x*c)/(2.0-c))-hi);
if(k >= -1021) {
- __HI(y) += (k<<20); /* add k to y's exponent */
+ set_high(&y, high(y) + (k<<20)); /* add k to y's exponent */
return y;
} else {
- __HI(y) += ((k+1000)<<20);/* add k to y's exponent */
+ set_high(&y, high(y) + ((k+1000)<<20)); /* add k to y's exponent */
return y*twom1000;
}
}
@@ -447,8 +448,8 @@
unsigned lx,ly;
i0 = ((*(int*)&one)>>29)^1; i1=1-i0;
- hx = __HI(x); lx = __LO(x);
- hy = __HI(y); ly = __LO(y);
+ hx = high(x); lx = low(x);
+ hy = high(y); ly = low(y);
ix = hx&0x7fffffff; iy = hy&0x7fffffff;
/* y==zero: x**0 = 1 */
@@ -548,14 +549,14 @@
u = ivln2_h*t; /* ivln2_h has 21 sig. bits */
v = t*ivln2_l-w*ivln2;
t1 = u+v;
- __LO(t1) = 0;
+ set_low(&t1, 0);
t2 = v-(t1-u);
} else {
double ss,s2,s_h,s_l,t_h,t_l;
n = 0;
/* take care subnormal number */
if(ix<0x00100000)
- {ax *= two53; n -= 53; ix = __HI(ax); }
+ {ax *= two53; n -= 53; ix = high(ax); }
n += ((ix)>>20)-0x3ff;
j = ix&0x000fffff;
/* determine interval */
@@ -563,17 +564,17 @@
if(j<=0x3988E) k=0; /* |x|<sqrt(3/2) */
else if(j<0xBB67A) k=1; /* |x|<sqrt(3) */
else {k=0;n+=1;ix -= 0x00100000;}
- __HI(ax) = ix;
+ set_high(&ax, ix);
/* compute ss = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
u = ax-bp[k]; /* bp[0]=1.0, bp[1]=1.5 */
v = one/(ax+bp[k]);
ss = u*v;
s_h = ss;
- __LO(s_h) = 0;
+ set_low(&s_h, 0);
/* t_h=ax+bp[k] High */
t_h = zeroX;
- __HI(t_h)=((ix>>1)|0x20000000)+0x00080000+(k<<18);
+ set_high(&t_h, ((ix>>1)|0x20000000)+0x00080000+(k<<18));
t_l = ax - (t_h-bp[k]);
s_l = v*((u-s_h*t_h)-s_h*t_l);
/* compute log(ax) */
@@ -582,32 +583,32 @@
r += s_l*(s_h+ss);
s2 = s_h*s_h;
t_h = 3.0+s2+r;
- __LO(t_h) = 0;
+ set_low(&t_h, 0);
t_l = r-((t_h-3.0)-s2);
/* u+v = ss*(1+...) */
u = s_h*t_h;
v = s_l*t_h+t_l*ss;
/* 2/(3log2)*(ss+...) */
p_h = u+v;
- __LO(p_h) = 0;
+ set_low(&p_h, 0);
p_l = v-(p_h-u);
z_h = cp_h*p_h; /* cp_h+cp_l = 2/(3*log2) */
z_l = cp_l*p_h+p_l*cp+dp_l[k];
/* log2(ax) = (ss+..)*2/(3*log2) = n + dp_h + z_h + z_l */
t = (double)n;
t1 = (((z_h+z_l)+dp_h[k])+t);
- __LO(t1) = 0;
+ set_low(&t1, 0);
t2 = z_l-(((t1-t)-dp_h[k])-z_h);
}
/* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */
y1 = y;
- __LO(y1) = 0;
+ set_low(&y1, 0);
p_l = (y-y1)*t1+y*t2;
p_h = y1*t1;
z = p_l+p_h;
- j = __HI(z);
- i = __LO(z);
+ j = high(z);
+ i = low(z);
if (j>=0x40900000) { /* z >= 1024 */
if(((j-0x40900000)|i)!=0) /* if z > 1024 */
return s*hugeX*hugeX; /* overflow */
@@ -631,13 +632,13 @@
n = j+(0x00100000>>(k+1));
k = ((n&0x7fffffff)>>20)-0x3ff; /* new k for n */
t = zeroX;
- __HI(t) = (n&~(0x000fffff>>k));
+ set_high(&t, (n&~(0x000fffff>>k)));
n = ((n&0x000fffff)|0x00100000)>>(20-k);
if(j<0) n = -n;
p_h -= t;
}
t = p_l+p_h;
- __LO(t) = 0;
+ set_low(&t, 0);
u = t*lg2_h;
v = (p_l-(t-p_h))*lg2+t*lg2_l;
z = u+v;
@@ -646,10 +647,10 @@
t1 = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
r = (z*t1)/(t1-two)-(w+z*w);
z = one-(r-z);
- j = __HI(z);
+ j = high(z);
j += (n<<20);
if((j>>20)<=0) z = scalbnA(z,n); /* subnormal output */
- else __HI(z) += (n<<20);
+ else set_high(&z, high(z) + (n<<20));
return s*z;
}
diff --git a/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp b/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp
index 84f35aa..8acd740 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp
@@ -519,7 +519,7 @@
{
double z,r,v;
int ix;
- ix = __HI(x)&0x7fffffff; /* high word of x */
+ ix = high(x)&0x7fffffff; /* high word of x */
if(ix<0x3e400000) /* |x| < 2**-27 */
{if((int)x==0) return x;} /* generate inexact */
z = x*x;
@@ -574,9 +574,9 @@
static double __kernel_cos(double x, double y)
{
- double a,h,z,r,qx;
+ double a,h,z,r,qx=0;
int ix;
- ix = __HI(x)&0x7fffffff; /* ix = |x|'s high word*/
+ ix = high(x)&0x7fffffff; /* ix = |x|'s high word*/
if(ix<0x3e400000) { /* if x < 2**27 */
if(((int)x)==0) return one; /* generate inexact */
}
@@ -588,8 +588,8 @@
if(ix > 0x3fe90000) { /* x > 0.78125 */
qx = 0.28125;
} else {
- __HI(qx) = ix-0x00200000; /* x/4 */
- __LO(qx) = 0;
+ set_high(&qx, ix-0x00200000); /* x/4 */
+ set_low(&qx, 0);
}
h = 0.5*z-qx;
a = one-qx;
@@ -654,11 +654,11 @@
{
double z,r,v,w,s;
int ix,hx;
- hx = __HI(x); /* high word of x */
+ hx = high(x); /* high word of x */
ix = hx&0x7fffffff; /* high word of |x| */
if(ix<0x3e300000) { /* x < 2**-28 */
if((int)x==0) { /* generate inexact */
- if (((ix | __LO(x)) | (iy + 1)) == 0)
+ if (((ix | low(x)) | (iy + 1)) == 0)
return one / fabsd(x);
else {
if (iy == 1)
@@ -667,10 +667,10 @@
double a, t;
z = w = x + y;
- __LO(z) = 0;
+ set_low(&z, 0);
v = y - (z - x);
t = a = -one / w;
- __LO(t) = 0;
+ set_low(&t, 0);
s = one + t * z;
return t + a * (s + t * v);
}
@@ -705,10 +705,10 @@
/* compute -1.0/(x+r) accurately */
double a,t;
z = w;
- __LO(z) = 0;
+ set_low(&z, 0);
v = r-(z - x); /* z+v = r+x */
t = a = -1.0/w; /* a = -1.0/w */
- __LO(t) = 0;
+ set_low(&t, 0);
s = 1.0+t*z;
return t+a*(s+t*v);
}
@@ -757,7 +757,7 @@
int n, ix;
/* High word of x. */
- ix = __HI(x);
+ ix = high(x);
/* |x| ~< pi/4 */
ix &= 0x7fffffff;
@@ -815,7 +815,7 @@
int n, ix;
/* High word of x. */
- ix = __HI(x);
+ ix = high(x);
/* |x| ~< pi/4 */
ix &= 0x7fffffff;
@@ -872,7 +872,7 @@
int n, ix;
/* High word of x. */
- ix = __HI(x);
+ ix = high(x);
/* |x| ~< pi/4 */
ix &= 0x7fffffff;
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index 0878580..9956ed2 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -297,8 +297,7 @@
#if INCLUDE_NMT
// record thread's native stack, stack grows downward
address stack_low_addr = stack_base() - stack_size();
- MemTracker::record_thread_stack(stack_low_addr, stack_size(), this,
- CURRENT_PC);
+ MemTracker::record_thread_stack(stack_low_addr, stack_size());
#endif // INCLUDE_NMT
}
@@ -316,7 +315,7 @@
#if INCLUDE_NMT
if (_stack_base != NULL) {
address low_stack_addr = stack_base() - stack_size();
- MemTracker::release_thread_stack(low_stack_addr, stack_size(), this);
+ MemTracker::release_thread_stack(low_stack_addr, stack_size());
#ifdef ASSERT
set_stack_base(NULL);
#endif
@@ -1425,9 +1424,6 @@
set_monitor_chunks(NULL);
set_next(NULL);
set_thread_state(_thread_new);
-#if INCLUDE_NMT
- set_recorder(NULL);
-#endif
_terminated = _not_terminated;
_privileged_stack_top = NULL;
_array_for_gc = NULL;
@@ -1503,7 +1499,6 @@
_jni_attach_state = _not_attaching_via_jni;
}
assert(deferred_card_mark().is_empty(), "Default MemRegion ctor");
- _safepoint_visible = false;
}
bool JavaThread::reguard_stack(address cur_sp) {
@@ -1566,7 +1561,6 @@
thr_type = entry_point == &compiler_thread_entry ? os::compiler_thread :
os::java_thread;
os::create_thread(this, thr_type, stack_sz);
- _safepoint_visible = false;
// The _osthread may be NULL here because we ran out of memory (too many threads active).
// We need to throw and OutOfMemoryError - however we cannot do this here because the caller
// may hold a lock and all locks must be unlocked before throwing the exception (throwing
@@ -1584,13 +1578,6 @@
tty->print_cr("terminate thread %p", this);
}
- // By now, this thread should already be invisible to safepoint,
- // and its per-thread recorder also collected.
- assert(!is_safepoint_visible(), "wrong state");
-#if INCLUDE_NMT
- assert(get_recorder() == NULL, "Already collected");
-#endif // INCLUDE_NMT
-
// JSR166 -- return the parker to the free list
Parker::Release(_parker);
_parker = NULL;
@@ -3359,11 +3346,6 @@
// initialize TLS
ThreadLocalStorage::init();
- // Bootstrap native memory tracking, so it can start recording memory
- // activities before worker thread is started. This is the first phase
- // of bootstrapping, VM is currently running in single-thread mode.
- MemTracker::bootstrap_single_thread();
-
// Initialize output stream logging
ostream_init_log();
@@ -3414,9 +3396,6 @@
// Initialize Java-Level synchronization subsystem
ObjectMonitor::Initialize();
- // Second phase of bootstrapping, VM is about entering multi-thread mode
- MemTracker::bootstrap_multi_thread();
-
// Initialize global modules
jint status = init_globals();
if (status != JNI_OK) {
@@ -3438,9 +3417,6 @@
// real raw monitor. VM is setup enough here for raw monitor enter.
JvmtiExport::transition_pending_onload_raw_monitors();
- // Fully start NMT
- MemTracker::start();
-
// Create the VMThread
{ TraceTime timer("Start VMThread", TraceStartupTime);
VMThread::create();
@@ -3995,8 +3971,6 @@
daemon = false;
}
- p->set_safepoint_visible(true);
-
ThreadService::add_thread(p, daemon);
// Possible GC point.
@@ -4042,13 +4016,6 @@
// to do callbacks into the safepoint code. However, the safepoint code is not aware
// of this thread since it is removed from the queue.
p->set_terminated_value();
-
- // Now, this thread is not visible to safepoint
- p->set_safepoint_visible(false);
- // once the thread becomes safepoint invisible, we can not use its per-thread
- // recorder. And Threads::do_threads() no longer walks this thread, so we have
- // to release its per-thread recorder here.
- MemTracker::thread_exiting(p);
} // unlock Threads_lock
// Since Events::log uses a lock, we grab it outside the Threads_lock
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index 7df1c0f..332fd86 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -43,10 +43,6 @@
#include "runtime/unhandledOops.hpp"
#include "utilities/macros.hpp"
-#if INCLUDE_NMT
-#include "services/memRecorder.hpp"
-#endif // INCLUDE_NMT
-
#include "trace/traceBackend.hpp"
#include "trace/traceMacros.hpp"
#include "utilities/exceptions.hpp"
@@ -1036,16 +1032,6 @@
bool do_not_unlock_if_synchronized() { return _do_not_unlock_if_synchronized; }
void set_do_not_unlock_if_synchronized(bool val) { _do_not_unlock_if_synchronized = val; }
-#if INCLUDE_NMT
- // native memory tracking
- inline MemRecorder* get_recorder() const { return (MemRecorder*)_recorder; }
- inline void set_recorder(MemRecorder* rc) { _recorder = rc; }
-
- private:
- // per-thread memory recorder
- MemRecorder* volatile _recorder;
-#endif // INCLUDE_NMT
-
// Suspend/resume support for JavaThread
private:
inline void set_ext_suspended();
@@ -1485,19 +1471,6 @@
return result;
}
- // NMT (Native memory tracking) support.
- // This flag helps NMT to determine if this JavaThread will be blocked
- // at safepoint. If not, ThreadCritical is needed for writing memory records.
- // JavaThread is only safepoint visible when it is in Threads' thread list,
- // it is not visible until it is added to the list and becomes invisible
- // once it is removed from the list.
- public:
- bool is_safepoint_visible() const { return _safepoint_visible; }
- void set_safepoint_visible(bool visible) { _safepoint_visible = visible; }
- private:
- bool _safepoint_visible;
-
- // Static operations
public:
// Returns the running thread as a JavaThread
static inline JavaThread* current();
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 3ff4170..72f7896 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -52,6 +52,7 @@
#include "interpreter/bytecodes.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
#include "memory/cardTableRS.hpp"
#include "memory/defNewGeneration.hpp"
#include "memory/freeBlockDictionary.hpp"
@@ -93,6 +94,7 @@
#include "runtime/globals.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
+#include "runtime/os.hpp"
#include "runtime/perfMemory.hpp"
#include "runtime/serviceThread.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -3296,14 +3298,14 @@
}
}
if (strstr(typeName, " const") == typeName + len - 6) {
- char * s = strdup(typeName);
+ char * s = os::strdup_check_oom(typeName);
s[len - 6] = '\0';
// tty->print_cr("checking \"%s\" for \"%s\"", s, typeName);
if (recursiveFindType(origtypes, s, true) == 1) {
- free(s);
+ os::free(s);
return 1;
}
- free(s);
+ os::free(s);
}
if (!isRecurse) {
tty->print_cr("type \"%s\" not found", typeName);
diff --git a/hotspot/src/share/vm/services/allocationSite.hpp b/hotspot/src/share/vm/services/allocationSite.hpp
new file mode 100644
index 0000000..07f8595
--- /dev/null
+++ b/hotspot/src/share/vm/services/allocationSite.hpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
+#define SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/nativeCallStack.hpp"
+
+// Allocation site represents a code path that makes a memory
+// allocation
+template <class E> class AllocationSite VALUE_OBJ_CLASS_SPEC {
+ private:
+ NativeCallStack _call_stack;
+ E e;
+ public:
+ AllocationSite(const NativeCallStack& stack) : _call_stack(stack) { }
+ int hash() const { return _call_stack.hash(); }
+ bool equals(const NativeCallStack& stack) const {
+ return _call_stack.equals(stack);
+ }
+
+ bool equals(const AllocationSite<E>& other) const {
+ return other.equals(_call_stack);
+ }
+
+ const NativeCallStack* call_stack() const {
+ return &_call_stack;
+ }
+
+ // Information regarding this allocation
+ E* data() { return &e; }
+ const E* peek() const { return &e; }
+};
+
+#endif // SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
diff --git a/hotspot/src/share/vm/services/attachListener.cpp b/hotspot/src/share/vm/services/attachListener.cpp
index 2321f08..ecd59d4 100644
--- a/hotspot/src/share/vm/services/attachListener.cpp
+++ b/hotspot/src/share/vm/services/attachListener.cpp
@@ -320,6 +320,25 @@
return res? JNI_OK : JNI_ERR;
}
+// set a size_t global flag using value from AttachOperation
+static jint set_size_t_flag(const char* name, AttachOperation* op, outputStream* out) {
+ size_t value;
+ const char* arg1;
+ if ((arg1 = op->arg(1)) != NULL) {
+ int n = sscanf(arg1, SIZE_FORMAT, &value);
+ if (n != 1) {
+ out->print_cr("flag value must be an unsigned integer");
+ return JNI_ERR;
+ }
+ }
+ bool res = CommandLineFlags::size_tAtPut((char*)name, &value, Flag::ATTACH_ON_DEMAND);
+ if (! res) {
+ out->print_cr("setting flag %s failed", name);
+ }
+
+ return res? JNI_OK : JNI_ERR;
+}
+
// set a string global flag using value from AttachOperation
static jint set_ccstr_flag(const char* name, AttachOperation* op, outputStream* out) {
const char* value;
@@ -356,6 +375,8 @@
return set_uintx_flag(name, op, out);
} else if (f->is_uint64_t()) {
return set_uint64_t_flag(name, op, out);
+ } else if (f->is_size_t()) {
+ return set_size_t_flag(name, op, out);
} else if (f->is_ccstr()) {
return set_ccstr_flag(name, op, out);
} else {
diff --git a/hotspot/src/share/vm/services/mallocSiteTable.cpp b/hotspot/src/share/vm/services/mallocSiteTable.cpp
new file mode 100644
index 0000000..ec11cfa
--- /dev/null
+++ b/hotspot/src/share/vm/services/mallocSiteTable.cpp
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+#include "precompiled.hpp"
+
+
+#include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "services/mallocSiteTable.hpp"
+
+/*
+ * Early os::malloc() calls come from initializations of static variables, long before entering any
+ * VM code. Upon the arrival of the first os::malloc() call, malloc site hashtable has to be
+ * initialized, along with the allocation site for the hashtable entries.
+ * To ensure that malloc site hashtable can be initialized without triggering any additional os::malloc()
+ * call, the hashtable bucket array and hashtable entry allocation site have to be static.
+ * It is not a problem for hashtable bucket, since it is an array of pointer type, C runtime just
+ * allocates a block memory and zero the memory for it.
+ * But for hashtable entry allocation site object, things get tricky. C runtime not only allocates
+ * memory for it, but also calls its constructor at some later time. If we initialize the allocation site
+ * at the first os::malloc() call, the object will be reinitialized when its constructor is called
+ * by C runtime.
+ * To workaround above issue, we declare a static size_t array with the size of the CallsiteHashtableEntry,
+ * the memory is used to instantiate CallsiteHashtableEntry for the hashtable entry allocation site.
+ * Given it is a primitive type array, C runtime will do nothing other than assign the memory block for the variable,
+ * which is exactly what we want.
+ * The same trick is also applied to create NativeCallStack object for CallsiteHashtableEntry memory allocation.
+ *
+ * Note: C++ object usually aligns to particular alignment, depends on compiler implementation, we declare
+ * the memory as size_t arrays, to ensure the memory is aligned to native machine word alignment.
+ */
+
+// Reserve enough memory for NativeCallStack and MallocSiteHashtableEntry objects
+size_t MallocSiteTable::_hash_entry_allocation_stack[CALC_OBJ_SIZE_IN_TYPE(NativeCallStack, size_t)];
+size_t MallocSiteTable::_hash_entry_allocation_site[CALC_OBJ_SIZE_IN_TYPE(MallocSiteHashtableEntry, size_t)];
+
+// Malloc site hashtable buckets
+MallocSiteHashtableEntry* MallocSiteTable::_table[MallocSiteTable::table_size];
+
+// concurrent access counter
+volatile int MallocSiteTable::_access_count = 0;
+
+// Tracking hashtable contention
+NOT_PRODUCT(int MallocSiteTable::_peak_count = 0;)
+
+
+/*
+ * Initialize malloc site table.
+ * Hashtable entry is malloc'd, so it can cause infinite recursion.
+ * To avoid above problem, we pre-initialize a hash entry for
+ * this allocation site.
+ * The method is called during C runtime static variable initialization
+ * time, it is in single-threaded mode from JVM perspective.
+ */
+bool MallocSiteTable::initialize() {
+ assert(sizeof(_hash_entry_allocation_stack) >= sizeof(NativeCallStack), "Sanity Check");
+ assert(sizeof(_hash_entry_allocation_site) >= sizeof(MallocSiteHashtableEntry),
+ "Sanity Check");
+ assert((size_t)table_size <= MAX_MALLOCSITE_TABLE_SIZE, "Hashtable overflow");
+
+ // Fake the call stack for hashtable entry allocation
+ assert(NMT_TrackingStackDepth > 1, "At least one tracking stack");
+
+ // Create pseudo call stack for hashtable entry allocation
+ address pc[3];
+ if (NMT_TrackingStackDepth >= 3) {
+ pc[2] = (address)MallocSiteTable::allocation_at;
+ }
+ if (NMT_TrackingStackDepth >= 2) {
+ pc[1] = (address)MallocSiteTable::lookup_or_add;
+ }
+ pc[0] = (address)MallocSiteTable::new_entry;
+
+ // Instantiate NativeCallStack object, have to use placement new operator. (see comments above)
+ NativeCallStack* stack = ::new ((void*)_hash_entry_allocation_stack)
+ NativeCallStack(pc, MIN2(((int)(sizeof(pc) / sizeof(address))), ((int)NMT_TrackingStackDepth)));
+
+ // Instantiate hash entry for hashtable entry allocation callsite
+ MallocSiteHashtableEntry* entry = ::new ((void*)_hash_entry_allocation_site)
+ MallocSiteHashtableEntry(*stack);
+
+ // Add the allocation site to hashtable.
+ int index = hash_to_index(stack->hash());
+ _table[index] = entry;
+
+ return true;
+}
+
+// Walks entries in the hashtable.
+// It stops walk if the walker returns false.
+bool MallocSiteTable::walk(MallocSiteWalker* walker) {
+ MallocSiteHashtableEntry* head;
+ for (int index = 0; index < table_size; index ++) {
+ head = _table[index];
+ while (head != NULL) {
+ if (!walker->do_malloc_site(head->peek())) {
+ return false;
+ }
+ head = (MallocSiteHashtableEntry*)head->next();
+ }
+ }
+ return true;
+}
+
+/*
+ * The hashtable does not have deletion policy on individual entry,
+ * and each linked list node is inserted via compare-and-swap,
+ * so each linked list is stable, the contention only happens
+ * at the end of linked list.
+ * This method should not return NULL under normal circumstance.
+ * If NULL is returned, it indicates:
+ * 1. Out of memory, it cannot allocate new hash entry.
+ * 2. Overflow hash bucket.
+ * Under any of above circumstances, caller should handle the situation.
+ */
+MallocSite* MallocSiteTable::lookup_or_add(const NativeCallStack& key, size_t* bucket_idx,
+ size_t* pos_idx) {
+ int index = hash_to_index(key.hash());
+ assert(index >= 0, "Negative index");
+ *bucket_idx = (size_t)index;
+ *pos_idx = 0;
+
+ // First entry for this hash bucket
+ if (_table[index] == NULL) {
+ MallocSiteHashtableEntry* entry = new_entry(key);
+ // OOM check
+ if (entry == NULL) return NULL;
+
+ // swap in the head
+ if (Atomic::cmpxchg_ptr((void*)entry, (volatile void *)&_table[index], NULL) == NULL) {
+ return entry->data();
+ }
+
+ delete entry;
+ }
+
+ MallocSiteHashtableEntry* head = _table[index];
+ while (head != NULL && (*pos_idx) <= MAX_BUCKET_LENGTH) {
+ MallocSite* site = head->data();
+ if (site->equals(key)) {
+ // found matched entry
+ return head->data();
+ }
+
+ if (head->next() == NULL && (*pos_idx) < MAX_BUCKET_LENGTH) {
+ MallocSiteHashtableEntry* entry = new_entry(key);
+ // OOM check
+ if (entry == NULL) return NULL;
+ if (head->atomic_insert(entry)) {
+ (*pos_idx) ++;
+ return entry->data();
+ }
+ // contended, other thread won
+ delete entry;
+ }
+ head = (MallocSiteHashtableEntry*)head->next();
+ (*pos_idx) ++;
+ }
+ return NULL;
+}
+
+// Access malloc site
+MallocSite* MallocSiteTable::malloc_site(size_t bucket_idx, size_t pos_idx) {
+ assert(bucket_idx < table_size, "Invalid bucket index");
+ MallocSiteHashtableEntry* head = _table[bucket_idx];
+ for (size_t index = 0; index < pos_idx && head != NULL;
+ index ++, head = (MallocSiteHashtableEntry*)head->next());
+ assert(head != NULL, "Invalid position index");
+ return head->data();
+}
+
+// Allocates MallocSiteHashtableEntry object. Special call stack
+// (pre-installed allocation site) has to be used to avoid infinite
+// recursion.
+MallocSiteHashtableEntry* MallocSiteTable::new_entry(const NativeCallStack& key) {
+ void* p = AllocateHeap(sizeof(MallocSiteHashtableEntry), mtNMT,
+ *hash_entry_allocation_stack(), AllocFailStrategy::RETURN_NULL);
+ return ::new (p) MallocSiteHashtableEntry(key);
+}
+
+void MallocSiteTable::reset() {
+ for (int index = 0; index < table_size; index ++) {
+ MallocSiteHashtableEntry* head = _table[index];
+ _table[index] = NULL;
+ delete_linked_list(head);
+ }
+}
+
+void MallocSiteTable::delete_linked_list(MallocSiteHashtableEntry* head) {
+ MallocSiteHashtableEntry* p;
+ while (head != NULL) {
+ p = head;
+ head = (MallocSiteHashtableEntry*)head->next();
+ if (p != (MallocSiteHashtableEntry*)_hash_entry_allocation_site) {
+ delete p;
+ }
+ }
+}
+
+void MallocSiteTable::shutdown() {
+ AccessLock locker(&_access_count);
+ locker.exclusiveLock();
+ reset();
+}
+
+bool MallocSiteTable::walk_malloc_site(MallocSiteWalker* walker) {
+ assert(walker != NULL, "NuLL walker");
+ AccessLock locker(&_access_count);
+ if (locker.sharedLock()) {
+ NOT_PRODUCT(_peak_count = MAX2(_peak_count, _access_count);)
+ return walk(walker);
+ }
+ return false;
+}
+
+
+void MallocSiteTable::AccessLock::exclusiveLock() {
+ jint target;
+ jint val;
+
+ assert(_lock_state != ExclusiveLock, "Can only call once");
+ assert(*_lock >= 0, "Can not content exclusive lock");
+
+ // make counter negative to block out shared locks
+ do {
+ val = *_lock;
+ target = _MAGIC_ + *_lock;
+ } while (Atomic::cmpxchg(target, _lock, val) != val);
+
+ // wait for all readers to exit
+ while (*_lock != _MAGIC_) {
+#ifdef _WINDOWS
+ os::naked_short_sleep(1);
+#else
+ os::naked_yield();
+#endif
+ }
+ _lock_state = ExclusiveLock;
+}
+
+
diff --git a/hotspot/src/share/vm/services/mallocSiteTable.hpp b/hotspot/src/share/vm/services/mallocSiteTable.hpp
new file mode 100644
index 0000000..e291211
--- /dev/null
+++ b/hotspot/src/share/vm/services/mallocSiteTable.hpp
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP
+#define SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP
+
+#if INCLUDE_NMT
+
+#include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
+#include "services/allocationSite.hpp"
+#include "services/mallocTracker.hpp"
+#include "services/nmtCommon.hpp"
+
+// MallocSite represents a code path that eventually calls
+// os::malloc() to allocate memory
+class MallocSite : public AllocationSite<MemoryCounter> {
+ public:
+ MallocSite() :
+ AllocationSite<MemoryCounter>(emptyStack) { }
+
+ MallocSite(const NativeCallStack& stack) :
+ AllocationSite<MemoryCounter>(stack) { }
+
+ void allocate(size_t size) { data()->allocate(size); }
+ void deallocate(size_t size) { data()->deallocate(size); }
+
+ // Memory allocated from this code path
+ size_t size() const { return peek()->size(); }
+ // The number of calls were made
+ size_t count() const { return peek()->count(); }
+};
+
+// Malloc site hashtable entry
+class MallocSiteHashtableEntry : public CHeapObj<mtNMT> {
+ private:
+ MallocSite _malloc_site;
+ MallocSiteHashtableEntry* _next;
+
+ public:
+ MallocSiteHashtableEntry() : _next(NULL) { }
+
+ MallocSiteHashtableEntry(NativeCallStack stack):
+ _malloc_site(stack), _next(NULL) { }
+
+ inline const MallocSiteHashtableEntry* next() const {
+ return _next;
+ }
+
+ // Insert an entry atomically.
+ // Return true if the entry is inserted successfully.
+ // The operation can be failed due to contention from other thread.
+ bool atomic_insert(const MallocSiteHashtableEntry* entry) {
+ return (Atomic::cmpxchg_ptr((void*)entry, (volatile void*)&_next,
+ NULL) == NULL);
+ }
+
+ void set_callsite(const MallocSite& site) {
+ _malloc_site = site;
+ }
+
+ inline const MallocSite* peek() const { return &_malloc_site; }
+ inline MallocSite* data() { return &_malloc_site; }
+
+ inline long hash() const { return _malloc_site.hash(); }
+ inline bool equals(const NativeCallStack& stack) const {
+ return _malloc_site.equals(stack);
+ }
+ // Allocation/deallocation on this allocation site
+ inline void allocate(size_t size) { _malloc_site.allocate(size); }
+ inline void deallocate(size_t size) { _malloc_site.deallocate(size); }
+ // Memory counters
+ inline size_t size() const { return _malloc_site.size(); }
+ inline size_t count() const { return _malloc_site.count(); }
+};
+
+// The walker walks every entry on MallocSiteTable
+class MallocSiteWalker : public StackObj {
+ public:
+ virtual bool do_malloc_site(const MallocSite* e) { return false; }
+};
+
+/*
+ * Native memory tracking call site table.
+ * The table is only needed when detail tracking is enabled.
+ */
+class MallocSiteTable : AllStatic {
+ private:
+ // The number of hash bucket in this hashtable. The number should
+ // be tuned if malloc activities changed significantly.
+ // The statistics data can be obtained via Jcmd
+ // jcmd <pid> VM.native_memory statistics.
+
+ // Currently, (number of buckets / number of entires) ratio is
+ // about 1 / 6
+ enum {
+ table_base_size = 128, // The base size is calculated from statistics to give
+ // table ratio around 1:6
+ table_size = (table_base_size * NMT_TrackingStackDepth - 1)
+ };
+
+
+ // This is a very special lock, that allows multiple shared accesses (sharedLock), but
+ // once exclusive access (exclusiveLock) is requested, all shared accesses are
+ // rejected forever.
+ class AccessLock : public StackObj {
+ enum LockState {
+ NoLock,
+ SharedLock,
+ ExclusiveLock
+ };
+
+ private:
+ // A very large negative number. The only possibility to "overflow"
+ // this number is when there are more than -min_jint threads in
+ // this process, which is not going to happen in foreseeable future.
+ const static int _MAGIC_ = min_jint;
+
+ LockState _lock_state;
+ volatile int* _lock;
+ public:
+ AccessLock(volatile int* lock) :
+ _lock(lock), _lock_state(NoLock) {
+ }
+
+ ~AccessLock() {
+ if (_lock_state == SharedLock) {
+ Atomic::dec((volatile jint*)_lock);
+ }
+ }
+ // Acquire shared lock.
+ // Return true if shared access is granted.
+ inline bool sharedLock() {
+ jint res = Atomic::add(1, _lock);
+ if (res < 0) {
+ Atomic::add(-1, _lock);
+ return false;
+ }
+ _lock_state = SharedLock;
+ return true;
+ }
+ // Acquire exclusive lock
+ void exclusiveLock();
+ };
+
+ public:
+ static bool initialize();
+ static void shutdown();
+
+ NOT_PRODUCT(static int access_peak_count() { return _peak_count; })
+
+ // Number of hash buckets
+ static inline int hash_buckets() { return (int)table_size; }
+
+ // Access and copy a call stack from this table. Shared lock should be
+ // acquired before access the entry.
+ static inline bool access_stack(NativeCallStack& stack, size_t bucket_idx,
+ size_t pos_idx) {
+ AccessLock locker(&_access_count);
+ if (locker.sharedLock()) {
+ NOT_PRODUCT(_peak_count = MAX2(_peak_count, _access_count);)
+ MallocSite* site = malloc_site(bucket_idx, pos_idx);
+ if (site != NULL) {
+ stack = *site->call_stack();
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // Record a new allocation from specified call path.
+ // Return true if the allocation is recorded successfully, bucket_idx
+ // and pos_idx are also updated to indicate the entry where the allocation
+ // information was recorded.
+ // Return false only occurs under rare scenarios:
+ // 1. out of memory
+ // 2. overflow hash bucket
+ static inline bool allocation_at(const NativeCallStack& stack, size_t size,
+ size_t* bucket_idx, size_t* pos_idx) {
+ AccessLock locker(&_access_count);
+ if (locker.sharedLock()) {
+ NOT_PRODUCT(_peak_count = MAX2(_peak_count, _access_count);)
+ MallocSite* site = lookup_or_add(stack, bucket_idx, pos_idx);
+ if (site != NULL) site->allocate(size);
+ return site != NULL;
+ }
+ return false;
+ }
+
+ // Record memory deallocation. bucket_idx and pos_idx indicate where the allocation
+ // information was recorded.
+ static inline bool deallocation_at(size_t size, size_t bucket_idx, size_t pos_idx) {
+ AccessLock locker(&_access_count);
+ if (locker.sharedLock()) {
+ NOT_PRODUCT(_peak_count = MAX2(_peak_count, _access_count);)
+ MallocSite* site = malloc_site(bucket_idx, pos_idx);
+ if (site != NULL) {
+ site->deallocate(size);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // Walk this table.
+ static bool walk_malloc_site(MallocSiteWalker* walker);
+
+ private:
+ static MallocSiteHashtableEntry* new_entry(const NativeCallStack& key);
+ static void reset();
+
+ // Delete a bucket linked list
+ static void delete_linked_list(MallocSiteHashtableEntry* head);
+
+ static MallocSite* lookup_or_add(const NativeCallStack& key, size_t* bucket_idx, size_t* pos_idx);
+ static MallocSite* malloc_site(size_t bucket_idx, size_t pos_idx);
+ static bool walk(MallocSiteWalker* walker);
+
+ static inline int hash_to_index(int hash) {
+ hash = (hash > 0) ? hash : (-hash);
+ return (hash % table_size);
+ }
+
+ static inline const NativeCallStack* hash_entry_allocation_stack() {
+ return (NativeCallStack*)_hash_entry_allocation_stack;
+ }
+
+ private:
+ // Counter for counting concurrent access
+ static volatile int _access_count;
+
+ // The callsite hashtable. It has to be a static table,
+ // since malloc call can come from C runtime linker.
+ static MallocSiteHashtableEntry* _table[table_size];
+
+
+ // Reserve enough memory for placing the objects
+
+ // The memory for hashtable entry allocation stack object
+ static size_t _hash_entry_allocation_stack[CALC_OBJ_SIZE_IN_TYPE(NativeCallStack, size_t)];
+ // The memory for hashtable entry allocation callsite object
+ static size_t _hash_entry_allocation_site[CALC_OBJ_SIZE_IN_TYPE(MallocSiteHashtableEntry, size_t)];
+ NOT_PRODUCT(static int _peak_count;)
+};
+
+#endif // INCLUDE_NMT
+#endif // SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP
diff --git a/hotspot/src/share/vm/services/mallocTracker.cpp b/hotspot/src/share/vm/services/mallocTracker.cpp
new file mode 100644
index 0000000..d60dd38
--- /dev/null
+++ b/hotspot/src/share/vm/services/mallocTracker.cpp
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+#include "precompiled.hpp"
+
+#include "runtime/atomic.hpp"
+#include "runtime/atomic.inline.hpp"
+#include "services/mallocSiteTable.hpp"
+#include "services/mallocTracker.hpp"
+#include "services/mallocTracker.inline.hpp"
+#include "services/memTracker.hpp"
+
+size_t MallocMemorySummary::_snapshot[CALC_OBJ_SIZE_IN_TYPE(MallocMemorySnapshot, size_t)];
+
+// Total malloc'd memory amount
+size_t MallocMemorySnapshot::total() const {
+ size_t amount = 0;
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ amount += _malloc[index].malloc_size();
+ }
+ amount += _tracking_header.size() + total_arena();
+ return amount;
+}
+
+// Total malloc'd memory used by arenas
+size_t MallocMemorySnapshot::total_arena() const {
+ size_t amount = 0;
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ amount += _malloc[index].arena_size();
+ }
+ return amount;
+}
+
+
+void MallocMemorySnapshot::reset() {
+ _tracking_header.reset();
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ _malloc[index].reset();
+ }
+}
+
+// Make adjustment by subtracting chunks used by arenas
+// from total chunks to get total free chunck size
+void MallocMemorySnapshot::make_adjustment() {
+ size_t arena_size = total_arena();
+ int chunk_idx = NMTUtil::flag_to_index(mtChunk);
+ _malloc[chunk_idx].record_free(arena_size);
+}
+
+
+void MallocMemorySummary::initialize() {
+ assert(sizeof(_snapshot) >= sizeof(MallocMemorySnapshot), "Sanity Check");
+ // Uses placement new operator to initialize static area.
+ ::new ((void*)_snapshot)MallocMemorySnapshot();
+}
+
+void MallocHeader::release() const {
+ // Tracking already shutdown, no housekeeping is needed anymore
+ if (MemTracker::tracking_level() <= NMT_minimal) return;
+
+ MallocMemorySummary::record_free(size(), flags());
+ MallocMemorySummary::record_free_malloc_header(sizeof(MallocHeader));
+ if (tracking_level() == NMT_detail) {
+ MallocSiteTable::deallocation_at(size(), _bucket_idx, _pos_idx);
+ }
+}
+
+bool MallocHeader::record_malloc_site(const NativeCallStack& stack, size_t size,
+ size_t* bucket_idx, size_t* pos_idx) const {
+ bool ret = MallocSiteTable::allocation_at(stack, size, bucket_idx, pos_idx);
+
+ // Something went wrong, could be OOM or overflow malloc site table.
+ // We want to keep tracking data under OOM circumstance, so transition to
+ // summary tracking.
+ if (!ret) {
+ MemTracker::transition_to(NMT_summary);
+ }
+ return ret;
+}
+
+bool MallocHeader::get_stack(NativeCallStack& stack) const {
+ return MallocSiteTable::access_stack(stack, _bucket_idx, _pos_idx);
+}
+
+bool MallocTracker::initialize(NMT_TrackingLevel level) {
+ if (level >= NMT_summary) {
+ MallocMemorySummary::initialize();
+ }
+
+ if (level == NMT_detail) {
+ return MallocSiteTable::initialize();
+ }
+ return true;
+}
+
+bool MallocTracker::transition(NMT_TrackingLevel from, NMT_TrackingLevel to) {
+ assert(from != NMT_off, "Can not transition from off state");
+ assert(to != NMT_off, "Can not transition to off state");
+ if (from == NMT_minimal) {
+ MallocMemorySummary::reset();
+ }
+
+ if (to == NMT_detail) {
+ assert(from == NMT_minimal || from == NMT_summary, "Just check");
+ return MallocSiteTable::initialize();
+ } else if (from == NMT_detail) {
+ assert(to == NMT_minimal || to == NMT_summary, "Just check");
+ MallocSiteTable::shutdown();
+ }
+ return true;
+}
+
+// Record a malloc memory allocation
+void* MallocTracker::record_malloc(void* malloc_base, size_t size, MEMFLAGS flags,
+ const NativeCallStack& stack, NMT_TrackingLevel level) {
+ void* memblock; // the address for user data
+ MallocHeader* header = NULL;
+
+ if (malloc_base == NULL) {
+ return NULL;
+ }
+
+ // Check malloc size, size has to <= MAX_MALLOC_SIZE. This is only possible on 32-bit
+ // systems, when malloc size >= 1GB, but is is safe to assume it won't happen.
+ if (size > MAX_MALLOC_SIZE) {
+ fatal("Should not use malloc for big memory block, use virtual memory instead");
+ }
+ // Uses placement global new operator to initialize malloc header
+ switch(level) {
+ case NMT_off:
+ return malloc_base;
+ case NMT_minimal: {
+ MallocHeader* hdr = ::new (malloc_base) MallocHeader();
+ break;
+ }
+ case NMT_summary: {
+ header = ::new (malloc_base) MallocHeader(size, flags);
+ break;
+ }
+ case NMT_detail: {
+ header = ::new (malloc_base) MallocHeader(size, flags, stack);
+ break;
+ }
+ default:
+ ShouldNotReachHere();
+ }
+ memblock = (void*)((char*)malloc_base + sizeof(MallocHeader));
+
+ // The alignment check: 8 bytes alignment for 32 bit systems.
+ // 16 bytes alignment for 64-bit systems.
+ assert(((size_t)memblock & (sizeof(size_t) * 2 - 1)) == 0, "Alignment check");
+
+ // Sanity check
+ assert(get_memory_tracking_level(memblock) == level,
+ "Wrong tracking level");
+
+#ifdef ASSERT
+ if (level > NMT_minimal) {
+ // Read back
+ assert(get_size(memblock) == size, "Wrong size");
+ assert(get_flags(memblock) == flags, "Wrong flags");
+ }
+#endif
+
+ return memblock;
+}
+
+void* MallocTracker::record_free(void* memblock) {
+ // Never turned on
+ if (MemTracker::tracking_level() == NMT_off ||
+ memblock == NULL) {
+ return memblock;
+ }
+ MallocHeader* header = malloc_header(memblock);
+ header->release();
+
+ return (void*)header;
+}
+
+
diff --git a/hotspot/src/share/vm/services/mallocTracker.hpp b/hotspot/src/share/vm/services/mallocTracker.hpp
new file mode 100644
index 0000000..3b84270
--- /dev/null
+++ b/hotspot/src/share/vm/services/mallocTracker.hpp
@@ -0,0 +1,424 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_SERVICES_MALLOC_TRACKER_HPP
+#define SHARE_VM_SERVICES_MALLOC_TRACKER_HPP
+
+#if INCLUDE_NMT
+
+#include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
+#include "services/nmtCommon.hpp"
+#include "utilities/nativeCallStack.hpp"
+
+/*
+ * This counter class counts memory allocation and deallocation,
+ * records total memory allocation size and number of allocations.
+ * The counters are updated atomically.
+ */
+class MemoryCounter VALUE_OBJ_CLASS_SPEC {
+ private:
+ size_t _count;
+ size_t _size;
+
+ DEBUG_ONLY(size_t _peak_count;)
+ DEBUG_ONLY(size_t _peak_size; )
+
+ public:
+ MemoryCounter() : _count(0), _size(0) {
+ DEBUG_ONLY(_peak_count = 0;)
+ DEBUG_ONLY(_peak_size = 0;)
+ }
+
+ // Reset counters
+ void reset() {
+ _size = 0;
+ _count = 0;
+ DEBUG_ONLY(_peak_size = 0;)
+ DEBUG_ONLY(_peak_count = 0;)
+ }
+
+ inline void allocate(size_t sz) {
+ Atomic::add(1, (volatile MemoryCounterType*)&_count);
+ if (sz > 0) {
+ Atomic::add((MemoryCounterType)sz, (volatile MemoryCounterType*)&_size);
+ DEBUG_ONLY(_peak_size = MAX2(_peak_size, _size));
+ }
+ DEBUG_ONLY(_peak_count = MAX2(_peak_count, _count);)
+ }
+
+ inline void deallocate(size_t sz) {
+ assert(_count > 0, "Negative counter");
+ assert(_size >= sz, "Negative size");
+ Atomic::add(-1, (volatile MemoryCounterType*)&_count);
+ if (sz > 0) {
+ Atomic::add(-(MemoryCounterType)sz, (volatile MemoryCounterType*)&_size);
+ }
+ }
+
+ inline void resize(long sz) {
+ if (sz != 0) {
+ Atomic::add((MemoryCounterType)sz, (volatile MemoryCounterType*)&_size);
+ DEBUG_ONLY(_peak_size = MAX2(_size, _peak_size);)
+ }
+ }
+
+ inline size_t count() const { return _count; }
+ inline size_t size() const { return _size; }
+ DEBUG_ONLY(inline size_t peak_count() const { return _peak_count; })
+ DEBUG_ONLY(inline size_t peak_size() const { return _peak_size; })
+
+};
+
+/*
+ * Malloc memory used by a particular subsystem.
+ * It includes the memory acquired through os::malloc()
+ * call and arena's backing memory.
+ */
+class MallocMemory VALUE_OBJ_CLASS_SPEC {
+ private:
+ MemoryCounter _malloc;
+ MemoryCounter _arena;
+
+ public:
+ MallocMemory() { }
+
+ inline void record_malloc(size_t sz) {
+ _malloc.allocate(sz);
+ }
+
+ inline void record_free(size_t sz) {
+ _malloc.deallocate(sz);
+ }
+
+ inline void record_new_arena() {
+ _arena.allocate(0);
+ }
+
+ inline void record_arena_free() {
+ _arena.deallocate(0);
+ }
+
+ inline void record_arena_size_change(long sz) {
+ _arena.resize(sz);
+ }
+
+ void reset() {
+ _malloc.reset();
+ _arena.reset();
+ }
+
+ inline size_t malloc_size() const { return _malloc.size(); }
+ inline size_t malloc_count() const { return _malloc.count();}
+ inline size_t arena_size() const { return _arena.size(); }
+ inline size_t arena_count() const { return _arena.count(); }
+
+ DEBUG_ONLY(inline const MemoryCounter& malloc_counter() const { return _malloc; })
+ DEBUG_ONLY(inline const MemoryCounter& arena_counter() const { return _arena; })
+};
+
+class MallocMemorySummary;
+
+// A snapshot of malloc'd memory, includes malloc memory
+// usage by types and memory used by tracking itself.
+class MallocMemorySnapshot : public ResourceObj {
+ friend class MallocMemorySummary;
+
+ private:
+ MallocMemory _malloc[mt_number_of_types];
+ MemoryCounter _tracking_header;
+
+
+ public:
+ inline MallocMemory* by_type(MEMFLAGS flags) {
+ int index = NMTUtil::flag_to_index(flags);
+ return &_malloc[index];
+ }
+
+ inline MallocMemory* by_index(int index) {
+ assert(index >= 0, "Index out of bound");
+ assert(index < mt_number_of_types, "Index out of bound");
+ return &_malloc[index];
+ }
+
+ inline MemoryCounter* malloc_overhead() {
+ return &_tracking_header;
+ }
+
+ // Total malloc'd memory amount
+ size_t total() const;
+ // Total malloc'd memory used by arenas
+ size_t total_arena() const;
+
+ inline size_t thread_count() {
+ return by_type(mtThreadStack)->malloc_count();
+ }
+
+ void reset();
+
+ void copy_to(MallocMemorySnapshot* s) {
+ s->_tracking_header = _tracking_header;
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ s->_malloc[index] = _malloc[index];
+ }
+ }
+
+ // Make adjustment by subtracting chunks used by arenas
+ // from total chunks to get total free chunk size
+ void make_adjustment();
+};
+
+/*
+ * This class is for collecting malloc statistics at summary level
+ */
+class MallocMemorySummary : AllStatic {
+ private:
+ // Reserve memory for placement of MallocMemorySnapshot object
+ static size_t _snapshot[CALC_OBJ_SIZE_IN_TYPE(MallocMemorySnapshot, size_t)];
+
+ public:
+ static void initialize();
+
+ static inline void record_malloc(size_t size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->record_malloc(size);
+ }
+
+ static inline void record_free(size_t size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->record_free(size);
+ }
+
+ static inline void record_new_arena(MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->record_new_arena();
+ }
+
+ static inline void record_arena_free(MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->record_arena_free();
+ }
+
+ static inline void record_arena_size_change(long size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->record_arena_size_change(size);
+ }
+
+ static void snapshot(MallocMemorySnapshot* s) {
+ as_snapshot()->copy_to(s);
+ s->make_adjustment();
+ }
+
+ // Record memory used by malloc tracking header
+ static inline void record_new_malloc_header(size_t sz) {
+ as_snapshot()->malloc_overhead()->allocate(sz);
+ }
+
+ static inline void record_free_malloc_header(size_t sz) {
+ as_snapshot()->malloc_overhead()->deallocate(sz);
+ }
+
+ // The memory used by malloc tracking headers
+ static inline size_t tracking_overhead() {
+ return as_snapshot()->malloc_overhead()->size();
+ }
+
+ // Reset all counters to zero
+ static void reset() {
+ as_snapshot()->reset();
+ }
+
+ static MallocMemorySnapshot* as_snapshot() {
+ return (MallocMemorySnapshot*)_snapshot;
+ }
+};
+
+
+/*
+ * Malloc tracking header.
+ * To satisfy malloc alignment requirement, NMT uses 2 machine words for tracking purpose,
+ * which ensures 8-bytes alignment on 32-bit systems and 16-bytes on 64-bit systems (Product build).
+ */
+
+class MallocHeader VALUE_OBJ_CLASS_SPEC {
+#ifdef _LP64
+ size_t _size : 62;
+ size_t _level : 2;
+ size_t _flags : 8;
+ size_t _pos_idx : 16;
+ size_t _bucket_idx: 40;
+#define MAX_MALLOCSITE_TABLE_SIZE ((size_t)1 << 40)
+#define MAX_BUCKET_LENGTH ((size_t)(1 << 16))
+#define MAX_MALLOC_SIZE (((size_t)1 << 62) - 1)
+#else
+ size_t _size : 30;
+ size_t _level : 2;
+ size_t _flags : 8;
+ size_t _pos_idx : 8;
+ size_t _bucket_idx: 16;
+#define MAX_MALLOCSITE_TABLE_SIZE ((size_t)(1 << 16))
+#define MAX_BUCKET_LENGTH ((size_t)(1 << 8))
+// Max malloc size = 1GB - 1 on 32 bit system, such has total 4GB memory
+#define MAX_MALLOC_SIZE ((size_t)(1 << 30) - 1)
+#endif // _LP64
+
+ public:
+ // Summary tracking header
+ MallocHeader(size_t size, MEMFLAGS flags) {
+ assert(sizeof(MallocHeader) == sizeof(void*) * 2,
+ "Wrong header size");
+
+ _level = NMT_summary;
+ _flags = flags;
+ set_size(size);
+ MallocMemorySummary::record_malloc(size, flags);
+ MallocMemorySummary::record_new_malloc_header(sizeof(MallocHeader));
+ }
+ // Detail tracking header
+ MallocHeader(size_t size, MEMFLAGS flags, const NativeCallStack& stack) {
+ assert(sizeof(MallocHeader) == sizeof(void*) * 2,
+ "Wrong header size");
+
+ _level = NMT_detail;
+ _flags = flags;
+ set_size(size);
+ size_t bucket_idx;
+ size_t pos_idx;
+ if (record_malloc_site(stack, size, &bucket_idx, &pos_idx)) {
+ assert(bucket_idx <= MAX_MALLOCSITE_TABLE_SIZE, "Overflow bucket index");
+ assert(pos_idx <= MAX_BUCKET_LENGTH, "Overflow bucket position index");
+ _bucket_idx = bucket_idx;
+ _pos_idx = pos_idx;
+ }
+ MallocMemorySummary::record_malloc(size, flags);
+ MallocMemorySummary::record_new_malloc_header(sizeof(MallocHeader));
+ }
+ // Minimal tracking header
+ MallocHeader() {
+ assert(sizeof(MallocHeader) == sizeof(void*) * 2,
+ "Wrong header size");
+
+ _level = (unsigned short)NMT_minimal;
+ }
+
+ inline NMT_TrackingLevel tracking_level() const {
+ return (NMT_TrackingLevel)_level;
+ }
+
+ inline size_t size() const { return _size; }
+ inline MEMFLAGS flags() const { return (MEMFLAGS)_flags; }
+ bool get_stack(NativeCallStack& stack) const;
+
+ // Cleanup tracking information before the memory is released.
+ void release() const;
+
+ private:
+ inline void set_size(size_t size) {
+ assert(size <= MAX_MALLOC_SIZE, "Malloc size too large, should use virtual memory?");
+ _size = size;
+ }
+ bool record_malloc_site(const NativeCallStack& stack, size_t size,
+ size_t* bucket_idx, size_t* pos_idx) const;
+};
+
+
+// Main class called from MemTracker to track malloc activities
+class MallocTracker : AllStatic {
+ public:
+ // Initialize malloc tracker for specific tracking level
+ static bool initialize(NMT_TrackingLevel level);
+
+ static bool transition(NMT_TrackingLevel from, NMT_TrackingLevel to);
+
+ // malloc tracking header size for specific tracking level
+ static inline size_t malloc_header_size(NMT_TrackingLevel level) {
+ return (level == NMT_off) ? 0 : sizeof(MallocHeader);
+ }
+
+ // Parameter name convention:
+ // memblock : the beginning address for user data
+ // malloc_base: the beginning address that includes malloc tracking header
+ //
+ // The relationship:
+ // memblock = (char*)malloc_base + sizeof(nmt header)
+ //
+
+ // Record malloc on specified memory block
+ static void* record_malloc(void* malloc_base, size_t size, MEMFLAGS flags,
+ const NativeCallStack& stack, NMT_TrackingLevel level);
+
+ // Record free on specified memory block
+ static void* record_free(void* memblock);
+
+ // Get tracking level of specified memory block
+ static inline NMT_TrackingLevel get_memory_tracking_level(void* memblock);
+
+
+ // Offset memory address to header address
+ static inline void* get_base(void* memblock);
+ static inline void* get_base(void* memblock, NMT_TrackingLevel level) {
+ if (memblock == NULL || level == NMT_off) return memblock;
+ return (char*)memblock - malloc_header_size(level);
+ }
+
+ // Get memory size
+ static inline size_t get_size(void* memblock) {
+ MallocHeader* header = malloc_header(memblock);
+ assert(header->tracking_level() >= NMT_summary,
+ "Wrong tracking level");
+ return header->size();
+ }
+
+ // Get memory type
+ static inline MEMFLAGS get_flags(void* memblock) {
+ MallocHeader* header = malloc_header(memblock);
+ assert(header->tracking_level() >= NMT_summary,
+ "Wrong tracking level");
+ return header->flags();
+ }
+
+ // Get header size
+ static inline size_t get_header_size(void* memblock) {
+ return (memblock == NULL) ? 0 : sizeof(MallocHeader);
+ }
+
+ static inline void record_new_arena(MEMFLAGS flags) {
+ MallocMemorySummary::record_new_arena(flags);
+ }
+
+ static inline void record_arena_free(MEMFLAGS flags) {
+ MallocMemorySummary::record_arena_free(flags);
+ }
+
+ static inline void record_arena_size_change(int size, MEMFLAGS flags) {
+ MallocMemorySummary::record_arena_size_change(size, flags);
+ }
+ private:
+ static inline MallocHeader* malloc_header(void *memblock) {
+ assert(memblock != NULL, "NULL pointer");
+ MallocHeader* header = (MallocHeader*)((char*)memblock - sizeof(MallocHeader));
+ assert(header->tracking_level() >= NMT_minimal, "Bad header");
+ return header;
+ }
+};
+
+#endif // INCLUDE_NMT
+
+
+#endif //SHARE_VM_SERVICES_MALLOC_TRACKER_HPP
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/hotspot/src/share/vm/services/mallocTracker.inline.hpp
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to hotspot/src/share/vm/services/mallocTracker.inline.hpp
index 2bab4b2..338295b 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/hotspot/src/share/vm/services/mallocTracker.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,22 +22,22 @@
*
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
+#ifndef SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP
+#define SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP
+
+#include "services/mallocTracker.hpp"
#include "services/memTracker.hpp"
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
-
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+inline NMT_TrackingLevel MallocTracker::get_memory_tracking_level(void* memblock) {
+ assert(memblock != NULL, "Sanity check");
+ if (MemTracker::tracking_level() == NMT_off) return NMT_off;
+ MallocHeader* header = malloc_header(memblock);
+ return header->tracking_level();
}
+inline void* MallocTracker::get_base(void* memblock){
+ return get_base(memblock, MemTracker::tracking_level());
+}
+
+#endif // SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP
+
diff --git a/hotspot/src/share/vm/services/management.cpp b/hotspot/src/share/vm/services/management.cpp
index 2d6f2ff..53096ac 100644
--- a/hotspot/src/share/vm/services/management.cpp
+++ b/hotspot/src/share/vm/services/management.cpp
@@ -1696,6 +1696,9 @@
} else if (flag->is_uint64_t()) {
global->value.j = (jlong)flag->get_uint64_t();
global->type = JMM_VMGLOBAL_TYPE_JLONG;
+ } else if (flag->is_size_t()) {
+ global->value.j = (jlong)flag->get_size_t();
+ global->type = JMM_VMGLOBAL_TYPE_JLONG;
} else if (flag->is_ccstr()) {
Handle str = java_lang_String::create_from_str(flag->get_ccstr(), CHECK_false);
global->value.l = (jobject)JNIHandles::make_local(env, str());
@@ -1851,6 +1854,9 @@
} else if (flag->is_uint64_t()) {
uint64_t uvalue = (uint64_t)new_value.j;
succeed = CommandLineFlags::uint64_tAtPut(name, &uvalue, Flag::MANAGEMENT);
+ } else if (flag->is_size_t()) {
+ size_t svalue = (size_t)new_value.j;
+ succeed = CommandLineFlags::size_tAtPut(name, &svalue, Flag::MANAGEMENT);
} else if (flag->is_ccstr()) {
oop str = JNIHandles::resolve_external_guard(new_value.l);
if (str == NULL) {
@@ -1914,7 +1920,7 @@
ResourceMark rm(THREAD); // thread->name() uses ResourceArea
assert(thread->name() != NULL, "All threads should have a name");
- _names_chars[_count] = strdup(thread->name());
+ _names_chars[_count] = os::strdup(thread->name());
_times->long_at_put(_count, os::is_thread_cpu_time_supported() ?
os::thread_cpu_time(thread) : -1);
_count++;
@@ -1932,7 +1938,7 @@
ThreadTimesClosure::~ThreadTimesClosure() {
for (int i = 0; i < _count; i++) {
- free(_names_chars[i]);
+ os::free(_names_chars[i]);
}
FREE_C_HEAP_ARRAY(char *, _names_chars, mtInternal);
}
diff --git a/hotspot/src/share/vm/services/memBaseline.cpp b/hotspot/src/share/vm/services/memBaseline.cpp
index 62e5187..26cef4c 100644
--- a/hotspot/src/share/vm/services/memBaseline.cpp
+++ b/hotspot/src/share/vm/services/memBaseline.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,471 +22,301 @@
*
*/
#include "precompiled.hpp"
+
#include "memory/allocation.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.inline.hpp"
#include "services/memBaseline.hpp"
#include "services/memTracker.hpp"
+/*
+ * Sizes are sorted in descenting order for reporting
+ */
+int compare_malloc_size(const MallocSite& s1, const MallocSite& s2) {
+ if (s1.size() == s2.size()) {
+ return 0;
+ } else if (s1.size() > s2.size()) {
+ return -1;
+ } else {
+ return 1;
+ }
+}
-MemType2Name MemBaseline::MemType2NameMap[NUMBER_OF_MEMORY_TYPE] = {
- {mtJavaHeap, "Java Heap"},
- {mtClass, "Class"},
- {mtThreadStack,"Thread Stack"},
- {mtThread, "Thread"},
- {mtCode, "Code"},
- {mtGC, "GC"},
- {mtCompiler, "Compiler"},
- {mtInternal, "Internal"},
- {mtOther, "Other"},
- {mtSymbol, "Symbol"},
- {mtNMT, "Memory Tracking"},
- {mtTracing, "Tracing"},
- {mtChunk, "Pooled Free Chunks"},
- {mtClassShared,"Shared spaces for classes"},
- {mtTest, "Test"},
- {mtNone, "Unknown"} // It can happen when type tagging records are lagging
- // behind
+
+int compare_virtual_memory_size(const VirtualMemoryAllocationSite& s1,
+ const VirtualMemoryAllocationSite& s2) {
+ if (s1.reserved() == s2.reserved()) {
+ return 0;
+ } else if (s1.reserved() > s2.reserved()) {
+ return -1;
+ } else {
+ return 1;
+ }
+}
+
+// Sort into allocation site addresses order for baseline comparison
+int compare_malloc_site(const MallocSite& s1, const MallocSite& s2) {
+ return s1.call_stack()->compare(*s2.call_stack());
+}
+
+
+int compare_virtual_memory_site(const VirtualMemoryAllocationSite& s1,
+ const VirtualMemoryAllocationSite& s2) {
+ return s1.call_stack()->compare(*s2.call_stack());
+}
+
+/*
+ * Walker to walk malloc allocation site table
+ */
+class MallocAllocationSiteWalker : public MallocSiteWalker {
+ private:
+ SortedLinkedList<MallocSite, compare_malloc_size, ResourceObj::ARENA>
+ _malloc_sites;
+ size_t _count;
+
+ // Entries in MallocSiteTable with size = 0 and count = 0,
+ // when the malloc site is not longer there.
+ public:
+ MallocAllocationSiteWalker(Arena* arena) : _count(0), _malloc_sites(arena) {
+ }
+
+ inline size_t count() const { return _count; }
+
+ LinkedList<MallocSite>* malloc_sites() {
+ return &_malloc_sites;
+ }
+
+ bool do_malloc_site(const MallocSite* site) {
+ if (site->size() >= MemBaseline::SIZE_THRESHOLD) {
+ if (_malloc_sites.add(*site) != NULL) {
+ _count++;
+ return true;
+ } else {
+ return false; // OOM
+ }
+ } else {
+ // malloc site does not meet threshold, ignore and continue
+ return true;
+ }
+ }
};
-MemBaseline::MemBaseline() {
- _baselined = false;
-
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- _malloc_data[index].set_type(MemType2NameMap[index]._flag);
- _vm_data[index].set_type(MemType2NameMap[index]._flag);
- _arena_data[index].set_type(MemType2NameMap[index]._flag);
- }
-
- _malloc_cs = NULL;
- _vm_cs = NULL;
- _vm_map = NULL;
-
- _number_of_classes = 0;
- _number_of_threads = 0;
+// Compare virtual memory region's base address
+int compare_virtual_memory_base(const ReservedMemoryRegion& r1, const ReservedMemoryRegion& r2) {
+ return r1.compare(r2);
}
+// Walk all virtual memory regions for baselining
+class VirtualMemoryAllocationWalker : public VirtualMemoryWalker {
+ private:
+ SortedLinkedList<ReservedMemoryRegion, compare_virtual_memory_base, ResourceObj::ARENA>
+ _virtual_memory_regions;
+ size_t _count;
-void MemBaseline::clear() {
- if (_malloc_cs != NULL) {
- delete _malloc_cs;
- _malloc_cs = NULL;
+ public:
+ VirtualMemoryAllocationWalker(Arena* a) : _count(0), _virtual_memory_regions(a) {
}
- if (_vm_cs != NULL) {
- delete _vm_cs;
- _vm_cs = NULL;
- }
-
- if (_vm_map != NULL) {
- delete _vm_map;
- _vm_map = NULL;
- }
-
- reset();
-}
-
-
-void MemBaseline::reset() {
- _baselined = false;
- _total_vm_reserved = 0;
- _total_vm_committed = 0;
- _total_malloced = 0;
- _number_of_classes = 0;
-
- if (_malloc_cs != NULL) _malloc_cs->clear();
- if (_vm_cs != NULL) _vm_cs->clear();
- if (_vm_map != NULL) _vm_map->clear();
-
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- _malloc_data[index].clear();
- _vm_data[index].clear();
- _arena_data[index].clear();
- }
-}
-
-MemBaseline::~MemBaseline() {
- clear();
-}
-
-// baseline malloc'd memory records, generate overall summary and summaries by
-// memory types
-bool MemBaseline::baseline_malloc_summary(const MemPointerArray* malloc_records) {
- MemPointerArrayIteratorImpl malloc_itr((MemPointerArray*)malloc_records);
- MemPointerRecord* malloc_ptr = (MemPointerRecord*)malloc_itr.current();
- size_t used_arena_size = 0;
- int index;
- while (malloc_ptr != NULL) {
- index = flag2index(FLAGS_TO_MEMORY_TYPE(malloc_ptr->flags()));
- size_t size = malloc_ptr->size();
- if (malloc_ptr->is_arena_memory_record()) {
- // We do have anonymous arenas, they are either used as value objects,
- // which are embedded inside other objects, or used as stack objects.
- _arena_data[index].inc(size);
- used_arena_size += size;
- } else {
- _total_malloced += size;
- _malloc_data[index].inc(size);
- if (malloc_ptr->is_arena_record()) {
- // see if arena memory record present
- MemPointerRecord* next_malloc_ptr = (MemPointerRecordEx*)malloc_itr.peek_next();
- if (next_malloc_ptr != NULL && next_malloc_ptr->is_arena_memory_record()) {
- assert(next_malloc_ptr->is_memory_record_of_arena(malloc_ptr),
- "Arena records do not match");
- size = next_malloc_ptr->size();
- _arena_data[index].inc(size);
- used_arena_size += size;
- malloc_itr.next();
- }
- }
- }
- malloc_ptr = (MemPointerRecordEx*)malloc_itr.next();
- }
-
- // substract used arena size to get size of arena chunk in free list
- index = flag2index(mtChunk);
- _malloc_data[index].reduce(used_arena_size);
- // we really don't know how many chunks in free list, so just set to
- // 0
- _malloc_data[index].overwrite_counter(0);
-
- return true;
-}
-
-// check if there is a safepoint in progress, if so, block the thread
-// for the safepoint
-void MemBaseline::check_safepoint(JavaThread* thr) {
- if (SafepointSynchronize::is_synchronizing()) {
- // grab and drop the SR_lock to honor the safepoint protocol
- MutexLocker ml(thr->SR_lock());
- }
-}
-
-// baseline mmap'd memory records, generate overall summary and summaries by
-// memory types
-bool MemBaseline::baseline_vm_summary(const MemPointerArray* vm_records) {
- MemPointerArrayIteratorImpl vm_itr((MemPointerArray*)vm_records);
- VMMemRegion* vm_ptr = (VMMemRegion*)vm_itr.current();
- int index;
- while (vm_ptr != NULL) {
- if (vm_ptr->is_reserved_region()) {
- index = flag2index(FLAGS_TO_MEMORY_TYPE(vm_ptr->flags()));
- // we use the number of thread stack to count threads
- if (IS_MEMORY_TYPE(vm_ptr->flags(), mtThreadStack)) {
- _number_of_threads ++;
- }
- _total_vm_reserved += vm_ptr->size();
- _vm_data[index].inc(vm_ptr->size(), 0);
- } else {
- _total_vm_committed += vm_ptr->size();
- _vm_data[index].inc(0, vm_ptr->size());
- }
- vm_ptr = (VMMemRegion*)vm_itr.next();
- }
- return true;
-}
-
-// baseline malloc'd memory by callsites, but only the callsites with memory allocation
-// over 1KB are stored.
-bool MemBaseline::baseline_malloc_details(const MemPointerArray* malloc_records) {
- assert(MemTracker::track_callsite(), "detail tracking is off");
-
- MemPointerArrayIteratorImpl malloc_itr(const_cast<MemPointerArray*>(malloc_records));
- MemPointerRecordEx* malloc_ptr = (MemPointerRecordEx*)malloc_itr.current();
- MallocCallsitePointer malloc_callsite;
-
- // initailize malloc callsite array
- if (_malloc_cs == NULL) {
- _malloc_cs = new (std::nothrow) MemPointerArrayImpl<MallocCallsitePointer>(64);
- // out of native memory
- if (_malloc_cs == NULL || _malloc_cs->out_of_memory()) {
- return false;
- }
- } else {
- _malloc_cs->clear();
- }
-
- MemPointerArray* malloc_data = const_cast<MemPointerArray*>(malloc_records);
-
- // sort into callsite pc order. Details are aggregated by callsites
- malloc_data->sort((FN_SORT)malloc_sort_by_pc);
- bool ret = true;
-
- // baseline memory that is totaled over 1 KB
- while (malloc_ptr != NULL) {
- if (!MemPointerRecord::is_arena_memory_record(malloc_ptr->flags())) {
- // skip thread stacks
- if (!IS_MEMORY_TYPE(malloc_ptr->flags(), mtThreadStack)) {
- if (malloc_callsite.addr() != malloc_ptr->pc()) {
- if ((malloc_callsite.amount()/K) > 0) {
- if (!_malloc_cs->append(&malloc_callsite)) {
- ret = false;
- break;
- }
- }
- malloc_callsite = MallocCallsitePointer(malloc_ptr->pc());
- }
- malloc_callsite.inc(malloc_ptr->size());
- }
- }
- malloc_ptr = (MemPointerRecordEx*)malloc_itr.next();
- }
-
- // restore to address order. Snapshot malloc data is maintained in memory
- // address order.
- malloc_data->sort((FN_SORT)malloc_sort_by_addr);
-
- if (!ret) {
- return false;
- }
- // deal with last record
- if (malloc_callsite.addr() != 0 && (malloc_callsite.amount()/K) > 0) {
- if (!_malloc_cs->append(&malloc_callsite)) {
- return false;
- }
- }
- return true;
-}
-
-// baseline mmap'd memory by callsites
-bool MemBaseline::baseline_vm_details(const MemPointerArray* vm_records) {
- assert(MemTracker::track_callsite(), "detail tracking is off");
-
- VMCallsitePointer vm_callsite;
- VMCallsitePointer* cur_callsite = NULL;
- MemPointerArrayIteratorImpl vm_itr((MemPointerArray*)vm_records);
- VMMemRegionEx* vm_ptr = (VMMemRegionEx*)vm_itr.current();
-
- // initialize virtual memory map array
- if (_vm_map == NULL) {
- _vm_map = new (std::nothrow) MemPointerArrayImpl<VMMemRegionEx>(vm_records->length());
- if (_vm_map == NULL || _vm_map->out_of_memory()) {
- return false;
- }
- } else {
- _vm_map->clear();
- }
-
- // initialize virtual memory callsite array
- if (_vm_cs == NULL) {
- _vm_cs = new (std::nothrow) MemPointerArrayImpl<VMCallsitePointer>(64);
- if (_vm_cs == NULL || _vm_cs->out_of_memory()) {
- return false;
- }
- } else {
- _vm_cs->clear();
- }
-
- // consolidate virtual memory data
- VMMemRegionEx* reserved_rec = NULL;
- VMMemRegionEx* committed_rec = NULL;
-
- // vm_ptr is coming in increasing base address order
- while (vm_ptr != NULL) {
- if (vm_ptr->is_reserved_region()) {
- // consolidate reserved memory regions for virtual memory map.
- // The criteria for consolidation is:
- // 1. two adjacent reserved memory regions
- // 2. belong to the same memory type
- // 3. reserved from the same callsite
- if (reserved_rec == NULL ||
- reserved_rec->base() + reserved_rec->size() != vm_ptr->addr() ||
- FLAGS_TO_MEMORY_TYPE(reserved_rec->flags()) != FLAGS_TO_MEMORY_TYPE(vm_ptr->flags()) ||
- reserved_rec->pc() != vm_ptr->pc()) {
- if (!_vm_map->append(vm_ptr)) {
+ bool do_allocation_site(const ReservedMemoryRegion* rgn) {
+ if (rgn->size() >= MemBaseline::SIZE_THRESHOLD) {
+ if (_virtual_memory_regions.add(*rgn) != NULL) {
+ _count ++;
+ return true;
+ } else {
return false;
}
- // inserted reserved region, we need the pointer to the element in virtual
- // memory map array.
- reserved_rec = (VMMemRegionEx*)_vm_map->at(_vm_map->length() - 1);
- } else {
- reserved_rec->expand_region(vm_ptr->addr(), vm_ptr->size());
}
-
- if (cur_callsite != NULL && !_vm_cs->append(cur_callsite)) {
- return false;
- }
- vm_callsite = VMCallsitePointer(vm_ptr->pc());
- cur_callsite = &vm_callsite;
- vm_callsite.inc(vm_ptr->size(), 0);
- } else {
- // consolidate committed memory regions for virtual memory map
- // The criterial is:
- // 1. two adjacent committed memory regions
- // 2. committed from the same callsite
- if (committed_rec == NULL ||
- committed_rec->base() + committed_rec->size() != vm_ptr->addr() ||
- committed_rec->pc() != vm_ptr->pc()) {
- if (!_vm_map->append(vm_ptr)) {
- return false;
- }
- committed_rec = (VMMemRegionEx*)_vm_map->at(_vm_map->length() - 1);
- } else {
- committed_rec->expand_region(vm_ptr->addr(), vm_ptr->size());
- }
- vm_callsite.inc(0, vm_ptr->size());
- }
- vm_ptr = (VMMemRegionEx*)vm_itr.next();
+ return true;
}
- // deal with last record
- if (cur_callsite != NULL && !_vm_cs->append(cur_callsite)) {
+
+ LinkedList<ReservedMemoryRegion>* virtual_memory_allocations() {
+ return &_virtual_memory_regions;
+ }
+};
+
+
+bool MemBaseline::baseline_summary() {
+ assert(_malloc_memory_snapshot == NULL, "Malloc baseline not yet reset");
+ assert(_virtual_memory_snapshot == NULL, "Virtual baseline not yet reset");
+
+ _malloc_memory_snapshot = new (arena()) MallocMemorySnapshot();
+ _virtual_memory_snapshot = new (arena()) VirtualMemorySnapshot();
+ if (_malloc_memory_snapshot == NULL || _virtual_memory_snapshot == NULL) {
+ return false;
+ }
+ MallocMemorySummary::snapshot(_malloc_memory_snapshot);
+ VirtualMemorySummary::snapshot(_virtual_memory_snapshot);
+ return true;
+}
+
+bool MemBaseline::baseline_allocation_sites() {
+ assert(arena() != NULL, "Just check");
+ // Malloc allocation sites
+ MallocAllocationSiteWalker malloc_walker(arena());
+ if (!MallocSiteTable::walk_malloc_site(&malloc_walker)) {
return false;
}
- // sort it into callsite pc order. Details are aggregated by callsites
- _vm_cs->sort((FN_SORT)bl_vm_sort_by_pc);
+ _malloc_sites.set_head(malloc_walker.malloc_sites()->head());
+ // The malloc sites are collected in size order
+ _malloc_sites_order = by_size;
- // walk the array to consolidate record by pc
- MemPointerArrayIteratorImpl itr(_vm_cs);
- VMCallsitePointer* callsite_rec = (VMCallsitePointer*)itr.current();
- VMCallsitePointer* next_rec = (VMCallsitePointer*)itr.next();
- while (next_rec != NULL) {
- assert(callsite_rec != NULL, "Sanity check");
- if (next_rec->addr() == callsite_rec->addr()) {
- callsite_rec->inc(next_rec->reserved_amount(), next_rec->committed_amount());
- itr.remove();
- next_rec = (VMCallsitePointer*)itr.current();
- } else {
- callsite_rec = next_rec;
- next_rec = (VMCallsitePointer*)itr.next();
- }
+ // Virtual memory allocation sites
+ VirtualMemoryAllocationWalker virtual_memory_walker(arena());
+ if (!VirtualMemoryTracker::walk_virtual_memory(&virtual_memory_walker)) {
+ return false;
+ }
+
+ // Virtual memory allocations are collected in call stack order
+ _virtual_memory_allocations.set_head(virtual_memory_walker.virtual_memory_allocations()->head());
+
+ if (!aggregate_virtual_memory_allocation_sites()) {
+ return false;
+ }
+ // Virtual memory allocation sites are aggregrated in call stack order
+ _virtual_memory_sites_order = by_address;
+
+ return true;
+}
+
+bool MemBaseline::baseline(bool summaryOnly) {
+ if (arena() == NULL) {
+ _arena = new (std::nothrow, mtNMT) Arena(mtNMT);
+ if (arena() == NULL) return false;
+ }
+
+ reset();
+
+ _class_count = InstanceKlass::number_of_instance_classes();
+
+ if (!baseline_summary()) {
+ return false;
+ }
+
+ _baseline_type = Summary_baselined;
+
+ // baseline details
+ if (!summaryOnly &&
+ MemTracker::tracking_level() == NMT_detail) {
+ baseline_allocation_sites();
+ _baseline_type = Detail_baselined;
}
return true;
}
-// baseline a snapshot. If summary_only = false, memory usages aggregated by
-// callsites are also baselined.
-// The method call can be lengthy, especially when detail tracking info is
-// requested. So the method checks for safepoint explicitly.
-bool MemBaseline::baseline(MemSnapshot& snapshot, bool summary_only) {
- Thread* THREAD = Thread::current();
- assert(THREAD->is_Java_thread(), "must be a JavaThread");
- MutexLocker snapshot_locker(snapshot._lock);
- reset();
- _baselined = baseline_malloc_summary(snapshot._alloc_ptrs);
- if (_baselined) {
- check_safepoint((JavaThread*)THREAD);
- _baselined = baseline_vm_summary(snapshot._vm_ptrs);
- }
- _number_of_classes = snapshot.number_of_classes();
+int compare_allocation_site(const VirtualMemoryAllocationSite& s1,
+ const VirtualMemoryAllocationSite& s2) {
+ return s1.call_stack()->compare(*s2.call_stack());
+}
- if (!summary_only && MemTracker::track_callsite() && _baselined) {
- check_safepoint((JavaThread*)THREAD);
- _baselined = baseline_malloc_details(snapshot._alloc_ptrs);
- if (_baselined) {
- check_safepoint((JavaThread*)THREAD);
- _baselined = baseline_vm_details(snapshot._vm_ptrs);
+bool MemBaseline::aggregate_virtual_memory_allocation_sites() {
+ SortedLinkedList<VirtualMemoryAllocationSite, compare_allocation_site, ResourceObj::ARENA>
+ allocation_sites(arena());
+
+ VirtualMemoryAllocationIterator itr = virtual_memory_allocations();
+ const ReservedMemoryRegion* rgn;
+ VirtualMemoryAllocationSite* site;
+ while ((rgn = itr.next()) != NULL) {
+ VirtualMemoryAllocationSite tmp(*rgn->call_stack());
+ site = allocation_sites.find(tmp);
+ if (site == NULL) {
+ LinkedListNode<VirtualMemoryAllocationSite>* node =
+ allocation_sites.add(tmp);
+ if (node == NULL) return false;
+ site = node->data();
}
- }
- return _baselined;
-}
-
-
-int MemBaseline::flag2index(MEMFLAGS flag) const {
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- if (MemType2NameMap[index]._flag == flag) {
- return index;
- }
- }
- assert(false, "no type");
- return -1;
-}
-
-const char* MemBaseline::type2name(MEMFLAGS type) {
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- if (MemType2NameMap[index]._flag == type) {
- return MemType2NameMap[index]._name;
- }
- }
- assert(false, err_msg("bad type %x", type));
- return NULL;
-}
-
-
-MemBaseline& MemBaseline::operator=(const MemBaseline& other) {
- _total_malloced = other._total_malloced;
- _total_vm_reserved = other._total_vm_reserved;
- _total_vm_committed = other._total_vm_committed;
-
- _baselined = other._baselined;
- _number_of_classes = other._number_of_classes;
-
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- _malloc_data[index] = other._malloc_data[index];
- _vm_data[index] = other._vm_data[index];
- _arena_data[index] = other._arena_data[index];
+ site->reserve_memory(rgn->size());
+ site->commit_memory(rgn->committed_size());
}
- if (MemTracker::track_callsite()) {
- assert(_malloc_cs != NULL && _vm_cs != NULL, "out of memory");
- assert(other._malloc_cs != NULL && other._vm_cs != NULL,
- "not properly baselined");
- _malloc_cs->clear();
- _vm_cs->clear();
- int index;
- for (index = 0; index < other._malloc_cs->length(); index ++) {
- _malloc_cs->append(other._malloc_cs->at(index));
- }
+ _virtual_memory_sites.set_head(allocation_sites.head());
+ return true;
+}
- for (index = 0; index < other._vm_cs->length(); index ++) {
- _vm_cs->append(other._vm_cs->at(index));
- }
+MallocSiteIterator MemBaseline::malloc_sites(SortingOrder order) {
+ assert(!_malloc_sites.is_empty(), "Detail baseline?");
+ switch(order) {
+ case by_size:
+ malloc_sites_to_size_order();
+ break;
+ case by_site:
+ malloc_sites_to_allocation_site_order();
+ break;
+ case by_address:
+ default:
+ ShouldNotReachHere();
}
- return *this;
+ return MallocSiteIterator(_malloc_sites.head());
}
-/* compare functions for sorting */
-
-// sort snapshot malloc'd records in callsite pc order
-int MemBaseline::malloc_sort_by_pc(const void* p1, const void* p2) {
- assert(MemTracker::track_callsite(),"Just check");
- const MemPointerRecordEx* mp1 = (const MemPointerRecordEx*)p1;
- const MemPointerRecordEx* mp2 = (const MemPointerRecordEx*)p2;
- return UNSIGNED_COMPARE(mp1->pc(), mp2->pc());
-}
-
-// sort baselined malloc'd records in size order
-int MemBaseline::bl_malloc_sort_by_size(const void* p1, const void* p2) {
- assert(MemTracker::is_on(), "Just check");
- const MallocCallsitePointer* mp1 = (const MallocCallsitePointer*)p1;
- const MallocCallsitePointer* mp2 = (const MallocCallsitePointer*)p2;
- return UNSIGNED_COMPARE(mp2->amount(), mp1->amount());
-}
-
-// sort baselined malloc'd records in callsite pc order
-int MemBaseline::bl_malloc_sort_by_pc(const void* p1, const void* p2) {
- assert(MemTracker::is_on(), "Just check");
- const MallocCallsitePointer* mp1 = (const MallocCallsitePointer*)p1;
- const MallocCallsitePointer* mp2 = (const MallocCallsitePointer*)p2;
- return UNSIGNED_COMPARE(mp1->addr(), mp2->addr());
+VirtualMemorySiteIterator MemBaseline::virtual_memory_sites(SortingOrder order) {
+ assert(!_virtual_memory_sites.is_empty(), "Detail baseline?");
+ switch(order) {
+ case by_size:
+ virtual_memory_sites_to_size_order();
+ break;
+ case by_site:
+ virtual_memory_sites_to_reservation_site_order();
+ break;
+ case by_address:
+ default:
+ ShouldNotReachHere();
+ }
+ return VirtualMemorySiteIterator(_virtual_memory_sites.head());
}
-// sort baselined mmap'd records in size (reserved size) order
-int MemBaseline::bl_vm_sort_by_size(const void* p1, const void* p2) {
- assert(MemTracker::is_on(), "Just check");
- const VMCallsitePointer* mp1 = (const VMCallsitePointer*)p1;
- const VMCallsitePointer* mp2 = (const VMCallsitePointer*)p2;
- return UNSIGNED_COMPARE(mp2->reserved_amount(), mp1->reserved_amount());
+// Sorting allocations sites in different orders
+void MemBaseline::malloc_sites_to_size_order() {
+ if (_malloc_sites_order != by_size) {
+ SortedLinkedList<MallocSite, compare_malloc_size, ResourceObj::ARENA>
+ tmp(arena());
+
+ // Add malloc sites to sorted linked list to sort into size order
+ tmp.move(&_malloc_sites);
+ _malloc_sites.set_head(tmp.head());
+ tmp.set_head(NULL);
+ _malloc_sites_order = by_size;
+ }
}
-// sort baselined mmap'd records in callsite pc order
-int MemBaseline::bl_vm_sort_by_pc(const void* p1, const void* p2) {
- assert(MemTracker::is_on(), "Just check");
- const VMCallsitePointer* mp1 = (const VMCallsitePointer*)p1;
- const VMCallsitePointer* mp2 = (const VMCallsitePointer*)p2;
- return UNSIGNED_COMPARE(mp1->addr(), mp2->addr());
+void MemBaseline::malloc_sites_to_allocation_site_order() {
+ if (_malloc_sites_order != by_site) {
+ SortedLinkedList<MallocSite, compare_malloc_site, ResourceObj::ARENA>
+ tmp(arena());
+ // Add malloc sites to sorted linked list to sort into site (address) order
+ tmp.move(&_malloc_sites);
+ _malloc_sites.set_head(tmp.head());
+ tmp.set_head(NULL);
+ _malloc_sites_order = by_site;
+ }
}
+void MemBaseline::virtual_memory_sites_to_size_order() {
+ if (_virtual_memory_sites_order != by_size) {
+ SortedLinkedList<VirtualMemoryAllocationSite, compare_virtual_memory_size, ResourceObj::ARENA>
+ tmp(arena());
-// sort snapshot malloc'd records in memory block address order
-int MemBaseline::malloc_sort_by_addr(const void* p1, const void* p2) {
- assert(MemTracker::is_on(), "Just check");
- const MemPointerRecord* mp1 = (const MemPointerRecord*)p1;
- const MemPointerRecord* mp2 = (const MemPointerRecord*)p2;
- int delta = UNSIGNED_COMPARE(mp1->addr(), mp2->addr());
- assert(p1 == p2 || delta != 0, "dup pointer");
- return delta;
+ tmp.move(&_virtual_memory_sites);
+
+ _virtual_memory_sites.set_head(tmp.head());
+ tmp.set_head(NULL);
+ _virtual_memory_sites_order = by_size;
+ }
+}
+
+void MemBaseline::virtual_memory_sites_to_reservation_site_order() {
+ if (_virtual_memory_sites_order != by_size) {
+ SortedLinkedList<VirtualMemoryAllocationSite, compare_virtual_memory_site, ResourceObj::ARENA>
+ tmp(arena());
+
+ tmp.add(&_virtual_memory_sites);
+
+ _virtual_memory_sites.set_head(tmp.head());
+ tmp.set_head(NULL);
+
+ _virtual_memory_sites_order = by_size;
+ }
}
diff --git a/hotspot/src/share/vm/services/memBaseline.hpp b/hotspot/src/share/vm/services/memBaseline.hpp
index 864c6cc..bf742f8 100644
--- a/hotspot/src/share/vm/services/memBaseline.hpp
+++ b/hotspot/src/share/vm/services/memBaseline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,425 +25,205 @@
#ifndef SHARE_VM_SERVICES_MEM_BASELINE_HPP
#define SHARE_VM_SERVICES_MEM_BASELINE_HPP
+#if INCLUDE_NMT
+
#include "memory/allocation.hpp"
#include "runtime/mutex.hpp"
-#include "services/memPtr.hpp"
-#include "services/memSnapshot.hpp"
+#include "services/mallocSiteTable.hpp"
+#include "services/mallocTracker.hpp"
+#include "services/nmtCommon.hpp"
+#include "services/virtualMemoryTracker.hpp"
+#include "utilities/linkedlist.hpp"
-// compare unsigned number
-#define UNSIGNED_COMPARE(a, b) ((a > b) ? 1 : ((a == b) ? 0 : -1))
+typedef LinkedListIterator<MallocSite> MallocSiteIterator;
+typedef LinkedListIterator<VirtualMemoryAllocationSite> VirtualMemorySiteIterator;
+typedef LinkedListIterator<ReservedMemoryRegion> VirtualMemoryAllocationIterator;
/*
- * MallocCallsitePointer and VMCallsitePointer are used
- * to baseline memory blocks with their callsite information.
- * They are only available when detail tracking is turned
- * on.
- */
-
-/* baselined malloc record aggregated by callsite */
-class MallocCallsitePointer : public MemPointer {
- private:
- size_t _count; // number of malloc invocation from this callsite
- size_t _amount; // total amount of memory malloc-ed from this callsite
-
- public:
- MallocCallsitePointer() {
- _count = 0;
- _amount = 0;
- }
-
- MallocCallsitePointer(address pc) : MemPointer(pc) {
- _count = 0;
- _amount = 0;
- }
-
- MallocCallsitePointer& operator=(const MallocCallsitePointer& p) {
- MemPointer::operator=(p);
- _count = p.count();
- _amount = p.amount();
- return *this;
- }
-
- inline void inc(size_t size) {
- _count ++;
- _amount += size;
- };
-
- inline size_t count() const {
- return _count;
- }
-
- inline size_t amount() const {
- return _amount;
- }
-};
-
-// baselined virtual memory record aggregated by callsite
-class VMCallsitePointer : public MemPointer {
- private:
- size_t _count; // number of invocation from this callsite
- size_t _reserved_amount; // total reserved amount
- size_t _committed_amount; // total committed amount
-
- public:
- VMCallsitePointer() {
- _count = 0;
- _reserved_amount = 0;
- _committed_amount = 0;
- }
-
- VMCallsitePointer(address pc) : MemPointer(pc) {
- _count = 0;
- _reserved_amount = 0;
- _committed_amount = 0;
- }
-
- VMCallsitePointer& operator=(const VMCallsitePointer& p) {
- MemPointer::operator=(p);
- _count = p.count();
- _reserved_amount = p.reserved_amount();
- _committed_amount = p.committed_amount();
- return *this;
- }
-
- inline void inc(size_t reserved, size_t committed) {
- _count ++;
- _reserved_amount += reserved;
- _committed_amount += committed;
- }
-
- inline size_t count() const {
- return _count;
- }
-
- inline size_t reserved_amount() const {
- return _reserved_amount;
- }
-
- inline size_t committed_amount() const {
- return _committed_amount;
- }
-};
-
-// maps a memory type flag to readable name
-typedef struct _memType2Name {
- MEMFLAGS _flag;
- const char* _name;
-} MemType2Name;
-
-
-// This class aggregates malloc'd records by memory type
-class MallocMem VALUE_OBJ_CLASS_SPEC {
- private:
- MEMFLAGS _type;
-
- size_t _count;
- size_t _amount;
-
- public:
- MallocMem() {
- _type = mtNone;
- _count = 0;
- _amount = 0;
- }
-
- MallocMem(MEMFLAGS flags) {
- assert(HAS_VALID_MEMORY_TYPE(flags), "no type");
- _type = FLAGS_TO_MEMORY_TYPE(flags);
- _count = 0;
- _amount = 0;
- }
-
- inline void set_type(MEMFLAGS flag) {
- _type = flag;
- }
-
- inline void clear() {
- _count = 0;
- _amount = 0;
- _type = mtNone;
- }
-
- MallocMem& operator=(const MallocMem& m) {
- assert(_type == m.type(), "different type");
- _count = m.count();
- _amount = m.amount();
- return *this;
- }
-
- inline void inc(size_t amt) {
- _amount += amt;
- _count ++;
- }
-
- inline void reduce(size_t amt) {
- assert(_amount >= amt, "Just check");
- _amount -= amt;
- }
-
- inline void overwrite_counter(size_t count) {
- _count = count;
- }
-
- inline MEMFLAGS type() const {
- return _type;
- }
-
- inline bool is_type(MEMFLAGS flags) const {
- return FLAGS_TO_MEMORY_TYPE(flags) == _type;
- }
-
- inline size_t count() const {
- return _count;
- }
-
- inline size_t amount() const {
- return _amount;
- }
-};
-
-// This class records live arena's memory usage
-class ArenaMem : public MallocMem {
- public:
- ArenaMem(MEMFLAGS typeflag): MallocMem(typeflag) {
- }
- ArenaMem() { }
-};
-
-// This class aggregates virtual memory by its memory type
-class VMMem VALUE_OBJ_CLASS_SPEC {
- private:
- MEMFLAGS _type;
-
- size_t _count;
- size_t _reserved_amount;
- size_t _committed_amount;
-
- public:
- VMMem() {
- _type = mtNone;
- _count = 0;
- _reserved_amount = 0;
- _committed_amount = 0;
- }
-
- VMMem(MEMFLAGS flags) {
- assert(HAS_VALID_MEMORY_TYPE(flags), "no type");
- _type = FLAGS_TO_MEMORY_TYPE(flags);
- _count = 0;
- _reserved_amount = 0;
- _committed_amount = 0;
- }
-
- inline void clear() {
- _type = mtNone;
- _count = 0;
- _reserved_amount = 0;
- _committed_amount = 0;
- }
-
- inline void set_type(MEMFLAGS flags) {
- _type = FLAGS_TO_MEMORY_TYPE(flags);
- }
-
- VMMem& operator=(const VMMem& m) {
- assert(_type == m.type(), "different type");
-
- _count = m.count();
- _reserved_amount = m.reserved_amount();
- _committed_amount = m.committed_amount();
- return *this;
- }
-
-
- inline MEMFLAGS type() const {
- return _type;
- }
-
- inline bool is_type(MEMFLAGS flags) const {
- return FLAGS_TO_MEMORY_TYPE(flags) == _type;
- }
-
- inline void inc(size_t reserved_amt, size_t committed_amt) {
- _reserved_amount += reserved_amt;
- _committed_amount += committed_amt;
- _count ++;
- }
-
- inline size_t count() const {
- return _count;
- }
-
- inline size_t reserved_amount() const {
- return _reserved_amount;
- }
-
- inline size_t committed_amount() const {
- return _committed_amount;
- }
-};
-
-
-
-#define NUMBER_OF_MEMORY_TYPE (mt_number_of_types + 1)
-
-class BaselineReporter;
-class BaselineComparisonReporter;
-
-/*
- * This class baselines current memory snapshot.
- * A memory baseline summarizes memory usage by memory type,
- * aggregates memory usage by callsites when detail tracking
- * is on.
+ * Baseline a memory snapshot
*/
class MemBaseline VALUE_OBJ_CLASS_SPEC {
- friend class BaselineReporter;
- friend class BaselineComparisonReporter;
+ public:
+ enum BaselineThreshold {
+ SIZE_THRESHOLD = K // Only allocation size over this threshold will be baselined.
+ };
+
+ enum BaselineType {
+ Not_baselined,
+ Summary_baselined,
+ Detail_baselined
+ };
+
+ enum SortingOrder {
+ by_address, // by memory address
+ by_size, // by memory size
+ by_site // by call site where the memory is allocated from
+ };
private:
- // overall summaries
- size_t _total_malloced;
- size_t _total_vm_reserved;
- size_t _total_vm_committed;
- size_t _number_of_classes;
- size_t _number_of_threads;
+ // All baseline data is stored in this arena
+ Arena* _arena;
- // if it has properly baselined
- bool _baselined;
+ // Summary information
+ MallocMemorySnapshot* _malloc_memory_snapshot;
+ VirtualMemorySnapshot* _virtual_memory_snapshot;
- // we categorize memory into three categories within the memory type
- MallocMem _malloc_data[NUMBER_OF_MEMORY_TYPE];
- VMMem _vm_data[NUMBER_OF_MEMORY_TYPE];
- ArenaMem _arena_data[NUMBER_OF_MEMORY_TYPE];
+ size_t _class_count;
- // memory records that aggregate memory usage by callsites.
- // only available when detail tracking is on.
- MemPointerArray* _malloc_cs;
- MemPointerArray* _vm_cs;
- // virtual memory map
- MemPointerArray* _vm_map;
+ // Allocation sites information
+ // Malloc allocation sites
+ LinkedListImpl<MallocSite, ResourceObj::ARENA>
+ _malloc_sites;
- private:
- static MemType2Name MemType2NameMap[NUMBER_OF_MEMORY_TYPE];
+ // All virtual memory allocations
+ LinkedListImpl<ReservedMemoryRegion, ResourceObj::ARENA>
+ _virtual_memory_allocations;
- private:
- // should not use copy constructor
- MemBaseline(MemBaseline& copy) { ShouldNotReachHere(); }
+ // Virtual memory allocations by allocation sites, always in by_address
+ // order
+ LinkedListImpl<VirtualMemoryAllocationSite, ResourceObj::ARENA>
+ _virtual_memory_sites;
- // check and block at a safepoint
- static inline void check_safepoint(JavaThread* thr);
+ SortingOrder _malloc_sites_order;
+ SortingOrder _virtual_memory_sites_order;
+
+ BaselineType _baseline_type;
public:
// create a memory baseline
- MemBaseline();
-
- ~MemBaseline();
-
- inline bool baselined() const {
- return _baselined;
+ MemBaseline():
+ _baseline_type(Not_baselined),
+ _class_count(0),
+ _arena(NULL),
+ _malloc_memory_snapshot(NULL),
+ _virtual_memory_snapshot(NULL),
+ _malloc_sites(NULL) {
}
- MemBaseline& operator=(const MemBaseline& other);
+ ~MemBaseline() {
+ reset();
+ if (_arena != NULL) {
+ delete _arena;
+ }
+ }
+
+ bool baseline(bool summaryOnly = true);
+
+ BaselineType baseline_type() const { return _baseline_type; }
+
+ MallocMemorySnapshot* malloc_memory_snapshot() const {
+ return _malloc_memory_snapshot;
+ }
+
+ VirtualMemorySnapshot* virtual_memory_snapshot() const {
+ return _virtual_memory_snapshot;
+ }
+
+ MallocSiteIterator malloc_sites(SortingOrder order);
+ VirtualMemorySiteIterator virtual_memory_sites(SortingOrder order);
+
+ // Virtual memory allocation iterator always returns in virtual memory
+ // base address order.
+ VirtualMemoryAllocationIterator virtual_memory_allocations() {
+ assert(!_virtual_memory_allocations.is_empty(), "Not detail baseline");
+ return VirtualMemoryAllocationIterator(_virtual_memory_allocations.head());
+ }
+
+ // Total reserved memory = total malloc'd memory + total reserved virtual
+ // memory
+ size_t total_reserved_memory() const {
+ assert(baseline_type() != Not_baselined, "Not yet baselined");
+ assert(_virtual_memory_snapshot != NULL, "No virtual memory snapshot");
+ assert(_malloc_memory_snapshot != NULL, "No malloc memory snapshot");
+ size_t amount = _malloc_memory_snapshot->total() +
+ _virtual_memory_snapshot->total_reserved();
+ return amount;
+ }
+
+ // Total committed memory = total malloc'd memory + total committed
+ // virtual memory
+ size_t total_committed_memory() const {
+ assert(baseline_type() != Not_baselined, "Not yet baselined");
+ assert(_virtual_memory_snapshot != NULL,
+ "Not a snapshot");
+ size_t amount = _malloc_memory_snapshot->total() +
+ _virtual_memory_snapshot->total_committed();
+ return amount;
+ }
+
+ size_t total_arena_memory() const {
+ assert(baseline_type() != Not_baselined, "Not yet baselined");
+ assert(_malloc_memory_snapshot != NULL, "Not yet baselined");
+ return _malloc_memory_snapshot->total_arena();
+ }
+
+ size_t malloc_tracking_overhead() const {
+ assert(baseline_type() != Not_baselined, "Not yet baselined");
+ return _malloc_memory_snapshot->malloc_overhead()->size();
+ }
+
+ const MallocMemory* malloc_memory(MEMFLAGS flag) const {
+ assert(_malloc_memory_snapshot != NULL, "Not a snapshot");
+ return _malloc_memory_snapshot->by_type(flag);
+ }
+
+ const VirtualMemory* virtual_memory(MEMFLAGS flag) const {
+ assert(_virtual_memory_snapshot != NULL, "Not a snapshot");
+ return _virtual_memory_snapshot->by_type(flag);
+ }
+
+
+ size_t class_count() const {
+ assert(baseline_type() != Not_baselined, "Not yet baselined");
+ return _class_count;
+ }
+
+ size_t thread_count() const {
+ assert(baseline_type() != Not_baselined, "Not yet baselined");
+ assert(_malloc_memory_snapshot != NULL, "Baselined?");
+ return _malloc_memory_snapshot->thread_count();
+ }
// reset the baseline for reuse
- void clear();
+ void reset() {
+ _baseline_type = Not_baselined;
+ _malloc_memory_snapshot = NULL;
+ _virtual_memory_snapshot = NULL;
+ _class_count = 0;
- // baseline the snapshot
- bool baseline(MemSnapshot& snapshot, bool summary_only = true);
+ _malloc_sites = NULL;
+ _virtual_memory_sites = NULL;
+ _virtual_memory_allocations = NULL;
- bool baseline(const MemPointerArray* malloc_records,
- const MemPointerArray* vm_records,
- bool summary_only = true);
-
- // total malloc'd memory of specified memory type
- inline size_t malloc_amount(MEMFLAGS flag) const {
- return _malloc_data[flag2index(flag)].amount();
+ if (_arena != NULL) {
+ _arena->destruct_contents();
+ }
}
- // number of malloc'd memory blocks of specified memory type
- inline size_t malloc_count(MEMFLAGS flag) const {
- return _malloc_data[flag2index(flag)].count();
- }
- // total memory used by arenas of specified memory type
- inline size_t arena_amount(MEMFLAGS flag) const {
- return _arena_data[flag2index(flag)].amount();
- }
- // number of arenas of specified memory type
- inline size_t arena_count(MEMFLAGS flag) const {
- return _arena_data[flag2index(flag)].count();
- }
- // total reserved memory of specified memory type
- inline size_t reserved_amount(MEMFLAGS flag) const {
- return _vm_data[flag2index(flag)].reserved_amount();
- }
- // total committed memory of specified memory type
- inline size_t committed_amount(MEMFLAGS flag) const {
- return _vm_data[flag2index(flag)].committed_amount();
- }
- // total memory (malloc'd + mmap'd + arena) of specified
- // memory type
- inline size_t total_amount(MEMFLAGS flag) const {
- int index = flag2index(flag);
- return _malloc_data[index].amount() +
- _vm_data[index].reserved_amount() +
- _arena_data[index].amount();
- }
-
- /* overall summaries */
-
- // total malloc'd memory in snapshot
- inline size_t total_malloc_amount() const {
- return _total_malloced;
- }
- // total mmap'd memory in snapshot
- inline size_t total_reserved_amount() const {
- return _total_vm_reserved;
- }
- // total committed memory in snapshot
- inline size_t total_committed_amount() const {
- return _total_vm_committed;
- }
- // number of loaded classes
- inline size_t number_of_classes() const {
- return _number_of_classes;
- }
- // number of running threads
- inline size_t number_of_threads() const {
- return _number_of_threads;
- }
- // lookup human readable name of a memory type
- static const char* type2name(MEMFLAGS type);
private:
- // convert memory flag to the index to mapping table
- int flag2index(MEMFLAGS flag) const;
+ // Baseline summary information
+ bool baseline_summary();
- // reset baseline values
- void reset();
+ // Baseline allocation sites (detail tracking only)
+ bool baseline_allocation_sites();
- // summarize the records in global snapshot
- bool baseline_malloc_summary(const MemPointerArray* malloc_records);
- bool baseline_vm_summary(const MemPointerArray* vm_records);
- bool baseline_malloc_details(const MemPointerArray* malloc_records);
- bool baseline_vm_details(const MemPointerArray* vm_records);
+ // Aggregate virtual memory allocation by allocation sites
+ bool aggregate_virtual_memory_allocation_sites();
- // print a line of malloc'd memory aggregated by callsite
- void print_malloc_callsite(outputStream* st, address pc, size_t size,
- size_t count, int diff_amt, int diff_count) const;
- // print a line of mmap'd memory aggregated by callsite
- void print_vm_callsite(outputStream* st, address pc, size_t rsz,
- size_t csz, int diff_rsz, int diff_csz) const;
+ Arena* arena() { return _arena; }
- // sorting functions for raw records
- static int malloc_sort_by_pc(const void* p1, const void* p2);
- static int malloc_sort_by_addr(const void* p1, const void* p2);
+ // Sorting allocation sites in different orders
+ // Sort allocation sites in size order
+ void malloc_sites_to_size_order();
+ // Sort allocation sites in call site address order
+ void malloc_sites_to_allocation_site_order();
- private:
- // sorting functions for baselined records
- static int bl_malloc_sort_by_size(const void* p1, const void* p2);
- static int bl_vm_sort_by_size(const void* p1, const void* p2);
- static int bl_malloc_sort_by_pc(const void* p1, const void* p2);
- static int bl_vm_sort_by_pc(const void* p1, const void* p2);
+ // Sort allocation sites in reserved size order
+ void virtual_memory_sites_to_size_order();
+ // Sort allocation sites in call site address order
+ void virtual_memory_sites_to_reservation_site_order();
};
+#endif // INCLUDE_NMT
#endif // SHARE_VM_SERVICES_MEM_BASELINE_HPP
diff --git a/hotspot/src/share/vm/services/memPtr.hpp b/hotspot/src/share/vm/services/memPtr.hpp
deleted file mode 100644
index cae454c..0000000
--- a/hotspot/src/share/vm/services/memPtr.hpp
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_SERVICES_MEM_PTR_HPP
-#define SHARE_VM_SERVICES_MEM_PTR_HPP
-
-#include "memory/allocation.hpp"
-#include "runtime/os.hpp"
-#include "runtime/safepoint.hpp"
-
-/*
- * global sequence generator that generates sequence numbers to serialize
- * memory records.
- */
-class SequenceGenerator : AllStatic {
- public:
- static jint next();
-
- // peek last sequence number
- static jint peek() {
- return _seq_number;
- }
-
- // reset sequence number
- static void reset() {
- assert(SafepointSynchronize::is_at_safepoint(), "Safepoint required");
- _seq_number = 1;
- _generation ++;
- };
-
- static unsigned long current_generation() { return _generation; }
- NOT_PRODUCT(static jint max_seq_num() { return _max_seq_number; })
-
- private:
- static volatile jint _seq_number;
- static volatile unsigned long _generation;
- NOT_PRODUCT(static jint _max_seq_number; )
-};
-
-/*
- * followings are the classes that are used to hold memory activity records in different stages.
- * MemPointer
- * |--------MemPointerRecord
- * |
- * |----MemPointerRecordEx
- * | |
- * | |-------SeqMemPointerRecordEx
- * |
- * |----SeqMemPointerRecord
- * |
- * |----VMMemRegion
- * |
- * |-----VMMemRegionEx
- *
- *
- * prefix 'Seq' - sequenced, the record contains a sequence number
- * surfix 'Ex' - extension, the record contains a caller's pc
- *
- * per-thread recorder : SeqMemPointerRecord(Ex)
- * snapshot staging : SeqMemPointerRecord(Ex)
- * snapshot : MemPointerRecord(Ex) and VMMemRegion(Ex)
- *
- */
-
-/*
- * class that wraps an address to a memory block,
- * the memory pointer either points to a malloc'd
- * memory block, or a mmap'd memory block
- */
-class MemPointer VALUE_OBJ_CLASS_SPEC {
- public:
- MemPointer(): _addr(0) { }
- MemPointer(address addr): _addr(addr) { }
-
- MemPointer(const MemPointer& copy_from) {
- _addr = copy_from.addr();
- }
-
- inline address addr() const {
- return _addr;
- }
-
- inline operator address() const {
- return addr();
- }
-
- inline bool operator == (const MemPointer& other) const {
- return addr() == other.addr();
- }
-
- inline MemPointer& operator = (const MemPointer& other) {
- _addr = other.addr();
- return *this;
- }
-
- protected:
- inline void set_addr(address addr) { _addr = addr; }
-
- protected:
- // memory address
- address _addr;
-};
-
-/* MemPointerRecord records an activityand associated
- * attributes on a memory block.
- */
-class MemPointerRecord : public MemPointer {
- private:
- MEMFLAGS _flags;
- size_t _size;
-
-public:
- /* extension of MemoryType enum
- * see share/vm/memory/allocation.hpp for details.
- *
- * The tag values are associated to sorting orders, so be
- * careful if changes are needed.
- * The allocation records should be sorted ahead of tagging
- * records, which in turn ahead of deallocation records
- */
- enum MemPointerTags {
- tag_alloc = 0x0001, // malloc or reserve record
- tag_commit = 0x0002, // commit record
- tag_type = 0x0003, // tag virtual memory to a memory type
- tag_uncommit = 0x0004, // uncommit record
- tag_release = 0x0005, // free or release record
- tag_size = 0x0006, // arena size
- tag_masks = 0x0007, // all tag bits
- vmBit = 0x0008
- };
-
- /* helper functions to interpret the tagging flags */
-
- inline static bool is_allocation_record(MEMFLAGS flags) {
- return (flags & tag_masks) == tag_alloc;
- }
-
- inline static bool is_deallocation_record(MEMFLAGS flags) {
- return (flags & tag_masks) == tag_release;
- }
-
- inline static bool is_arena_record(MEMFLAGS flags) {
- return (flags & (otArena | tag_size)) == otArena;
- }
-
- inline static bool is_arena_memory_record(MEMFLAGS flags) {
- return (flags & (otArena | tag_size)) == (otArena | tag_size);
- }
-
- inline static bool is_virtual_memory_record(MEMFLAGS flags) {
- return (flags & vmBit) != 0;
- }
-
- inline static bool is_virtual_memory_reserve_record(MEMFLAGS flags) {
- return (flags & 0x0F) == (tag_alloc | vmBit);
- }
-
- inline static bool is_virtual_memory_commit_record(MEMFLAGS flags) {
- return (flags & 0x0F) == (tag_commit | vmBit);
- }
-
- inline static bool is_virtual_memory_uncommit_record(MEMFLAGS flags) {
- return (flags & 0x0F) == (tag_uncommit | vmBit);
- }
-
- inline static bool is_virtual_memory_release_record(MEMFLAGS flags) {
- return (flags & 0x0F) == (tag_release | vmBit);
- }
-
- inline static bool is_virtual_memory_type_record(MEMFLAGS flags) {
- return (flags & 0x0F) == (tag_type | vmBit);
- }
-
- /* tagging flags */
- inline static MEMFLAGS malloc_tag() { return tag_alloc; }
- inline static MEMFLAGS free_tag() { return tag_release; }
- inline static MEMFLAGS arena_size_tag() { return tag_size | otArena; }
- inline static MEMFLAGS virtual_memory_tag() { return vmBit; }
- inline static MEMFLAGS virtual_memory_reserve_tag() { return (tag_alloc | vmBit); }
- inline static MEMFLAGS virtual_memory_commit_tag() { return (tag_commit | vmBit); }
- inline static MEMFLAGS virtual_memory_uncommit_tag(){ return (tag_uncommit | vmBit); }
- inline static MEMFLAGS virtual_memory_release_tag() { return (tag_release | vmBit); }
- inline static MEMFLAGS virtual_memory_type_tag() { return (tag_type | vmBit); }
-
- public:
- MemPointerRecord(): _size(0), _flags(mtNone) { }
-
- MemPointerRecord(address addr, MEMFLAGS memflags, size_t size = 0):
- MemPointer(addr), _flags(memflags), _size(size) { }
-
- MemPointerRecord(const MemPointerRecord& copy_from):
- MemPointer(copy_from), _flags(copy_from.flags()),
- _size(copy_from.size()) {
- }
-
- /* MemPointerRecord is not sequenced, it always return
- * 0 to indicate non-sequenced
- */
- virtual jint seq() const { return 0; }
-
- inline size_t size() const { return _size; }
- inline void set_size(size_t size) { _size = size; }
-
- inline MEMFLAGS flags() const { return _flags; }
- inline void set_flags(MEMFLAGS flags) { _flags = flags; }
-
- MemPointerRecord& operator= (const MemPointerRecord& ptr) {
- MemPointer::operator=(ptr);
- _flags = ptr.flags();
-#ifdef ASSERT
- if (IS_ARENA_OBJ(_flags)) {
- assert(!is_vm_pointer(), "wrong flags");
- assert((_flags & ot_masks) == otArena, "wrong flags");
- }
-#endif
- _size = ptr.size();
- return *this;
- }
-
- // if the pointer represents a malloc-ed memory address
- inline bool is_malloced_pointer() const {
- return !is_vm_pointer();
- }
-
- // if the pointer represents a virtual memory address
- inline bool is_vm_pointer() const {
- return is_virtual_memory_record(_flags);
- }
-
- // if this record records a 'malloc' or virtual memory
- // 'reserve' call
- inline bool is_allocation_record() const {
- return is_allocation_record(_flags);
- }
-
- // if this record records a size information of an arena
- inline bool is_arena_memory_record() const {
- return is_arena_memory_record(_flags);
- }
-
- // if this pointer represents an address to an arena object
- inline bool is_arena_record() const {
- return is_arena_record(_flags);
- }
-
- // if this record represents a size information of specific arena
- inline bool is_memory_record_of_arena(const MemPointerRecord* arena_rc) {
- assert(is_arena_memory_record(), "not size record");
- assert(arena_rc->is_arena_record(), "not arena record");
- return (arena_rc->addr() + sizeof(void*)) == addr();
- }
-
- // if this record records a 'free' or virtual memory 'free' call
- inline bool is_deallocation_record() const {
- return is_deallocation_record(_flags);
- }
-
- // if this record records a virtual memory 'commit' call
- inline bool is_commit_record() const {
- return is_virtual_memory_commit_record(_flags);
- }
-
- // if this record records a virtual memory 'uncommit' call
- inline bool is_uncommit_record() const {
- return is_virtual_memory_uncommit_record(_flags);
- }
-
- // if this record is a tagging record of a virtual memory block
- inline bool is_type_tagging_record() const {
- return is_virtual_memory_type_record(_flags);
- }
-
- // if the two memory pointer records actually represent the same
- // memory block
- inline bool is_same_region(const MemPointerRecord* other) const {
- return (addr() == other->addr() && size() == other->size());
- }
-
- // if this memory region fully contains another one
- inline bool contains_region(const MemPointerRecord* other) const {
- return contains_region(other->addr(), other->size());
- }
-
- // if this memory region fully contains specified memory range
- inline bool contains_region(address add, size_t sz) const {
- return (addr() <= add && addr() + size() >= add + sz);
- }
-
- inline bool contains_address(address add) const {
- return (addr() <= add && addr() + size() > add);
- }
-
- // if this memory region overlaps another region
- inline bool overlaps_region(const MemPointerRecord* other) const {
- assert(other != NULL, "Just check");
- assert(size() > 0 && other->size() > 0, "empty range");
- return contains_address(other->addr()) ||
- contains_address(other->addr() + other->size() - 1) || // exclude end address
- other->contains_address(addr()) ||
- other->contains_address(addr() + size() - 1); // exclude end address
- }
-
-};
-
-// MemPointerRecordEx also records callsite pc, from where
-// the memory block is allocated
-class MemPointerRecordEx : public MemPointerRecord {
- private:
- address _pc; // callsite pc
-
- public:
- MemPointerRecordEx(): _pc(0) { }
-
- MemPointerRecordEx(address addr, MEMFLAGS memflags, size_t size = 0, address pc = 0):
- MemPointerRecord(addr, memflags, size), _pc(pc) {}
-
- MemPointerRecordEx(const MemPointerRecordEx& copy_from):
- MemPointerRecord(copy_from), _pc(copy_from.pc()) {}
-
- inline address pc() const { return _pc; }
-
- void init(const MemPointerRecordEx* mpe) {
- MemPointerRecord::operator=(*mpe);
- _pc = mpe->pc();
- }
-
- void init(const MemPointerRecord* mp) {
- MemPointerRecord::operator=(*mp);
- _pc = 0;
- }
-};
-
-// a virtual memory region. The region can represent a reserved
-// virtual memory region or a committed memory region
-class VMMemRegion : public MemPointerRecord {
-public:
- VMMemRegion() { }
-
- void init(const MemPointerRecord* mp) {
- assert(mp->is_vm_pointer(), "Sanity check");
- _addr = mp->addr();
- set_size(mp->size());
- set_flags(mp->flags());
- }
-
- VMMemRegion& operator=(const VMMemRegion& other) {
- MemPointerRecord::operator=(other);
- return *this;
- }
-
- inline bool is_reserved_region() const {
- return is_allocation_record();
- }
-
- inline bool is_committed_region() const {
- return is_commit_record();
- }
-
- /* base address of this virtual memory range */
- inline address base() const {
- return addr();
- }
-
- /* tag this virtual memory range to the specified memory type */
- inline void tag(MEMFLAGS f) {
- set_flags(flags() | (f & mt_masks));
- }
-
- // expand this region to also cover specified range.
- // The range has to be on either end of the memory region.
- void expand_region(address addr, size_t sz) {
- if (addr < base()) {
- assert(addr + sz == base(), "Sanity check");
- _addr = addr;
- set_size(size() + sz);
- } else {
- assert(base() + size() == addr, "Sanity check");
- set_size(size() + sz);
- }
- }
-
- // exclude the specified address range from this region.
- // The excluded memory range has to be on either end of this memory
- // region.
- inline void exclude_region(address add, size_t sz) {
- assert(is_reserved_region() || is_committed_region(), "Sanity check");
- assert(addr() != NULL && size() != 0, "Sanity check");
- assert(add >= addr() && add < addr() + size(), "Sanity check");
- assert(add == addr() || (add + sz) == (addr() + size()),
- "exclude in the middle");
- if (add == addr()) {
- set_addr(add + sz);
- set_size(size() - sz);
- } else {
- set_size(size() - sz);
- }
- }
-};
-
-class VMMemRegionEx : public VMMemRegion {
- private:
- jint _seq; // sequence number
-
- public:
- VMMemRegionEx(): _pc(0) { }
-
- void init(const MemPointerRecordEx* mpe) {
- VMMemRegion::init(mpe);
- _pc = mpe->pc();
- }
-
- void init(const MemPointerRecord* mpe) {
- VMMemRegion::init(mpe);
- _pc = 0;
- }
-
- VMMemRegionEx& operator=(const VMMemRegionEx& other) {
- VMMemRegion::operator=(other);
- _pc = other.pc();
- return *this;
- }
-
- inline address pc() const { return _pc; }
- private:
- address _pc;
-};
-
-/*
- * Sequenced memory record
- */
-class SeqMemPointerRecord : public MemPointerRecord {
- private:
- jint _seq; // sequence number
-
- public:
- SeqMemPointerRecord(): _seq(0){ }
-
- SeqMemPointerRecord(address addr, MEMFLAGS flags, size_t size, jint seq)
- : MemPointerRecord(addr, flags, size), _seq(seq) {
- }
-
- SeqMemPointerRecord(const SeqMemPointerRecord& copy_from)
- : MemPointerRecord(copy_from) {
- _seq = copy_from.seq();
- }
-
- SeqMemPointerRecord& operator= (const SeqMemPointerRecord& ptr) {
- MemPointerRecord::operator=(ptr);
- _seq = ptr.seq();
- return *this;
- }
-
- inline jint seq() const {
- return _seq;
- }
-};
-
-
-
-class SeqMemPointerRecordEx : public MemPointerRecordEx {
- private:
- jint _seq; // sequence number
-
- public:
- SeqMemPointerRecordEx(): _seq(0) { }
-
- SeqMemPointerRecordEx(address addr, MEMFLAGS flags, size_t size,
- jint seq, address pc):
- MemPointerRecordEx(addr, flags, size, pc), _seq(seq) {
- }
-
- SeqMemPointerRecordEx(const SeqMemPointerRecordEx& copy_from)
- : MemPointerRecordEx(copy_from) {
- _seq = copy_from.seq();
- }
-
- SeqMemPointerRecordEx& operator= (const SeqMemPointerRecordEx& ptr) {
- MemPointerRecordEx::operator=(ptr);
- _seq = ptr.seq();
- return *this;
- }
-
- inline jint seq() const {
- return _seq;
- }
-};
-
-#endif // SHARE_VM_SERVICES_MEM_PTR_HPP
diff --git a/hotspot/src/share/vm/services/memPtrArray.hpp b/hotspot/src/share/vm/services/memPtrArray.hpp
deleted file mode 100644
index b3e48f6..0000000
--- a/hotspot/src/share/vm/services/memPtrArray.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-#ifndef SHARE_VM_UTILITIES_MEM_PTR_ARRAY_HPP
-#define SHARE_VM_UTILITIES_MEM_PTR_ARRAY_HPP
-
-#include "memory/allocation.hpp"
-#include "services/memPtr.hpp"
-
-class MemPtr;
-class MemRecorder;
-class ArenaInfo;
-class MemSnapshot;
-
-extern "C" {
- typedef int (*FN_SORT)(const void *, const void *);
-}
-
-
-// Memory pointer array interface. This array is used by NMT to hold
-// various memory block information.
-// The memory pointer arrays are usually walked with their iterators.
-
-class MemPointerArray : public CHeapObj<mtNMT> {
- public:
- virtual ~MemPointerArray() { }
-
- // return true if it can not allocate storage for the data
- virtual bool out_of_memory() const = 0;
- virtual bool is_empty() const = 0;
- virtual bool is_full() = 0;
- virtual int length() const = 0;
- virtual void clear() = 0;
- virtual bool append(MemPointer* ptr) = 0;
- virtual bool insert_at(MemPointer* ptr, int pos) = 0;
- virtual bool remove_at(int pos) = 0;
- virtual MemPointer* at(int index) const = 0;
- virtual void sort(FN_SORT fn) = 0;
- virtual size_t instance_size() const = 0;
- virtual bool shrink() = 0;
-
- NOT_PRODUCT(virtual int capacity() const = 0;)
-};
-
-// Iterator interface
-class MemPointerArrayIterator VALUE_OBJ_CLASS_SPEC {
- public:
- // return the pointer at current position
- virtual MemPointer* current() const = 0;
- // return the next pointer and advance current position
- virtual MemPointer* next() = 0;
- // return next pointer without advancing current position
- virtual MemPointer* peek_next() const = 0;
- // return previous pointer without changing current position
- virtual MemPointer* peek_prev() const = 0;
- // remove the pointer at current position
- virtual void remove() = 0;
- // insert the pointer at current position
- virtual bool insert(MemPointer* ptr) = 0;
- // insert specified element after current position and
- // move current position to newly inserted position
- virtual bool insert_after(MemPointer* ptr) = 0;
-};
-
-// implementation class
-class MemPointerArrayIteratorImpl : public MemPointerArrayIterator {
- protected:
- MemPointerArray* _array;
- int _pos;
-
- public:
- MemPointerArrayIteratorImpl(MemPointerArray* arr) {
- assert(arr != NULL, "Parameter check");
- _array = arr;
- _pos = 0;
- }
-
- virtual MemPointer* current() const {
- if (_pos < _array->length()) {
- return _array->at(_pos);
- }
- return NULL;
- }
-
- virtual MemPointer* next() {
- if (_pos + 1 < _array->length()) {
- return _array->at(++_pos);
- }
- _pos = _array->length();
- return NULL;
- }
-
- virtual MemPointer* peek_next() const {
- if (_pos + 1 < _array->length()) {
- return _array->at(_pos + 1);
- }
- return NULL;
- }
-
- virtual MemPointer* peek_prev() const {
- if (_pos > 0) {
- return _array->at(_pos - 1);
- }
- return NULL;
- }
-
- virtual void remove() {
- if (_pos < _array->length()) {
- _array->remove_at(_pos);
- }
- }
-
- virtual bool insert(MemPointer* ptr) {
- return _array->insert_at(ptr, _pos);
- }
-
- virtual bool insert_after(MemPointer* ptr) {
- if (_array->insert_at(ptr, _pos + 1)) {
- _pos ++;
- return true;
- }
- return false;
- }
-};
-
-
-
-// Memory pointer array implementation.
-// This implementation implements expandable array
-#define DEFAULT_PTR_ARRAY_SIZE 1024
-
-template <class E> class MemPointerArrayImpl : public MemPointerArray {
- private:
- int _max_size;
- int _size;
- bool _init_elements;
- E* _data;
-
- public:
- MemPointerArrayImpl(int initial_size = DEFAULT_PTR_ARRAY_SIZE, bool init_elements = true):
- _max_size(initial_size), _size(0), _init_elements(init_elements) {
- _data = (E*)raw_allocate(sizeof(E), initial_size);
- if (_init_elements) {
- for (int index = 0; index < _max_size; index ++) {
- ::new ((void*)&_data[index]) E();
- }
- }
- }
-
- virtual ~MemPointerArrayImpl() {
- if (_data != NULL) {
- raw_free(_data);
- }
- }
-
- public:
- bool out_of_memory() const {
- return (_data == NULL);
- }
-
- size_t instance_size() const {
- return sizeof(MemPointerArrayImpl<E>) + _max_size * sizeof(E);
- }
-
- bool is_empty() const {
- assert(_data != NULL, "Just check");
- return _size == 0;
- }
-
- bool is_full() {
- assert(_data != NULL, "Just check");
- if (_size < _max_size) {
- return false;
- } else {
- return !expand_array();
- }
- }
-
- int length() const {
- assert(_data != NULL, "Just check");
- return _size;
- }
-
- NOT_PRODUCT(int capacity() const { return _max_size; })
-
- void clear() {
- assert(_data != NULL, "Just check");
- _size = 0;
- }
-
- bool append(MemPointer* ptr) {
- assert(_data != NULL, "Just check");
- if (is_full()) {
- return false;
- }
- _data[_size ++] = *(E*)ptr;
- return true;
- }
-
- bool insert_at(MemPointer* ptr, int pos) {
- assert(_data != NULL, "Just check");
- if (is_full()) {
- return false;
- }
- for (int index = _size; index > pos; index --) {
- _data[index] = _data[index - 1];
- }
- _data[pos] = *(E*)ptr;
- _size ++;
- return true;
- }
-
- bool remove_at(int pos) {
- assert(_data != NULL, "Just check");
- if (_size <= pos && pos >= 0) {
- return false;
- }
- -- _size;
-
- for (int index = pos; index < _size; index ++) {
- _data[index] = _data[index + 1];
- }
- return true;
- }
-
- MemPointer* at(int index) const {
- assert(_data != NULL, "Just check");
- assert(index >= 0 && index < _size, "illegal index");
- return &_data[index];
- }
-
- bool shrink() {
- float used = ((float)_size) / ((float)_max_size);
- if (used < 0.40) {
- E* old_ptr = _data;
- int new_size = ((_max_size) / (2 * DEFAULT_PTR_ARRAY_SIZE) + 1) * DEFAULT_PTR_ARRAY_SIZE;
- _data = (E*)raw_reallocate(_data, sizeof(E), new_size);
- if (_data == NULL) {
- _data = old_ptr;
- return false;
- } else {
- _max_size = new_size;
- return true;
- }
- }
- return false;
- }
-
- void sort(FN_SORT fn) {
- assert(_data != NULL, "Just check");
- qsort((void*)_data, _size, sizeof(E), fn);
- }
-
- private:
- bool expand_array() {
- assert(_data != NULL, "Not yet allocated");
- E* old_ptr = _data;
- if ((_data = (E*)raw_reallocate((void*)_data, sizeof(E),
- _max_size + DEFAULT_PTR_ARRAY_SIZE)) == NULL) {
- _data = old_ptr;
- return false;
- } else {
- _max_size += DEFAULT_PTR_ARRAY_SIZE;
- if (_init_elements) {
- for (int index = _size; index < _max_size; index ++) {
- ::new ((void*)&_data[index]) E();
- }
- }
- return true;
- }
- }
-
- void* raw_allocate(size_t elementSize, int items) {
- return os::malloc(elementSize * items, mtNMT);
- }
-
- void* raw_reallocate(void* ptr, size_t elementSize, int items) {
- return os::realloc(ptr, elementSize * items, mtNMT);
- }
-
- void raw_free(void* ptr) {
- os::free(ptr, mtNMT);
- }
-};
-
-#endif // SHARE_VM_UTILITIES_MEM_PTR_ARRAY_HPP
diff --git a/hotspot/src/share/vm/services/memRecorder.cpp b/hotspot/src/share/vm/services/memRecorder.cpp
deleted file mode 100644
index b8707f5..0000000
--- a/hotspot/src/share/vm/services/memRecorder.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-
-#include "runtime/atomic.inline.hpp"
-#include "services/memBaseline.hpp"
-#include "services/memRecorder.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
-
-MemPointer* SequencedRecordIterator::next_record() {
- MemPointerRecord* itr_cur = (MemPointerRecord*)_itr.current();
- if (itr_cur == NULL) {
- return itr_cur;
- }
-
- MemPointerRecord* itr_next = (MemPointerRecord*)_itr.next();
-
- // don't collapse virtual memory records
- while (itr_next != NULL && !itr_cur->is_vm_pointer() &&
- !itr_next->is_vm_pointer() &&
- same_kind(itr_cur, itr_next)) {
- itr_cur = itr_next;
- itr_next = (MemPointerRecord*)_itr.next();
- }
-
- return itr_cur;
-}
-
-
-volatile jint MemRecorder::_instance_count = 0;
-
-MemRecorder::MemRecorder() {
- assert(MemTracker::is_on(), "Native memory tracking is off");
- Atomic::inc(&_instance_count);
- set_generation();
-
- if (MemTracker::track_callsite()) {
- _pointer_records = new (std::nothrow)FixedSizeMemPointerArray<SeqMemPointerRecordEx,
- DEFAULT_RECORDER_PTR_ARRAY_SIZE>();
- } else {
- _pointer_records = new (std::nothrow)FixedSizeMemPointerArray<SeqMemPointerRecord,
- DEFAULT_RECORDER_PTR_ARRAY_SIZE>();
- }
- _next = NULL;
-
-
- if (_pointer_records != NULL) {
- // recode itself
- address pc = CURRENT_PC;
- record((address)this, (MemPointerRecord::malloc_tag()|mtNMT|otNMTRecorder),
- sizeof(MemRecorder), SequenceGenerator::next(), pc);
- record((address)_pointer_records, (MemPointerRecord::malloc_tag()|mtNMT|otNMTRecorder),
- _pointer_records->instance_size(), SequenceGenerator::next(), pc);
- }
-}
-
-MemRecorder::~MemRecorder() {
- if (_pointer_records != NULL) {
- if (MemTracker::is_on()) {
- MemTracker::record_free((address)_pointer_records, mtNMT);
- MemTracker::record_free((address)this, mtNMT);
- }
- delete _pointer_records;
- }
- // delete all linked recorders
- while (_next != NULL) {
- MemRecorder* tmp = _next;
- _next = _next->next();
- tmp->set_next(NULL);
- delete tmp;
- }
- Atomic::dec(&_instance_count);
-}
-
-// Sorting order:
-// 1. memory block address
-// 2. mem pointer record tags
-// 3. sequence number
-int MemRecorder::sort_record_fn(const void* e1, const void* e2) {
- const MemPointerRecord* p1 = (const MemPointerRecord*)e1;
- const MemPointerRecord* p2 = (const MemPointerRecord*)e2;
- int delta = UNSIGNED_COMPARE(p1->addr(), p2->addr());
- if (delta == 0) {
- int df = UNSIGNED_COMPARE((p1->flags() & MemPointerRecord::tag_masks),
- (p2->flags() & MemPointerRecord::tag_masks));
- if (df == 0) {
- assert(p1->seq() != p2->seq(), "dup seq");
- return p1->seq() - p2->seq();
- } else {
- return df;
- }
- } else {
- return delta;
- }
-}
-
-bool MemRecorder::record(address p, MEMFLAGS flags, size_t size, jint seq, address pc) {
- assert(seq > 0, "No sequence number");
-#ifdef ASSERT
- if (MemPointerRecord::is_virtual_memory_record(flags)) {
- assert((flags & MemPointerRecord::tag_masks) != 0, "bad virtual memory record");
- } else {
- assert((flags & MemPointerRecord::tag_masks) == MemPointerRecord::malloc_tag() ||
- (flags & MemPointerRecord::tag_masks) == MemPointerRecord::free_tag() ||
- IS_ARENA_OBJ(flags),
- "bad malloc record");
- }
- // a recorder should only hold records within the same generation
- unsigned long cur_generation = SequenceGenerator::current_generation();
- assert(cur_generation == _generation,
- "this thread did not enter sync point");
-#endif
-
- if (MemTracker::track_callsite()) {
- SeqMemPointerRecordEx ap(p, flags, size, seq, pc);
- debug_only(check_dup_seq(ap.seq());)
- return _pointer_records->append(&ap);
- } else {
- SeqMemPointerRecord ap(p, flags, size, seq);
- debug_only(check_dup_seq(ap.seq());)
- return _pointer_records->append(&ap);
- }
-}
-
- // iterator for alloc pointers
-SequencedRecordIterator MemRecorder::pointer_itr() {
- assert(_pointer_records != NULL, "just check");
- _pointer_records->sort((FN_SORT)sort_record_fn);
- return SequencedRecordIterator(_pointer_records);
-}
-
-
-void MemRecorder::set_generation() {
- _generation = SequenceGenerator::current_generation();
-}
-
-#ifdef ASSERT
-
-void MemRecorder::check_dup_seq(jint seq) const {
- MemPointerArrayIteratorImpl itr(_pointer_records);
- MemPointerRecord* rc = (MemPointerRecord*)itr.current();
- while (rc != NULL) {
- assert(rc->seq() != seq, "dup seq");
- rc = (MemPointerRecord*)itr.next();
- }
-}
-
-#endif
diff --git a/hotspot/src/share/vm/services/memRecorder.hpp b/hotspot/src/share/vm/services/memRecorder.hpp
deleted file mode 100644
index 4329dad..0000000
--- a/hotspot/src/share/vm/services/memRecorder.hpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_SERVICES_MEM_RECORDER_HPP
-#define SHARE_VM_SERVICES_MEM_RECORDER_HPP
-
-#include "memory/allocation.hpp"
-#include "runtime/os.hpp"
-#include "services/memPtrArray.hpp"
-
-class MemSnapshot;
-class MemTracker;
-class MemTrackWorker;
-
-// Fixed size memory pointer array implementation
-template <class E, int SIZE> class FixedSizeMemPointerArray :
- public MemPointerArray {
- // This implementation is for memory recorder only
- friend class MemRecorder;
-
- private:
- E _data[SIZE];
- int _size;
-
- protected:
- FixedSizeMemPointerArray(bool init_elements = false):
- _size(0){
- if (init_elements) {
- for (int index = 0; index < SIZE; index ++) {
- ::new ((void*)&_data[index]) E();
- }
- }
- }
-
- void* operator new(size_t size, const std::nothrow_t& nothrow_constant) throw() {
- // the instance is part of memRecorder, needs to be tagged with 'otNMTRecorder'
- // to avoid recursion
- return os::malloc(size, (mtNMT | otNMTRecorder));
- }
-
- void* operator new(size_t size) throw() {
- assert(false, "use nothrow version");
- return NULL;
- }
-
- void operator delete(void* p) {
- os::free(p, (mtNMT | otNMTRecorder));
- }
-
- // instance size
- inline size_t instance_size() const {
- return sizeof(FixedSizeMemPointerArray<E, SIZE>);
- }
-
- NOT_PRODUCT(int capacity() const { return SIZE; })
-
- public:
- // implementation of public interface
- bool out_of_memory() const { return false; }
- bool is_empty() const { return _size == 0; }
- bool is_full() { return length() >= SIZE; }
- int length() const { return _size; }
-
- void clear() {
- _size = 0;
- }
-
- bool append(MemPointer* ptr) {
- if (is_full()) return false;
- _data[_size ++] = *(E*)ptr;
- return true;
- }
-
- virtual bool insert_at(MemPointer* p, int pos) {
- assert(false, "append only");
- return false;
- }
-
- virtual bool remove_at(int pos) {
- assert(false, "not supported");
- return false;
- }
-
- MemPointer* at(int index) const {
- assert(index >= 0 && index < length(),
- "parameter check");
- return ((E*)&_data[index]);
- }
-
- void sort(FN_SORT fn) {
- qsort((void*)_data, _size, sizeof(E), fn);
- }
-
- bool shrink() {
- return false;
- }
-};
-
-
-// This iterator requires pre-sorted MemPointerArray, which is sorted by:
-// 1. address
-// 2. allocation type
-// 3. sequence number
-// During the array walking, iterator collapses pointers with the same
-// address and allocation type, and only returns the one with highest
-// sequence number.
-//
-// This is read-only iterator, update methods are asserted.
-class SequencedRecordIterator : public MemPointerArrayIterator {
- private:
- MemPointerArrayIteratorImpl _itr;
- MemPointer* _cur;
-
- public:
- SequencedRecordIterator(const MemPointerArray* arr):
- _itr(const_cast<MemPointerArray*>(arr)) {
- _cur = next_record();
- }
-
- SequencedRecordIterator(const SequencedRecordIterator& itr):
- _itr(itr._itr) {
- _cur = next_record();
- }
-
- // return the pointer at current position
- virtual MemPointer* current() const {
- return _cur;
- };
-
- // return the next pointer and advance current position
- virtual MemPointer* next() {
- _cur = next_record();
- return _cur;
- }
-
- // return the next pointer without advancing current position
- virtual MemPointer* peek_next() const {
- assert(false, "not implemented");
- return NULL;
-
- }
- // return the previous pointer without changing current position
- virtual MemPointer* peek_prev() const {
- assert(false, "not implemented");
- return NULL;
- }
-
- // remove the pointer at current position
- virtual void remove() {
- assert(false, "read-only iterator");
- };
- // insert the pointer at current position
- virtual bool insert(MemPointer* ptr) {
- assert(false, "read-only iterator");
- return false;
- }
-
- virtual bool insert_after(MemPointer* ptr) {
- assert(false, "read-only iterator");
- return false;
- }
- private:
- // collapse the 'same kind' of records, and return this 'kind' of
- // record with highest sequence number
- MemPointer* next_record();
-
- // Test if the two records are the same kind: the same memory block and allocation
- // type.
- inline bool same_kind(const MemPointerRecord* p1, const MemPointerRecord* p2) const {
- assert(!p1->is_vm_pointer() && !p2->is_vm_pointer(), "malloc pointer only");
- return (p1->addr() == p2->addr() &&
- (p1->flags() &MemPointerRecord::tag_masks) ==
- (p2->flags() & MemPointerRecord::tag_masks));
- }
-};
-
-
-
-#define DEFAULT_RECORDER_PTR_ARRAY_SIZE 512
-
-class MemRecorder : public CHeapObj<mtNMT|otNMTRecorder> {
- friend class MemSnapshot;
- friend class MemTracker;
- friend class MemTrackWorker;
- friend class GenerationData;
-
- protected:
- // the array that holds memory records
- MemPointerArray* _pointer_records;
-
- private:
- // used for linked list
- MemRecorder* _next;
- // active recorder can only record a certain generation data
- unsigned long _generation;
-
- protected:
- _NOINLINE_ MemRecorder();
- ~MemRecorder();
-
- // record a memory operation
- bool record(address addr, MEMFLAGS flags, size_t size, jint seq, address caller_pc = 0);
-
- // linked list support
- inline void set_next(MemRecorder* rec) {
- _next = rec;
- }
-
- inline MemRecorder* next() const {
- return _next;
- }
-
- // if the recorder is full
- inline bool is_full() const {
- assert(_pointer_records != NULL, "just check");
- return _pointer_records->is_full();
- }
-
- // if running out of memory when initializing recorder's internal
- // data
- inline bool out_of_memory() const {
- return (_pointer_records == NULL ||
- _pointer_records->out_of_memory());
- }
-
- inline void clear() {
- assert(_pointer_records != NULL, "Just check");
- _pointer_records->clear();
- }
-
- SequencedRecordIterator pointer_itr();
-
- // return the generation of this recorder which it belongs to
- unsigned long get_generation() const { return _generation; }
- protected:
- // number of MemRecorder instance
- static volatile jint _instance_count;
-
- private:
- // sorting function, sort records into following order
- // 1. memory address
- // 2. allocation type
- // 3. sequence number
- static int sort_record_fn(const void* e1, const void* e2);
-
- debug_only(void check_dup_seq(jint seq) const;)
- void set_generation();
-};
-
-#endif // SHARE_VM_SERVICES_MEM_RECORDER_HPP
diff --git a/hotspot/src/share/vm/services/memReporter.cpp b/hotspot/src/share/vm/services/memReporter.cpp
index 305693d..0269619 100644
--- a/hotspot/src/share/vm/services/memReporter.cpp
+++ b/hotspot/src/share/vm/services/memReporter.cpp
@@ -22,618 +22,595 @@
*
*/
#include "precompiled.hpp"
-#include "classfile/systemDictionary.hpp"
-#include "runtime/os.hpp"
+
+#include "memory/allocation.hpp"
+#include "services/mallocTracker.hpp"
#include "services/memReporter.hpp"
-#include "services/memPtrArray.hpp"
-#include "services/memTracker.hpp"
+#include "services/virtualMemoryTracker.hpp"
+#include "utilities/globalDefinitions.hpp"
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+size_t MemReporterBase::reserved_total(const MallocMemory* malloc, const VirtualMemory* vm) const {
+ return malloc->malloc_size() + malloc->arena_size() + vm->reserved();
+}
-const char* BaselineOutputer::memory_unit(size_t scale) {
- switch(scale) {
- case K: return "KB";
- case M: return "MB";
- case G: return "GB";
+size_t MemReporterBase::committed_total(const MallocMemory* malloc, const VirtualMemory* vm) const {
+ return malloc->malloc_size() + malloc->arena_size() + vm->committed();
+}
+
+void MemReporterBase::print_total(size_t reserved, size_t committed) const {
+ const char* scale = current_scale();
+ output()->print("reserved=" SIZE_FORMAT "%s, committed=" SIZE_FORMAT "%s",
+ amount_in_current_scale(reserved), scale, amount_in_current_scale(committed), scale);
+}
+
+void MemReporterBase::print_malloc(size_t amount, size_t count) const {
+ const char* scale = current_scale();
+ outputStream* out = output();
+ out->print("(malloc=" SIZE_FORMAT "%s",
+ amount_in_current_scale(amount), scale);
+
+ if (count > 0) {
+ out->print(" #" SIZE_FORMAT "", count);
}
- ShouldNotReachHere();
- return NULL;
+
+ out->print(")");
+}
+
+void MemReporterBase::print_virtual_memory(size_t reserved, size_t committed) const {
+ const char* scale = current_scale();
+ output()->print("(mmap: reserved=" SIZE_FORMAT "%s, committed=" SIZE_FORMAT "%s)",
+ amount_in_current_scale(reserved), scale, amount_in_current_scale(committed), scale);
+}
+
+void MemReporterBase::print_malloc_line(size_t amount, size_t count) const {
+ output()->print("%28s", " ");
+ print_malloc(amount, count);
+ output()->print_cr(" ");
+}
+
+void MemReporterBase::print_virtual_memory_line(size_t reserved, size_t committed) const {
+ output()->print("%28s", " ");
+ print_virtual_memory(reserved, committed);
+ output()->print_cr(" ");
+}
+
+void MemReporterBase::print_arena_line(size_t amount, size_t count) const {
+ const char* scale = current_scale();
+ output()->print_cr("%27s (arena=" SIZE_FORMAT "%s #" SIZE_FORMAT ")", " ",
+ amount_in_current_scale(amount), scale, count);
+}
+
+void MemReporterBase::print_virtual_memory_region(const char* type, address base, size_t size) const {
+ const char* scale = current_scale();
+ output()->print("[" PTR_FORMAT " - " PTR_FORMAT "] %s " SIZE_FORMAT "%s",
+ p2i(base), p2i(base + size), type, amount_in_current_scale(size), scale);
}
-void BaselineReporter::report_baseline(const MemBaseline& baseline, bool summary_only) {
- assert(MemTracker::is_on(), "Native memory tracking is off");
- _outputer.start(scale());
- _outputer.total_usage(
- amount_in_current_scale(baseline.total_malloc_amount() + baseline.total_reserved_amount()),
- amount_in_current_scale(baseline.total_malloc_amount() + baseline.total_committed_amount()));
+void MemSummaryReporter::report() {
+ const char* scale = current_scale();
+ outputStream* out = output();
+ size_t total_reserved_amount = _malloc_snapshot->total() +
+ _vm_snapshot->total_reserved();
+ size_t total_committed_amount = _malloc_snapshot->total() +
+ _vm_snapshot->total_committed();
- _outputer.num_of_classes(baseline.number_of_classes());
- _outputer.num_of_threads(baseline.number_of_threads());
+ // Overall total
+ out->print_cr("\nNative Memory Tracking:\n");
+ out->print("Total: ");
+ print_total(total_reserved_amount, total_committed_amount);
+ out->print("\n");
- report_summaries(baseline);
- if (!summary_only && MemTracker::track_callsite()) {
- report_virtual_memory_map(baseline);
- report_callsites(baseline);
+ // Summary by memory type
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ MEMFLAGS flag = NMTUtil::index_to_flag(index);
+ // thread stack is reported as part of thread category
+ if (flag == mtThreadStack) continue;
+ MallocMemory* malloc_memory = _malloc_snapshot->by_type(flag);
+ VirtualMemory* virtual_memory = _vm_snapshot->by_type(flag);
+
+ report_summary_of_type(flag, malloc_memory, virtual_memory);
}
- _outputer.done();
}
-void BaselineReporter::report_summaries(const MemBaseline& baseline) {
- _outputer.start_category_summary();
- MEMFLAGS type;
+void MemSummaryReporter::report_summary_of_type(MEMFLAGS flag,
+ MallocMemory* malloc_memory, VirtualMemory* virtual_memory) {
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- type = MemBaseline::MemType2NameMap[index]._flag;
- _outputer.category_summary(type,
- amount_in_current_scale(baseline.reserved_amount(type)),
- amount_in_current_scale(baseline.committed_amount(type)),
- amount_in_current_scale(baseline.malloc_amount(type)),
- baseline.malloc_count(type),
- amount_in_current_scale(baseline.arena_amount(type)),
- baseline.arena_count(type));
+ size_t reserved_amount = reserved_total (malloc_memory, virtual_memory);
+ size_t committed_amount = committed_total(malloc_memory, virtual_memory);
+
+ // Count thread's native stack in "Thread" category
+ if (flag == mtThread) {
+ const VirtualMemory* thread_stack_usage =
+ (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
+ reserved_amount += thread_stack_usage->reserved();
+ committed_amount += thread_stack_usage->committed();
+ } else if (flag == mtNMT) {
+ // Count malloc headers in "NMT" category
+ reserved_amount += _malloc_snapshot->malloc_overhead()->size();
+ committed_amount += _malloc_snapshot->malloc_overhead()->size();
}
- _outputer.done_category_summary();
-}
+ if (amount_in_current_scale(reserved_amount) > 0) {
+ outputStream* out = output();
+ const char* scale = current_scale();
+ out->print("-%26s (", NMTUtil::flag_to_name(flag));
+ print_total(reserved_amount, committed_amount);
+ out->print_cr(")");
-void BaselineReporter::report_virtual_memory_map(const MemBaseline& baseline) {
- _outputer.start_virtual_memory_map();
- MemBaseline* pBL = const_cast<MemBaseline*>(&baseline);
- MemPointerArrayIteratorImpl itr = MemPointerArrayIteratorImpl(pBL->_vm_map);
- VMMemRegionEx* rgn = (VMMemRegionEx*)itr.current();
- while (rgn != NULL) {
- if (rgn->is_reserved_region()) {
- _outputer.reserved_memory_region(FLAGS_TO_MEMORY_TYPE(rgn->flags()),
- rgn->base(), rgn->base() + rgn->size(), amount_in_current_scale(rgn->size()), rgn->pc());
- } else {
- _outputer.committed_memory_region(rgn->base(), rgn->base() + rgn->size(),
- amount_in_current_scale(rgn->size()), rgn->pc());
+ if (flag == mtClass) {
+ // report class count
+ out->print_cr("%27s (classes #" SIZE_FORMAT ")", " ", _class_count);
+ } else if (flag == mtThread) {
+ // report thread count
+ out->print_cr("%27s (thread #" SIZE_FORMAT ")", " ", _malloc_snapshot->thread_count());
+ const VirtualMemory* thread_stack_usage =
+ _vm_snapshot->by_type(mtThreadStack);
+ out->print("%27s (stack: ", " ");
+ print_total(thread_stack_usage->reserved(), thread_stack_usage->committed());
+ out->print_cr(")");
}
- rgn = (VMMemRegionEx*)itr.next();
- }
- _outputer.done_virtual_memory_map();
+ // report malloc'd memory
+ if (amount_in_current_scale(malloc_memory->malloc_size()) > 0) {
+ // We don't know how many arena chunks are in used, so don't report the count
+ size_t count = (flag == mtChunk) ? 0 : malloc_memory->malloc_count();
+ print_malloc_line(malloc_memory->malloc_size(), count);
+ }
+
+ if (amount_in_current_scale(virtual_memory->reserved()) > 0) {
+ print_virtual_memory_line(virtual_memory->reserved(), virtual_memory->committed());
+ }
+
+ if (amount_in_current_scale(malloc_memory->arena_size()) > 0) {
+ print_arena_line(malloc_memory->arena_size(), malloc_memory->arena_count());
+ }
+
+ if (flag == mtNMT &&
+ amount_in_current_scale(_malloc_snapshot->malloc_overhead()->size()) > 0) {
+ out->print_cr("%27s (tracking overhead=" SIZE_FORMAT "%s)", " ",
+ amount_in_current_scale(_malloc_snapshot->malloc_overhead()->size()), scale);
+ }
+
+ out->print_cr(" ");
+ }
}
-void BaselineReporter::report_callsites(const MemBaseline& baseline) {
- _outputer.start_callsite();
- MemBaseline* pBL = const_cast<MemBaseline*>(&baseline);
+void MemDetailReporter::report_detail() {
+ // Start detail report
+ outputStream* out = output();
+ out->print_cr("Details:\n");
- pBL->_malloc_cs->sort((FN_SORT)MemBaseline::bl_malloc_sort_by_size);
- pBL->_vm_cs->sort((FN_SORT)MemBaseline::bl_vm_sort_by_size);
-
- // walk malloc callsites
- MemPointerArrayIteratorImpl malloc_itr(pBL->_malloc_cs);
- MallocCallsitePointer* malloc_callsite =
- (MallocCallsitePointer*)malloc_itr.current();
- while (malloc_callsite != NULL) {
- _outputer.malloc_callsite(malloc_callsite->addr(),
- amount_in_current_scale(malloc_callsite->amount()), malloc_callsite->count());
- malloc_callsite = (MallocCallsitePointer*)malloc_itr.next();
- }
-
- // walk virtual memory callsite
- MemPointerArrayIteratorImpl vm_itr(pBL->_vm_cs);
- VMCallsitePointer* vm_callsite = (VMCallsitePointer*)vm_itr.current();
- while (vm_callsite != NULL) {
- _outputer.virtual_memory_callsite(vm_callsite->addr(),
- amount_in_current_scale(vm_callsite->reserved_amount()),
- amount_in_current_scale(vm_callsite->committed_amount()));
- vm_callsite = (VMCallsitePointer*)vm_itr.next();
- }
- pBL->_malloc_cs->sort((FN_SORT)MemBaseline::bl_malloc_sort_by_pc);
- pBL->_vm_cs->sort((FN_SORT)MemBaseline::bl_vm_sort_by_pc);
- _outputer.done_callsite();
+ report_malloc_sites();
+ report_virtual_memory_allocation_sites();
}
-void BaselineReporter::diff_baselines(const MemBaseline& cur, const MemBaseline& prev,
- bool summary_only) {
- assert(MemTracker::is_on(), "Native memory tracking is off");
- _outputer.start(scale());
- size_t total_reserved = cur.total_malloc_amount() + cur.total_reserved_amount();
- size_t total_committed = cur.total_malloc_amount() + cur.total_committed_amount();
+void MemDetailReporter::report_malloc_sites() {
+ MallocSiteIterator malloc_itr = _baseline.malloc_sites(MemBaseline::by_size);
+ if (malloc_itr.is_empty()) return;
- _outputer.diff_total_usage(
- amount_in_current_scale(total_reserved), amount_in_current_scale(total_committed),
- diff_in_current_scale(total_reserved, (prev.total_malloc_amount() + prev.total_reserved_amount())),
- diff_in_current_scale(total_committed, (prev.total_committed_amount() + prev.total_malloc_amount())));
+ outputStream* out = output();
- _outputer.diff_num_of_classes(cur.number_of_classes(),
- diff(cur.number_of_classes(), prev.number_of_classes()));
- _outputer.diff_num_of_threads(cur.number_of_threads(),
- diff(cur.number_of_threads(), prev.number_of_threads()));
+ const MallocSite* malloc_site;
+ while ((malloc_site = malloc_itr.next()) != NULL) {
+ // Don't report if size is too small
+ if (amount_in_current_scale(malloc_site->size()) == 0)
+ continue;
- diff_summaries(cur, prev);
- if (!summary_only && MemTracker::track_callsite()) {
- diff_callsites(cur, prev);
+ const NativeCallStack* stack = malloc_site->call_stack();
+ stack->print_on(out);
+ out->print("%29s", " ");
+ print_malloc(malloc_site->size(), malloc_site->count());
+ out->print_cr("\n");
}
- _outputer.done();
}
-void BaselineReporter::diff_summaries(const MemBaseline& cur, const MemBaseline& prev) {
- _outputer.start_category_summary();
- MEMFLAGS type;
+void MemDetailReporter::report_virtual_memory_allocation_sites() {
+ VirtualMemorySiteIterator virtual_memory_itr =
+ _baseline.virtual_memory_sites(MemBaseline::by_size);
- for (int index = 0; index < NUMBER_OF_MEMORY_TYPE; index ++) {
- type = MemBaseline::MemType2NameMap[index]._flag;
- _outputer.diff_category_summary(type,
- amount_in_current_scale(cur.reserved_amount(type)),
- amount_in_current_scale(cur.committed_amount(type)),
- amount_in_current_scale(cur.malloc_amount(type)),
- cur.malloc_count(type),
- amount_in_current_scale(cur.arena_amount(type)),
- cur.arena_count(type),
- diff_in_current_scale(cur.reserved_amount(type), prev.reserved_amount(type)),
- diff_in_current_scale(cur.committed_amount(type), prev.committed_amount(type)),
- diff_in_current_scale(cur.malloc_amount(type), prev.malloc_amount(type)),
- diff(cur.malloc_count(type), prev.malloc_count(type)),
- diff_in_current_scale(cur.arena_amount(type), prev.arena_amount(type)),
- diff(cur.arena_count(type), prev.arena_count(type)));
+ if (virtual_memory_itr.is_empty()) return;
+
+ outputStream* out = output();
+ const VirtualMemoryAllocationSite* virtual_memory_site;
+
+ while ((virtual_memory_site = virtual_memory_itr.next()) != NULL) {
+ // Don't report if size is too small
+ if (amount_in_current_scale(virtual_memory_site->reserved()) == 0)
+ continue;
+
+ const NativeCallStack* stack = virtual_memory_site->call_stack();
+ stack->print_on(out);
+ out->print("%28s (", " ");
+ print_total(virtual_memory_site->reserved(), virtual_memory_site->committed());
+ out->print_cr(")\n");
}
-
- _outputer.done_category_summary();
}
-void BaselineReporter::diff_callsites(const MemBaseline& cur, const MemBaseline& prev) {
- _outputer.start_callsite();
- MemBaseline* pBL_cur = const_cast<MemBaseline*>(&cur);
- MemBaseline* pBL_prev = const_cast<MemBaseline*>(&prev);
- // walk malloc callsites
- MemPointerArrayIteratorImpl cur_malloc_itr(pBL_cur->_malloc_cs);
- MemPointerArrayIteratorImpl prev_malloc_itr(pBL_prev->_malloc_cs);
+void MemDetailReporter::report_virtual_memory_map() {
+ // Virtual memory map always in base address order
+ VirtualMemoryAllocationIterator itr = _baseline.virtual_memory_allocations();
+ const ReservedMemoryRegion* rgn;
- MallocCallsitePointer* cur_malloc_callsite =
- (MallocCallsitePointer*)cur_malloc_itr.current();
- MallocCallsitePointer* prev_malloc_callsite =
- (MallocCallsitePointer*)prev_malloc_itr.current();
+ output()->print_cr("Virtual memory map:");
+ while ((rgn = itr.next()) != NULL) {
+ report_virtual_memory_region(rgn);
+ }
+}
- while (cur_malloc_callsite != NULL || prev_malloc_callsite != NULL) {
- if (prev_malloc_callsite == NULL) {
- assert(cur_malloc_callsite != NULL, "sanity check");
- // this is a new callsite
- _outputer.diff_malloc_callsite(cur_malloc_callsite->addr(),
- amount_in_current_scale(cur_malloc_callsite->amount()),
- cur_malloc_callsite->count(),
- diff_in_current_scale(cur_malloc_callsite->amount(), 0),
- diff(cur_malloc_callsite->count(), 0));
- cur_malloc_callsite = (MallocCallsitePointer*)cur_malloc_itr.next();
- } else if (cur_malloc_callsite == NULL) {
- assert(prev_malloc_callsite != NULL, "Sanity check");
- // this callsite is already gone
- _outputer.diff_malloc_callsite(prev_malloc_callsite->addr(),
- 0, 0,
- diff_in_current_scale(0, prev_malloc_callsite->amount()),
- diff(0, prev_malloc_callsite->count()));
- prev_malloc_callsite = (MallocCallsitePointer*)prev_malloc_itr.next();
+void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion* reserved_rgn) {
+ assert(reserved_rgn != NULL, "NULL pointer");
+
+ // Don't report if size is too small
+ if (amount_in_current_scale(reserved_rgn->size()) == 0) return;
+
+ outputStream* out = output();
+ const char* scale = current_scale();
+ const NativeCallStack* stack = reserved_rgn->call_stack();
+ bool all_committed = reserved_rgn->all_committed();
+ const char* region_type = (all_committed ? "reserved and committed" : "reserved");
+ out->print_cr(" ");
+ print_virtual_memory_region(region_type, reserved_rgn->base(), reserved_rgn->size());
+ out->print(" for %s", NMTUtil::flag_to_name(reserved_rgn->flag()));
+ if (stack->is_empty()) {
+ out->print_cr(" ");
+ } else {
+ out->print_cr(" from");
+ stack->print_on(out, 4);
+ }
+
+ if (all_committed) return;
+
+ CommittedRegionIterator itr = reserved_rgn->iterate_committed_regions();
+ const CommittedMemoryRegion* committed_rgn;
+ while ((committed_rgn = itr.next()) != NULL) {
+ // Don't report if size is too small
+ if (amount_in_current_scale(committed_rgn->size()) == 0) continue;
+ stack = committed_rgn->call_stack();
+ out->print("\n\t");
+ print_virtual_memory_region("committed", committed_rgn->base(), committed_rgn->size());
+ if (stack->is_empty()) {
+ out->print_cr(" ");
} else {
- assert(cur_malloc_callsite != NULL, "Sanity check");
- assert(prev_malloc_callsite != NULL, "Sanity check");
- if (cur_malloc_callsite->addr() < prev_malloc_callsite->addr()) {
- // this is a new callsite
- _outputer.diff_malloc_callsite(cur_malloc_callsite->addr(),
- amount_in_current_scale(cur_malloc_callsite->amount()),
- cur_malloc_callsite->count(),
- diff_in_current_scale(cur_malloc_callsite->amount(), 0),
- diff(cur_malloc_callsite->count(), 0));
- cur_malloc_callsite = (MallocCallsitePointer*)cur_malloc_itr.next();
- } else if (cur_malloc_callsite->addr() > prev_malloc_callsite->addr()) {
- // this callsite is already gone
- _outputer.diff_malloc_callsite(prev_malloc_callsite->addr(),
- 0, 0,
- diff_in_current_scale(0, prev_malloc_callsite->amount()),
- diff(0, prev_malloc_callsite->count()));
- prev_malloc_callsite = (MallocCallsitePointer*)prev_malloc_itr.next();
+ out->print_cr(" from");
+ stack->print_on(out, 12);
+ }
+ }
+}
+
+void MemSummaryDiffReporter::report_diff() {
+ const char* scale = current_scale();
+ outputStream* out = output();
+ out->print_cr("\nNative Memory Tracking:\n");
+
+ // Overall diff
+ out->print("Total: ");
+ print_virtual_memory_diff(_current_baseline.total_reserved_memory(),
+ _current_baseline.total_committed_memory(), _early_baseline.total_reserved_memory(),
+ _early_baseline.total_committed_memory());
+
+ out->print_cr("\n");
+
+ // Summary diff by memory type
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ MEMFLAGS flag = NMTUtil::index_to_flag(index);
+ // thread stack is reported as part of thread category
+ if (flag == mtThreadStack) continue;
+ diff_summary_of_type(flag, _early_baseline.malloc_memory(flag),
+ _early_baseline.virtual_memory(flag), _current_baseline.malloc_memory(flag),
+ _current_baseline.virtual_memory(flag));
+ }
+}
+
+void MemSummaryDiffReporter::print_malloc_diff(size_t current_amount, size_t current_count,
+ size_t early_amount, size_t early_count) const {
+ const char* scale = current_scale();
+ outputStream* out = output();
+
+ out->print("malloc=" SIZE_FORMAT "%s", amount_in_current_scale(current_amount), scale);
+ long amount_diff = diff_in_current_scale(current_amount, early_amount);
+ if (amount_diff != 0) {
+ out->print(" %+ld%s", amount_diff, scale);
+ }
+ if (current_count > 0) {
+ out->print(" #" SIZE_FORMAT "", current_count);
+ if (current_count != early_count) {
+ out->print(" %+d", (int)(current_count - early_count));
+ }
+ }
+}
+
+void MemSummaryDiffReporter::print_arena_diff(size_t current_amount, size_t current_count,
+ size_t early_amount, size_t early_count) const {
+ const char* scale = current_scale();
+ outputStream* out = output();
+ out->print("arena=" SIZE_FORMAT "%s", amount_in_current_scale(current_amount), scale);
+ if (diff_in_current_scale(current_amount, early_amount) != 0) {
+ out->print(" %+ld", diff_in_current_scale(current_amount, early_amount));
+ }
+
+ out->print(" #" SIZE_FORMAT "", current_count);
+ if (current_count != early_count) {
+ out->print(" %+d", (int)(current_count - early_count));
+ }
+}
+
+void MemSummaryDiffReporter::print_virtual_memory_diff(size_t current_reserved, size_t current_committed,
+ size_t early_reserved, size_t early_committed) const {
+ const char* scale = current_scale();
+ outputStream* out = output();
+ out->print("reserved=" SIZE_FORMAT "%s", amount_in_current_scale(current_reserved), scale);
+ long reserved_diff = diff_in_current_scale(current_reserved, early_reserved);
+ if (reserved_diff != 0) {
+ out->print(" %+ld%s", reserved_diff, scale);
+ }
+
+ out->print(", committed=" SIZE_FORMAT "%s", amount_in_current_scale(current_committed), scale);
+ long committed_diff = diff_in_current_scale(current_committed, early_committed);
+ if (committed_diff != 0) {
+ out->print(" %+ld%s", committed_diff, scale);
+ }
+}
+
+
+void MemSummaryDiffReporter::diff_summary_of_type(MEMFLAGS flag, const MallocMemory* early_malloc,
+ const VirtualMemory* early_vm, const MallocMemory* current_malloc,
+ const VirtualMemory* current_vm) const {
+
+ outputStream* out = output();
+ const char* scale = current_scale();
+
+ // Total reserved and committed memory in current baseline
+ size_t current_reserved_amount = reserved_total (current_malloc, current_vm);
+ size_t current_committed_amount = committed_total(current_malloc, current_vm);
+
+ // Total reserved and committed memory in early baseline
+ size_t early_reserved_amount = reserved_total(early_malloc, early_vm);
+ size_t early_committed_amount = committed_total(early_malloc, early_vm);
+
+ // Adjust virtual memory total
+ if (flag == mtThread) {
+ const VirtualMemory* early_thread_stack_usage =
+ _early_baseline.virtual_memory(mtThreadStack);
+ const VirtualMemory* current_thread_stack_usage =
+ _current_baseline.virtual_memory(mtThreadStack);
+
+ early_reserved_amount += early_thread_stack_usage->reserved();
+ early_committed_amount += early_thread_stack_usage->committed();
+
+ current_reserved_amount += current_thread_stack_usage->reserved();
+ current_committed_amount += current_thread_stack_usage->committed();
+ } else if (flag == mtNMT) {
+ early_reserved_amount += _early_baseline.malloc_tracking_overhead();
+ early_committed_amount += _early_baseline.malloc_tracking_overhead();
+
+ current_reserved_amount += _current_baseline.malloc_tracking_overhead();
+ current_committed_amount += _current_baseline.malloc_tracking_overhead();
+ }
+
+ if (amount_in_current_scale(current_reserved_amount) > 0 ||
+ diff_in_current_scale(current_reserved_amount, early_reserved_amount) != 0) {
+
+ // print summary line
+ out->print("-%26s (", NMTUtil::flag_to_name(flag));
+ print_virtual_memory_diff(current_reserved_amount, current_committed_amount,
+ early_reserved_amount, early_committed_amount);
+ out->print_cr(")");
+
+ // detail lines
+ if (flag == mtClass) {
+ // report class count
+ out->print("%27s (classes #" SIZE_FORMAT "", " ", _current_baseline.class_count());
+ int class_count_diff = (int)(_current_baseline.class_count() -
+ _early_baseline.class_count());
+ if (_current_baseline.class_count() != _early_baseline.class_count()) {
+ out->print(" %+d", (int)(_current_baseline.class_count() - _early_baseline.class_count()));
+ }
+ out->print_cr(")");
+ } else if (flag == mtThread) {
+ // report thread count
+ out->print("%27s (thread #" SIZE_FORMAT "", " ", _current_baseline.thread_count());
+ int thread_count_diff = (int)(_current_baseline.thread_count() -
+ _early_baseline.thread_count());
+ if (thread_count_diff != 0) {
+ out->print(" %+d", thread_count_diff);
+ }
+ out->print_cr(")");
+
+ // report thread stack
+ const VirtualMemory* current_thread_stack =
+ _current_baseline.virtual_memory(mtThreadStack);
+ const VirtualMemory* early_thread_stack =
+ _early_baseline.virtual_memory(mtThreadStack);
+
+ out->print("%27s (stack: ", " ");
+ print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
+ early_thread_stack->reserved(), early_thread_stack->committed());
+ out->print_cr(")");
+ }
+
+ // Report malloc'd memory
+ size_t current_malloc_amount = current_malloc->malloc_size();
+ size_t early_malloc_amount = early_malloc->malloc_size();
+ if (amount_in_current_scale(current_malloc_amount) > 0 ||
+ diff_in_current_scale(current_malloc_amount, early_malloc_amount) != 0) {
+ out->print("%28s(", " ");
+ print_malloc_diff(current_malloc_amount, (flag == mtChunk) ? 0 : current_malloc->malloc_count(),
+ early_malloc_amount, early_malloc->malloc_count());
+ out->print_cr(")");
+ }
+
+ // Report virtual memory
+ if (amount_in_current_scale(current_vm->reserved()) > 0 ||
+ diff_in_current_scale(current_vm->reserved(), early_vm->reserved()) != 0) {
+ out->print("%27s (mmap: ", " ");
+ print_virtual_memory_diff(current_vm->reserved(), current_vm->committed(),
+ early_vm->reserved(), early_vm->committed());
+ out->print_cr(")");
+ }
+
+ // Report arena memory
+ if (amount_in_current_scale(current_malloc->arena_size()) > 0 ||
+ diff_in_current_scale(current_malloc->arena_size(), early_malloc->arena_size()) != 0) {
+ out->print("%28s(", " ");
+ print_arena_diff(current_malloc->arena_size(), current_malloc->arena_count(),
+ early_malloc->arena_size(), early_malloc->arena_count());
+ out->print_cr(")");
+ }
+
+ // Report native memory tracking overhead
+ if (flag == mtNMT) {
+ size_t current_tracking_overhead = amount_in_current_scale(_current_baseline.malloc_tracking_overhead());
+ size_t early_tracking_overhead = amount_in_current_scale(_early_baseline.malloc_tracking_overhead());
+
+ out->print("%27s (tracking overhead=" SIZE_FORMAT "%s", " ",
+ amount_in_current_scale(_current_baseline.malloc_tracking_overhead()), scale);
+
+ long overhead_diff = diff_in_current_scale(_current_baseline.malloc_tracking_overhead(),
+ _early_baseline.malloc_tracking_overhead());
+ if (overhead_diff != 0) {
+ out->print(" %+ld%s", overhead_diff, scale);
+ }
+ out->print_cr(")");
+ }
+ out->print_cr(" ");
+ }
+}
+
+void MemDetailDiffReporter::report_diff() {
+ MemSummaryDiffReporter::report_diff();
+ diff_malloc_sites();
+ diff_virtual_memory_sites();
+}
+
+void MemDetailDiffReporter::diff_malloc_sites() const {
+ MallocSiteIterator early_itr = _early_baseline.malloc_sites(MemBaseline::by_site);
+ MallocSiteIterator current_itr = _current_baseline.malloc_sites(MemBaseline::by_site);
+
+ const MallocSite* early_site = early_itr.next();
+ const MallocSite* current_site = current_itr.next();
+
+ while (early_site != NULL || current_site != NULL) {
+ if (early_site == NULL) {
+ new_malloc_site(current_site);
+ current_site = current_itr.next();
+ } else if (current_site == NULL) {
+ old_malloc_site(early_site);
+ early_site = early_itr.next();
+ } else {
+ int compVal = current_site->call_stack()->compare(*early_site->call_stack());
+ if (compVal < 0) {
+ new_malloc_site(current_site);
+ current_site = current_itr.next();
+ } else if (compVal > 0) {
+ old_malloc_site(early_site);
+ early_site = early_itr.next();
} else {
- // the same callsite
- _outputer.diff_malloc_callsite(cur_malloc_callsite->addr(),
- amount_in_current_scale(cur_malloc_callsite->amount()),
- cur_malloc_callsite->count(),
- diff_in_current_scale(cur_malloc_callsite->amount(), prev_malloc_callsite->amount()),
- diff(cur_malloc_callsite->count(), prev_malloc_callsite->count()));
- cur_malloc_callsite = (MallocCallsitePointer*)cur_malloc_itr.next();
- prev_malloc_callsite = (MallocCallsitePointer*)prev_malloc_itr.next();
+ diff_malloc_site(early_site, current_site);
+ early_site = early_itr.next();
+ current_site = current_itr.next();
}
}
}
-
- // walk virtual memory callsite
- MemPointerArrayIteratorImpl cur_vm_itr(pBL_cur->_vm_cs);
- MemPointerArrayIteratorImpl prev_vm_itr(pBL_prev->_vm_cs);
- VMCallsitePointer* cur_vm_callsite = (VMCallsitePointer*)cur_vm_itr.current();
- VMCallsitePointer* prev_vm_callsite = (VMCallsitePointer*)prev_vm_itr.current();
- while (cur_vm_callsite != NULL || prev_vm_callsite != NULL) {
- if (prev_vm_callsite == NULL || cur_vm_callsite->addr() < prev_vm_callsite->addr()) {
- // this is a new callsite
- _outputer.diff_virtual_memory_callsite(cur_vm_callsite->addr(),
- amount_in_current_scale(cur_vm_callsite->reserved_amount()),
- amount_in_current_scale(cur_vm_callsite->committed_amount()),
- diff_in_current_scale(cur_vm_callsite->reserved_amount(), 0),
- diff_in_current_scale(cur_vm_callsite->committed_amount(), 0));
- cur_vm_callsite = (VMCallsitePointer*)cur_vm_itr.next();
- } else if (cur_vm_callsite == NULL || cur_vm_callsite->addr() > prev_vm_callsite->addr()) {
- // this callsite is already gone
- _outputer.diff_virtual_memory_callsite(prev_vm_callsite->addr(),
- amount_in_current_scale(0),
- amount_in_current_scale(0),
- diff_in_current_scale(0, prev_vm_callsite->reserved_amount()),
- diff_in_current_scale(0, prev_vm_callsite->committed_amount()));
- prev_vm_callsite = (VMCallsitePointer*)prev_vm_itr.next();
- } else { // the same callsite
- _outputer.diff_virtual_memory_callsite(cur_vm_callsite->addr(),
- amount_in_current_scale(cur_vm_callsite->reserved_amount()),
- amount_in_current_scale(cur_vm_callsite->committed_amount()),
- diff_in_current_scale(cur_vm_callsite->reserved_amount(), prev_vm_callsite->reserved_amount()),
- diff_in_current_scale(cur_vm_callsite->committed_amount(), prev_vm_callsite->committed_amount()));
- cur_vm_callsite = (VMCallsitePointer*)cur_vm_itr.next();
- prev_vm_callsite = (VMCallsitePointer*)prev_vm_itr.next();
- }
- }
-
- _outputer.done_callsite();
}
-size_t BaselineReporter::amount_in_current_scale(size_t amt) const {
- return (size_t)(((float)amt/(float)_scale) + 0.5);
-}
+void MemDetailDiffReporter::diff_virtual_memory_sites() const {
+ VirtualMemorySiteIterator early_itr = _early_baseline.virtual_memory_sites(MemBaseline::by_site);
+ VirtualMemorySiteIterator current_itr = _current_baseline.virtual_memory_sites(MemBaseline::by_site);
-int BaselineReporter::diff_in_current_scale(size_t value1, size_t value2) const {
- return (int)(((float)value1 - (float)value2)/((float)_scale) + 0.5);
-}
+ const VirtualMemoryAllocationSite* early_site = early_itr.next();
+ const VirtualMemoryAllocationSite* current_site = current_itr.next();
-int BaselineReporter::diff(size_t value1, size_t value2) const {
- return ((int)value1 - (int)value2);
-}
-
-void BaselineTTYOutputer::start(size_t scale, bool report_diff) {
- _scale = scale;
- _output->print_cr(" ");
- _output->print_cr("Native Memory Tracking:");
- _output->print_cr(" ");
-}
-
-void BaselineTTYOutputer::done() {
-
-}
-
-void BaselineTTYOutputer::total_usage(size_t total_reserved, size_t total_committed) {
- const char* unit = memory_unit(_scale);
- _output->print_cr("Total: reserved=%d%s, committed=%d%s",
- total_reserved, unit, total_committed, unit);
-}
-
-void BaselineTTYOutputer::start_category_summary() {
- _output->print_cr(" ");
-}
-
-/**
- * report a summary of memory type
- */
-void BaselineTTYOutputer::category_summary(MEMFLAGS type,
- size_t reserved_amt, size_t committed_amt, size_t malloc_amt,
- size_t malloc_count, size_t arena_amt, size_t arena_count) {
-
- // we report mtThreadStack under mtThread category
- if (type == mtThreadStack) {
- assert(malloc_amt == 0 && malloc_count == 0 && arena_amt == 0,
- "Just check");
- _thread_stack_reserved = reserved_amt;
- _thread_stack_committed = committed_amt;
- } else {
- const char* unit = memory_unit(_scale);
- size_t total_reserved = (reserved_amt + malloc_amt + arena_amt);
- size_t total_committed = (committed_amt + malloc_amt + arena_amt);
- if (type == mtThread) {
- total_reserved += _thread_stack_reserved;
- total_committed += _thread_stack_committed;
- }
-
- if (total_reserved > 0) {
- _output->print_cr("-%26s (reserved=%d%s, committed=%d%s)",
- MemBaseline::type2name(type), total_reserved, unit,
- total_committed, unit);
-
- if (type == mtClass) {
- _output->print_cr("%27s (classes #%d)", " ", _num_of_classes);
- } else if (type == mtThread) {
- _output->print_cr("%27s (thread #%d)", " ", _num_of_threads);
- _output->print_cr("%27s (stack: reserved=%d%s, committed=%d%s)", " ",
- _thread_stack_reserved, unit, _thread_stack_committed, unit);
- }
-
- if (malloc_amt > 0) {
- if (type != mtChunk) {
- _output->print_cr("%27s (malloc=%d%s, #%d)", " ", malloc_amt, unit,
- malloc_count);
- } else {
- _output->print_cr("%27s (malloc=%d%s)", " ", malloc_amt, unit);
- }
- }
-
- if (reserved_amt > 0) {
- _output->print_cr("%27s (mmap: reserved=%d%s, committed=%d%s)",
- " ", reserved_amt, unit, committed_amt, unit);
- }
-
- if (arena_amt > 0) {
- _output->print_cr("%27s (arena=%d%s, #%d)", " ", arena_amt, unit, arena_count);
- }
-
- _output->print_cr(" ");
- }
- }
-}
-
-void BaselineTTYOutputer::done_category_summary() {
- _output->print_cr(" ");
-}
-
-
-void BaselineTTYOutputer::start_virtual_memory_map() {
- _output->print_cr("Virtual memory map:");
-}
-
-void BaselineTTYOutputer::reserved_memory_region(MEMFLAGS type, address base, address end,
- size_t size, address pc) {
- const char* unit = memory_unit(_scale);
- char buf[128];
- int offset;
- _output->print_cr(" ");
- _output->print_cr("[" PTR_FORMAT " - " PTR_FORMAT "] reserved %d%s for %s", base, end, size, unit,
- MemBaseline::type2name(type));
- if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
- _output->print_cr("\t\tfrom [%s+0x%x]", buf, offset);
- }
-}
-
-void BaselineTTYOutputer::committed_memory_region(address base, address end, size_t size, address pc) {
- const char* unit = memory_unit(_scale);
- char buf[128];
- int offset;
- _output->print("\t[" PTR_FORMAT " - " PTR_FORMAT "] committed %d%s", base, end, size, unit);
- if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
- _output->print_cr(" from [%s+0x%x]", buf, offset);
- }
-}
-
-void BaselineTTYOutputer::done_virtual_memory_map() {
- _output->print_cr(" ");
-}
-
-
-
-void BaselineTTYOutputer::start_callsite() {
- _output->print_cr("Details:");
- _output->print_cr(" ");
-}
-
-void BaselineTTYOutputer::done_callsite() {
- _output->print_cr(" ");
-}
-
-void BaselineTTYOutputer::malloc_callsite(address pc, size_t malloc_amt,
- size_t malloc_count) {
- if (malloc_amt > 0) {
- const char* unit = memory_unit(_scale);
- char buf[128];
- int offset;
- if (pc == 0) {
- _output->print("[BOOTSTRAP]%18s", " ");
- } else if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
- _output->print_cr("[" PTR_FORMAT "] %s+0x%x", pc, buf, offset);
- _output->print("%28s", " ");
+ while (early_site != NULL || current_site != NULL) {
+ if (early_site == NULL) {
+ new_virtual_memory_site(current_site);
+ current_site = current_itr.next();
+ } else if (current_site == NULL) {
+ old_virtual_memory_site(early_site);
+ early_site = early_itr.next();
} else {
- _output->print("[" PTR_FORMAT "]%18s", pc, " ");
+ int compVal = current_site->call_stack()->compare(*early_site->call_stack());
+ if (compVal < 0) {
+ new_virtual_memory_site(current_site);
+ current_site = current_itr.next();
+ } else if (compVal > 0) {
+ old_virtual_memory_site(early_site);
+ early_site = early_itr.next();
+ } else {
+ diff_virtual_memory_site(early_site, current_site);
+ early_site = early_itr.next();
+ current_site = current_itr.next();
+ }
}
-
- _output->print_cr("(malloc=%d%s #%d)", malloc_amt, unit, malloc_count);
- _output->print_cr(" ");
}
}
-void BaselineTTYOutputer::virtual_memory_callsite(address pc, size_t reserved_amt,
- size_t committed_amt) {
- if (reserved_amt > 0) {
- const char* unit = memory_unit(_scale);
- char buf[128];
- int offset;
- if (pc == 0) {
- _output->print("[BOOTSTRAP]%18s", " ");
- } else if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
- _output->print_cr("[" PTR_FORMAT "] %s+0x%x", pc, buf, offset);
- _output->print("%28s", " ");
- } else {
- _output->print("[" PTR_FORMAT "]%18s", pc, " ");
- }
- _output->print_cr("(mmap: reserved=%d%s, committed=%d%s)",
- reserved_amt, unit, committed_amt, unit);
- _output->print_cr(" ");
- }
+void MemDetailDiffReporter::new_malloc_site(const MallocSite* malloc_site) const {
+ diff_malloc_site(malloc_site->call_stack(), malloc_site->size(), malloc_site->count(),
+ 0, 0);
}
-void BaselineTTYOutputer::diff_total_usage(size_t total_reserved,
- size_t total_committed, int reserved_diff, int committed_diff) {
- const char* unit = memory_unit(_scale);
- _output->print_cr("Total: reserved=%d%s %+d%s, committed=%d%s %+d%s",
- total_reserved, unit, reserved_diff, unit, total_committed, unit,
- committed_diff, unit);
+void MemDetailDiffReporter::old_malloc_site(const MallocSite* malloc_site) const {
+ diff_malloc_site(malloc_site->call_stack(), 0, 0, malloc_site->size(),
+ malloc_site->count());
}
-void BaselineTTYOutputer::diff_category_summary(MEMFLAGS type,
- size_t cur_reserved_amt, size_t cur_committed_amt,
- size_t cur_malloc_amt, size_t cur_malloc_count,
- size_t cur_arena_amt, size_t cur_arena_count,
- int reserved_diff, int committed_diff, int malloc_diff,
- int malloc_count_diff, int arena_diff, int arena_count_diff) {
+void MemDetailDiffReporter::diff_malloc_site(const MallocSite* early,
+ const MallocSite* current) const {
+ diff_malloc_site(current->call_stack(), current->size(), current->count(),
+ early->size(), early->count());
+}
- if (type == mtThreadStack) {
- assert(cur_malloc_amt == 0 && cur_malloc_count == 0 &&
- cur_arena_amt == 0, "Just check");
- _thread_stack_reserved = cur_reserved_amt;
- _thread_stack_committed = cur_committed_amt;
- _thread_stack_reserved_diff = reserved_diff;
- _thread_stack_committed_diff = committed_diff;
- } else {
- const char* unit = memory_unit(_scale);
- size_t total_reserved = (cur_reserved_amt + cur_malloc_amt + cur_arena_amt);
- // nothing to report in this category
- if (total_reserved == 0) {
+void MemDetailDiffReporter::diff_malloc_site(const NativeCallStack* stack, size_t current_size,
+ size_t current_count, size_t early_size, size_t early_count) const {
+ outputStream* out = output();
+
+ assert(stack != NULL, "NULL stack");
+
+ if (diff_in_current_scale(current_size, early_size) == 0) {
return;
- }
- int diff_reserved = (reserved_diff + malloc_diff + arena_diff);
-
- // category summary
- _output->print("-%26s (reserved=%d%s", MemBaseline::type2name(type),
- total_reserved, unit);
-
- if (diff_reserved != 0) {
- _output->print(" %+d%s", diff_reserved, unit);
- }
-
- size_t total_committed = cur_committed_amt + cur_malloc_amt + cur_arena_amt;
- _output->print(", committed=%d%s", total_committed, unit);
-
- int total_committed_diff = committed_diff + malloc_diff + arena_diff;
- if (total_committed_diff != 0) {
- _output->print(" %+d%s", total_committed_diff, unit);
- }
-
- _output->print_cr(")");
-
- // special cases
- if (type == mtClass) {
- _output->print("%27s (classes #%d", " ", _num_of_classes);
- if (_num_of_classes_diff != 0) {
- _output->print(" %+d", _num_of_classes_diff);
- }
- _output->print_cr(")");
- } else if (type == mtThread) {
- // thread count
- _output->print("%27s (thread #%d", " ", _num_of_threads);
- if (_num_of_threads_diff != 0) {
- _output->print_cr(" %+d)", _num_of_threads_diff);
- } else {
- _output->print_cr(")");
- }
- _output->print("%27s (stack: reserved=%d%s", " ", _thread_stack_reserved, unit);
- if (_thread_stack_reserved_diff != 0) {
- _output->print(" %+d%s", _thread_stack_reserved_diff, unit);
- }
-
- _output->print(", committed=%d%s", _thread_stack_committed, unit);
- if (_thread_stack_committed_diff != 0) {
- _output->print(" %+d%s",_thread_stack_committed_diff, unit);
- }
-
- _output->print_cr(")");
- }
-
- // malloc'd memory
- if (cur_malloc_amt > 0) {
- _output->print("%27s (malloc=%d%s", " ", cur_malloc_amt, unit);
- if (malloc_diff != 0) {
- _output->print(" %+d%s", malloc_diff, unit);
- }
- if (type != mtChunk) {
- _output->print(", #%d", cur_malloc_count);
- if (malloc_count_diff) {
- _output->print(" %+d", malloc_count_diff);
- }
- }
- _output->print_cr(")");
- }
-
- // mmap'd memory
- if (cur_reserved_amt > 0) {
- _output->print("%27s (mmap: reserved=%d%s", " ", cur_reserved_amt, unit);
- if (reserved_diff != 0) {
- _output->print(" %+d%s", reserved_diff, unit);
- }
-
- _output->print(", committed=%d%s", cur_committed_amt, unit);
- if (committed_diff != 0) {
- _output->print(" %+d%s", committed_diff, unit);
- }
- _output->print_cr(")");
- }
-
- // arena memory
- if (cur_arena_amt > 0) {
- _output->print("%27s (arena=%d%s", " ", cur_arena_amt, unit);
- if (arena_diff != 0) {
- _output->print(" %+d%s", arena_diff, unit);
- }
- _output->print(", #%d", cur_arena_count);
- if (arena_count_diff != 0) {
- _output->print(" %+d", arena_count_diff);
- }
- _output->print_cr(")");
- }
-
- _output->print_cr(" ");
}
+
+ stack->print_on(out);
+ out->print("%28s (", " ");
+ print_malloc_diff(current_size, current_count,
+ early_size, early_count);
+
+ out->print_cr(")\n");
}
-void BaselineTTYOutputer::diff_malloc_callsite(address pc,
- size_t cur_malloc_amt, size_t cur_malloc_count,
- int malloc_diff, int malloc_count_diff) {
- if (malloc_diff != 0) {
- const char* unit = memory_unit(_scale);
- char buf[128];
- int offset;
- if (pc == 0) {
- _output->print_cr("[BOOTSTRAP]%18s", " ");
- } else {
- if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
- _output->print_cr("[" PTR_FORMAT "] %s+0x%x", pc, buf, offset);
- _output->print("%28s", " ");
- } else {
- _output->print("[" PTR_FORMAT "]%18s", pc, " ");
- }
- }
- _output->print("(malloc=%d%s", cur_malloc_amt, unit);
- if (malloc_diff != 0) {
- _output->print(" %+d%s", malloc_diff, unit);
- }
- _output->print(", #%d", cur_malloc_count);
- if (malloc_count_diff != 0) {
- _output->print(" %+d", malloc_count_diff);
- }
- _output->print_cr(")");
- _output->print_cr(" ");
- }
+void MemDetailDiffReporter::new_virtual_memory_site(const VirtualMemoryAllocationSite* site) const {
+ diff_virtual_memory_site(site->call_stack(), site->reserved(), site->committed(), 0, 0);
}
-void BaselineTTYOutputer::diff_virtual_memory_callsite(address pc,
- size_t cur_reserved_amt, size_t cur_committed_amt,
- int reserved_diff, int committed_diff) {
- if (reserved_diff != 0 || committed_diff != 0) {
- const char* unit = memory_unit(_scale);
- char buf[64];
- int offset;
- if (pc == 0) {
- _output->print_cr("[BOOSTRAP]%18s", " ");
- } else {
- if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
- _output->print_cr("[" PTR_FORMAT "] %s+0x%x", pc, buf, offset);
- _output->print("%28s", " ");
- } else {
- _output->print("[" PTR_FORMAT "]%18s", pc, " ");
- }
- }
-
- _output->print("(mmap: reserved=%d%s", cur_reserved_amt, unit);
- if (reserved_diff != 0) {
- _output->print(" %+d%s", reserved_diff, unit);
- }
- _output->print(", committed=%d%s", cur_committed_amt, unit);
- if (committed_diff != 0) {
- _output->print(" %+d%s", committed_diff, unit);
- }
- _output->print_cr(")");
- _output->print_cr(" ");
- }
+void MemDetailDiffReporter::old_virtual_memory_site(const VirtualMemoryAllocationSite* site) const {
+ diff_virtual_memory_site(site->call_stack(), 0, 0, site->reserved(), site->committed());
}
+
+void MemDetailDiffReporter::diff_virtual_memory_site(const VirtualMemoryAllocationSite* early,
+ const VirtualMemoryAllocationSite* current) const {
+ diff_virtual_memory_site(current->call_stack(), current->reserved(), current->committed(),
+ early->reserved(), early->committed());
+}
+
+void MemDetailDiffReporter::diff_virtual_memory_site(const NativeCallStack* stack, size_t current_reserved,
+ size_t current_committed, size_t early_reserved, size_t early_committed) const {
+ outputStream* out = output();
+
+ // no change
+ if (diff_in_current_scale(current_reserved, early_reserved) == 0 &&
+ diff_in_current_scale(current_committed, early_committed) == 0) {
+ return;
+ }
+
+ stack->print_on(out);
+ out->print("%28s (mmap: ", " ");
+ print_virtual_memory_diff(current_reserved, current_committed,
+ early_reserved, early_committed);
+
+ out->print_cr(")\n");
+ }
+
diff --git a/hotspot/src/share/vm/services/memReporter.hpp b/hotspot/src/share/vm/services/memReporter.hpp
index 805559b..239fb94 100644
--- a/hotspot/src/share/vm/services/memReporter.hpp
+++ b/hotspot/src/share/vm/services/memReporter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,262 +25,217 @@
#ifndef SHARE_VM_SERVICES_MEM_REPORTER_HPP
#define SHARE_VM_SERVICES_MEM_REPORTER_HPP
-#include "runtime/mutexLocker.hpp"
-#include "services/memBaseline.hpp"
-#include "services/memTracker.hpp"
-#include "utilities/ostream.hpp"
-#include "utilities/macros.hpp"
-
#if INCLUDE_NMT
+#include "oops/instanceKlass.hpp"
+#include "services/memBaseline.hpp"
+#include "services/nmtCommon.hpp"
+#include "services/mallocTracker.hpp"
+#include "services/virtualMemoryTracker.hpp"
+
/*
- * MemBaselineReporter reports data to this outputer class,
- * ReportOutputer is responsible for format, store and redirect
- * the data to the final destination.
- */
-class BaselineOutputer : public StackObj {
+ * Base class that provides helpers
+*/
+class MemReporterBase : public StackObj {
+ private:
+ size_t _scale; // report in this scale
+ outputStream* _output; // destination
+
public:
- // start to report memory usage in specified scale.
- // if report_diff = true, the reporter reports baseline comparison
- // information.
+ MemReporterBase(outputStream* out = NULL, size_t scale = K)
+ : _scale(scale) {
+ _output = (out == NULL) ? tty : out;
+ }
- virtual void start(size_t scale, bool report_diff = false) = 0;
- // Done reporting
- virtual void done() = 0;
+ protected:
+ inline outputStream* output() const {
+ return _output;
+ }
+ // Current reporting scale
+ inline const char* current_scale() const {
+ return NMTUtil::scale_name(_scale);
+ }
+ // Convert memory amount in bytes to current reporting scale
+ inline size_t amount_in_current_scale(size_t amount) const {
+ return NMTUtil::amount_in_scale(amount, _scale);
+ }
- /* report baseline summary information */
- virtual void total_usage(size_t total_reserved,
- size_t total_committed) = 0;
- virtual void num_of_classes(size_t classes) = 0;
- virtual void num_of_threads(size_t threads) = 0;
+ // Convert diff amount in bytes to current reporting scale
+ inline long diff_in_current_scale(size_t s1, size_t s2) const {
+ long amount = (long)(s1 - s2);
+ long scale = (long)_scale;
+ amount = (amount > 0) ? (amount + scale / 2) : (amount - scale / 2);
+ return amount / scale;
+ }
- virtual void thread_info(size_t stack_reserved_amt, size_t stack_committed_amt) = 0;
-
- /* report baseline summary comparison */
- virtual void diff_total_usage(size_t total_reserved,
- size_t total_committed,
- int reserved_diff,
- int committed_diff) = 0;
- virtual void diff_num_of_classes(size_t classes, int diff) = 0;
- virtual void diff_num_of_threads(size_t threads, int diff) = 0;
-
- virtual void diff_thread_info(size_t stack_reserved, size_t stack_committed,
- int stack_reserved_diff, int stack_committed_diff) = 0;
+ // Helper functions
+ // Calculate total reserved and committed amount
+ size_t reserved_total(const MallocMemory* malloc, const VirtualMemory* vm) const;
+ size_t committed_total(const MallocMemory* malloc, const VirtualMemory* vm) const;
- /*
- * memory summary by memory types.
- * for each memory type, following summaries are reported:
- * - reserved amount, committed amount
- * - malloc'd amount, malloc count
- * - arena amount, arena count
- */
+ // Print summary total, malloc and virtual memory
+ void print_total(size_t reserved, size_t committed) const;
+ void print_malloc(size_t amount, size_t count) const;
+ void print_virtual_memory(size_t reserved, size_t committed) const;
- // start reporting memory summary by memory type
- virtual void start_category_summary() = 0;
+ void print_malloc_line(size_t amount, size_t count) const;
+ void print_virtual_memory_line(size_t reserved, size_t committed) const;
+ void print_arena_line(size_t amount, size_t count) const;
- virtual void category_summary(MEMFLAGS type, size_t reserved_amt,
- size_t committed_amt,
- size_t malloc_amt, size_t malloc_count,
- size_t arena_amt, size_t arena_count) = 0;
-
- virtual void diff_category_summary(MEMFLAGS type, size_t cur_reserved_amt,
- size_t cur_committed_amt,
- size_t cur_malloc_amt, size_t cur_malloc_count,
- size_t cur_arena_amt, size_t cur_arena_count,
- int reserved_diff, int committed_diff, int malloc_diff,
- int malloc_count_diff, int arena_diff,
- int arena_count_diff) = 0;
-
- virtual void done_category_summary() = 0;
-
- virtual void start_virtual_memory_map() = 0;
- virtual void reserved_memory_region(MEMFLAGS type, address base, address end, size_t size, address pc) = 0;
- virtual void committed_memory_region(address base, address end, size_t size, address pc) = 0;
- virtual void done_virtual_memory_map() = 0;
-
- /*
- * Report callsite information
- */
- virtual void start_callsite() = 0;
- virtual void malloc_callsite(address pc, size_t malloc_amt, size_t malloc_count) = 0;
- virtual void virtual_memory_callsite(address pc, size_t reserved_amt, size_t committed_amt) = 0;
-
- virtual void diff_malloc_callsite(address pc, size_t cur_malloc_amt, size_t cur_malloc_count,
- int malloc_diff, int malloc_count_diff) = 0;
- virtual void diff_virtual_memory_callsite(address pc, size_t cur_reserved_amt, size_t cur_committed_amt,
- int reserved_diff, int committed_diff) = 0;
-
- virtual void done_callsite() = 0;
-
- // return current scale in "KB", "MB" or "GB"
- static const char* memory_unit(size_t scale);
+ void print_virtual_memory_region(const char* type, address base, size_t size) const;
};
/*
- * This class reports processed data from a baseline or
- * the changes between the two baseline.
+ * The class is for generating summary tracking report.
*/
-class BaselineReporter : public StackObj {
+class MemSummaryReporter : public MemReporterBase {
private:
- BaselineOutputer& _outputer;
- size_t _scale;
+ MallocMemorySnapshot* _malloc_snapshot;
+ VirtualMemorySnapshot* _vm_snapshot;
+ size_t _class_count;
public:
- // construct a reporter that reports memory usage
- // in specified scale
- BaselineReporter(BaselineOutputer& outputer, size_t scale = K):
- _outputer(outputer) {
- _scale = scale;
+ // Report summary tracking data from global snapshots directly.
+ // This constructor is used for final reporting and hs_err reporting.
+ MemSummaryReporter(MallocMemorySnapshot* malloc_snapshot,
+ VirtualMemorySnapshot* vm_snapshot, outputStream* output,
+ size_t class_count = 0, size_t scale = K) :
+ MemReporterBase(output, scale),
+ _malloc_snapshot(malloc_snapshot),
+ _vm_snapshot(vm_snapshot) {
+ if (class_count == 0) {
+ _class_count = InstanceKlass::number_of_instance_classes();
+ } else {
+ _class_count = class_count;
+ }
}
- virtual void report_baseline(const MemBaseline& baseline, bool summary_only = false);
- virtual void diff_baselines(const MemBaseline& cur, const MemBaseline& prev,
- bool summary_only = false);
+ // This constructor is for normal reporting from a recent baseline.
+ MemSummaryReporter(MemBaseline& baseline, outputStream* output,
+ size_t scale = K) : MemReporterBase(output, scale),
+ _malloc_snapshot(baseline.malloc_memory_snapshot()),
+ _vm_snapshot(baseline.virtual_memory_snapshot()),
+ _class_count(baseline.class_count()) { }
- void set_scale(size_t scale);
- size_t scale() const { return _scale; }
+ // Generate summary report
+ virtual void report();
private:
- void report_summaries(const MemBaseline& baseline);
- void report_virtual_memory_map(const MemBaseline& baseline);
- void report_callsites(const MemBaseline& baseline);
-
- void diff_summaries(const MemBaseline& cur, const MemBaseline& prev);
- void diff_callsites(const MemBaseline& cur, const MemBaseline& prev);
-
- // calculate memory size in current memory scale
- size_t amount_in_current_scale(size_t amt) const;
- // diff two unsigned values in current memory scale
- int diff_in_current_scale(size_t value1, size_t value2) const;
- // diff two unsigned value
- int diff(size_t value1, size_t value2) const;
+ // Report summary for each memory type
+ void report_summary_of_type(MEMFLAGS type, MallocMemory* malloc_memory,
+ VirtualMemory* virtual_memory);
};
/*
- * tty output implementation. Native memory tracking
- * DCmd uses this outputer.
+ * The class is for generating detail tracking report.
*/
-class BaselineTTYOutputer : public BaselineOutputer {
+class MemDetailReporter : public MemSummaryReporter {
private:
- size_t _scale;
-
- size_t _num_of_classes;
- size_t _num_of_threads;
- size_t _thread_stack_reserved;
- size_t _thread_stack_committed;
-
- int _num_of_classes_diff;
- int _num_of_threads_diff;
- int _thread_stack_reserved_diff;
- int _thread_stack_committed_diff;
-
- outputStream* _output;
+ MemBaseline& _baseline;
public:
- BaselineTTYOutputer(outputStream* st) {
- _scale = K;
- _num_of_classes = 0;
- _num_of_threads = 0;
- _thread_stack_reserved = 0;
- _thread_stack_committed = 0;
- _num_of_classes_diff = 0;
- _num_of_threads_diff = 0;
- _thread_stack_reserved_diff = 0;
- _thread_stack_committed_diff = 0;
- _output = st;
+ MemDetailReporter(MemBaseline& baseline, outputStream* output, size_t scale = K) :
+ MemSummaryReporter(baseline, output, scale),
+ _baseline(baseline) { }
+
+ // Generate detail report.
+ // The report contains summary and detail sections.
+ virtual void report() {
+ MemSummaryReporter::report();
+ report_virtual_memory_map();
+ report_detail();
}
- // begin reporting memory usage in specified scale
- void start(size_t scale, bool report_diff = false);
- // done reporting
- void done();
+ private:
+ // Report detail tracking data.
+ void report_detail();
+ // Report virtual memory map
+ void report_virtual_memory_map();
+ // Report malloc allocation sites
+ void report_malloc_sites();
+ // Report virtual memory reservation sites
+ void report_virtual_memory_allocation_sites();
- // total memory usage
- void total_usage(size_t total_reserved,
- size_t total_committed);
- // report total loaded classes
- void num_of_classes(size_t classes) {
- _num_of_classes = classes;
- }
-
- void num_of_threads(size_t threads) {
- _num_of_threads = threads;
- }
-
- void thread_info(size_t stack_reserved_amt, size_t stack_committed_amt) {
- _thread_stack_reserved = stack_reserved_amt;
- _thread_stack_committed = stack_committed_amt;
- }
-
- void diff_total_usage(size_t total_reserved,
- size_t total_committed,
- int reserved_diff,
- int committed_diff);
-
- void diff_num_of_classes(size_t classes, int diff) {
- _num_of_classes = classes;
- _num_of_classes_diff = diff;
- }
-
- void diff_num_of_threads(size_t threads, int diff) {
- _num_of_threads = threads;
- _num_of_threads_diff = diff;
- }
-
- void diff_thread_info(size_t stack_reserved_amt, size_t stack_committed_amt,
- int stack_reserved_diff, int stack_committed_diff) {
- _thread_stack_reserved = stack_reserved_amt;
- _thread_stack_committed = stack_committed_amt;
- _thread_stack_reserved_diff = stack_reserved_diff;
- _thread_stack_committed_diff = stack_committed_diff;
- }
-
- /*
- * Report memory summary categoriuzed by memory types.
- * For each memory type, following summaries are reported:
- * - reserved amount, committed amount
- * - malloc-ed amount, malloc count
- * - arena amount, arena count
- */
- // start reporting memory summary by memory type
- void start_category_summary();
- void category_summary(MEMFLAGS type, size_t reserved_amt, size_t committed_amt,
- size_t malloc_amt, size_t malloc_count,
- size_t arena_amt, size_t arena_count);
-
- void diff_category_summary(MEMFLAGS type, size_t cur_reserved_amt,
- size_t cur_committed_amt,
- size_t cur_malloc_amt, size_t cur_malloc_count,
- size_t cur_arena_amt, size_t cur_arena_count,
- int reserved_diff, int committed_diff, int malloc_diff,
- int malloc_count_diff, int arena_diff,
- int arena_count_diff);
-
- void done_category_summary();
-
- // virtual memory map
- void start_virtual_memory_map();
- void reserved_memory_region(MEMFLAGS type, address base, address end, size_t size, address pc);
- void committed_memory_region(address base, address end, size_t size, address pc);
- void done_virtual_memory_map();
-
-
- /*
- * Report callsite information
- */
- void start_callsite();
- void malloc_callsite(address pc, size_t malloc_amt, size_t malloc_count);
- void virtual_memory_callsite(address pc, size_t reserved_amt, size_t committed_amt);
-
- void diff_malloc_callsite(address pc, size_t cur_malloc_amt, size_t cur_malloc_count,
- int malloc_diff, int malloc_count_diff);
- void diff_virtual_memory_callsite(address pc, size_t cur_reserved_amt, size_t cur_committed_amt,
- int reserved_diff, int committed_diff);
-
- void done_callsite();
+ // Report a virtual memory region
+ void report_virtual_memory_region(const ReservedMemoryRegion* rgn);
};
+/*
+ * The class is for generating summary comparison report.
+ * It compares current memory baseline against an early baseline.
+ */
+class MemSummaryDiffReporter : public MemReporterBase {
+ protected:
+ MemBaseline& _early_baseline;
+ MemBaseline& _current_baseline;
+
+ public:
+ MemSummaryDiffReporter(MemBaseline& early_baseline, MemBaseline& current_baseline,
+ outputStream* output, size_t scale = K) : MemReporterBase(output, scale),
+ _early_baseline(early_baseline), _current_baseline(current_baseline) {
+ assert(early_baseline.baseline_type() != MemBaseline::Not_baselined, "Not baselined");
+ assert(current_baseline.baseline_type() != MemBaseline::Not_baselined, "Not baselined");
+ }
+
+ // Generate summary comparison report
+ virtual void report_diff();
+
+ private:
+ // report the comparison of each memory type
+ void diff_summary_of_type(MEMFLAGS type,
+ const MallocMemory* early_malloc, const VirtualMemory* early_vm,
+ const MallocMemory* current_malloc, const VirtualMemory* current_vm) const;
+
+ protected:
+ void print_malloc_diff(size_t current_amount, size_t current_count,
+ size_t early_amount, size_t early_count) const;
+ void print_virtual_memory_diff(size_t current_reserved, size_t current_committed,
+ size_t early_reserved, size_t early_committed) const;
+ void print_arena_diff(size_t current_amount, size_t current_count,
+ size_t early_amount, size_t early_count) const;
+};
+
+/*
+ * The class is for generating detail comparison report.
+ * It compares current memory baseline against an early baseline,
+ * both baselines have to be detail baseline.
+ */
+class MemDetailDiffReporter : public MemSummaryDiffReporter {
+ public:
+ MemDetailDiffReporter(MemBaseline& early_baseline, MemBaseline& current_baseline,
+ outputStream* output, size_t scale = K) :
+ MemSummaryDiffReporter(early_baseline, current_baseline, output, scale) { }
+
+ // Generate detail comparison report
+ virtual void report_diff();
+
+ // Malloc allocation site comparison
+ void diff_malloc_sites() const;
+ // Virutal memory reservation site comparison
+ void diff_virtual_memory_sites() const;
+
+ // New malloc allocation site in recent baseline
+ void new_malloc_site (const MallocSite* site) const;
+ // The malloc allocation site is not in recent baseline
+ void old_malloc_site (const MallocSite* site) const;
+ // Compare malloc allocation site, it is in both baselines
+ void diff_malloc_site(const MallocSite* early, const MallocSite* current) const;
+
+ // New virtual memory allocation site in recent baseline
+ void new_virtual_memory_site (const VirtualMemoryAllocationSite* callsite) const;
+ // The virtual memory allocation site is not in recent baseline
+ void old_virtual_memory_site (const VirtualMemoryAllocationSite* callsite) const;
+ // Compare virtual memory allocation site, it is in both baseline
+ void diff_virtual_memory_site(const VirtualMemoryAllocationSite* early,
+ const VirtualMemoryAllocationSite* current) const;
+
+ void diff_malloc_site(const NativeCallStack* stack, size_t current_size,
+ size_t currrent_count, size_t early_size, size_t early_count) const;
+ void diff_virtual_memory_site(const NativeCallStack* stack, size_t current_reserved,
+ size_t current_committed, size_t early_reserved, size_t early_committed) const;
+};
#endif // INCLUDE_NMT
-#endif // SHARE_VM_SERVICES_MEM_REPORTER_HPP
+#endif
+
diff --git a/hotspot/src/share/vm/services/memSnapshot.cpp b/hotspot/src/share/vm/services/memSnapshot.cpp
deleted file mode 100644
index 8f5ca4f..0000000
--- a/hotspot/src/share/vm/services/memSnapshot.cpp
+++ /dev/null
@@ -1,748 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "runtime/mutexLocker.hpp"
-#include "utilities/decoder.hpp"
-#include "services/memBaseline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memPtrArray.hpp"
-#include "services/memSnapshot.hpp"
-#include "services/memTracker.hpp"
-
-PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
-#ifdef ASSERT
-
-void decode_pointer_record(MemPointerRecord* rec) {
- tty->print("Pointer: [" PTR_FORMAT " - " PTR_FORMAT "] size = %d bytes", rec->addr(),
- rec->addr() + rec->size(), (int)rec->size());
- tty->print(" type = %s", MemBaseline::type2name(FLAGS_TO_MEMORY_TYPE(rec->flags())));
- if (rec->is_vm_pointer()) {
- if (rec->is_allocation_record()) {
- tty->print_cr(" (reserve)");
- } else if (rec->is_commit_record()) {
- tty->print_cr(" (commit)");
- } else if (rec->is_uncommit_record()) {
- tty->print_cr(" (uncommit)");
- } else if (rec->is_deallocation_record()) {
- tty->print_cr(" (release)");
- } else {
- tty->print_cr(" (tag)");
- }
- } else {
- if (rec->is_arena_memory_record()) {
- tty->print_cr(" (arena size)");
- } else if (rec->is_allocation_record()) {
- tty->print_cr(" (malloc)");
- } else {
- tty->print_cr(" (free)");
- }
- }
- if (MemTracker::track_callsite()) {
- char buf[1024];
- address pc = ((MemPointerRecordEx*)rec)->pc();
- if (pc != NULL && os::dll_address_to_function_name(pc, buf, sizeof(buf), NULL)) {
- tty->print_cr("\tfrom %s", buf);
- } else {
- tty->print_cr("\tcould not decode pc = " PTR_FORMAT "", pc);
- }
- }
-}
-
-void decode_vm_region_record(VMMemRegion* rec) {
- tty->print("VM Region [" PTR_FORMAT " - " PTR_FORMAT "]", rec->addr(),
- rec->addr() + rec->size());
- tty->print(" type = %s", MemBaseline::type2name(FLAGS_TO_MEMORY_TYPE(rec->flags())));
- if (rec->is_allocation_record()) {
- tty->print_cr(" (reserved)");
- } else if (rec->is_commit_record()) {
- tty->print_cr(" (committed)");
- } else {
- ShouldNotReachHere();
- }
- if (MemTracker::track_callsite()) {
- char buf[1024];
- address pc = ((VMMemRegionEx*)rec)->pc();
- if (pc != NULL && os::dll_address_to_function_name(pc, buf, sizeof(buf), NULL)) {
- tty->print_cr("\tfrom %s", buf);
- } else {
- tty->print_cr("\tcould not decode pc = " PTR_FORMAT "", pc);
- }
-
- }
-}
-
-#endif
-
-
-bool VMMemPointerIterator::insert_record(MemPointerRecord* rec) {
- VMMemRegionEx new_rec;
- assert(rec->is_allocation_record() || rec->is_commit_record(),
- "Sanity check");
- if (MemTracker::track_callsite()) {
- new_rec.init((MemPointerRecordEx*)rec);
- } else {
- new_rec.init(rec);
- }
- return insert(&new_rec);
-}
-
-bool VMMemPointerIterator::insert_record_after(MemPointerRecord* rec) {
- VMMemRegionEx new_rec;
- assert(rec->is_allocation_record() || rec->is_commit_record(),
- "Sanity check");
- if (MemTracker::track_callsite()) {
- new_rec.init((MemPointerRecordEx*)rec);
- } else {
- new_rec.init(rec);
- }
- return insert_after(&new_rec);
-}
-
-// we don't consolidate reserved regions, since they may be categorized
-// in different types.
-bool VMMemPointerIterator::add_reserved_region(MemPointerRecord* rec) {
- assert(rec->is_allocation_record(), "Sanity check");
- VMMemRegion* reserved_region = (VMMemRegion*)current();
-
- // we don't have anything yet
- if (reserved_region == NULL) {
- return insert_record(rec);
- }
-
- assert(reserved_region->is_reserved_region(), "Sanity check");
- // duplicated records
- if (reserved_region->is_same_region(rec)) {
- return true;
- }
- // Overlapping stack regions indicate that a JNI thread failed to
- // detach from the VM before exiting. This leaks the JavaThread object.
- if (CheckJNICalls) {
- guarantee(FLAGS_TO_MEMORY_TYPE(reserved_region->flags()) != mtThreadStack ||
- !reserved_region->overlaps_region(rec),
- "Attached JNI thread exited without being detached");
- }
- // otherwise, we should not have overlapping reserved regions
- assert(FLAGS_TO_MEMORY_TYPE(reserved_region->flags()) == mtThreadStack ||
- reserved_region->base() > rec->addr(), "Just check: locate()");
- assert(FLAGS_TO_MEMORY_TYPE(reserved_region->flags()) == mtThreadStack ||
- !reserved_region->overlaps_region(rec), "overlapping reserved regions");
-
- return insert_record(rec);
-}
-
-// we do consolidate committed regions
-bool VMMemPointerIterator::add_committed_region(MemPointerRecord* rec) {
- assert(rec->is_commit_record(), "Sanity check");
- VMMemRegion* reserved_rgn = (VMMemRegion*)current();
- assert(reserved_rgn->is_reserved_region() && reserved_rgn->contains_region(rec),
- "Sanity check");
-
- // thread's native stack is always marked as "committed", ignore
- // the "commit" operation for creating stack guard pages
- if (FLAGS_TO_MEMORY_TYPE(reserved_rgn->flags()) == mtThreadStack &&
- FLAGS_TO_MEMORY_TYPE(rec->flags()) != mtThreadStack) {
- return true;
- }
-
- // if the reserved region has any committed regions
- VMMemRegion* committed_rgn = (VMMemRegion*)next();
- while (committed_rgn != NULL && committed_rgn->is_committed_region()) {
- // duplicated commit records
- if(committed_rgn->contains_region(rec)) {
- return true;
- } else if (committed_rgn->overlaps_region(rec)) {
- // overlaps front part
- if (rec->addr() < committed_rgn->addr()) {
- committed_rgn->expand_region(rec->addr(),
- committed_rgn->addr() - rec->addr());
- } else {
- // overlaps tail part
- address committed_rgn_end = committed_rgn->addr() +
- committed_rgn->size();
- assert(committed_rgn_end < rec->addr() + rec->size(),
- "overlap tail part");
- committed_rgn->expand_region(committed_rgn_end,
- (rec->addr() + rec->size()) - committed_rgn_end);
- }
- } else if (committed_rgn->base() + committed_rgn->size() == rec->addr()) {
- // adjunct each other
- committed_rgn->expand_region(rec->addr(), rec->size());
- VMMemRegion* next_reg = (VMMemRegion*)next();
- // see if we can consolidate next committed region
- if (next_reg != NULL && next_reg->is_committed_region() &&
- next_reg->base() == committed_rgn->base() + committed_rgn->size()) {
- committed_rgn->expand_region(next_reg->base(), next_reg->size());
- // delete merged region
- remove();
- }
- return true;
- } else if (committed_rgn->base() > rec->addr()) {
- // found the location, insert this committed region
- return insert_record(rec);
- }
- committed_rgn = (VMMemRegion*)next();
- }
- return insert_record(rec);
-}
-
-bool VMMemPointerIterator::remove_uncommitted_region(MemPointerRecord* rec) {
- assert(rec->is_uncommit_record(), "sanity check");
- VMMemRegion* cur;
- cur = (VMMemRegion*)current();
- assert(cur->is_reserved_region() && cur->contains_region(rec),
- "Sanity check");
- // thread's native stack is always marked as "committed", ignore
- // the "commit" operation for creating stack guard pages
- if (FLAGS_TO_MEMORY_TYPE(cur->flags()) == mtThreadStack &&
- FLAGS_TO_MEMORY_TYPE(rec->flags()) != mtThreadStack) {
- return true;
- }
-
- cur = (VMMemRegion*)next();
- while (cur != NULL && cur->is_committed_region()) {
- // region already uncommitted, must be due to duplicated record
- if (cur->addr() >= rec->addr() + rec->size()) {
- break;
- } else if (cur->contains_region(rec)) {
- // uncommit whole region
- if (cur->is_same_region(rec)) {
- remove();
- break;
- } else if (rec->addr() == cur->addr() ||
- rec->addr() + rec->size() == cur->addr() + cur->size()) {
- // uncommitted from either end of current memory region.
- cur->exclude_region(rec->addr(), rec->size());
- break;
- } else { // split the committed region and release the middle
- address high_addr = cur->addr() + cur->size();
- size_t sz = high_addr - rec->addr();
- cur->exclude_region(rec->addr(), sz);
- sz = high_addr - (rec->addr() + rec->size());
- if (MemTracker::track_callsite()) {
- MemPointerRecordEx tmp(rec->addr() + rec->size(), cur->flags(), sz,
- ((VMMemRegionEx*)cur)->pc());
- return insert_record_after(&tmp);
- } else {
- MemPointerRecord tmp(rec->addr() + rec->size(), cur->flags(), sz);
- return insert_record_after(&tmp);
- }
- }
- }
- cur = (VMMemRegion*)next();
- }
-
- // we may not find committed record due to duplicated records
- return true;
-}
-
-bool VMMemPointerIterator::remove_released_region(MemPointerRecord* rec) {
- assert(rec->is_deallocation_record(), "Sanity check");
- VMMemRegion* cur = (VMMemRegion*)current();
- assert(cur->is_reserved_region() && cur->contains_region(rec),
- "Sanity check");
- if (rec->is_same_region(cur)) {
-
- // In snapshot, the virtual memory records are sorted in following orders:
- // 1. virtual memory's base address
- // 2. virtual memory reservation record, followed by commit records within this reservation.
- // The commit records are also in base address order.
- // When a reserved region is released, we want to remove the reservation record and all
- // commit records following it.
-#ifdef ASSERT
- address low_addr = cur->addr();
- address high_addr = low_addr + cur->size();
-#endif
- // remove virtual memory reservation record
- remove();
- // remove committed regions within above reservation
- VMMemRegion* next_region = (VMMemRegion*)current();
- while (next_region != NULL && next_region->is_committed_region()) {
- assert(next_region->addr() >= low_addr &&
- next_region->addr() + next_region->size() <= high_addr,
- "Range check");
- remove();
- next_region = (VMMemRegion*)current();
- }
- } else if (rec->addr() == cur->addr() ||
- rec->addr() + rec->size() == cur->addr() + cur->size()) {
- // released region is at either end of this region
- cur->exclude_region(rec->addr(), rec->size());
- assert(check_reserved_region(), "Integrity check");
- } else { // split the reserved region and release the middle
- address high_addr = cur->addr() + cur->size();
- size_t sz = high_addr - rec->addr();
- cur->exclude_region(rec->addr(), sz);
- sz = high_addr - rec->addr() - rec->size();
- if (MemTracker::track_callsite()) {
- MemPointerRecordEx tmp(rec->addr() + rec->size(), cur->flags(), sz,
- ((VMMemRegionEx*)cur)->pc());
- bool ret = insert_reserved_region(&tmp);
- assert(!ret || check_reserved_region(), "Integrity check");
- return ret;
- } else {
- MemPointerRecord tmp(rec->addr() + rec->size(), cur->flags(), sz);
- bool ret = insert_reserved_region(&tmp);
- assert(!ret || check_reserved_region(), "Integrity check");
- return ret;
- }
- }
- return true;
-}
-
-bool VMMemPointerIterator::insert_reserved_region(MemPointerRecord* rec) {
- // skip all 'commit' records associated with previous reserved region
- VMMemRegion* p = (VMMemRegion*)next();
- while (p != NULL && p->is_committed_region() &&
- p->base() + p->size() < rec->addr()) {
- p = (VMMemRegion*)next();
- }
- return insert_record(rec);
-}
-
-bool VMMemPointerIterator::split_reserved_region(VMMemRegion* rgn, address new_rgn_addr, size_t new_rgn_size) {
- assert(rgn->contains_region(new_rgn_addr, new_rgn_size), "Not fully contained");
- address pc = (MemTracker::track_callsite() ? ((VMMemRegionEx*)rgn)->pc() : NULL);
- if (rgn->base() == new_rgn_addr) { // new region is at the beginning of the region
- size_t sz = rgn->size() - new_rgn_size;
- // the original region becomes 'new' region
- rgn->exclude_region(new_rgn_addr + new_rgn_size, sz);
- // remaining becomes next region
- MemPointerRecordEx next_rgn(new_rgn_addr + new_rgn_size, rgn->flags(), sz, pc);
- return insert_reserved_region(&next_rgn);
- } else if (rgn->base() + rgn->size() == new_rgn_addr + new_rgn_size) {
- rgn->exclude_region(new_rgn_addr, new_rgn_size);
- MemPointerRecordEx next_rgn(new_rgn_addr, rgn->flags(), new_rgn_size, pc);
- return insert_reserved_region(&next_rgn);
- } else {
- // the orginal region will be split into three
- address rgn_high_addr = rgn->base() + rgn->size();
- // first region
- rgn->exclude_region(new_rgn_addr, (rgn_high_addr - new_rgn_addr));
- // the second region is the new region
- MemPointerRecordEx new_rgn(new_rgn_addr, rgn->flags(), new_rgn_size, pc);
- if (!insert_reserved_region(&new_rgn)) return false;
- // the remaining region
- MemPointerRecordEx rem_rgn(new_rgn_addr + new_rgn_size, rgn->flags(),
- rgn_high_addr - (new_rgn_addr + new_rgn_size), pc);
- return insert_reserved_region(&rem_rgn);
- }
-}
-
-static int sort_in_seq_order(const void* p1, const void* p2) {
- assert(p1 != NULL && p2 != NULL, "Sanity check");
- const MemPointerRecord* mp1 = (MemPointerRecord*)p1;
- const MemPointerRecord* mp2 = (MemPointerRecord*)p2;
- return (mp1->seq() - mp2->seq());
-}
-
-bool StagingArea::init() {
- if (MemTracker::track_callsite()) {
- _malloc_data = new (std::nothrow)MemPointerArrayImpl<SeqMemPointerRecordEx>();
- _vm_data = new (std::nothrow)MemPointerArrayImpl<SeqMemPointerRecordEx>();
- } else {
- _malloc_data = new (std::nothrow)MemPointerArrayImpl<SeqMemPointerRecord>();
- _vm_data = new (std::nothrow)MemPointerArrayImpl<SeqMemPointerRecord>();
- }
-
- if (_malloc_data != NULL && _vm_data != NULL &&
- !_malloc_data->out_of_memory() &&
- !_vm_data->out_of_memory()) {
- return true;
- } else {
- if (_malloc_data != NULL) delete _malloc_data;
- if (_vm_data != NULL) delete _vm_data;
- _malloc_data = NULL;
- _vm_data = NULL;
- return false;
- }
-}
-
-
-VMRecordIterator StagingArea::virtual_memory_record_walker() {
- MemPointerArray* arr = vm_data();
- // sort into seq number order
- arr->sort((FN_SORT)sort_in_seq_order);
- return VMRecordIterator(arr);
-}
-
-
-MemSnapshot::MemSnapshot() {
- if (MemTracker::track_callsite()) {
- _alloc_ptrs = new (std::nothrow) MemPointerArrayImpl<MemPointerRecordEx>();
- _vm_ptrs = new (std::nothrow)MemPointerArrayImpl<VMMemRegionEx>(64, true);
- } else {
- _alloc_ptrs = new (std::nothrow) MemPointerArrayImpl<MemPointerRecord>();
- _vm_ptrs = new (std::nothrow)MemPointerArrayImpl<VMMemRegion>(64, true);
- }
-
- _staging_area.init();
- _lock = new (std::nothrow) Mutex(Monitor::max_nonleaf - 1, "memSnapshotLock");
- NOT_PRODUCT(_untracked_count = 0;)
- _number_of_classes = 0;
-}
-
-MemSnapshot::~MemSnapshot() {
- assert(MemTracker::shutdown_in_progress(), "native memory tracking still on");
- {
- MutexLockerEx locker(_lock);
- if (_alloc_ptrs != NULL) {
- delete _alloc_ptrs;
- _alloc_ptrs = NULL;
- }
-
- if (_vm_ptrs != NULL) {
- delete _vm_ptrs;
- _vm_ptrs = NULL;
- }
- }
-
- if (_lock != NULL) {
- delete _lock;
- _lock = NULL;
- }
-}
-
-
-void MemSnapshot::copy_seq_pointer(MemPointerRecord* dest, const MemPointerRecord* src) {
- assert(dest != NULL && src != NULL, "Just check");
- assert(dest->addr() == src->addr(), "Just check");
- assert(dest->seq() > 0 && src->seq() > 0, "not sequenced");
-
- if (MemTracker::track_callsite()) {
- *(SeqMemPointerRecordEx*)dest = *(SeqMemPointerRecordEx*)src;
- } else {
- *(SeqMemPointerRecord*)dest = *(SeqMemPointerRecord*)src;
- }
-}
-
-void MemSnapshot::assign_pointer(MemPointerRecord*dest, const MemPointerRecord* src) {
- assert(src != NULL && dest != NULL, "Just check");
- assert(dest->seq() == 0 && src->seq() >0, "cast away sequence");
-
- if (MemTracker::track_callsite()) {
- *(MemPointerRecordEx*)dest = *(MemPointerRecordEx*)src;
- } else {
- *(MemPointerRecord*)dest = *(MemPointerRecord*)src;
- }
-}
-
-// merge a recorder to the staging area
-bool MemSnapshot::merge(MemRecorder* rec) {
- assert(rec != NULL && !rec->out_of_memory(), "Just check");
-
- SequencedRecordIterator itr(rec->pointer_itr());
-
- MutexLockerEx lock(_lock, true);
- MemPointerIterator malloc_staging_itr(_staging_area.malloc_data());
- MemPointerRecord* incoming_rec = (MemPointerRecord*) itr.current();
- MemPointerRecord* matched_rec;
-
- while (incoming_rec != NULL) {
- if (incoming_rec->is_vm_pointer()) {
- // we don't do anything with virtual memory records during merge
- if (!_staging_area.vm_data()->append(incoming_rec)) {
- return false;
- }
- } else {
- // locate matched record and/or also position the iterator to proper
- // location for this incoming record.
- matched_rec = (MemPointerRecord*)malloc_staging_itr.locate(incoming_rec->addr());
- // we have not seen this memory block in this generation,
- // so just add to staging area
- if (matched_rec == NULL) {
- if (!malloc_staging_itr.insert(incoming_rec)) {
- return false;
- }
- } else if (incoming_rec->addr() == matched_rec->addr()) {
- // whoever has higher sequence number wins
- if (incoming_rec->seq() > matched_rec->seq()) {
- copy_seq_pointer(matched_rec, incoming_rec);
- }
- } else if (incoming_rec->addr() < matched_rec->addr()) {
- if (!malloc_staging_itr.insert(incoming_rec)) {
- return false;
- }
- } else {
- ShouldNotReachHere();
- }
- }
- incoming_rec = (MemPointerRecord*)itr.next();
- }
- NOT_PRODUCT(void check_staging_data();)
- return true;
-}
-
-
-// promote data to next generation
-bool MemSnapshot::promote(int number_of_classes) {
- assert(_alloc_ptrs != NULL && _vm_ptrs != NULL, "Just check");
- assert(_staging_area.malloc_data() != NULL && _staging_area.vm_data() != NULL,
- "Just check");
- MutexLockerEx lock(_lock, true);
-
- MallocRecordIterator malloc_itr = _staging_area.malloc_record_walker();
- bool promoted = false;
- if (promote_malloc_records(&malloc_itr)) {
- VMRecordIterator vm_itr = _staging_area.virtual_memory_record_walker();
- if (promote_virtual_memory_records(&vm_itr)) {
- promoted = true;
- }
- }
-
- NOT_PRODUCT(check_malloc_pointers();)
- _staging_area.clear();
- _number_of_classes = number_of_classes;
- return promoted;
-}
-
-bool MemSnapshot::promote_malloc_records(MemPointerArrayIterator* itr) {
- MemPointerIterator malloc_snapshot_itr(_alloc_ptrs);
- MemPointerRecord* new_rec = (MemPointerRecord*)itr->current();
- MemPointerRecord* matched_rec;
- while (new_rec != NULL) {
- matched_rec = (MemPointerRecord*)malloc_snapshot_itr.locate(new_rec->addr());
- // found matched memory block
- if (matched_rec != NULL && new_rec->addr() == matched_rec->addr()) {
- // snapshot already contains 'live' records
- assert(matched_rec->is_allocation_record() || matched_rec->is_arena_memory_record(),
- "Sanity check");
- // update block states
- if (new_rec->is_allocation_record()) {
- assign_pointer(matched_rec, new_rec);
- } else if (new_rec->is_arena_memory_record()) {
- if (new_rec->size() == 0) {
- // remove size record once size drops to 0
- malloc_snapshot_itr.remove();
- } else {
- assign_pointer(matched_rec, new_rec);
- }
- } else {
- // a deallocation record
- assert(new_rec->is_deallocation_record(), "Sanity check");
- // an arena record can be followed by a size record, we need to remove both
- if (matched_rec->is_arena_record()) {
- MemPointerRecord* next = (MemPointerRecord*)malloc_snapshot_itr.peek_next();
- if (next != NULL && next->is_arena_memory_record() &&
- next->is_memory_record_of_arena(matched_rec)) {
- malloc_snapshot_itr.remove();
- }
- }
- // the memory is deallocated, remove related record(s)
- malloc_snapshot_itr.remove();
- }
- } else {
- // don't insert size 0 record
- if (new_rec->is_arena_memory_record() && new_rec->size() == 0) {
- new_rec = NULL;
- }
-
- if (new_rec != NULL) {
- if (new_rec->is_allocation_record() || new_rec->is_arena_memory_record()) {
- if (matched_rec != NULL && new_rec->addr() > matched_rec->addr()) {
- if (!malloc_snapshot_itr.insert_after(new_rec)) {
- return false;
- }
- } else {
- if (!malloc_snapshot_itr.insert(new_rec)) {
- return false;
- }
- }
- }
-#ifndef PRODUCT
- else if (!has_allocation_record(new_rec->addr())) {
- // NMT can not track some startup memory, which is allocated before NMT is on
- _untracked_count ++;
- }
-#endif
- }
- }
- new_rec = (MemPointerRecord*)itr->next();
- }
- return true;
-}
-
-bool MemSnapshot::promote_virtual_memory_records(MemPointerArrayIterator* itr) {
- VMMemPointerIterator vm_snapshot_itr(_vm_ptrs);
- MemPointerRecord* new_rec = (MemPointerRecord*)itr->current();
- VMMemRegion* reserved_rec;
- while (new_rec != NULL) {
- assert(new_rec->is_vm_pointer(), "Sanity check");
-
- // locate a reserved region that contains the specified address, or
- // the nearest reserved region has base address just above the specified
- // address
- reserved_rec = (VMMemRegion*)vm_snapshot_itr.locate(new_rec->addr());
- if (reserved_rec != NULL && reserved_rec->contains_region(new_rec)) {
- // snapshot can only have 'live' records
- assert(reserved_rec->is_reserved_region(), "Sanity check");
- if (new_rec->is_allocation_record()) {
- if (!reserved_rec->is_same_region(new_rec)) {
- // only deal with split a bigger reserved region into smaller regions.
- // So far, CDS is the only use case.
- if (!vm_snapshot_itr.split_reserved_region(reserved_rec, new_rec->addr(), new_rec->size())) {
- return false;
- }
- }
- } else if (new_rec->is_uncommit_record()) {
- if (!vm_snapshot_itr.remove_uncommitted_region(new_rec)) {
- return false;
- }
- } else if (new_rec->is_commit_record()) {
- // insert or expand existing committed region to cover this
- // newly committed region
- if (!vm_snapshot_itr.add_committed_region(new_rec)) {
- return false;
- }
- } else if (new_rec->is_deallocation_record()) {
- // release part or all memory region
- if (!vm_snapshot_itr.remove_released_region(new_rec)) {
- return false;
- }
- } else if (new_rec->is_type_tagging_record()) {
- // tag this reserved virtual memory range to a memory type. Can not re-tag a memory range
- // to different type.
- assert(FLAGS_TO_MEMORY_TYPE(reserved_rec->flags()) == mtNone ||
- FLAGS_TO_MEMORY_TYPE(reserved_rec->flags()) == FLAGS_TO_MEMORY_TYPE(new_rec->flags()),
- "Sanity check");
- reserved_rec->tag(new_rec->flags());
- } else {
- ShouldNotReachHere();
- }
- } else {
- /*
- * The assertion failure indicates mis-matched virtual memory records. The likely
- * scenario is, that some virtual memory operations are not going through os::xxxx_memory()
- * api, which have to be tracked manually. (perfMemory is an example).
- */
- assert(new_rec->is_allocation_record(), "Sanity check");
- if (!vm_snapshot_itr.add_reserved_region(new_rec)) {
- return false;
- }
- }
- new_rec = (MemPointerRecord*)itr->next();
- }
- return true;
-}
-
-#ifndef PRODUCT
-void MemSnapshot::print_snapshot_stats(outputStream* st) {
- st->print_cr("Snapshot:");
- st->print_cr("\tMalloced: %d/%d [%5.2f%%] %dKB", _alloc_ptrs->length(), _alloc_ptrs->capacity(),
- (100.0 * (float)_alloc_ptrs->length()) / (float)_alloc_ptrs->capacity(), _alloc_ptrs->instance_size()/K);
-
- st->print_cr("\tVM: %d/%d [%5.2f%%] %dKB", _vm_ptrs->length(), _vm_ptrs->capacity(),
- (100.0 * (float)_vm_ptrs->length()) / (float)_vm_ptrs->capacity(), _vm_ptrs->instance_size()/K);
-
- st->print_cr("\tMalloc staging Area: %d/%d [%5.2f%%] %dKB", _staging_area.malloc_data()->length(),
- _staging_area.malloc_data()->capacity(),
- (100.0 * (float)_staging_area.malloc_data()->length()) / (float)_staging_area.malloc_data()->capacity(),
- _staging_area.malloc_data()->instance_size()/K);
-
- st->print_cr("\tVirtual memory staging Area: %d/%d [%5.2f%%] %dKB", _staging_area.vm_data()->length(),
- _staging_area.vm_data()->capacity(),
- (100.0 * (float)_staging_area.vm_data()->length()) / (float)_staging_area.vm_data()->capacity(),
- _staging_area.vm_data()->instance_size()/K);
-
- st->print_cr("\tUntracked allocation: %d", _untracked_count);
-}
-
-void MemSnapshot::check_malloc_pointers() {
- MemPointerArrayIteratorImpl mItr(_alloc_ptrs);
- MemPointerRecord* p = (MemPointerRecord*)mItr.current();
- MemPointerRecord* prev = NULL;
- while (p != NULL) {
- if (prev != NULL) {
- assert(p->addr() >= prev->addr(), "sorting order");
- }
- prev = p;
- p = (MemPointerRecord*)mItr.next();
- }
-}
-
-bool MemSnapshot::has_allocation_record(address addr) {
- MemPointerArrayIteratorImpl itr(_staging_area.malloc_data());
- MemPointerRecord* cur = (MemPointerRecord*)itr.current();
- while (cur != NULL) {
- if (cur->addr() == addr && cur->is_allocation_record()) {
- return true;
- }
- cur = (MemPointerRecord*)itr.next();
- }
- return false;
-}
-#endif // PRODUCT
-
-#ifdef ASSERT
-void MemSnapshot::check_staging_data() {
- MemPointerArrayIteratorImpl itr(_staging_area.malloc_data());
- MemPointerRecord* cur = (MemPointerRecord*)itr.current();
- MemPointerRecord* next = (MemPointerRecord*)itr.next();
- while (next != NULL) {
- assert((next->addr() > cur->addr()) ||
- ((next->flags() & MemPointerRecord::tag_masks) >
- (cur->flags() & MemPointerRecord::tag_masks)),
- "sorting order");
- cur = next;
- next = (MemPointerRecord*)itr.next();
- }
-
- MemPointerArrayIteratorImpl vm_itr(_staging_area.vm_data());
- cur = (MemPointerRecord*)vm_itr.current();
- while (cur != NULL) {
- assert(cur->is_vm_pointer(), "virtual memory pointer only");
- cur = (MemPointerRecord*)vm_itr.next();
- }
-}
-
-void MemSnapshot::dump_all_vm_pointers() {
- MemPointerArrayIteratorImpl itr(_vm_ptrs);
- VMMemRegion* ptr = (VMMemRegion*)itr.current();
- tty->print_cr("dump virtual memory pointers:");
- while (ptr != NULL) {
- if (ptr->is_committed_region()) {
- tty->print("\t");
- }
- tty->print("[" PTR_FORMAT " - " PTR_FORMAT "] [%x]", ptr->addr(),
- (ptr->addr() + ptr->size()), ptr->flags());
-
- if (MemTracker::track_callsite()) {
- VMMemRegionEx* ex = (VMMemRegionEx*)ptr;
- if (ex->pc() != NULL) {
- char buf[1024];
- if (os::dll_address_to_function_name(ex->pc(), buf, sizeof(buf), NULL)) {
- tty->print_cr("\t%s", buf);
- } else {
- tty->cr();
- }
- }
- }
-
- ptr = (VMMemRegion*)itr.next();
- }
- tty->flush();
-}
-#endif // ASSERT
-
diff --git a/hotspot/src/share/vm/services/memSnapshot.hpp b/hotspot/src/share/vm/services/memSnapshot.hpp
deleted file mode 100644
index f7d0756..0000000
--- a/hotspot/src/share/vm/services/memSnapshot.hpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_SERVICES_MEM_SNAPSHOT_HPP
-#define SHARE_VM_SERVICES_MEM_SNAPSHOT_HPP
-
-#include "memory/allocation.hpp"
-#include "runtime/mutex.hpp"
-#include "runtime/mutexLocker.hpp"
-#include "services/memBaseline.hpp"
-#include "services/memPtrArray.hpp"
-
-// Snapshot pointer array iterator
-
-// The pointer array contains malloc-ed pointers
-class MemPointerIterator : public MemPointerArrayIteratorImpl {
- public:
- MemPointerIterator(MemPointerArray* arr):
- MemPointerArrayIteratorImpl(arr) {
- assert(arr != NULL, "null array");
- }
-
-#ifdef ASSERT
- virtual bool is_dup_pointer(const MemPointer* ptr1,
- const MemPointer* ptr2) const {
- MemPointerRecord* p1 = (MemPointerRecord*)ptr1;
- MemPointerRecord* p2 = (MemPointerRecord*)ptr2;
-
- if (p1->addr() != p2->addr()) return false;
- if ((p1->flags() & MemPointerRecord::tag_masks) !=
- (p2->flags() & MemPointerRecord::tag_masks)) {
- return false;
- }
- // we do see multiple commit/uncommit on the same memory, it is ok
- return (p1->flags() & MemPointerRecord::tag_masks) == MemPointerRecord::tag_alloc ||
- (p1->flags() & MemPointerRecord::tag_masks) == MemPointerRecord::tag_release;
- }
-
- virtual bool insert(MemPointer* ptr) {
- if (_pos > 0) {
- MemPointer* p1 = (MemPointer*)ptr;
- MemPointer* p2 = (MemPointer*)_array->at(_pos - 1);
- assert(!is_dup_pointer(p1, p2),
- err_msg("duplicated pointer, flag = [%x]", (unsigned int)((MemPointerRecord*)p1)->flags()));
- }
- if (_pos < _array->length() -1) {
- MemPointer* p1 = (MemPointer*)ptr;
- MemPointer* p2 = (MemPointer*)_array->at(_pos + 1);
- assert(!is_dup_pointer(p1, p2),
- err_msg("duplicated pointer, flag = [%x]", (unsigned int)((MemPointerRecord*)p1)->flags()));
- }
- return _array->insert_at(ptr, _pos);
- }
-
- virtual bool insert_after(MemPointer* ptr) {
- if (_pos > 0) {
- MemPointer* p1 = (MemPointer*)ptr;
- MemPointer* p2 = (MemPointer*)_array->at(_pos - 1);
- assert(!is_dup_pointer(p1, p2),
- err_msg("duplicated pointer, flag = [%x]", (unsigned int)((MemPointerRecord*)p1)->flags()));
- }
- if (_pos < _array->length() - 1) {
- MemPointer* p1 = (MemPointer*)ptr;
- MemPointer* p2 = (MemPointer*)_array->at(_pos + 1);
-
- assert(!is_dup_pointer(p1, p2),
- err_msg("duplicated pointer, flag = [%x]", (unsigned int)((MemPointerRecord*)p1)->flags()));
- }
- if (_array->insert_at(ptr, _pos + 1)) {
- _pos ++;
- return true;
- }
- return false;
- }
-#endif
-
- virtual MemPointer* locate(address addr) {
- MemPointer* cur = current();
- while (cur != NULL && cur->addr() < addr) {
- cur = next();
- }
- return cur;
- }
-};
-
-class VMMemPointerIterator : public MemPointerIterator {
- public:
- VMMemPointerIterator(MemPointerArray* arr):
- MemPointerIterator(arr) {
- }
-
- // locate an existing reserved memory region that contains specified address,
- // or the reserved region just above this address, where the incoming
- // reserved region should be inserted.
- virtual MemPointer* locate(address addr) {
- reset();
- VMMemRegion* reg = (VMMemRegion*)current();
- while (reg != NULL) {
- if (reg->is_reserved_region()) {
- if (reg->contains_address(addr) || addr < reg->base()) {
- return reg;
- }
- }
- reg = (VMMemRegion*)next();
- }
- return NULL;
- }
-
- // following methods update virtual memory in the context
- // of 'current' position, which is properly positioned by
- // callers via locate method.
- bool add_reserved_region(MemPointerRecord* rec);
- bool add_committed_region(MemPointerRecord* rec);
- bool remove_uncommitted_region(MemPointerRecord* rec);
- bool remove_released_region(MemPointerRecord* rec);
-
- // split a reserved region to create a new memory region with specified base and size
- bool split_reserved_region(VMMemRegion* rgn, address new_rgn_addr, size_t new_rgn_size);
- private:
- bool insert_record(MemPointerRecord* rec);
- bool insert_record_after(MemPointerRecord* rec);
-
- bool insert_reserved_region(MemPointerRecord* rec);
-
- // reset current position
- inline void reset() { _pos = 0; }
-#ifdef ASSERT
- // check integrity of records on current reserved memory region.
- bool check_reserved_region() {
- VMMemRegion* reserved_region = (VMMemRegion*)current();
- assert(reserved_region != NULL && reserved_region->is_reserved_region(),
- "Sanity check");
- // all committed regions that follow current reserved region, should all
- // belong to the reserved region.
- VMMemRegion* next_region = (VMMemRegion*)next();
- for (; next_region != NULL && next_region->is_committed_region();
- next_region = (VMMemRegion*)next() ) {
- if(!reserved_region->contains_region(next_region)) {
- return false;
- }
- }
- return true;
- }
-
- virtual bool is_dup_pointer(const MemPointer* ptr1,
- const MemPointer* ptr2) const {
- VMMemRegion* p1 = (VMMemRegion*)ptr1;
- VMMemRegion* p2 = (VMMemRegion*)ptr2;
-
- if (p1->addr() != p2->addr()) return false;
- if ((p1->flags() & MemPointerRecord::tag_masks) !=
- (p2->flags() & MemPointerRecord::tag_masks)) {
- return false;
- }
- // we do see multiple commit/uncommit on the same memory, it is ok
- return (p1->flags() & MemPointerRecord::tag_masks) == MemPointerRecord::tag_alloc ||
- (p1->flags() & MemPointerRecord::tag_masks) == MemPointerRecord::tag_release;
- }
-#endif
-};
-
-class MallocRecordIterator : public MemPointerArrayIterator {
- private:
- MemPointerArrayIteratorImpl _itr;
-
-
-
- public:
- MallocRecordIterator(MemPointerArray* arr) : _itr(arr) {
- }
-
- virtual MemPointer* current() const {
-#ifdef ASSERT
- MemPointer* cur_rec = _itr.current();
- if (cur_rec != NULL) {
- MemPointer* prev_rec = _itr.peek_prev();
- MemPointer* next_rec = _itr.peek_next();
- assert(prev_rec == NULL || prev_rec->addr() < cur_rec->addr(), "Sorting order");
- assert(next_rec == NULL || next_rec->addr() > cur_rec->addr(), "Sorting order");
- }
-#endif
- return _itr.current();
- }
- virtual MemPointer* next() {
- MemPointerRecord* next_rec = (MemPointerRecord*)_itr.next();
- // arena memory record is a special case, which we have to compare
- // sequence number against its associated arena record.
- if (next_rec != NULL && next_rec->is_arena_memory_record()) {
- MemPointerRecord* prev_rec = (MemPointerRecord*)_itr.peek_prev();
- // if there is an associated arena record, it has to be previous
- // record because of sorting order (by address) - NMT generates a pseudo address
- // for arena's size record by offsetting arena's address, that guarantees
- // the order of arena record and it's size record.
- if (prev_rec != NULL && prev_rec->is_arena_record() &&
- next_rec->is_memory_record_of_arena(prev_rec)) {
- if (prev_rec->seq() > next_rec->seq()) {
- // Skip this arena memory record
- // Two scenarios:
- // - if the arena record is an allocation record, this early
- // size record must be leftover by previous arena,
- // and the last size record should have size = 0.
- // - if the arena record is a deallocation record, this
- // size record should be its cleanup record, which should
- // also have size = 0. In other world, arena alway reset
- // its size before gone (see Arena's destructor)
- assert(next_rec->size() == 0, "size not reset");
- return _itr.next();
- } else {
- assert(prev_rec->is_allocation_record(),
- "Arena size record ahead of allocation record");
- }
- }
- }
- return next_rec;
- }
-
- MemPointer* peek_next() const { ShouldNotReachHere(); return NULL; }
- MemPointer* peek_prev() const { ShouldNotReachHere(); return NULL; }
- void remove() { ShouldNotReachHere(); }
- bool insert(MemPointer* ptr) { ShouldNotReachHere(); return false; }
- bool insert_after(MemPointer* ptr) { ShouldNotReachHere(); return false; }
-};
-
-// collapse duplicated records. Eliminating duplicated records here, is much
-// cheaper than during promotion phase. However, it does have limitation - it
-// can only eliminate duplicated records within the generation, there are
-// still chances seeing duplicated records during promotion.
-// We want to use the record with higher sequence number, because it has
-// more accurate callsite pc.
-class VMRecordIterator : public MemPointerArrayIterator {
- private:
- MemPointerArrayIteratorImpl _itr;
-
- public:
- VMRecordIterator(MemPointerArray* arr) : _itr(arr) {
- MemPointerRecord* cur = (MemPointerRecord*)_itr.current();
- MemPointerRecord* next = (MemPointerRecord*)_itr.peek_next();
- while (next != NULL) {
- assert(cur != NULL, "Sanity check");
- assert(((SeqMemPointerRecord*)next)->seq() > ((SeqMemPointerRecord*)cur)->seq(),
- "pre-sort order");
-
- if (is_duplicated_record(cur, next)) {
- _itr.next();
- next = (MemPointerRecord*)_itr.peek_next();
- } else {
- break;
- }
- }
- }
-
- virtual MemPointer* current() const {
- return _itr.current();
- }
-
- // get next record, but skip the duplicated records
- virtual MemPointer* next() {
- MemPointerRecord* cur = (MemPointerRecord*)_itr.next();
- MemPointerRecord* next = (MemPointerRecord*)_itr.peek_next();
- while (next != NULL) {
- assert(cur != NULL, "Sanity check");
- assert(((SeqMemPointerRecord*)next)->seq() > ((SeqMemPointerRecord*)cur)->seq(),
- "pre-sort order");
-
- if (is_duplicated_record(cur, next)) {
- _itr.next();
- cur = next;
- next = (MemPointerRecord*)_itr.peek_next();
- } else {
- break;
- }
- }
- return cur;
- }
-
- MemPointer* peek_next() const { ShouldNotReachHere(); return NULL; }
- MemPointer* peek_prev() const { ShouldNotReachHere(); return NULL; }
- void remove() { ShouldNotReachHere(); }
- bool insert(MemPointer* ptr) { ShouldNotReachHere(); return false; }
- bool insert_after(MemPointer* ptr) { ShouldNotReachHere(); return false; }
-
- private:
- bool is_duplicated_record(MemPointerRecord* p1, MemPointerRecord* p2) const {
- bool ret = (p1->addr() == p2->addr() && p1->size() == p2->size() && p1->flags() == p2->flags());
- assert(!(ret && FLAGS_TO_MEMORY_TYPE(p1->flags()) == mtThreadStack), "dup on stack record");
- return ret;
- }
-};
-
-class StagingArea VALUE_OBJ_CLASS_SPEC {
- private:
- MemPointerArray* _malloc_data;
- MemPointerArray* _vm_data;
-
- public:
- StagingArea() : _malloc_data(NULL), _vm_data(NULL) {
- init();
- }
-
- ~StagingArea() {
- if (_malloc_data != NULL) delete _malloc_data;
- if (_vm_data != NULL) delete _vm_data;
- }
-
- MallocRecordIterator malloc_record_walker() {
- return MallocRecordIterator(malloc_data());
- }
-
- VMRecordIterator virtual_memory_record_walker();
-
- bool init();
- void clear() {
- assert(_malloc_data != NULL && _vm_data != NULL, "Just check");
- _malloc_data->shrink();
- _malloc_data->clear();
- _vm_data->clear();
- }
-
- inline MemPointerArray* malloc_data() { return _malloc_data; }
- inline MemPointerArray* vm_data() { return _vm_data; }
-};
-
-class MemBaseline;
-class MemSnapshot : public CHeapObj<mtNMT> {
- private:
- // the following two arrays contain records of all known lived memory blocks
- // live malloc-ed memory pointers
- MemPointerArray* _alloc_ptrs;
- // live virtual memory pointers
- MemPointerArray* _vm_ptrs;
-
- StagingArea _staging_area;
-
- // the lock to protect this snapshot
- Monitor* _lock;
-
- // the number of instance classes
- int _number_of_classes;
-
- NOT_PRODUCT(size_t _untracked_count;)
- friend class MemBaseline;
-
- public:
- MemSnapshot();
- virtual ~MemSnapshot();
-
- // if we are running out of native memory
- bool out_of_memory() {
- return (_alloc_ptrs == NULL ||
- _staging_area.malloc_data() == NULL ||
- _staging_area.vm_data() == NULL ||
- _vm_ptrs == NULL || _lock == NULL ||
- _alloc_ptrs->out_of_memory() ||
- _vm_ptrs->out_of_memory());
- }
-
- // merge a per-thread memory recorder into staging area
- bool merge(MemRecorder* rec);
- // promote staged data to snapshot
- bool promote(int number_of_classes);
-
- int number_of_classes() const { return _number_of_classes; }
-
- void wait(long timeout) {
- assert(_lock != NULL, "Just check");
- MonitorLockerEx locker(_lock);
- locker.wait(true, timeout);
- }
-
- NOT_PRODUCT(void print_snapshot_stats(outputStream* st);)
- NOT_PRODUCT(void check_staging_data();)
- NOT_PRODUCT(void check_malloc_pointers();)
- NOT_PRODUCT(bool has_allocation_record(address addr);)
- // dump all virtual memory pointers in snapshot
- DEBUG_ONLY( void dump_all_vm_pointers();)
-
- private:
- // copy sequenced pointer from src to dest
- void copy_seq_pointer(MemPointerRecord* dest, const MemPointerRecord* src);
- // assign a sequenced pointer to non-sequenced pointer
- void assign_pointer(MemPointerRecord*dest, const MemPointerRecord* src);
-
- bool promote_malloc_records(MemPointerArrayIterator* itr);
- bool promote_virtual_memory_records(MemPointerArrayIterator* itr);
-};
-
-#endif // SHARE_VM_SERVICES_MEM_SNAPSHOT_HPP
diff --git a/hotspot/src/share/vm/services/memTrackWorker.cpp b/hotspot/src/share/vm/services/memTrackWorker.cpp
deleted file mode 100644
index 7bf18eb..0000000
--- a/hotspot/src/share/vm/services/memTrackWorker.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "runtime/threadCritical.hpp"
-#include "services/memTracker.hpp"
-#include "services/memTrackWorker.hpp"
-#include "utilities/decoder.hpp"
-#include "utilities/vmError.hpp"
-
-
-void GenerationData::reset() {
- _number_of_classes = 0;
- while (_recorder_list != NULL) {
- MemRecorder* tmp = _recorder_list;
- _recorder_list = _recorder_list->next();
- MemTracker::release_thread_recorder(tmp);
- }
-}
-
-MemTrackWorker::MemTrackWorker(MemSnapshot* snapshot): _snapshot(snapshot) {
- // create thread uses cgc thread type for now. We should revisit
- // the option, or create new thread type.
- _has_error = !os::create_thread(this, os::cgc_thread);
- set_name("MemTrackWorker");
-
- // initial generation circuit buffer
- if (!has_error()) {
- _head = _tail = 0;
- for(int index = 0; index < MAX_GENERATIONS; index ++) {
- ::new ((void*)&_gen[index]) GenerationData();
- }
- }
- NOT_PRODUCT(_sync_point_count = 0;)
- NOT_PRODUCT(_merge_count = 0;)
- NOT_PRODUCT(_last_gen_in_use = 0;)
-}
-
-MemTrackWorker::~MemTrackWorker() {
- for (int index = 0; index < MAX_GENERATIONS; index ++) {
- _gen[index].reset();
- }
-}
-
-void* MemTrackWorker::operator new(size_t size) throw() {
- assert(false, "use nothrow version");
- return NULL;
-}
-
-void* MemTrackWorker::operator new(size_t size, const std::nothrow_t& nothrow_constant) throw() {
- return allocate(size, false, mtNMT);
-}
-
-void MemTrackWorker::start() {
- os::start_thread(this);
-}
-
-/*
- * Native memory tracking worker thread loop:
- * 1. merge one generation of memory recorders to staging area
- * 2. promote staging data to memory snapshot
- *
- * This thread can run through safepoint.
- */
-
-void MemTrackWorker::run() {
- assert(MemTracker::is_on(), "native memory tracking is off");
- this->initialize_thread_local_storage();
- this->record_stack_base_and_size();
- assert(_snapshot != NULL, "Worker should not be started");
- MemRecorder* rec;
- unsigned long processing_generation = 0;
- bool worker_idle = false;
-
- while (!MemTracker::shutdown_in_progress()) {
- NOT_PRODUCT(_last_gen_in_use = generations_in_use();)
- {
- // take a recorder from earliest generation in buffer
- ThreadCritical tc;
- rec = _gen[_head].next_recorder();
- }
- if (rec != NULL) {
- if (rec->get_generation() != processing_generation || worker_idle) {
- processing_generation = rec->get_generation();
- worker_idle = false;
- MemTracker::set_current_processing_generation(processing_generation);
- }
-
- // merge the recorder into staging area
- if (!_snapshot->merge(rec)) {
- MemTracker::shutdown(MemTracker::NMT_out_of_memory);
- } else {
- NOT_PRODUCT(_merge_count ++;)
- }
- MemTracker::release_thread_recorder(rec);
- } else {
- // no more recorder to merge, promote staging area
- // to snapshot
- if (_head != _tail) {
- long number_of_classes;
- {
- ThreadCritical tc;
- if (_gen[_head].has_more_recorder() || _head == _tail) {
- continue;
- }
- number_of_classes = _gen[_head].number_of_classes();
- _gen[_head].reset();
-
- // done with this generation, increment _head pointer
- _head = (_head + 1) % MAX_GENERATIONS;
- }
- // promote this generation data to snapshot
- if (!_snapshot->promote(number_of_classes)) {
- // failed to promote, means out of memory
- MemTracker::shutdown(MemTracker::NMT_out_of_memory);
- }
- } else {
- // worker thread is idle
- worker_idle = true;
- MemTracker::report_worker_idle();
- _snapshot->wait(1000);
- ThreadCritical tc;
- // check if more data arrived
- if (!_gen[_head].has_more_recorder()) {
- _gen[_head].add_recorders(MemTracker::get_pending_recorders());
- }
- }
- }
- }
- assert(MemTracker::shutdown_in_progress(), "just check");
-
- // transits to final shutdown
- MemTracker::final_shutdown();
-}
-
-// at synchronization point, where 'safepoint visible' Java threads are blocked
-// at a safepoint, and the rest of threads are blocked on ThreadCritical lock.
-// The caller MemTracker::sync() already takes ThreadCritical before calling this
-// method.
-//
-// Following tasks are performed:
-// 1. add all recorders in pending queue to current generation
-// 2. increase generation
-
-void MemTrackWorker::at_sync_point(MemRecorder* rec, int number_of_classes) {
- NOT_PRODUCT(_sync_point_count ++;)
- assert(count_recorder(rec) <= MemRecorder::_instance_count,
- "pending queue has infinite loop");
-
- bool out_of_generation_buffer = false;
- // check shutdown state inside ThreadCritical
- if (MemTracker::shutdown_in_progress()) return;
-
- _gen[_tail].set_number_of_classes(number_of_classes);
- // append the recorders to the end of the generation
- _gen[_tail].add_recorders(rec);
- assert(count_recorder(_gen[_tail].peek()) <= MemRecorder::_instance_count,
- "after add to current generation has infinite loop");
- // we have collected all recorders for this generation. If there is data,
- // we need to increment _tail to start a new generation.
- if (_gen[_tail].has_more_recorder() || _head == _tail) {
- _tail = (_tail + 1) % MAX_GENERATIONS;
- out_of_generation_buffer = (_tail == _head);
- }
-
- if (out_of_generation_buffer) {
- MemTracker::shutdown(MemTracker::NMT_out_of_generation);
- }
-}
-
-#ifndef PRODUCT
-int MemTrackWorker::count_recorder(const MemRecorder* head) {
- int count = 0;
- while(head != NULL) {
- count ++;
- head = head->next();
- }
- return count;
-}
-
-int MemTrackWorker::count_pending_recorders() const {
- int count = 0;
- for (int index = 0; index < MAX_GENERATIONS; index ++) {
- MemRecorder* head = _gen[index].peek();
- if (head != NULL) {
- count += count_recorder(head);
- }
- }
- return count;
-}
-#endif
diff --git a/hotspot/src/share/vm/services/memTrackWorker.hpp b/hotspot/src/share/vm/services/memTrackWorker.hpp
deleted file mode 100644
index ee45244..0000000
--- a/hotspot/src/share/vm/services/memTrackWorker.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_SERVICES_MEM_TRACK_WORKER_HPP
-#define SHARE_VM_SERVICES_MEM_TRACK_WORKER_HPP
-
-#include "memory/allocation.hpp"
-#include "runtime/thread.hpp"
-#include "services/memRecorder.hpp"
-
-// Maximum MAX_GENERATIONS generation data can be tracked.
-#define MAX_GENERATIONS 512
-
-class GenerationData VALUE_OBJ_CLASS_SPEC {
- private:
- int _number_of_classes;
- MemRecorder* _recorder_list;
-
- public:
- GenerationData(): _number_of_classes(0), _recorder_list(NULL) { }
-
- inline int number_of_classes() const { return _number_of_classes; }
- inline void set_number_of_classes(long num) { _number_of_classes = num; }
-
- inline MemRecorder* next_recorder() {
- if (_recorder_list == NULL) {
- return NULL;
- } else {
- MemRecorder* tmp = _recorder_list;
- _recorder_list = _recorder_list->next();
- return tmp;
- }
- }
-
- inline bool has_more_recorder() const {
- return (_recorder_list != NULL);
- }
-
- // add recorders to this generation
- void add_recorders(MemRecorder* head) {
- if (head != NULL) {
- if (_recorder_list == NULL) {
- _recorder_list = head;
- } else {
- MemRecorder* tmp = _recorder_list;
- for (; tmp->next() != NULL; tmp = tmp->next());
- tmp->set_next(head);
- }
- }
- }
-
- void reset();
-
- NOT_PRODUCT(MemRecorder* peek() const { return _recorder_list; })
-};
-
-class MemTrackWorker : public NamedThread {
- private:
- // circular buffer. This buffer contains generation data to be merged into global
- // snaphsot.
- // Each slot holds a generation
- GenerationData _gen[MAX_GENERATIONS];
- int _head, _tail; // head and tail pointers to above circular buffer
-
- bool _has_error;
-
- MemSnapshot* _snapshot;
-
- public:
- MemTrackWorker(MemSnapshot* snapshot);
- ~MemTrackWorker();
- _NOINLINE_ void* operator new(size_t size) throw();
- _NOINLINE_ void* operator new(size_t size, const std::nothrow_t& nothrow_constant) throw();
-
- void start();
- void run();
-
- inline bool has_error() const { return _has_error; }
-
- // task at synchronization point
- void at_sync_point(MemRecorder* pending_recorders, int number_of_classes);
-
- // for debugging purpose, they are not thread safe.
- NOT_PRODUCT(static int count_recorder(const MemRecorder* head);)
- NOT_PRODUCT(int count_pending_recorders() const;)
-
- NOT_PRODUCT(int _sync_point_count;)
- NOT_PRODUCT(int _merge_count;)
- NOT_PRODUCT(int _last_gen_in_use;)
-
- // how many generations are queued
- inline int generations_in_use() const {
- return (_tail >= _head ? (_tail - _head + 1) : (MAX_GENERATIONS - (_head - _tail) + 1));
- }
-};
-
-#endif // SHARE_VM_SERVICES_MEM_TRACK_WORKER_HPP
diff --git a/hotspot/src/share/vm/services/memTracker.cpp b/hotspot/src/share/vm/services/memTracker.cpp
index 190c004b..e66d6fe 100644
--- a/hotspot/src/share/vm/services/memTracker.cpp
+++ b/hotspot/src/share/vm/services/memTracker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,862 +23,308 @@
*/
#include "precompiled.hpp"
-#include "oops/instanceKlass.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "runtime/interfaceSupport.hpp"
-#include "runtime/mutexLocker.hpp"
-#include "runtime/safepoint.hpp"
-#include "runtime/threadCritical.hpp"
-#include "runtime/thread.inline.hpp"
-#include "runtime/vm_operations.hpp"
-#include "services/memPtr.hpp"
+#include "runtime/mutex.hpp"
+#include "services/memBaseline.hpp"
#include "services/memReporter.hpp"
+#include "services/mallocTracker.inline.hpp"
#include "services/memTracker.hpp"
-#include "utilities/decoder.hpp"
#include "utilities/defaultStream.hpp"
-#include "utilities/globalDefinitions.hpp"
-bool NMT_track_callsite = false;
+#ifdef SOLARIS
+ volatile bool NMT_stack_walkable = false;
+#else
+ volatile bool NMT_stack_walkable = true;
+#endif
-// walk all 'known' threads at NMT sync point, and collect their recorders
-void SyncThreadRecorderClosure::do_thread(Thread* thread) {
- assert(SafepointSynchronize::is_at_safepoint(), "Safepoint required");
- if (thread->is_Java_thread()) {
- JavaThread* javaThread = (JavaThread*)thread;
- MemRecorder* recorder = javaThread->get_recorder();
- if (recorder != NULL) {
- MemTracker::enqueue_pending_recorder(recorder);
- javaThread->set_recorder(NULL);
+volatile NMT_TrackingLevel MemTracker::_tracking_level = NMT_unknown;
+NMT_TrackingLevel MemTracker::_cmdline_tracking_level = NMT_unknown;
+
+NativeCallStack emptyStack(0, false);
+
+MemBaseline MemTracker::_baseline;
+Mutex* MemTracker::_query_lock = NULL;
+bool MemTracker::_is_nmt_env_valid = true;
+
+
+NMT_TrackingLevel MemTracker::init_tracking_level() {
+ NMT_TrackingLevel level = NMT_off;
+ char buf[64];
+ char nmt_option[64];
+ jio_snprintf(buf, sizeof(buf), "NMT_LEVEL_%d", os::current_process_id());
+ if (os::getenv(buf, nmt_option, sizeof(nmt_option))) {
+ if (strcmp(nmt_option, "summary") == 0) {
+ level = NMT_summary;
+ } else if (strcmp(nmt_option, "detail") == 0) {
+#if PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
+ level = NMT_detail;
+#else
+ level = NMT_summary;
+#endif // PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
+ } else if (strcmp(nmt_option, "off") != 0) {
+ // The option value is invalid
+ _is_nmt_env_valid = false;
}
+
+ // Remove the environment variable to avoid leaking to child processes
+ os::unsetenv(buf);
}
- _thread_count ++;
+
+ if (!MallocTracker::initialize(level) ||
+ !VirtualMemoryTracker::initialize(level)) {
+ level = NMT_off;
+ }
+ return level;
}
+void MemTracker::init() {
+ if (tracking_level() >= NMT_summary) {
+ _query_lock = new (std::nothrow) Mutex(Monitor::max_nonleaf, "NMT_queryLock");
+ // Already OOM. It is unlikely, but still have to handle it.
+ if (_query_lock == NULL) {
+ shutdown();
+ }
+ }
+}
-MemRecorder* volatile MemTracker::_global_recorder = NULL;
-MemSnapshot* MemTracker::_snapshot = NULL;
-MemBaseline MemTracker::_baseline;
-Mutex* MemTracker::_query_lock = NULL;
-MemRecorder* volatile MemTracker::_merge_pending_queue = NULL;
-MemRecorder* volatile MemTracker::_pooled_recorders = NULL;
-MemTrackWorker* MemTracker::_worker_thread = NULL;
-int MemTracker::_sync_point_skip_count = 0;
-MemTracker::NMTLevel MemTracker::_tracking_level = MemTracker::NMT_off;
-volatile MemTracker::NMTStates MemTracker::_state = NMT_uninited;
-MemTracker::ShutdownReason MemTracker::_reason = NMT_shutdown_none;
-int MemTracker::_thread_count = 255;
-volatile jint MemTracker::_pooled_recorder_count = 0;
-volatile unsigned long MemTracker::_processing_generation = 0;
-volatile bool MemTracker::_worker_thread_idle = false;
-volatile jint MemTracker::_pending_op_count = 0;
-volatile bool MemTracker::_slowdown_calling_thread = false;
-debug_only(intx MemTracker::_main_thread_tid = 0;)
-NOT_PRODUCT(volatile jint MemTracker::_pending_recorder_count = 0;)
-
-void MemTracker::init_tracking_options(const char* option_line) {
- _tracking_level = NMT_off;
- if (strcmp(option_line, "=summary") == 0) {
- _tracking_level = NMT_summary;
- } else if (strcmp(option_line, "=detail") == 0) {
- // detail relies on a stack-walking ability that may not
- // be available depending on platform and/or compiler flags
-#if PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
- _tracking_level = NMT_detail;
-#else
+bool MemTracker::check_launcher_nmt_support(const char* value) {
+ if (strcmp(value, "=detail") == 0) {
+#if !PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
jio_fprintf(defaultStream::error_stream(),
"NMT detail is not supported on this platform. Using NMT summary instead.\n");
- _tracking_level = NMT_summary;
+ if (MemTracker::tracking_level() != NMT_summary) {
+ return false;
+ }
+#else
+ if (MemTracker::tracking_level() != NMT_detail) {
+ return false;
+ }
#endif
- } else if (strcmp(option_line, "=off") != 0) {
- vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
- }
-}
-
-// first phase of bootstrapping, when VM is still in single-threaded mode.
-void MemTracker::bootstrap_single_thread() {
- if (_tracking_level > NMT_off) {
- assert(_state == NMT_uninited, "wrong state");
-
- // NMT is not supported with UseMallocOnly is on. NMT can NOT
- // handle the amount of malloc data without significantly impacting
- // runtime performance when this flag is on.
- if (UseMallocOnly) {
- shutdown(NMT_use_malloc_only);
- return;
+ } else if (strcmp(value, "=summary") == 0) {
+ if (MemTracker::tracking_level() != NMT_summary) {
+ return false;
}
-
- _query_lock = new (std::nothrow) Mutex(Monitor::max_nonleaf, "NMT_queryLock");
- if (_query_lock == NULL) {
- shutdown(NMT_out_of_memory);
- return;
+ } else if (strcmp(value, "=off") == 0) {
+ if (MemTracker::tracking_level() != NMT_off) {
+ return false;
}
-
- debug_only(_main_thread_tid = os::current_thread_id();)
- _state = NMT_bootstrapping_single_thread;
- NMT_track_callsite = (_tracking_level == NMT_detail && can_walk_stack());
- }
-}
-
-// second phase of bootstrapping, when VM is about to or already entered multi-theaded mode.
-void MemTracker::bootstrap_multi_thread() {
- if (_tracking_level > NMT_off && _state == NMT_bootstrapping_single_thread) {
- // create nmt lock for multi-thread execution
- assert(_main_thread_tid == os::current_thread_id(), "wrong thread");
- _state = NMT_bootstrapping_multi_thread;
- NMT_track_callsite = (_tracking_level == NMT_detail && can_walk_stack());
- }
-}
-
-// fully start nmt
-void MemTracker::start() {
- // Native memory tracking is off from command line option
- if (_tracking_level == NMT_off || shutdown_in_progress()) return;
-
- assert(_main_thread_tid == os::current_thread_id(), "wrong thread");
- assert(_state == NMT_bootstrapping_multi_thread, "wrong state");
-
- _snapshot = new (std::nothrow)MemSnapshot();
- if (_snapshot != NULL) {
- if (!_snapshot->out_of_memory() && start_worker(_snapshot)) {
- _state = NMT_started;
- NMT_track_callsite = (_tracking_level == NMT_detail && can_walk_stack());
- return;
- }
-
- delete _snapshot;
- _snapshot = NULL;
- }
-
- // fail to start native memory tracking, shut it down
- shutdown(NMT_initialization);
-}
-
-/**
- * Shutting down native memory tracking.
- * We can not shutdown native memory tracking immediately, so we just
- * setup shutdown pending flag, every native memory tracking component
- * should orderly shut itself down.
- *
- * The shutdown sequences:
- * 1. MemTracker::shutdown() sets MemTracker to shutdown pending state
- * 2. Worker thread calls MemTracker::final_shutdown(), which transites
- * MemTracker to final shutdown state.
- * 3. At sync point, MemTracker does final cleanup, before sets memory
- * tracking level to off to complete shutdown.
- */
-void MemTracker::shutdown(ShutdownReason reason) {
- if (_tracking_level == NMT_off) return;
-
- if (_state <= NMT_bootstrapping_single_thread) {
- // we still in single thread mode, there is not contention
- _state = NMT_shutdown_pending;
- _reason = reason;
} else {
- // we want to know who initialized shutdown
- if ((jint)NMT_started == Atomic::cmpxchg((jint)NMT_shutdown_pending,
- (jint*)&_state, (jint)NMT_started)) {
- _reason = reason;
- }
- }
-}
-
-// final phase of shutdown
-void MemTracker::final_shutdown() {
- // delete all pending recorders and pooled recorders
- delete_all_pending_recorders();
- delete_all_pooled_recorders();
-
- {
- // shared baseline and snapshot are the only objects needed to
- // create query results
- MutexLockerEx locker(_query_lock, true);
- // cleanup baseline data and snapshot
- _baseline.clear();
- delete _snapshot;
- _snapshot = NULL;
+ _is_nmt_env_valid = false;
}
- // shutdown shared decoder instance, since it is only
- // used by native memory tracking so far.
- Decoder::shutdown();
-
- MemTrackWorker* worker = NULL;
- {
- ThreadCritical tc;
- // can not delete worker inside the thread critical
- if (_worker_thread != NULL && Thread::current() == _worker_thread) {
- worker = _worker_thread;
- _worker_thread = NULL;
- }
- }
- if (worker != NULL) {
- delete worker;
- }
- _state = NMT_final_shutdown;
-}
-
-// delete all pooled recorders
-void MemTracker::delete_all_pooled_recorders() {
- // free all pooled recorders
- MemRecorder* volatile cur_head = _pooled_recorders;
- if (cur_head != NULL) {
- MemRecorder* null_ptr = NULL;
- while (cur_head != NULL && (void*)cur_head != Atomic::cmpxchg_ptr((void*)null_ptr,
- (void*)&_pooled_recorders, (void*)cur_head)) {
- cur_head = _pooled_recorders;
- }
- if (cur_head != NULL) {
- delete cur_head;
- _pooled_recorder_count = 0;
- }
- }
-}
-
-// delete all recorders in pending queue
-void MemTracker::delete_all_pending_recorders() {
- // free all pending recorders
- MemRecorder* pending_head = get_pending_recorders();
- if (pending_head != NULL) {
- delete pending_head;
- }
-}
-
-/*
- * retrieve per-thread recorder of specified thread.
- * if thread == NULL, it means global recorder
- */
-MemRecorder* MemTracker::get_thread_recorder(JavaThread* thread) {
- if (shutdown_in_progress()) return NULL;
-
- MemRecorder* rc;
- if (thread == NULL) {
- rc = _global_recorder;
- } else {
- rc = thread->get_recorder();
- }
-
- if (rc != NULL && rc->is_full()) {
- enqueue_pending_recorder(rc);
- rc = NULL;
- }
-
- if (rc == NULL) {
- rc = get_new_or_pooled_instance();
- if (thread == NULL) {
- _global_recorder = rc;
- } else {
- thread->set_recorder(rc);
- }
- }
- return rc;
-}
-
-/*
- * get a per-thread recorder from pool, or create a new one if
- * there is not one available.
- */
-MemRecorder* MemTracker::get_new_or_pooled_instance() {
- MemRecorder* cur_head = const_cast<MemRecorder*> (_pooled_recorders);
- if (cur_head == NULL) {
- MemRecorder* rec = new (std::nothrow)MemRecorder();
- if (rec == NULL || rec->out_of_memory()) {
- shutdown(NMT_out_of_memory);
- if (rec != NULL) {
- delete rec;
- rec = NULL;
- }
- }
- return rec;
- } else {
- MemRecorder* next_head = cur_head->next();
- if ((void*)cur_head != Atomic::cmpxchg_ptr((void*)next_head, (void*)&_pooled_recorders,
- (void*)cur_head)) {
- return get_new_or_pooled_instance();
- }
- cur_head->set_next(NULL);
- Atomic::dec(&_pooled_recorder_count);
- cur_head->set_generation();
- return cur_head;
- }
-}
-
-/*
- * retrieve all recorders in pending queue, and empty the queue
- */
-MemRecorder* MemTracker::get_pending_recorders() {
- MemRecorder* cur_head = const_cast<MemRecorder*>(_merge_pending_queue);
- MemRecorder* null_ptr = NULL;
- while ((void*)cur_head != Atomic::cmpxchg_ptr((void*)null_ptr, (void*)&_merge_pending_queue,
- (void*)cur_head)) {
- cur_head = const_cast<MemRecorder*>(_merge_pending_queue);
- }
- NOT_PRODUCT(Atomic::store(0, &_pending_recorder_count));
- return cur_head;
-}
-
-/*
- * release a recorder to recorder pool.
- */
-void MemTracker::release_thread_recorder(MemRecorder* rec) {
- assert(rec != NULL, "null recorder");
- // we don't want to pool too many recorders
- rec->set_next(NULL);
- if (shutdown_in_progress() || _pooled_recorder_count > _thread_count * 2) {
- delete rec;
- return;
- }
-
- rec->clear();
- MemRecorder* cur_head = const_cast<MemRecorder*>(_pooled_recorders);
- rec->set_next(cur_head);
- while ((void*)cur_head != Atomic::cmpxchg_ptr((void*)rec, (void*)&_pooled_recorders,
- (void*)cur_head)) {
- cur_head = const_cast<MemRecorder*>(_pooled_recorders);
- rec->set_next(cur_head);
- }
- Atomic::inc(&_pooled_recorder_count);
-}
-
-// write a record to proper recorder. No lock can be taken from this method
-// down.
-void MemTracker::write_tracking_record(address addr, MEMFLAGS flags,
- size_t size, jint seq, address pc, JavaThread* thread) {
-
- MemRecorder* rc = get_thread_recorder(thread);
- if (rc != NULL) {
- rc->record(addr, flags, size, seq, pc);
- }
-}
-
-/**
- * enqueue a recorder to pending queue
- */
-void MemTracker::enqueue_pending_recorder(MemRecorder* rec) {
- assert(rec != NULL, "null recorder");
-
- // we are shutting down, so just delete it
- if (shutdown_in_progress()) {
- rec->set_next(NULL);
- delete rec;
- return;
- }
-
- MemRecorder* cur_head = const_cast<MemRecorder*>(_merge_pending_queue);
- rec->set_next(cur_head);
- while ((void*)cur_head != Atomic::cmpxchg_ptr((void*)rec, (void*)&_merge_pending_queue,
- (void*)cur_head)) {
- cur_head = const_cast<MemRecorder*>(_merge_pending_queue);
- rec->set_next(cur_head);
- }
- NOT_PRODUCT(Atomic::inc(&_pending_recorder_count);)
-}
-
-/*
- * The method is called at global safepoint
- * during it synchronization process.
- * 1. enqueue all JavaThreads' per-thread recorders
- * 2. enqueue global recorder
- * 3. retrieve all pending recorders
- * 4. reset global sequence number generator
- * 5. call worker's sync
- */
-#define MAX_SAFEPOINTS_TO_SKIP 128
-#define SAFE_SEQUENCE_THRESHOLD 30
-#define HIGH_GENERATION_THRESHOLD 60
-#define MAX_RECORDER_THREAD_RATIO 30
-#define MAX_RECORDER_PER_THREAD 100
-
-void MemTracker::sync() {
- assert(_tracking_level > NMT_off, "NMT is not enabled");
- assert(SafepointSynchronize::is_at_safepoint(), "Safepoint required");
-
- // Some GC tests hit large number of safepoints in short period of time
- // without meaningful activities. We should prevent going to
- // sync point in these cases, which can potentially exhaust generation buffer.
- // Here is the factots to determine if we should go into sync point:
- // 1. not to overflow sequence number
- // 2. if we are in danger to overflow generation buffer
- // 3. how many safepoints we already skipped sync point
- if (_state == NMT_started) {
- // worker thread is not ready, no one can manage generation
- // buffer, so skip this safepoint
- if (_worker_thread == NULL) return;
-
- if (_sync_point_skip_count < MAX_SAFEPOINTS_TO_SKIP) {
- int per_seq_in_use = SequenceGenerator::peek() * 100 / max_jint;
- int per_gen_in_use = _worker_thread->generations_in_use() * 100 / MAX_GENERATIONS;
- if (per_seq_in_use < SAFE_SEQUENCE_THRESHOLD && per_gen_in_use >= HIGH_GENERATION_THRESHOLD) {
- _sync_point_skip_count ++;
- return;
- }
- }
- {
- // This method is running at safepoint, with ThreadCritical lock,
- // it should guarantee that NMT is fully sync-ed.
- ThreadCritical tc;
-
- // We can NOT execute NMT sync-point if there are pending tracking ops.
- if (_pending_op_count == 0) {
- SequenceGenerator::reset();
- _sync_point_skip_count = 0;
-
- // walk all JavaThreads to collect recorders
- SyncThreadRecorderClosure stc;
- Threads::threads_do(&stc);
-
- _thread_count = stc.get_thread_count();
- MemRecorder* pending_recorders = get_pending_recorders();
-
- if (_global_recorder != NULL) {
- _global_recorder->set_next(pending_recorders);
- pending_recorders = _global_recorder;
- _global_recorder = NULL;
- }
-
- // see if NMT has too many outstanding recorder instances, it usually
- // means that worker thread is lagging behind in processing them.
- if (!AutoShutdownNMT) {
- _slowdown_calling_thread = (MemRecorder::_instance_count > MAX_RECORDER_THREAD_RATIO * _thread_count);
- } else {
- // If auto shutdown is on, enforce MAX_RECORDER_PER_THREAD threshold to prevent OOM
- if (MemRecorder::_instance_count >= _thread_count * MAX_RECORDER_PER_THREAD) {
- shutdown(NMT_out_of_memory);
- }
- }
-
- // check _worker_thread with lock to avoid racing condition
- if (_worker_thread != NULL) {
- _worker_thread->at_sync_point(pending_recorders, InstanceKlass::number_of_instance_classes());
- }
- assert(SequenceGenerator::peek() == 1, "Should not have memory activities during sync-point");
- } else {
- _sync_point_skip_count ++;
- }
- }
- }
-
- // now, it is the time to shut whole things off
- if (_state == NMT_final_shutdown) {
- // walk all JavaThreads to delete all recorders
- SyncThreadRecorderClosure stc;
- Threads::threads_do(&stc);
- // delete global recorder
- {
- ThreadCritical tc;
- if (_global_recorder != NULL) {
- delete _global_recorder;
- _global_recorder = NULL;
- }
- }
- MemRecorder* pending_recorders = get_pending_recorders();
- if (pending_recorders != NULL) {
- delete pending_recorders;
- }
- // try at a later sync point to ensure MemRecorder instance drops to zero to
- // completely shutdown NMT
- if (MemRecorder::_instance_count == 0) {
- _state = NMT_shutdown;
- _tracking_level = NMT_off;
- }
- }
-}
-
-/*
- * Start worker thread.
- */
-bool MemTracker::start_worker(MemSnapshot* snapshot) {
- assert(_worker_thread == NULL && _snapshot != NULL, "Just Check");
- _worker_thread = new (std::nothrow) MemTrackWorker(snapshot);
- if (_worker_thread == NULL) {
- return false;
- } else if (_worker_thread->has_error()) {
- delete _worker_thread;
- _worker_thread = NULL;
- return false;
- }
- _worker_thread->start();
return true;
}
-/*
- * We need to collect a JavaThread's per-thread recorder
- * before it exits.
- */
-void MemTracker::thread_exiting(JavaThread* thread) {
- if (is_on()) {
- MemRecorder* rec = thread->get_recorder();
- if (rec != NULL) {
- enqueue_pending_recorder(rec);
- thread->set_recorder(NULL);
+bool MemTracker::verify_nmt_option() {
+ return _is_nmt_env_valid;
+}
+
+void* MemTracker::malloc_base(void* memblock) {
+ return MallocTracker::get_base(memblock);
+}
+
+void Tracker::record(address addr, size_t size) {
+ if (MemTracker::tracking_level() < NMT_summary) return;
+ switch(_type) {
+ case uncommit:
+ VirtualMemoryTracker::remove_uncommitted_region(addr, size);
+ break;
+ case release:
+ VirtualMemoryTracker::remove_released_region(addr, size);
+ break;
+ default:
+ ShouldNotReachHere();
+ }
+}
+
+
+// Shutdown can only be issued via JCmd, and NMT JCmd is serialized
+// by lock
+void MemTracker::shutdown() {
+ // We can only shutdown NMT to minimal tracking level if it is
+ // ever on.
+ if (tracking_level () > NMT_minimal) {
+ transition_to(NMT_minimal);
+ }
+}
+
+bool MemTracker::transition_to(NMT_TrackingLevel level) {
+ NMT_TrackingLevel current_level = tracking_level();
+
+ if (current_level == level) {
+ return true;
+ } else if (current_level > level) {
+ // Downgrade tracking level, we want to lower the tracking
+ // level first
+ _tracking_level = level;
+ // Make _tracking_level visible immediately.
+ OrderAccess::fence();
+ VirtualMemoryTracker::transition(current_level, level);
+ MallocTracker::transition(current_level, level);
+
+ if (level == NMT_minimal) _baseline.reset();
+ } else {
+ VirtualMemoryTracker::transition(current_level, level);
+ MallocTracker::transition(current_level, level);
+
+ _tracking_level = level;
+ // Make _tracking_level visible immediately.
+ OrderAccess::fence();
+ }
+
+ return true;
+}
+
+void MemTracker::final_report(outputStream* output) {
+ assert(output != NULL, "No output stream");
+ if (tracking_level() >= NMT_summary) {
+ MallocMemorySnapshot* malloc_memory_snapshot =
+ MallocMemorySummary::as_snapshot();
+ malloc_memory_snapshot->make_adjustment();
+
+ VirtualMemorySnapshot* virtual_memory_snapshot =
+ VirtualMemorySummary::as_snapshot();
+
+ MemSummaryReporter rptr(malloc_memory_snapshot,
+ virtual_memory_snapshot, output);
+ rptr.report();
+ // shutdown NMT, the data no longer accurate
+ shutdown();
+ }
+}
+
+// This is a walker to gather malloc site hashtable statistics,
+// the result is used for tuning.
+class StatisticsWalker : public MallocSiteWalker {
+ private:
+ enum Threshold {
+ // aggregates statistics over this threshold into one
+ // line item.
+ report_threshold = 20
+ };
+
+ private:
+ // Number of allocation sites that have all memory freed
+ int _empty_entries;
+ // Total number of allocation sites, include empty sites
+ int _total_entries;
+ // Number of captured call stack distribution
+ int _stack_depth_distribution[NMT_TrackingStackDepth];
+ // Hash distribution
+ int _hash_distribution[report_threshold];
+ // Number of hash buckets that have entries over the threshold
+ int _bucket_over_threshold;
+
+ // The hash bucket that walker is currently walking
+ int _current_hash_bucket;
+ // The length of current hash bucket
+ int _current_bucket_length;
+ // Number of hash buckets that are not empty
+ int _used_buckets;
+ // Longest hash bucket length
+ int _longest_bucket_length;
+
+ public:
+ StatisticsWalker() : _empty_entries(0), _total_entries(0) {
+ int index = 0;
+ for (index = 0; index < NMT_TrackingStackDepth; index ++) {
+ _stack_depth_distribution[index] = 0;
}
+ for (index = 0; index < report_threshold; index ++) {
+ _hash_distribution[index] = 0;
+ }
+ _bucket_over_threshold = 0;
+ _longest_bucket_length = 0;
+ _current_hash_bucket = -1;
+ _current_bucket_length = 0;
+ _used_buckets = 0;
}
-}
-// baseline current memory snapshot
-bool MemTracker::baseline() {
- MutexLocker lock(_query_lock);
- MemSnapshot* snapshot = get_snapshot();
- if (snapshot != NULL) {
- return _baseline.baseline(*snapshot, false);
- }
- return false;
-}
+ virtual bool do_malloc_site(const MallocSite* e) {
+ if (e->size() == 0) _empty_entries ++;
+ _total_entries ++;
-// print memory usage from current snapshot
-bool MemTracker::print_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
- MemBaseline baseline;
- MutexLocker lock(_query_lock);
- MemSnapshot* snapshot = get_snapshot();
- if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
- BaselineReporter reporter(out, unit);
- reporter.report_baseline(baseline, summary_only);
+ // stack depth distrubution
+ int frames = e->call_stack()->frames();
+ _stack_depth_distribution[frames - 1] ++;
+
+ // hash distribution
+ int hash_bucket = e->hash() % MallocSiteTable::hash_buckets();
+ if (_current_hash_bucket == -1) {
+ _current_hash_bucket = hash_bucket;
+ _current_bucket_length = 1;
+ } else if (_current_hash_bucket == hash_bucket) {
+ _current_bucket_length ++;
+ } else {
+ record_bucket_length(_current_bucket_length);
+ _current_hash_bucket = hash_bucket;
+ _current_bucket_length = 1;
+ }
return true;
}
- return false;
-}
-// Whitebox API for blocking until the current generation of NMT data has been merged
-bool MemTracker::wbtest_wait_for_data_merge() {
- // NMT can't be shutdown while we're holding _query_lock
- MutexLocker lock(_query_lock);
- assert(_worker_thread != NULL, "Invalid query");
- // the generation at query time, so NMT will spin till this generation is processed
- unsigned long generation_at_query_time = SequenceGenerator::current_generation();
- unsigned long current_processing_generation = _processing_generation;
- // if generation counter overflown
- bool generation_overflown = (generation_at_query_time < current_processing_generation);
- long generations_to_wrap = MAX_UNSIGNED_LONG - current_processing_generation;
- // spin
- while (!shutdown_in_progress()) {
- if (!generation_overflown) {
- if (current_processing_generation > generation_at_query_time) {
- return true;
+ // walk completed
+ void completed() {
+ record_bucket_length(_current_bucket_length);
+ }
+
+ void report_statistics(outputStream* out) {
+ int index;
+ out->print_cr("Malloc allocation site table:");
+ out->print_cr("\tTotal entries: %d", _total_entries);
+ out->print_cr("\tEmpty entries: %d (%2.2f%%)", _empty_entries, ((float)_empty_entries * 100) / _total_entries);
+ out->print_cr(" ");
+ out->print_cr("Hash distribution:");
+ if (_used_buckets < MallocSiteTable::hash_buckets()) {
+ out->print_cr("empty bucket: %d", (MallocSiteTable::hash_buckets() - _used_buckets));
+ }
+ for (index = 0; index < report_threshold; index ++) {
+ if (_hash_distribution[index] != 0) {
+ if (index == 0) {
+ out->print_cr(" %d entry: %d", 1, _hash_distribution[0]);
+ } else if (index < 9) { // single digit
+ out->print_cr(" %d entries: %d", (index + 1), _hash_distribution[index]);
+ } else {
+ out->print_cr(" %d entries: %d", (index + 1), _hash_distribution[index]);
+ }
}
+ }
+ if (_bucket_over_threshold > 0) {
+ out->print_cr(" >%d entries: %d", report_threshold, _bucket_over_threshold);
+ }
+ out->print_cr("most entries: %d", _longest_bucket_length);
+ out->print_cr(" ");
+ out->print_cr("Call stack depth distribution:");
+ for (index = 0; index < NMT_TrackingStackDepth; index ++) {
+ if (_stack_depth_distribution[index] > 0) {
+ out->print_cr("\t%d: %d", index + 1, _stack_depth_distribution[index]);
+ }
+ }
+ }
+
+ private:
+ void record_bucket_length(int length) {
+ _used_buckets ++;
+ if (length <= report_threshold) {
+ _hash_distribution[length - 1] ++;
} else {
- assert(generations_to_wrap >= 0, "Sanity check");
- long current_generations_to_wrap = MAX_UNSIGNED_LONG - current_processing_generation;
- assert(current_generations_to_wrap >= 0, "Sanity check");
- // to overflow an unsigned long should take long time, so to_wrap check should be sufficient
- if (current_generations_to_wrap > generations_to_wrap &&
- current_processing_generation > generation_at_query_time) {
- return true;
- }
+ _bucket_over_threshold ++;
}
-
- // if worker thread is idle, but generation is not advancing, that means
- // there is not safepoint to let NMT advance generation, force one.
- if (_worker_thread_idle) {
- VM_ForceSafepoint vfs;
- VMThread::execute(&vfs);
- }
- MemSnapshot* snapshot = get_snapshot();
- if (snapshot == NULL) {
- return false;
- }
- snapshot->wait(1000);
- current_processing_generation = _processing_generation;
+ _longest_bucket_length = MAX2(_longest_bucket_length, length);
}
- // We end up here if NMT is shutting down before our data has been merged
- return false;
-}
-
-// compare memory usage between current snapshot and baseline
-bool MemTracker::compare_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
- MutexLocker lock(_query_lock);
- if (_baseline.baselined()) {
- MemBaseline baseline;
- MemSnapshot* snapshot = get_snapshot();
- if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
- BaselineReporter reporter(out, unit);
- reporter.diff_baselines(baseline, _baseline, summary_only);
- return true;
- }
- }
- return false;
-}
-
-#ifndef PRODUCT
-void MemTracker::walk_stack(int toSkip, char* buf, int len) {
- int cur_len = 0;
- char tmp[1024];
- address pc;
-
- while (cur_len < len) {
- pc = os::get_caller_pc(toSkip + 1);
- if (pc != NULL && os::dll_address_to_function_name(pc, tmp, sizeof(tmp), NULL)) {
- jio_snprintf(&buf[cur_len], (len - cur_len), "%s\n", tmp);
- cur_len = (int)strlen(buf);
- } else {
- buf[cur_len] = '\0';
- break;
- }
- toSkip ++;
- }
-}
-
-void MemTracker::print_tracker_stats(outputStream* st) {
- st->print_cr("\nMemory Tracker Stats:");
- st->print_cr("\tMax sequence number = %d", SequenceGenerator::max_seq_num());
- st->print_cr("\tthead count = %d", _thread_count);
- st->print_cr("\tArena instance = %d", Arena::_instance_count);
- st->print_cr("\tpooled recorder count = %d", _pooled_recorder_count);
- st->print_cr("\tqueued recorder count = %d", _pending_recorder_count);
- st->print_cr("\tmemory recorder instance count = %d", MemRecorder::_instance_count);
- if (_worker_thread != NULL) {
- st->print_cr("\tWorker thread:");
- st->print_cr("\t\tSync point count = %d", _worker_thread->_sync_point_count);
- st->print_cr("\t\tpending recorder count = %d", _worker_thread->count_pending_recorders());
- st->print_cr("\t\tmerge count = %d", _worker_thread->_merge_count);
- } else {
- st->print_cr("\tWorker thread is not started");
- }
- st->print_cr(" ");
-
- if (_snapshot != NULL) {
- _snapshot->print_snapshot_stats(st);
- } else {
- st->print_cr("No snapshot");
- }
-}
-#endif
+};
-// Tracker Implementation
+void MemTracker::tuning_statistics(outputStream* out) {
+ // NMT statistics
+ StatisticsWalker walker;
+ MallocSiteTable::walk_malloc_site(&walker);
+ walker.completed();
-/*
- * Create a tracker.
- * This is a fairly complicated constructor, as it has to make two important decisions:
- * 1) Does it need to take ThreadCritical lock to write tracking record
- * 2) Does it need to pre-reserve a sequence number for the tracking record
- *
- * The rules to determine if ThreadCritical is needed:
- * 1. When nmt is in single-threaded bootstrapping mode, no lock is needed as VM
- * still in single thread mode.
- * 2. For all threads other than JavaThread, ThreadCritical is needed
- * to write to recorders to global recorder.
- * 3. For JavaThreads that are no longer visible by safepoint, also
- * need to take ThreadCritical and records are written to global
- * recorders, since these threads are NOT walked by Threads.do_thread().
- * 4. JavaThreads that are running in safepoint-safe states do not stop
- * for safepoints, ThreadCritical lock should be taken to write
- * memory records.
- * 5. JavaThreads that are running in VM state do not need any lock and
- * records are written to per-thread recorders.
- * 6. For a thread has yet to attach VM 'Thread', they need to take
- * ThreadCritical to write to global recorder.
- *
- * The memory operations that need pre-reserve sequence numbers:
- * The memory operations that "release" memory blocks and the
- * operations can fail, need to pre-reserve sequence number. They
- * are realloc, uncommit and release.
- *
- * The reason for pre-reserve sequence number, is to prevent race condition:
- * Thread 1 Thread 2
- * <release>
- * <allocate>
- * <write allocate record>
- * <write release record>
- * if Thread 2 happens to obtain the memory address Thread 1 just released,
- * then NMT can mistakenly report the memory is free.
- *
- * Noticeably, free() does not need pre-reserve sequence number, because the call
- * does not fail, so we can alway write "release" record before the memory is actaully
- * freed.
- *
- * For realloc, uncommit and release, following coding pattern should be used:
- *
- * MemTracker::Tracker tkr = MemTracker::get_realloc_tracker();
- * ptr = ::realloc(...);
- * if (ptr == NULL) {
- * tkr.record(...)
- * } else {
- * tkr.discard();
- * }
- *
- * MemTracker::Tracker tkr = MemTracker::get_virtual_memory_uncommit_tracker();
- * if (uncommit(...)) {
- * tkr.record(...);
- * } else {
- * tkr.discard();
- * }
- *
- * MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
- * if (release(...)) {
- * tkr.record(...);
- * } else {
- * tkr.discard();
- * }
- *
- * Since pre-reserved sequence number is only good for the generation that it is acquired,
- * when there is pending Tracker that reserved sequence number, NMT sync-point has
- * to be skipped to prevent from advancing generation. This is done by inc and dec
- * MemTracker::_pending_op_count, when MemTracker::_pending_op_count > 0, NMT sync-point is skipped.
- * Not all pre-reservation of sequence number will increment pending op count. For JavaThreads
- * that honor safepoints, safepoint can not occur during the memory operations, so the
- * pre-reserved sequence number won't cross the generation boundry.
- */
-MemTracker::Tracker::Tracker(MemoryOperation op, Thread* thr) {
- _op = NoOp;
- _seq = 0;
- if (MemTracker::is_on()) {
- _java_thread = NULL;
- _op = op;
-
- // figure out if ThreadCritical lock is needed to write this operation
- // to MemTracker
- if (MemTracker::is_single_threaded_bootstrap()) {
- thr = NULL;
- } else if (thr == NULL) {
- // don't use Thread::current(), since it is possible that
- // the calling thread has yet to attach to VM 'Thread',
- // which will result assertion failure
- thr = ThreadLocalStorage::thread();
- }
-
- if (thr != NULL) {
- // Check NMT load
- MemTracker::check_NMT_load(thr);
-
- if (thr->is_Java_thread() && ((JavaThread*)thr)->is_safepoint_visible()) {
- _java_thread = (JavaThread*)thr;
- JavaThreadState state = _java_thread->thread_state();
- // JavaThreads that are safepoint safe, can run through safepoint,
- // so ThreadCritical is needed to ensure no threads at safepoint create
- // new records while the records are being gathered and the sequence number is changing
- _need_thread_critical_lock =
- SafepointSynchronize::safepoint_safe(_java_thread, state);
- } else {
- _need_thread_critical_lock = true;
- }
- } else {
- _need_thread_critical_lock
- = !MemTracker::is_single_threaded_bootstrap();
- }
-
- // see if we need to pre-reserve sequence number for this operation
- if (_op == Realloc || _op == Uncommit || _op == Release) {
- if (_need_thread_critical_lock) {
- ThreadCritical tc;
- MemTracker::inc_pending_op_count();
- _seq = SequenceGenerator::next();
- } else {
- // for the threads that honor safepoints, no safepoint can occur
- // during the lifespan of tracker, so we don't need to increase
- // pending op count.
- _seq = SequenceGenerator::next();
- }
- }
- }
-}
-
-void MemTracker::Tracker::discard() {
- if (MemTracker::is_on() && _seq != 0) {
- if (_need_thread_critical_lock) {
- ThreadCritical tc;
- MemTracker::dec_pending_op_count();
- }
- _seq = 0;
- }
-}
-
-
-void MemTracker::Tracker::record(address old_addr, address new_addr, size_t size,
- MEMFLAGS flags, address pc) {
- assert(old_addr != NULL && new_addr != NULL, "Sanity check");
- assert(_op == Realloc || _op == NoOp, "Wrong call");
- if (MemTracker::is_on() && NMT_CAN_TRACK(flags) && _op != NoOp && !MemTracker::shutdown_in_progress()) {
- assert(_seq > 0, "Need pre-reserve sequence number");
- if (_need_thread_critical_lock) {
- ThreadCritical tc;
- // free old address, use pre-reserved sequence number
- MemTracker::write_tracking_record(old_addr, MemPointerRecord::free_tag(),
- 0, _seq, pc, _java_thread);
- MemTracker::write_tracking_record(new_addr, flags | MemPointerRecord::malloc_tag(),
- size, SequenceGenerator::next(), pc, _java_thread);
- // decrement MemTracker pending_op_count
- MemTracker::dec_pending_op_count();
- } else {
- // free old address, use pre-reserved sequence number
- MemTracker::write_tracking_record(old_addr, MemPointerRecord::free_tag(),
- 0, _seq, pc, _java_thread);
- MemTracker::write_tracking_record(new_addr, flags | MemPointerRecord::malloc_tag(),
- size, SequenceGenerator::next(), pc, _java_thread);
- }
- _seq = 0;
- }
-}
-
-void MemTracker::Tracker::record(address addr, size_t size, MEMFLAGS flags, address pc) {
- // OOM already?
- if (addr == NULL) return;
-
- if (MemTracker::is_on() && NMT_CAN_TRACK(flags) && _op != NoOp && !MemTracker::shutdown_in_progress()) {
- bool pre_reserved_seq = (_seq != 0);
- address pc = CALLER_CALLER_PC;
- MEMFLAGS orig_flags = flags;
-
- // or the tagging flags
- switch(_op) {
- case Malloc:
- flags |= MemPointerRecord::malloc_tag();
- break;
- case Free:
- flags = MemPointerRecord::free_tag();
- break;
- case Realloc:
- fatal("Use the other Tracker::record()");
- break;
- case Reserve:
- case ReserveAndCommit:
- flags |= MemPointerRecord::virtual_memory_reserve_tag();
- break;
- case Commit:
- flags = MemPointerRecord::virtual_memory_commit_tag();
- break;
- case Type:
- flags |= MemPointerRecord::virtual_memory_type_tag();
- break;
- case Uncommit:
- assert(pre_reserved_seq, "Need pre-reserve sequence number");
- flags = MemPointerRecord::virtual_memory_uncommit_tag();
- break;
- case Release:
- assert(pre_reserved_seq, "Need pre-reserve sequence number");
- flags = MemPointerRecord::virtual_memory_release_tag();
- break;
- case ArenaSize:
- // a bit of hack here, add a small postive offset to arena
- // address for its size record, so the size record is sorted
- // right after arena record.
- flags = MemPointerRecord::arena_size_tag();
- addr += sizeof(void*);
- break;
- case StackRelease:
- flags = MemPointerRecord::virtual_memory_release_tag();
- break;
- default:
- ShouldNotReachHere();
- }
-
- // write memory tracking record
- if (_need_thread_critical_lock) {
- ThreadCritical tc;
- if (_seq == 0) _seq = SequenceGenerator::next();
- MemTracker::write_tracking_record(addr, flags, size, _seq, pc, _java_thread);
- if (_op == ReserveAndCommit) {
- MemTracker::write_tracking_record(addr, orig_flags | MemPointerRecord::virtual_memory_commit_tag(),
- size, SequenceGenerator::next(), pc, _java_thread);
- }
- if (pre_reserved_seq) MemTracker::dec_pending_op_count();
- } else {
- if (_seq == 0) _seq = SequenceGenerator::next();
- MemTracker::write_tracking_record(addr, flags, size, _seq, pc, _java_thread);
- if (_op == ReserveAndCommit) {
- MemTracker::write_tracking_record(addr, orig_flags | MemPointerRecord::virtual_memory_commit_tag(),
- size, SequenceGenerator::next(), pc, _java_thread);
- }
- }
- _seq = 0;
- }
+ out->print_cr("Native Memory Tracking Statistics:");
+ out->print_cr("Malloc allocation site table size: %d", MallocSiteTable::hash_buckets());
+ out->print_cr(" Tracking stack depth: %d", NMT_TrackingStackDepth);
+ NOT_PRODUCT(out->print_cr("Peak concurrent access: %d", MallocSiteTable::access_peak_count());)
+ out->print_cr(" ");
+ walker.report_statistics(out);
}
diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp
index 8573c1f..c256c3e 100644
--- a/hotspot/src/share/vm/services/memTracker.hpp
+++ b/hotspot/src/share/vm/services/memTracker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,566 +25,289 @@
#ifndef SHARE_VM_SERVICES_MEM_TRACKER_HPP
#define SHARE_VM_SERVICES_MEM_TRACKER_HPP
-#include "utilities/macros.hpp"
+#include "services/nmtCommon.hpp"
+
+class NativeCallStack;
+extern NativeCallStack emptyStack;
#if !INCLUDE_NMT
-#include "utilities/ostream.hpp"
+#define CURRENT_PC emptyStack
+#define CALLER_PC emptyStack
-class BaselineOutputer : public StackObj {
-
-};
-
-class BaselineTTYOutputer : public BaselineOutputer {
- public:
- BaselineTTYOutputer(outputStream* st) { }
+class Tracker : public StackObj {
+ public:
+ Tracker() { }
+ void record(address addr, size_t size) { }
};
class MemTracker : AllStatic {
- public:
- enum ShutdownReason {
- NMT_shutdown_none, // no shutdown requested
- NMT_shutdown_user, // user requested shutdown
- NMT_normal, // normal shutdown, process exit
- NMT_out_of_memory, // shutdown due to out of memory
- NMT_initialization, // shutdown due to initialization failure
- NMT_use_malloc_only, // can not combine NMT with UseMallocOnly flag
- NMT_error_reporting, // shutdown by vmError::report_and_die()
- NMT_out_of_generation, // running out of generation queue
- NMT_sequence_overflow // overflow the sequence number
- };
+ public:
+ static inline NMT_TrackingLevel tracking_level() { return NMT_off; }
+ static inline void shutdown() { }
+ static inline void init() { }
+ static bool check_launcher_nmt_support(const char* value) { return true; }
+ static bool verify_nmt_option() { return true; }
- class Tracker {
- public:
- void discard() { }
+ static inline void* record_malloc(void* mem_base, size_t size, MEMFLAGS flag,
+ const NativeCallStack& stack, NMT_TrackingLevel level) { return mem_base; }
+ static inline size_t malloc_header_size(NMT_TrackingLevel level) { return 0; }
+ static inline size_t malloc_header_size(void* memblock) { return 0; }
+ static inline void* malloc_base(void* memblock) { return memblock; }
+ static inline void* record_free(void* memblock) { return memblock; }
- void record(address addr, size_t size = 0, MEMFLAGS flags = mtNone, address pc = NULL) { }
- void record(address old_addr, address new_addr, size_t size,
- MEMFLAGS flags, address pc = NULL) { }
- };
+ static inline void record_new_arena(MEMFLAGS flag) { }
+ static inline void record_arena_free(MEMFLAGS flag) { }
+ static inline void record_arena_size_change(int diff, MEMFLAGS flag) { }
+ static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack,
+ MEMFLAGS flag = mtNone) { }
+ static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size,
+ const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
+ static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
+ static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
+ static inline Tracker get_virtual_memory_release_tracker() { }
+ static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
+ static inline void record_thread_stack(void* addr, size_t size) { }
+ static inline void release_thread_stack(void* addr, size_t size) { }
- private:
- static Tracker _tkr;
-
-
- public:
- static inline void init_tracking_options(const char* option_line) { }
- static inline bool is_on() { return false; }
- static const char* reason() { return "Native memory tracking is not implemented"; }
- static inline bool can_walk_stack() { return false; }
-
- static inline void bootstrap_single_thread() { }
- static inline void bootstrap_multi_thread() { }
- static inline void start() { }
-
- static inline void record_malloc(address addr, size_t size, MEMFLAGS flags,
- address pc = 0, Thread* thread = NULL) { }
- static inline void record_free(address addr, MEMFLAGS flags, Thread* thread = NULL) { }
- static inline void record_arena_size(address addr, size_t size) { }
- static inline void record_virtual_memory_reserve(address addr, size_t size,
- MEMFLAGS flags, address pc = 0, Thread* thread = NULL) { }
- static inline void record_virtual_memory_reserve_and_commit(address addr, size_t size,
- MEMFLAGS flags, address pc = 0, Thread* thread = NULL) { }
- static inline void record_virtual_memory_commit(address addr, size_t size,
- address pc = 0, Thread* thread = NULL) { }
- static inline void record_virtual_memory_release(address addr, size_t size,
- Thread* thread = NULL) { }
- static inline void record_virtual_memory_type(address base, MEMFLAGS flags,
- Thread* thread = NULL) { }
- static inline Tracker get_realloc_tracker() { return _tkr; }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return _tkr; }
- static inline Tracker get_virtual_memory_release_tracker() { return _tkr; }
- static inline bool baseline() { return false; }
- static inline bool has_baseline() { return false; }
-
- static inline void set_autoShutdown(bool value) { }
- static void shutdown(ShutdownReason reason) { }
- static inline bool shutdown_in_progress() { return false; }
- static bool print_memory_usage(BaselineOutputer& out, size_t unit,
- bool summary_only = true) { return false; }
- static bool compare_memory_usage(BaselineOutputer& out, size_t unit,
- bool summary_only = true) { return false; }
-
- static bool wbtest_wait_for_data_merge() { return false; }
-
- static inline void sync() { }
- static inline void thread_exiting(JavaThread* thread) { }
+ static void final_report(outputStream*) { }
};
-
-#else // !INCLUDE_NMT
-
-#include "memory/allocation.hpp"
-#include "runtime/globals.hpp"
-#include "runtime/mutex.hpp"
-#include "runtime/os.hpp"
-#include "runtime/thread.hpp"
-#include "services/memPtr.hpp"
-#include "services/memRecorder.hpp"
-#include "services/memSnapshot.hpp"
-#include "services/memTrackWorker.hpp"
-
-extern bool NMT_track_callsite;
-
-#ifndef MAX_UNSIGNED_LONG
-#define MAX_UNSIGNED_LONG (unsigned long)(-1)
-#endif
-
-#ifdef ASSERT
- #define DEBUG_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)
#else
- #define DEBUG_CALLER_PC 0
-#endif
-// The thread closure walks threads to collect per-thread
-// memory recorders at NMT sync point
-class SyncThreadRecorderClosure : public ThreadClosure {
- private:
- int _thread_count;
+#include "runtime/atomic.hpp"
+#include "runtime/threadCritical.hpp"
+#include "services/mallocTracker.hpp"
+#include "services/virtualMemoryTracker.hpp"
+
+extern volatile bool NMT_stack_walkable;
+
+#define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \
+ NativeCallStack(0, true) : emptyStack)
+#define CALLER_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \
+ NativeCallStack(1, true) : emptyStack)
+
+class MemBaseline;
+class Mutex;
+
+// Tracker is used for guarding 'release' semantics of virtual memory operation, to avoid
+// the other thread obtains and records the same region that is just 'released' by current
+// thread but before it can record the operation.
+class Tracker : public StackObj {
+ public:
+ enum TrackerType {
+ uncommit,
+ release
+ };
public:
- SyncThreadRecorderClosure() {
- _thread_count =0;
- }
-
- void do_thread(Thread* thread);
- int get_thread_count() const {
- return _thread_count;
- }
+ Tracker(enum TrackerType type) : _type(type) { }
+ void record(address addr, size_t size);
+ private:
+ enum TrackerType _type;
+ // Virtual memory tracking data structures are protected by ThreadCritical lock.
+ ThreadCritical _tc;
};
-class BaselineOutputer;
-class MemSnapshot;
-class MemTrackWorker;
-class Thread;
-/*
- * MemTracker is the 'gate' class to native memory tracking runtime.
- */
class MemTracker : AllStatic {
- friend class GenerationData;
- friend class MemTrackWorker;
- friend class MemSnapshot;
- friend class SyncThreadRecorderClosure;
-
- // NMT state
- enum NMTStates {
- NMT_uninited, // not yet initialized
- NMT_bootstrapping_single_thread, // bootstrapping, VM is in single thread mode
- NMT_bootstrapping_multi_thread, // bootstrapping, VM is about to enter multi-thread mode
- NMT_started, // NMT fully started
- NMT_shutdown_pending, // shutdown pending
- NMT_final_shutdown, // in final phase of shutdown
- NMT_shutdown // shutdown
- };
-
public:
- class Tracker : public StackObj {
- friend class MemTracker;
- public:
- enum MemoryOperation {
- NoOp, // no op
- Malloc, // malloc
- Realloc, // realloc
- Free, // free
- Reserve, // virtual memory reserve
- Commit, // virtual memory commit
- ReserveAndCommit, // virtual memory reserve and commit
- StackAlloc = ReserveAndCommit, // allocate thread stack
- Type, // assign virtual memory type
- Uncommit, // virtual memory uncommit
- Release, // virtual memory release
- ArenaSize, // set arena size
- StackRelease // release thread stack
- };
-
-
- protected:
- Tracker(MemoryOperation op, Thread* thr = NULL);
-
- public:
- void discard();
-
- void record(address addr, size_t size = 0, MEMFLAGS flags = mtNone, address pc = NULL);
- void record(address old_addr, address new_addr, size_t size,
- MEMFLAGS flags, address pc = NULL);
-
- private:
- bool _need_thread_critical_lock;
- JavaThread* _java_thread;
- MemoryOperation _op; // memory operation
- jint _seq; // reserved sequence number
- };
-
-
- public:
- // native memory tracking level
- enum NMTLevel {
- NMT_off, // native memory tracking is off
- NMT_summary, // don't track callsite
- NMT_detail // track callsite also
- };
-
- enum ShutdownReason {
- NMT_shutdown_none, // no shutdown requested
- NMT_shutdown_user, // user requested shutdown
- NMT_normal, // normal shutdown, process exit
- NMT_out_of_memory, // shutdown due to out of memory
- NMT_initialization, // shutdown due to initialization failure
- NMT_use_malloc_only, // can not combine NMT with UseMallocOnly flag
- NMT_error_reporting, // shutdown by vmError::report_and_die()
- NMT_out_of_generation, // running out of generation queue
- NMT_sequence_overflow // overflow the sequence number
- };
-
- public:
- // initialize NMT tracking level from command line options, called
- // from VM command line parsing code
- static void init_tracking_options(const char* option_line);
-
- // if NMT is enabled to record memory activities
- static inline bool is_on() {
- return (_tracking_level >= NMT_summary &&
- _state >= NMT_bootstrapping_single_thread);
- }
-
- static inline enum NMTLevel tracking_level() {
+ static inline NMT_TrackingLevel tracking_level() {
+ if (_tracking_level == NMT_unknown) {
+ // No fencing is needed here, since JVM is in single-threaded
+ // mode.
+ _tracking_level = init_tracking_level();
+ _cmdline_tracking_level = _tracking_level;
+ }
return _tracking_level;
}
- // user readable reason for shutting down NMT
- static const char* reason() {
- switch(_reason) {
- case NMT_shutdown_none:
- return "Native memory tracking is not enabled";
- case NMT_shutdown_user:
- return "Native memory tracking has been shutdown by user";
- case NMT_normal:
- return "Native memory tracking has been shutdown due to process exiting";
- case NMT_out_of_memory:
- return "Native memory tracking has been shutdown due to out of native memory";
- case NMT_initialization:
- return "Native memory tracking failed to initialize";
- case NMT_error_reporting:
- return "Native memory tracking has been shutdown due to error reporting";
- case NMT_out_of_generation:
- return "Native memory tracking has been shutdown due to running out of generation buffer";
- case NMT_sequence_overflow:
- return "Native memory tracking has been shutdown due to overflow the sequence number";
- case NMT_use_malloc_only:
- return "Native memory tracking is not supported when UseMallocOnly is on";
- default:
- ShouldNotReachHere();
- return NULL;
+ // A late initialization, for the stuff(s) can not be
+ // done in init_tracking_level(), which can NOT malloc
+ // any memory.
+ static void init();
+
+ // Shutdown native memory tracking
+ static void shutdown();
+
+ // Verify native memory tracking command line option.
+ // This check allows JVM to detect if compatible launcher
+ // is used.
+ // If an incompatible launcher is used, NMT may not be
+ // able to start, even it is enabled by command line option.
+ // A warning message should be given if it is encountered.
+ static bool check_launcher_nmt_support(const char* value);
+
+ // This method checks native memory tracking environment
+ // variable value passed by launcher.
+ // Launcher only obligated to pass native memory tracking
+ // option value, but not obligated to validate the value,
+ // and launcher has option to discard native memory tracking
+ // option from the command line once it sets up the environment
+ // variable, so NMT has to catch the bad value here.
+ static bool verify_nmt_option();
+
+ // Transition the tracking level to specified level
+ static bool transition_to(NMT_TrackingLevel level);
+
+ static inline void* record_malloc(void* mem_base, size_t size, MEMFLAGS flag,
+ const NativeCallStack& stack, NMT_TrackingLevel level) {
+ return MallocTracker::record_malloc(mem_base, size, flag, stack, level);
+ }
+
+ static inline size_t malloc_header_size(NMT_TrackingLevel level) {
+ return MallocTracker::malloc_header_size(level);
+ }
+
+ static size_t malloc_header_size(void* memblock) {
+ if (tracking_level() != NMT_off) {
+ return MallocTracker::get_header_size(memblock);
+ }
+ return 0;
+ }
+
+ // To malloc base address, which is the starting address
+ // of malloc tracking header if tracking is enabled.
+ // Otherwise, it returns the same address.
+ static void* malloc_base(void* memblock);
+
+ // Record malloc free and return malloc base address
+ static inline void* record_free(void* memblock) {
+ return MallocTracker::record_free(memblock);
+ }
+
+
+ // Record creation of an arena
+ static inline void record_new_arena(MEMFLAGS flag) {
+ if (tracking_level() < NMT_summary) return;
+ MallocTracker::record_new_arena(flag);
+ }
+
+ // Record destruction of an arena
+ static inline void record_arena_free(MEMFLAGS flag) {
+ if (tracking_level() < NMT_summary) return;
+ MallocTracker::record_arena_free(flag);
+ }
+
+ // Record arena size change. Arena size is the size of all arena
+ // chuncks that backing up the arena.
+ static inline void record_arena_size_change(int diff, MEMFLAGS flag) {
+ if (tracking_level() < NMT_summary) return;
+ MallocTracker::record_arena_size_change(diff, flag);
+ }
+
+ static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack,
+ MEMFLAGS flag = mtNone) {
+ if (tracking_level() < NMT_summary) return;
+ if (addr != NULL) {
+ ThreadCritical tc;
+ // Recheck to avoid potential racing during NMT shutdown
+ if (tracking_level() < NMT_summary) return;
+ VirtualMemoryTracker::add_reserved_region((address)addr, size, stack, flag);
}
}
- // test if we can walk native stack
- static bool can_walk_stack() {
- // native stack is not walkable during bootstrapping on sparc
-#if defined(SPARC)
- return (_state == NMT_started);
-#else
- return (_state >= NMT_bootstrapping_single_thread && _state <= NMT_started);
-#endif
- }
-
- // if native memory tracking tracks callsite
- static inline bool track_callsite() { return _tracking_level == NMT_detail; }
-
- // NMT automatically shuts itself down under extreme situation by default.
- // When the value is set to false, NMT will try its best to stay alive,
- // even it has to slow down VM.
- static inline void set_autoShutdown(bool value) {
- AutoShutdownNMT = value;
- if (AutoShutdownNMT && _slowdown_calling_thread) {
- _slowdown_calling_thread = false;
+ static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size,
+ const NativeCallStack& stack, MEMFLAGS flag = mtNone) {
+ if (tracking_level() < NMT_summary) return;
+ if (addr != NULL) {
+ ThreadCritical tc;
+ if (tracking_level() < NMT_summary) return;
+ VirtualMemoryTracker::add_reserved_region((address)addr, size,
+ stack, flag, true);
}
}
- // shutdown native memory tracking capability. Native memory tracking
- // can be shutdown by VM when it encounters low memory scenarios.
- // Memory tracker should gracefully shutdown itself, and preserve the
- // latest memory statistics for post morten diagnosis.
- static void shutdown(ShutdownReason reason);
-
- // if there is shutdown requested
- static inline bool shutdown_in_progress() {
- return (_state >= NMT_shutdown_pending);
- }
-
- // bootstrap native memory tracking, so it can start to collect raw data
- // before worker thread can start
-
- // the first phase of bootstrapping, when VM still in single-threaded mode
- static void bootstrap_single_thread();
- // the second phase of bootstrapping, VM is about or already in multi-threaded mode
- static void bootstrap_multi_thread();
-
-
- // start() has to be called when VM still in single thread mode, but after
- // command line option parsing is done.
- static void start();
-
- // record a 'malloc' call
- static inline void record_malloc(address addr, size_t size, MEMFLAGS flags,
- address pc = 0, Thread* thread = NULL) {
- Tracker tkr(Tracker::Malloc, thread);
- tkr.record(addr, size, flags, pc);
- }
- // record a 'free' call
- static inline void record_free(address addr, MEMFLAGS flags, Thread* thread = NULL) {
- Tracker tkr(Tracker::Free, thread);
- tkr.record(addr, 0, flags, DEBUG_CALLER_PC);
- }
-
- static inline void record_arena_size(address addr, size_t size) {
- Tracker tkr(Tracker::ArenaSize);
- tkr.record(addr, size);
- }
-
- // record a virtual memory 'reserve' call
- static inline void record_virtual_memory_reserve(address addr, size_t size,
- MEMFLAGS flags, address pc = 0, Thread* thread = NULL) {
- assert(size > 0, "Sanity check");
- Tracker tkr(Tracker::Reserve, thread);
- tkr.record(addr, size, flags, pc);
- }
-
- static inline void record_thread_stack(address addr, size_t size, Thread* thr,
- address pc = 0) {
- Tracker tkr(Tracker::StackAlloc, thr);
- tkr.record(addr, size, mtThreadStack, pc);
- }
-
- static inline void release_thread_stack(address addr, size_t size, Thread* thr) {
- Tracker tkr(Tracker::StackRelease, thr);
- tkr.record(addr, size, mtThreadStack, DEBUG_CALLER_PC);
- }
-
- // record a virtual memory 'commit' call
- static inline void record_virtual_memory_commit(address addr, size_t size,
- address pc, Thread* thread = NULL) {
- Tracker tkr(Tracker::Commit, thread);
- tkr.record(addr, size, mtNone, pc);
- }
-
- static inline void record_virtual_memory_reserve_and_commit(address addr, size_t size,
- MEMFLAGS flags, address pc, Thread* thread = NULL) {
- Tracker tkr(Tracker::ReserveAndCommit, thread);
- tkr.record(addr, size, flags, pc);
- }
-
- static inline void record_virtual_memory_release(address addr, size_t size,
- Thread* thread = NULL) {
- if (is_on()) {
- Tracker tkr(Tracker::Release, thread);
- tkr.record(addr, size);
+ static inline void record_virtual_memory_commit(void* addr, size_t size,
+ const NativeCallStack& stack) {
+ if (tracking_level() < NMT_summary) return;
+ if (addr != NULL) {
+ ThreadCritical tc;
+ if (tracking_level() < NMT_summary) return;
+ VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
}
}
- // record memory type on virtual memory base address
- static inline void record_virtual_memory_type(address base, MEMFLAGS flags,
- Thread* thread = NULL) {
- Tracker tkr(Tracker::Type);
- tkr.record(base, 0, flags);
- }
-
- // Get memory trackers for memory operations that can result race conditions.
- // The memory tracker has to be obtained before realloc, virtual memory uncommit
- // and virtual memory release, and call tracker.record() method if operation
- // succeeded, or tracker.discard() to abort the tracking.
- static inline Tracker get_realloc_tracker() {
- return Tracker(Tracker::Realloc);
- }
-
static inline Tracker get_virtual_memory_uncommit_tracker() {
- return Tracker(Tracker::Uncommit);
+ assert(tracking_level() >= NMT_summary, "Check by caller");
+ return Tracker(Tracker::uncommit);
}
static inline Tracker get_virtual_memory_release_tracker() {
- return Tracker(Tracker::Release);
+ assert(tracking_level() >= NMT_summary, "Check by caller");
+ return Tracker(Tracker::release);
}
-
- // create memory baseline of current memory snapshot
- static bool baseline();
- // is there a memory baseline
- static bool has_baseline() {
- return _baseline.baselined();
- }
-
- // print memory usage from current snapshot
- static bool print_memory_usage(BaselineOutputer& out, size_t unit,
- bool summary_only = true);
- // compare memory usage between current snapshot and baseline
- static bool compare_memory_usage(BaselineOutputer& out, size_t unit,
- bool summary_only = true);
-
- // the version for whitebox testing support, it ensures that all memory
- // activities before this method call, are reflected in the snapshot
- // database.
- static bool wbtest_wait_for_data_merge();
-
- // sync is called within global safepoint to synchronize nmt data
- static void sync();
-
- // called when a thread is about to exit
- static void thread_exiting(JavaThread* thread);
-
- // retrieve global snapshot
- static MemSnapshot* get_snapshot() {
- if (shutdown_in_progress()) {
- return NULL;
- }
- return _snapshot;
- }
-
- // print tracker stats
- NOT_PRODUCT(static void print_tracker_stats(outputStream* st);)
- NOT_PRODUCT(static void walk_stack(int toSkip, char* buf, int len);)
-
- private:
- // start native memory tracking worker thread
- static bool start_worker(MemSnapshot* snapshot);
-
- // called by worker thread to complete shutdown process
- static void final_shutdown();
-
- protected:
- // retrieve per-thread recorder of the specified thread.
- // if the recorder is full, it will be enqueued to overflow
- // queue, a new recorder is acquired from recorder pool or a
- // new instance is created.
- // when thread == NULL, it means global recorder
- static MemRecorder* get_thread_recorder(JavaThread* thread);
-
- // per-thread recorder pool
- static void release_thread_recorder(MemRecorder* rec);
- static void delete_all_pooled_recorders();
-
- // pending recorder queue. Recorders are queued to pending queue
- // when they are overflowed or collected at nmt sync point.
- static void enqueue_pending_recorder(MemRecorder* rec);
- static MemRecorder* get_pending_recorders();
- static void delete_all_pending_recorders();
-
- // write a memory tracking record in recorder
- static void write_tracking_record(address addr, MEMFLAGS type,
- size_t size, jint seq, address pc, JavaThread* thread);
-
- static bool is_single_threaded_bootstrap() {
- return _state == NMT_bootstrapping_single_thread;
- }
-
- static void check_NMT_load(Thread* thr) {
- assert(thr != NULL, "Sanity check");
- if (_slowdown_calling_thread && thr != _worker_thread) {
-#ifdef _WINDOWS
- // On Windows, os::NakedYield() does not work as well
- // as short sleep.
- os::naked_short_sleep(1);
-#else
- os::naked_yield();
-#endif
+ static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) {
+ if (tracking_level() < NMT_summary) return;
+ if (addr != NULL) {
+ ThreadCritical tc;
+ if (tracking_level() < NMT_summary) return;
+ VirtualMemoryTracker::set_reserved_region_type((address)addr, flag);
}
}
- static void inc_pending_op_count() {
- Atomic::inc(&_pending_op_count);
+ static inline void record_thread_stack(void* addr, size_t size) {
+ if (tracking_level() < NMT_summary) return;
+ if (addr != NULL) {
+ // uses thread stack malloc slot for book keeping number of threads
+ MallocMemorySummary::record_malloc(0, mtThreadStack);
+ record_virtual_memory_reserve_and_commit(addr, size, CALLER_PC, mtThreadStack);
+ }
}
- static void dec_pending_op_count() {
- Atomic::dec(&_pending_op_count);
- assert(_pending_op_count >= 0, "Sanity check");
+ static inline void release_thread_stack(void* addr, size_t size) {
+ if (tracking_level() < NMT_summary) return;
+ if (addr != NULL) {
+ // uses thread stack malloc slot for book keeping number of threads
+ MallocMemorySummary::record_free(0, mtThreadStack);
+ ThreadCritical tc;
+ if (tracking_level() < NMT_summary) return;
+ VirtualMemoryTracker::remove_released_region((address)addr, size);
+ }
}
+ // Query lock is used to synchronize the access to tracking data.
+ // So far, it is only used by JCmd query, but it may be used by
+ // other tools.
+ static inline Mutex* query_lock() { return _query_lock; }
+
+ // Make a final report and shutdown.
+ // This function generates summary report without creating snapshots,
+ // to avoid additional memory allocation. It uses native memory summary
+ // counters, and makes adjustment to them, once the adjustment is made,
+ // the counters are no longer accurate. As the result, this function
+ // should only be used for final reporting before shutting down.
+ static void final_report(outputStream*);
+
+ // Stored baseline
+ static inline MemBaseline& get_baseline() {
+ return _baseline;
+ }
+
+ static NMT_TrackingLevel cmdline_tracking_level() {
+ return _cmdline_tracking_level;
+ }
+
+ static void tuning_statistics(outputStream* out);
private:
- // retrieve a pooled memory record or create new one if there is not
- // one available
- static MemRecorder* get_new_or_pooled_instance();
- static void create_memory_record(address addr, MEMFLAGS type,
- size_t size, address pc, Thread* thread);
- static void create_record_in_recorder(address addr, MEMFLAGS type,
- size_t size, address pc, JavaThread* thread);
-
- static void set_current_processing_generation(unsigned long generation) {
- _worker_thread_idle = false;
- _processing_generation = generation;
- }
-
- static void report_worker_idle() {
- _worker_thread_idle = true;
- }
+ static NMT_TrackingLevel init_tracking_level();
private:
- // global memory snapshot
- static MemSnapshot* _snapshot;
-
- // a memory baseline of snapshot
+ // Tracking level
+ static volatile NMT_TrackingLevel _tracking_level;
+ // If NMT option value passed by launcher through environment
+ // variable is valid
+ static bool _is_nmt_env_valid;
+ // command line tracking level
+ static NMT_TrackingLevel _cmdline_tracking_level;
+ // Stored baseline
static MemBaseline _baseline;
-
- // query lock
+ // Query lock
static Mutex* _query_lock;
-
- // a thread can start to allocate memory before it is attached
- // to VM 'Thread', those memory activities are recorded here.
- // ThreadCritical is required to guard this global recorder.
- static MemRecorder* volatile _global_recorder;
-
- // main thread id
- debug_only(static intx _main_thread_tid;)
-
- // pending recorders to be merged
- static MemRecorder* volatile _merge_pending_queue;
-
- NOT_PRODUCT(static volatile jint _pending_recorder_count;)
-
- // pooled memory recorders
- static MemRecorder* volatile _pooled_recorders;
-
- // memory recorder pool management, uses following
- // counter to determine if a released memory recorder
- // should be pooled
-
- // latest thread count
- static int _thread_count;
- // pooled recorder count
- static volatile jint _pooled_recorder_count;
-
-
- // worker thread to merge pending recorders into snapshot
- static MemTrackWorker* _worker_thread;
-
- // how many safepoints we skipped without entering sync point
- static int _sync_point_skip_count;
-
- // if the tracker is properly intialized
- static bool _is_tracker_ready;
- // tracking level (off, summary and detail)
- static enum NMTLevel _tracking_level;
-
- // current nmt state
- static volatile enum NMTStates _state;
- // the reason for shutting down nmt
- static enum ShutdownReason _reason;
- // the generation that NMT is processing
- static volatile unsigned long _processing_generation;
- // although NMT is still procesing current generation, but
- // there is not more recorder to process, set idle state
- static volatile bool _worker_thread_idle;
-
- // if NMT should slow down calling thread to allow
- // worker thread to catch up
- static volatile bool _slowdown_calling_thread;
-
- // pending memory op count.
- // Certain memory ops need to pre-reserve sequence number
- // before memory operation can happen to avoid race condition.
- // See MemTracker::Tracker for detail
- static volatile jint _pending_op_count;
};
-#endif // !INCLUDE_NMT
+#endif // INCLUDE_NMT
#endif // SHARE_VM_SERVICES_MEM_TRACKER_HPP
+
diff --git a/hotspot/src/share/vm/services/nmtCommon.cpp b/hotspot/src/share/vm/services/nmtCommon.cpp
new file mode 100644
index 0000000..0934e96
--- /dev/null
+++ b/hotspot/src/share/vm/services/nmtCommon.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+#include "precompiled.hpp"
+#include "services/nmtCommon.hpp"
+
+const char* NMTUtil::_memory_type_names[] = {
+ "Java Heap",
+ "Class",
+ "Thread",
+ "Thread Stack",
+ "Code",
+ "GC",
+ "Compiler",
+ "Internal",
+ "Other",
+ "Symbol",
+ "Native Memory Tracking",
+ "Shared class space",
+ "Arena Chunk",
+ "Test",
+ "Tracing",
+ "Unknown"
+};
+
+
+const char* NMTUtil::scale_name(size_t scale) {
+ switch(scale) {
+ case K: return "KB";
+ case M: return "MB";
+ case G: return "GB";
+ }
+ ShouldNotReachHere();
+ return NULL;
+}
+
+size_t NMTUtil::scale_from_name(const char* scale) {
+ assert(scale != NULL, "Null pointer check");
+ if (strncmp(scale, "KB", 2) == 0 ||
+ strncmp(scale, "kb", 2) == 0) {
+ return K;
+ } else if (strncmp(scale, "MB", 2) == 0 ||
+ strncmp(scale, "mb", 2) == 0) {
+ return M;
+ } else if (strncmp(scale, "GB", 2) == 0 ||
+ strncmp(scale, "gb", 2) == 0) {
+ return G;
+ } else {
+ return 0; // Invalid value
+ }
+ return K;
+}
+
diff --git a/hotspot/src/share/vm/services/nmtCommon.hpp b/hotspot/src/share/vm/services/nmtCommon.hpp
new file mode 100644
index 0000000..7813941
--- /dev/null
+++ b/hotspot/src/share/vm/services/nmtCommon.hpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_SERVICES_NMT_COMMON_HPP
+#define SHARE_VM_SERVICES_NMT_COMMON_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+#define CALC_OBJ_SIZE_IN_TYPE(obj, type) (align_size_up_(sizeof(obj), sizeof(type))/sizeof(type))
+
+// Data type for memory counters
+#ifdef _LP64
+ typedef jlong MemoryCounterType;
+#else
+ typedef jint MemoryCounterType;
+#endif
+
+// Native memory tracking level
+enum NMT_TrackingLevel {
+ NMT_unknown = 0xFF,
+ NMT_off = 0x00,
+ NMT_minimal = 0x01,
+ NMT_summary = 0x02,
+ NMT_detail = 0x03
+};
+
+// Number of stack frames to capture. This is a
+// build time decision.
+const int NMT_TrackingStackDepth = 4;
+
+class NativeCallStack;
+extern NativeCallStack emptyStack;
+
+// A few common utilities for native memory tracking
+class NMTUtil : AllStatic {
+ public:
+ // Map memory type to index
+ static inline int flag_to_index(MEMFLAGS flag) {
+ return (flag & 0xff);
+ }
+
+ // Map memory type to human readable name
+ static const char* flag_to_name(MEMFLAGS flag) {
+ return _memory_type_names[flag_to_index(flag)];
+ }
+
+ // Map an index to memory type
+ static MEMFLAGS index_to_flag(int index) {
+ return (MEMFLAGS)index;
+ }
+
+ // Memory size scale
+ static const char* scale_name(size_t scale);
+ static size_t scale_from_name(const char* scale);
+
+ // Translate memory size in specified scale
+ static size_t amount_in_scale(size_t amount, size_t scale) {
+ return (amount + scale / 2) / scale;
+ }
+ private:
+ static const char* _memory_type_names[mt_number_of_types];
+};
+
+
+#endif
diff --git a/hotspot/src/share/vm/services/nmtDCmd.cpp b/hotspot/src/share/vm/services/nmtDCmd.cpp
index 8ced287..fcad784 100644
--- a/hotspot/src/share/vm/services/nmtDCmd.cpp
+++ b/hotspot/src/share/vm/services/nmtDCmd.cpp
@@ -22,6 +22,8 @@
*
*/
#include "precompiled.hpp"
+
+#include "runtime/mutexLocker.hpp"
#include "services/nmtDCmd.hpp"
#include "services/memReporter.hpp"
#include "services/memTracker.hpp"
@@ -49,13 +51,8 @@
_shutdown("shutdown", "request runtime to shutdown itself and free the " \
"memory used by runtime.",
"BOOLEAN", false, "false"),
- _auto_shutdown("autoShutdown", "automatically shutdown itself under " \
- "stress situation",
- "BOOLEAN", true, "true"),
-#ifndef PRODUCT
- _debug("debug", "print tracker statistics. Debug only, not thread safe", \
+ _statistics("statistics", "print tracker statistics for tuning purpose.", \
"BOOLEAN", false, "false"),
-#endif
_scale("scale", "Memory usage in which scale, KB, MB or GB",
"STRING", false, "KB") {
_dcmdparser.add_dcmd_option(&_summary);
@@ -64,25 +61,30 @@
_dcmdparser.add_dcmd_option(&_summary_diff);
_dcmdparser.add_dcmd_option(&_detail_diff);
_dcmdparser.add_dcmd_option(&_shutdown);
- _dcmdparser.add_dcmd_option(&_auto_shutdown);
-#ifndef PRODUCT
- _dcmdparser.add_dcmd_option(&_debug);
-#endif
+ _dcmdparser.add_dcmd_option(&_statistics);
_dcmdparser.add_dcmd_option(&_scale);
}
+
+size_t NMTDCmd::get_scale(const char* scale) const {
+ if (scale == NULL) return 0;
+ return NMTUtil::scale_from_name(scale);
+}
+
void NMTDCmd::execute(DCmdSource source, TRAPS) {
+ // Check NMT state
+ // native memory tracking has to be on
+ if (MemTracker::tracking_level() == NMT_off) {
+ output()->print_cr("Native memory tracking is not enabled");
+ return;
+ } else if (MemTracker::tracking_level() == NMT_minimal) {
+ output()->print_cr("Native memory tracking has been shutdown");
+ return;
+ }
+
const char* scale_value = _scale.value();
- size_t scale_unit;
- if (strcmp(scale_value, "KB") == 0 || strcmp(scale_value, "kb") == 0) {
- scale_unit = K;
- } else if (strcmp(scale_value, "MB") == 0 ||
- strcmp(scale_value, "mb") == 0) {
- scale_unit = M;
- } else if (strcmp(scale_value, "GB") == 0 ||
- strcmp(scale_value, "gb") == 0) {
- scale_unit = G;
- } else {
+ size_t scale_unit = get_scale(scale_value);
+ if (scale_unit == 0) {
output()->print_cr("Incorrect scale value: %s", scale_value);
return;
}
@@ -94,19 +96,11 @@
if (_summary_diff.is_set() && _summary_diff.value()) { ++nopt; }
if (_detail_diff.is_set() && _detail_diff.value()) { ++nopt; }
if (_shutdown.is_set() && _shutdown.value()) { ++nopt; }
- if (_auto_shutdown.is_set()) { ++nopt; }
-
-#ifndef PRODUCT
- if (_debug.is_set() && _debug.value()) { ++nopt; }
-#endif
+ if (_statistics.is_set() && _statistics.value()) { ++nopt; }
if (nopt > 1) {
output()->print_cr("At most one of the following option can be specified: " \
- "summary, detail, baseline, summary.diff, detail.diff, shutdown"
-#ifndef PRODUCT
- ", debug"
-#endif
- );
+ "summary, detail, baseline, summary.diff, detail.diff, shutdown");
return;
} else if (nopt == 0) {
if (_summary.is_set()) {
@@ -117,53 +111,47 @@
}
}
-#ifndef PRODUCT
- if (_debug.value()) {
- output()->print_cr("debug command is NOT thread-safe, may cause crash");
- MemTracker::print_tracker_stats(output());
- return;
- }
-#endif
-
- // native memory tracking has to be on
- if (!MemTracker::is_on() || MemTracker::shutdown_in_progress()) {
- // if it is not on, what's the reason?
- output()->print_cr("%s", MemTracker::reason());
- return;
- }
+ // Serialize NMT query
+ MutexLocker locker(MemTracker::query_lock());
if (_summary.value()) {
- BaselineTTYOutputer outputer(output());
- MemTracker::print_memory_usage(outputer, scale_unit, true);
+ report(true, scale_unit);
} else if (_detail.value()) {
- BaselineTTYOutputer outputer(output());
- MemTracker::print_memory_usage(outputer, scale_unit, false);
+ if (!check_detail_tracking_level(output())) {
+ return;
+ }
+ report(false, scale_unit);
} else if (_baseline.value()) {
- if (MemTracker::baseline()) {
- output()->print_cr("Successfully baselined.");
+ MemBaseline& baseline = MemTracker::get_baseline();
+ if (!baseline.baseline(MemTracker::tracking_level() != NMT_detail)) {
+ output()->print_cr("Baseline failed");
} else {
- output()->print_cr("Baseline failed.");
+ output()->print_cr("Baseline succeeded");
}
} else if (_summary_diff.value()) {
- if (MemTracker::has_baseline()) {
- BaselineTTYOutputer outputer(output());
- MemTracker::compare_memory_usage(outputer, scale_unit, true);
+ MemBaseline& baseline = MemTracker::get_baseline();
+ if (baseline.baseline_type() >= MemBaseline::Summary_baselined) {
+ report_diff(true, scale_unit);
} else {
- output()->print_cr("No baseline to compare, run 'baseline' command first");
+ output()->print_cr("No baseline for comparison");
}
} else if (_detail_diff.value()) {
- if (MemTracker::has_baseline()) {
- BaselineTTYOutputer outputer(output());
- MemTracker::compare_memory_usage(outputer, scale_unit, false);
+ if (!check_detail_tracking_level(output())) {
+ return;
+ }
+ MemBaseline& baseline = MemTracker::get_baseline();
+ if (baseline.baseline_type() == MemBaseline::Detail_baselined) {
+ report_diff(false, scale_unit);
} else {
- output()->print_cr("No baseline to compare to, run 'baseline' command first");
+ output()->print_cr("No detail baseline for comparison");
}
} else if (_shutdown.value()) {
- MemTracker::shutdown(MemTracker::NMT_shutdown_user);
- output()->print_cr("Shutdown is in progress, it will take a few moments to " \
- "completely shutdown");
- } else if (_auto_shutdown.is_set()) {
- MemTracker::set_autoShutdown(_auto_shutdown.value());
+ MemTracker::shutdown();
+ output()->print_cr("Native memory tracking has been turned off");
+ } else if (_statistics.value()) {
+ if (check_detail_tracking_level(output())) {
+ MemTracker::tuning_statistics(output());
+ }
} else {
ShouldNotReachHere();
output()->print_cr("Unknown command");
@@ -181,3 +169,46 @@
}
}
+void NMTDCmd::report(bool summaryOnly, size_t scale_unit) {
+ MemBaseline baseline;
+ if (baseline.baseline(summaryOnly)) {
+ if (summaryOnly) {
+ MemSummaryReporter rpt(baseline, output(), scale_unit);
+ rpt.report();
+ } else {
+ MemDetailReporter rpt(baseline, output(), scale_unit);
+ rpt.report();
+ }
+ }
+}
+
+void NMTDCmd::report_diff(bool summaryOnly, size_t scale_unit) {
+ MemBaseline& early_baseline = MemTracker::get_baseline();
+ assert(early_baseline.baseline_type() != MemBaseline::Not_baselined,
+ "Not yet baselined");
+ assert(summaryOnly || early_baseline.baseline_type() == MemBaseline::Detail_baselined,
+ "Not a detail baseline");
+
+ MemBaseline baseline;
+ if (baseline.baseline(summaryOnly)) {
+ if (summaryOnly) {
+ MemSummaryDiffReporter rpt(early_baseline, baseline, output(), scale_unit);
+ rpt.report_diff();
+ } else {
+ MemDetailDiffReporter rpt(early_baseline, baseline, output(), scale_unit);
+ rpt.report_diff();
+ }
+ }
+}
+
+bool NMTDCmd::check_detail_tracking_level(outputStream* out) {
+ if (MemTracker::tracking_level() == NMT_detail) {
+ return true;
+ } else if (MemTracker::cmdline_tracking_level() == NMT_detail) {
+ out->print_cr("Tracking level has been downgraded due to lack of resources");
+ return false;
+ } else {
+ out->print_cr("Detail tracking is not enabled");
+ return false;
+ }
+}
diff --git a/hotspot/src/share/vm/services/nmtDCmd.hpp b/hotspot/src/share/vm/services/nmtDCmd.hpp
index 62872c6..df1ab36 100644
--- a/hotspot/src/share/vm/services/nmtDCmd.hpp
+++ b/hotspot/src/share/vm/services/nmtDCmd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,12 @@
#ifndef SHARE_VM_SERVICES_NMT_DCMD_HPP
#define SHARE_VM_SERVICES_NMT_DCMD_HPP
+#if INCLUDE_NMT
+
#include "services/diagnosticArgument.hpp"
#include "services/diagnosticFramework.hpp"
+#include "services/memBaseline.hpp"
+#include "services/mallocTracker.hpp"
/**
* Native memory tracking DCmd implementation
@@ -39,10 +43,7 @@
DCmdArgument<bool> _summary_diff;
DCmdArgument<bool> _detail_diff;
DCmdArgument<bool> _shutdown;
- DCmdArgument<bool> _auto_shutdown;
-#ifndef PRODUCT
- DCmdArgument<bool> _debug;
-#endif
+ DCmdArgument<bool> _statistics;
DCmdArgument<char*> _scale;
public:
@@ -61,6 +62,17 @@
}
static int num_arguments();
virtual void execute(DCmdSource source, TRAPS);
+
+ private:
+ void report(bool summaryOnly, size_t scale);
+ void report_diff(bool summaryOnly, size_t scale);
+
+ size_t get_scale(const char* scale) const;
+
+ // check if NMT running at detail tracking level
+ bool check_detail_tracking_level(outputStream* out);
};
+#endif // INCLUDE_NMT
+
#endif // SHARE_VM_SERVICES_NMT_DCMD_HPP
diff --git a/hotspot/src/share/vm/services/virtualMemoryTracker.cpp b/hotspot/src/share/vm/services/virtualMemoryTracker.cpp
new file mode 100644
index 0000000..4e0476f
--- /dev/null
+++ b/hotspot/src/share/vm/services/virtualMemoryTracker.cpp
@@ -0,0 +1,448 @@
+/*
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+#include "precompiled.hpp"
+
+#include "runtime/threadCritical.hpp"
+#include "services/virtualMemoryTracker.hpp"
+
+size_t VirtualMemorySummary::_snapshot[CALC_OBJ_SIZE_IN_TYPE(VirtualMemorySnapshot, size_t)];
+
+void VirtualMemorySummary::initialize() {
+ assert(sizeof(_snapshot) >= sizeof(VirtualMemorySnapshot), "Sanity Check");
+ // Use placement operator new to initialize static data area.
+ ::new ((void*)_snapshot) VirtualMemorySnapshot();
+}
+
+SortedLinkedList<ReservedMemoryRegion, compare_reserved_region_base> VirtualMemoryTracker::_reserved_regions;
+
+int compare_committed_region(const CommittedMemoryRegion& r1, const CommittedMemoryRegion& r2) {
+ return r1.compare(r2);
+}
+
+int compare_reserved_region_base(const ReservedMemoryRegion& r1, const ReservedMemoryRegion& r2) {
+ return r1.compare(r2);
+}
+
+bool ReservedMemoryRegion::add_committed_region(address addr, size_t size, const NativeCallStack& stack) {
+ assert(addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+ assert(contain_region(addr, size), "Not contain this region");
+
+ if (all_committed()) return true;
+
+ CommittedMemoryRegion committed_rgn(addr, size, stack);
+ LinkedListNode<CommittedMemoryRegion>* node = _committed_regions.find_node(committed_rgn);
+ if (node != NULL) {
+ CommittedMemoryRegion* rgn = node->data();
+ if (rgn->same_region(addr, size)) {
+ return true;
+ }
+
+ if (rgn->adjacent_to(addr, size)) {
+ // check if the next region covers this committed region,
+ // the regions may not be merged due to different call stacks
+ LinkedListNode<CommittedMemoryRegion>* next =
+ node->next();
+ if (next != NULL && next->data()->contain_region(addr, size)) {
+ if (next->data()->same_region(addr, size)) {
+ next->data()->set_call_stack(stack);
+ }
+ return true;
+ }
+ if (rgn->call_stack()->equals(stack)) {
+ VirtualMemorySummary::record_uncommitted_memory(rgn->size(), flag());
+ // the two adjacent regions have the same call stack, merge them
+ rgn->expand_region(addr, size);
+ VirtualMemorySummary::record_committed_memory(rgn->size(), flag());
+ return true;
+ }
+ VirtualMemorySummary::record_committed_memory(size, flag());
+ if (rgn->base() > addr) {
+ return _committed_regions.insert_before(committed_rgn, node) != NULL;
+ } else {
+ return _committed_regions.insert_after(committed_rgn, node) != NULL;
+ }
+ }
+ assert(rgn->contain_region(addr, size), "Must cover this region");
+ return true;
+ } else {
+ // New committed region
+ VirtualMemorySummary::record_committed_memory(size, flag());
+ return add_committed_region(committed_rgn);
+ }
+}
+
+void ReservedMemoryRegion::set_all_committed(bool b) {
+ if (all_committed() != b) {
+ _all_committed = b;
+ if (b) {
+ VirtualMemorySummary::record_committed_memory(size(), flag());
+ }
+ }
+}
+
+bool ReservedMemoryRegion::remove_uncommitted_region(LinkedListNode<CommittedMemoryRegion>* node,
+ address addr, size_t size) {
+ assert(addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+
+ CommittedMemoryRegion* rgn = node->data();
+ assert(rgn->contain_region(addr, size), "Has to be contained");
+ assert(!rgn->same_region(addr, size), "Can not be the same region");
+
+ if (rgn->base() == addr ||
+ rgn->end() == addr + size) {
+ rgn->exclude_region(addr, size);
+ return true;
+ } else {
+ // split this region
+ address top =rgn->end();
+ // use this region for lower part
+ size_t exclude_size = rgn->end() - addr;
+ rgn->exclude_region(addr, exclude_size);
+
+ // higher part
+ address high_base = addr + size;
+ size_t high_size = top - high_base;
+
+ CommittedMemoryRegion high_rgn(high_base, high_size, *rgn->call_stack());
+ LinkedListNode<CommittedMemoryRegion>* high_node = _committed_regions.add(high_rgn);
+ assert(high_node == NULL || node->next() == high_node, "Should be right after");
+ return (high_node != NULL);
+ }
+
+ return false;
+}
+
+bool ReservedMemoryRegion::remove_uncommitted_region(address addr, size_t sz) {
+ // uncommit stack guard pages
+ if (flag() == mtThreadStack && !same_region(addr, sz)) {
+ return true;
+ }
+
+ assert(addr != NULL, "Invalid address");
+ assert(sz > 0, "Invalid size");
+
+ if (all_committed()) {
+ assert(_committed_regions.is_empty(), "Sanity check");
+ assert(contain_region(addr, sz), "Reserved region does not contain this region");
+ set_all_committed(false);
+ VirtualMemorySummary::record_uncommitted_memory(sz, flag());
+ if (same_region(addr, sz)) {
+ return true;
+ } else {
+ CommittedMemoryRegion rgn(base(), size(), *call_stack());
+ if (rgn.base() == addr || rgn.end() == (addr + sz)) {
+ rgn.exclude_region(addr, sz);
+ return add_committed_region(rgn);
+ } else {
+ // split this region
+ // top of the whole region
+ address top =rgn.end();
+ // use this region for lower part
+ size_t exclude_size = rgn.end() - addr;
+ rgn.exclude_region(addr, exclude_size);
+ if (add_committed_region(rgn)) {
+ // higher part
+ address high_base = addr + sz;
+ size_t high_size = top - high_base;
+ CommittedMemoryRegion high_rgn(high_base, high_size, emptyStack);
+ return add_committed_region(high_rgn);
+ } else {
+ return false;
+ }
+ }
+ }
+ } else {
+ // we have to walk whole list to remove the committed regions in
+ // specified range
+ LinkedListNode<CommittedMemoryRegion>* head =
+ _committed_regions.head();
+ LinkedListNode<CommittedMemoryRegion>* prev = NULL;
+ VirtualMemoryRegion uncommitted_rgn(addr, sz);
+
+ while (head != NULL && !uncommitted_rgn.is_empty()) {
+ CommittedMemoryRegion* crgn = head->data();
+ // this committed region overlaps to region to uncommit
+ if (crgn->overlap_region(uncommitted_rgn.base(), uncommitted_rgn.size())) {
+ if (crgn->same_region(uncommitted_rgn.base(), uncommitted_rgn.size())) {
+ // find matched region, remove the node will do
+ VirtualMemorySummary::record_uncommitted_memory(uncommitted_rgn.size(), flag());
+ _committed_regions.remove_after(prev);
+ return true;
+ } else if (crgn->contain_region(uncommitted_rgn.base(), uncommitted_rgn.size())) {
+ // this committed region contains whole uncommitted region
+ VirtualMemorySummary::record_uncommitted_memory(uncommitted_rgn.size(), flag());
+ return remove_uncommitted_region(head, uncommitted_rgn.base(), uncommitted_rgn.size());
+ } else if (uncommitted_rgn.contain_region(crgn->base(), crgn->size())) {
+ // this committed region has been uncommitted
+ size_t exclude_size = crgn->end() - uncommitted_rgn.base();
+ uncommitted_rgn.exclude_region(uncommitted_rgn.base(), exclude_size);
+ VirtualMemorySummary::record_uncommitted_memory(crgn->size(), flag());
+ LinkedListNode<CommittedMemoryRegion>* tmp = head;
+ head = head->next();
+ _committed_regions.remove_after(prev);
+ continue;
+ } else if (crgn->contain_address(uncommitted_rgn.base())) {
+ size_t toUncommitted = crgn->end() - uncommitted_rgn.base();
+ crgn->exclude_region(uncommitted_rgn.base(), toUncommitted);
+ uncommitted_rgn.exclude_region(uncommitted_rgn.base(), toUncommitted);
+ VirtualMemorySummary::record_uncommitted_memory(toUncommitted, flag());
+ } else if (uncommitted_rgn.contain_address(crgn->base())) {
+ size_t toUncommitted = uncommitted_rgn.end() - crgn->base();
+ crgn->exclude_region(crgn->base(), toUncommitted);
+ uncommitted_rgn.exclude_region(uncommitted_rgn.end() - toUncommitted,
+ toUncommitted);
+ VirtualMemorySummary::record_uncommitted_memory(toUncommitted, flag());
+ }
+ }
+ prev = head;
+ head = head->next();
+ }
+ }
+
+ return true;
+}
+
+void ReservedMemoryRegion::move_committed_regions(address addr, ReservedMemoryRegion& rgn) {
+ assert(addr != NULL, "Invalid address");
+
+ // split committed regions
+ LinkedListNode<CommittedMemoryRegion>* head =
+ _committed_regions.head();
+ LinkedListNode<CommittedMemoryRegion>* prev = NULL;
+
+ while (head != NULL) {
+ if (head->data()->base() >= addr) {
+ break;
+ }
+ prev = head;
+ head = head->next();
+ }
+
+ if (head != NULL) {
+ if (prev != NULL) {
+ prev->set_next(head->next());
+ } else {
+ _committed_regions.set_head(NULL);
+ }
+ }
+
+ rgn._committed_regions.set_head(head);
+}
+
+size_t ReservedMemoryRegion::committed_size() const {
+ if (all_committed()) {
+ return size();
+ } else {
+ size_t committed = 0;
+ LinkedListNode<CommittedMemoryRegion>* head =
+ _committed_regions.head();
+ while (head != NULL) {
+ committed += head->data()->size();
+ head = head->next();
+ }
+ return committed;
+ }
+}
+
+void ReservedMemoryRegion::set_flag(MEMFLAGS f) {
+ assert((flag() == mtNone || flag() == f), "Overwrite memory type");
+ if (flag() != f) {
+ VirtualMemorySummary::move_reserved_memory(flag(), f, size());
+ VirtualMemorySummary::move_committed_memory(flag(), f, committed_size());
+ _flag = f;
+ }
+}
+
+bool VirtualMemoryTracker::initialize(NMT_TrackingLevel level) {
+ if (level >= NMT_summary) {
+ VirtualMemorySummary::initialize();
+ }
+ return true;
+}
+
+bool VirtualMemoryTracker::add_reserved_region(address base_addr, size_t size,
+ const NativeCallStack& stack, MEMFLAGS flag, bool all_committed) {
+ assert(base_addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+
+ ReservedMemoryRegion rgn(base_addr, size, stack, flag);
+ ReservedMemoryRegion* reserved_rgn = _reserved_regions.find(rgn);
+ LinkedListNode<ReservedMemoryRegion>* node;
+ if (reserved_rgn == NULL) {
+ VirtualMemorySummary::record_reserved_memory(size, flag);
+ node = _reserved_regions.add(rgn);
+ if (node != NULL) {
+ node->data()->set_all_committed(all_committed);
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ if (reserved_rgn->same_region(base_addr, size)) {
+ reserved_rgn->set_call_stack(stack);
+ reserved_rgn->set_flag(flag);
+ return true;
+ } else if (reserved_rgn->adjacent_to(base_addr, size)) {
+ VirtualMemorySummary::record_reserved_memory(size, flag);
+ reserved_rgn->expand_region(base_addr, size);
+ reserved_rgn->set_call_stack(stack);
+ return true;
+ } else {
+ // Overlapped reservation.
+ // It can happen when the regions are thread stacks, as JNI
+ // thread does not detach from VM before exits, and leads to
+ // leak JavaThread object
+ if (reserved_rgn->flag() == mtThreadStack) {
+ guarantee(!CheckJNICalls, "Attached JNI thread exited without being detached");
+ // Overwrite with new region
+
+ // Release old region
+ VirtualMemorySummary::record_uncommitted_memory(reserved_rgn->committed_size(), reserved_rgn->flag());
+ VirtualMemorySummary::record_released_memory(reserved_rgn->size(), reserved_rgn->flag());
+
+ // Add new region
+ VirtualMemorySummary::record_reserved_memory(rgn.size(), flag);
+
+ *reserved_rgn = rgn;
+ return true;
+ } else {
+ ShouldNotReachHere();
+ return false;
+ }
+ }
+ }
+}
+
+void VirtualMemoryTracker::set_reserved_region_type(address addr, MEMFLAGS flag) {
+ assert(addr != NULL, "Invalid address");
+
+ ReservedMemoryRegion rgn(addr, 1);
+ ReservedMemoryRegion* reserved_rgn = _reserved_regions.find(rgn);
+ if (reserved_rgn != NULL) {
+ assert(reserved_rgn->contain_address(addr), "Containment");
+ if (reserved_rgn->flag() != flag) {
+ assert(reserved_rgn->flag() == mtNone, "Overwrite memory type");
+ reserved_rgn->set_flag(flag);
+ }
+ }
+}
+
+bool VirtualMemoryTracker::add_committed_region(address addr, size_t size,
+ const NativeCallStack& stack) {
+ assert(addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+ ReservedMemoryRegion rgn(addr, size);
+ ReservedMemoryRegion* reserved_rgn = _reserved_regions.find(rgn);
+
+ assert(reserved_rgn != NULL, "No reserved region");
+ assert(reserved_rgn->contain_region(addr, size), "Not completely contained");
+ return reserved_rgn->add_committed_region(addr, size, stack);
+}
+
+bool VirtualMemoryTracker::remove_uncommitted_region(address addr, size_t size) {
+ assert(addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+ ReservedMemoryRegion rgn(addr, size);
+ ReservedMemoryRegion* reserved_rgn = _reserved_regions.find(rgn);
+ assert(reserved_rgn != NULL, "No reserved region");
+ assert(reserved_rgn->contain_region(addr, size), "Not completely contained");
+ return reserved_rgn->remove_uncommitted_region(addr, size);
+}
+
+bool VirtualMemoryTracker::remove_released_region(address addr, size_t size) {
+ assert(addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+
+ ReservedMemoryRegion rgn(addr, size);
+ ReservedMemoryRegion* reserved_rgn = _reserved_regions.find(rgn);
+
+ assert(reserved_rgn != NULL, "No reserved region");
+
+ // uncommit regions within the released region
+ if (!reserved_rgn->remove_uncommitted_region(addr, size)) {
+ return false;
+ }
+
+
+ VirtualMemorySummary::record_released_memory(size, reserved_rgn->flag());
+
+ if (reserved_rgn->same_region(addr, size)) {
+ return _reserved_regions.remove(rgn);
+ } else {
+ assert(reserved_rgn->contain_region(addr, size), "Not completely contained");
+ if (reserved_rgn->base() == addr ||
+ reserved_rgn->end() == addr + size) {
+ reserved_rgn->exclude_region(addr, size);
+ return true;
+ } else {
+ address top = reserved_rgn->end();
+ address high_base = addr + size;
+ ReservedMemoryRegion high_rgn(high_base, top - high_base,
+ *reserved_rgn->call_stack(), reserved_rgn->flag());
+
+ // use original region for lower region
+ reserved_rgn->exclude_region(addr, top - addr);
+ LinkedListNode<ReservedMemoryRegion>* new_rgn = _reserved_regions.add(high_rgn);
+ if (new_rgn == NULL) {
+ return false;
+ } else {
+ reserved_rgn->move_committed_regions(addr, *new_rgn->data());
+ return true;
+ }
+ }
+ }
+}
+
+
+bool VirtualMemoryTracker::walk_virtual_memory(VirtualMemoryWalker* walker) {
+ ThreadCritical tc;
+ LinkedListNode<ReservedMemoryRegion>* head = _reserved_regions.head();
+ while (head != NULL) {
+ const ReservedMemoryRegion* rgn = head->peek();
+ if (!walker->do_allocation_site(rgn)) {
+ return false;
+ }
+ head = head->next();
+ }
+ return true;
+}
+
+// Transition virtual memory tracking level.
+bool VirtualMemoryTracker::transition(NMT_TrackingLevel from, NMT_TrackingLevel to) {
+ if (from == NMT_minimal) {
+ assert(to == NMT_summary || to == NMT_detail, "Just check");
+ VirtualMemorySummary::reset();
+ } else if (to == NMT_minimal) {
+ assert(from == NMT_summary || from == NMT_detail, "Just check");
+ // Clean up virtual memory tracking data structures.
+ ThreadCritical tc;
+ _reserved_regions.clear();
+ }
+
+ return true;
+}
+
+
diff --git a/hotspot/src/share/vm/services/virtualMemoryTracker.hpp b/hotspot/src/share/vm/services/virtualMemoryTracker.hpp
new file mode 100644
index 0000000..982b153
--- /dev/null
+++ b/hotspot/src/share/vm/services/virtualMemoryTracker.hpp
@@ -0,0 +1,437 @@
+/*
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP
+#define SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP
+
+#if INCLUDE_NMT
+
+#include "memory/allocation.hpp"
+#include "services/allocationSite.hpp"
+#include "services/nmtCommon.hpp"
+#include "utilities/linkedlist.hpp"
+#include "utilities/nativeCallStack.hpp"
+#include "utilities/ostream.hpp"
+
+
+/*
+ * Virtual memory counter
+ */
+class VirtualMemory VALUE_OBJ_CLASS_SPEC {
+ private:
+ size_t _reserved;
+ size_t _committed;
+
+ public:
+ VirtualMemory() : _reserved(0), _committed(0) { }
+
+ inline void reserve_memory(size_t sz) { _reserved += sz; }
+ inline void commit_memory (size_t sz) {
+ _committed += sz;
+ assert(_committed <= _reserved, "Sanity check");
+ }
+
+ inline void release_memory (size_t sz) {
+ assert(_reserved >= sz, "Negative amount");
+ _reserved -= sz;
+ }
+
+ inline void uncommit_memory(size_t sz) {
+ assert(_committed >= sz, "Negative amount");
+ _committed -= sz;
+ }
+
+ void reset() {
+ _reserved = 0;
+ _committed = 0;
+ }
+
+ inline size_t reserved() const { return _reserved; }
+ inline size_t committed() const { return _committed; }
+};
+
+// Virtual memory allocation site, keeps track where the virtual memory is reserved.
+class VirtualMemoryAllocationSite : public AllocationSite<VirtualMemory> {
+ public:
+ VirtualMemoryAllocationSite(const NativeCallStack& stack) :
+ AllocationSite<VirtualMemory>(stack) { }
+
+ inline void reserve_memory(size_t sz) { data()->reserve_memory(sz); }
+ inline void commit_memory (size_t sz) { data()->commit_memory(sz); }
+ inline void uncommit_memory(size_t sz) { data()->uncommit_memory(sz); }
+ inline void release_memory(size_t sz) { data()->release_memory(sz); }
+ inline size_t reserved() const { return peek()->reserved(); }
+ inline size_t committed() const { return peek()->committed(); }
+};
+
+class VirtualMemorySummary;
+
+// This class represents a snapshot of virtual memory at a given time.
+// The latest snapshot is saved in a static area.
+class VirtualMemorySnapshot : public ResourceObj {
+ friend class VirtualMemorySummary;
+
+ private:
+ VirtualMemory _virtual_memory[mt_number_of_types];
+
+ public:
+ inline VirtualMemory* by_type(MEMFLAGS flag) {
+ int index = NMTUtil::flag_to_index(flag);
+ return &_virtual_memory[index];
+ }
+
+ inline VirtualMemory* by_index(int index) {
+ assert(index >= 0, "Index out of bound");
+ assert(index < mt_number_of_types, "Index out of bound");
+ return &_virtual_memory[index];
+ }
+
+ inline size_t total_reserved() const {
+ size_t amount = 0;
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ amount += _virtual_memory[index].reserved();
+ }
+ return amount;
+ }
+
+ inline size_t total_committed() const {
+ size_t amount = 0;
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ amount += _virtual_memory[index].committed();
+ }
+ return amount;
+ }
+
+ inline void reset() {
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ _virtual_memory[index].reset();
+ }
+ }
+
+ void copy_to(VirtualMemorySnapshot* s) {
+ for (int index = 0; index < mt_number_of_types; index ++) {
+ s->_virtual_memory[index] = _virtual_memory[index];
+ }
+ }
+};
+
+class VirtualMemorySummary : AllStatic {
+ public:
+ static void initialize();
+
+ static inline void record_reserved_memory(size_t size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->reserve_memory(size);
+ }
+
+ static inline void record_committed_memory(size_t size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->commit_memory(size);
+ }
+
+ static inline void record_uncommitted_memory(size_t size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->uncommit_memory(size);
+ }
+
+ static inline void record_released_memory(size_t size, MEMFLAGS flag) {
+ as_snapshot()->by_type(flag)->release_memory(size);
+ }
+
+ // Move virtual memory from one memory type to another.
+ // Virtual memory can be reserved before it is associated with a memory type, and tagged
+ // as 'unknown'. Once the memory is tagged, the virtual memory will be moved from 'unknown'
+ // type to specified memory type.
+ static inline void move_reserved_memory(MEMFLAGS from, MEMFLAGS to, size_t size) {
+ as_snapshot()->by_type(from)->release_memory(size);
+ as_snapshot()->by_type(to)->reserve_memory(size);
+ }
+
+ static inline void move_committed_memory(MEMFLAGS from, MEMFLAGS to, size_t size) {
+ as_snapshot()->by_type(from)->uncommit_memory(size);
+ as_snapshot()->by_type(to)->commit_memory(size);
+ }
+
+ static inline void snapshot(VirtualMemorySnapshot* s) {
+ as_snapshot()->copy_to(s);
+ }
+
+ static inline void reset() {
+ as_snapshot()->reset();
+ }
+
+ static VirtualMemorySnapshot* as_snapshot() {
+ return (VirtualMemorySnapshot*)_snapshot;
+ }
+
+ private:
+ static size_t _snapshot[CALC_OBJ_SIZE_IN_TYPE(VirtualMemorySnapshot, size_t)];
+};
+
+
+
+/*
+ * A virtual memory region
+ */
+class VirtualMemoryRegion VALUE_OBJ_CLASS_SPEC {
+ private:
+ address _base_address;
+ size_t _size;
+
+ public:
+ VirtualMemoryRegion(address addr, size_t size) :
+ _base_address(addr), _size(size) {
+ assert(addr != NULL, "Invalid address");
+ assert(size > 0, "Invalid size");
+ }
+
+ inline address base() const { return _base_address; }
+ inline address end() const { return base() + size(); }
+ inline size_t size() const { return _size; }
+
+ inline bool is_empty() const { return size() == 0; }
+
+ inline bool contain_address(address addr) const {
+ return (addr >= base() && addr < end());
+ }
+
+
+ inline bool contain_region(address addr, size_t size) const {
+ return contain_address(addr) && contain_address(addr + size - 1);
+ }
+
+ inline bool same_region(address addr, size_t sz) const {
+ return (addr == base() && sz == size());
+ }
+
+
+ inline bool overlap_region(address addr, size_t sz) const {
+ VirtualMemoryRegion rgn(addr, sz);
+ return contain_address(addr) ||
+ contain_address(addr + sz - 1) ||
+ rgn.contain_address(base()) ||
+ rgn.contain_address(end() - 1);
+ }
+
+ inline bool adjacent_to(address addr, size_t sz) const {
+ return (addr == end() || (addr + sz) == base());
+ }
+
+ void exclude_region(address addr, size_t sz) {
+ assert(contain_region(addr, sz), "Not containment");
+ assert(addr == base() || addr + sz == end(), "Can not exclude from middle");
+ size_t new_size = size() - sz;
+
+ if (addr == base()) {
+ set_base(addr + sz);
+ }
+ set_size(new_size);
+ }
+
+ void expand_region(address addr, size_t sz) {
+ assert(adjacent_to(addr, sz), "Not adjacent regions");
+ if (base() == addr + sz) {
+ set_base(addr);
+ }
+ set_size(size() + sz);
+ }
+
+ protected:
+ void set_base(address base) {
+ assert(base != NULL, "Sanity check");
+ _base_address = base;
+ }
+
+ void set_size(size_t size) {
+ assert(size > 0, "Sanity check");
+ _size = size;
+ }
+};
+
+
+class CommittedMemoryRegion : public VirtualMemoryRegion {
+ private:
+ NativeCallStack _stack;
+
+ public:
+ CommittedMemoryRegion(address addr, size_t size, const NativeCallStack& stack) :
+ VirtualMemoryRegion(addr, size), _stack(stack) { }
+
+ inline int compare(const CommittedMemoryRegion& rgn) const {
+ if (overlap_region(rgn.base(), rgn.size()) ||
+ adjacent_to (rgn.base(), rgn.size())) {
+ return 0;
+ } else {
+ if (base() == rgn.base()) {
+ return 0;
+ } else if (base() > rgn.base()) {
+ return 1;
+ } else {
+ return -1;
+ }
+ }
+ }
+
+ inline bool equals(const CommittedMemoryRegion& rgn) const {
+ return compare(rgn) == 0;
+ }
+
+ inline void set_call_stack(const NativeCallStack& stack) { _stack = stack; }
+ inline const NativeCallStack* call_stack() const { return &_stack; }
+};
+
+
+typedef LinkedListIterator<CommittedMemoryRegion> CommittedRegionIterator;
+
+int compare_committed_region(const CommittedMemoryRegion&, const CommittedMemoryRegion&);
+class ReservedMemoryRegion : public VirtualMemoryRegion {
+ private:
+ SortedLinkedList<CommittedMemoryRegion, compare_committed_region>
+ _committed_regions;
+
+ NativeCallStack _stack;
+ MEMFLAGS _flag;
+
+ bool _all_committed;
+
+ public:
+ ReservedMemoryRegion(address base, size_t size, const NativeCallStack& stack,
+ MEMFLAGS flag = mtNone) :
+ VirtualMemoryRegion(base, size), _stack(stack), _flag(flag),
+ _all_committed(false) { }
+
+
+ ReservedMemoryRegion(address base, size_t size) :
+ VirtualMemoryRegion(base, size), _stack(emptyStack), _flag(mtNone),
+ _all_committed(false) { }
+
+ // Copy constructor
+ ReservedMemoryRegion(const ReservedMemoryRegion& rr) :
+ VirtualMemoryRegion(rr.base(), rr.size()) {
+ *this = rr;
+ }
+
+ inline void set_call_stack(const NativeCallStack& stack) { _stack = stack; }
+ inline const NativeCallStack* call_stack() const { return &_stack; }
+
+ void set_flag(MEMFLAGS flag);
+ inline MEMFLAGS flag() const { return _flag; }
+
+ inline int compare(const ReservedMemoryRegion& rgn) const {
+ if (overlap_region(rgn.base(), rgn.size())) {
+ return 0;
+ } else {
+ if (base() == rgn.base()) {
+ return 0;
+ } else if (base() > rgn.base()) {
+ return 1;
+ } else {
+ return -1;
+ }
+ }
+ }
+
+ inline bool equals(const ReservedMemoryRegion& rgn) const {
+ return compare(rgn) == 0;
+ }
+
+ bool add_committed_region(address addr, size_t size, const NativeCallStack& stack);
+ bool remove_uncommitted_region(address addr, size_t size);
+
+ size_t committed_size() const;
+
+ // move committed regions that higher than specified address to
+ // the new region
+ void move_committed_regions(address addr, ReservedMemoryRegion& rgn);
+
+ inline bool all_committed() const { return _all_committed; }
+ void set_all_committed(bool b);
+
+ CommittedRegionIterator iterate_committed_regions() const {
+ return CommittedRegionIterator(_committed_regions.head());
+ }
+
+ ReservedMemoryRegion& operator= (const ReservedMemoryRegion& other) {
+ set_base(other.base());
+ set_size(other.size());
+
+ _stack = *other.call_stack();
+ _flag = other.flag();
+ _all_committed = other.all_committed();
+ if (other.all_committed()) {
+ set_all_committed(true);
+ } else {
+ CommittedRegionIterator itr = other.iterate_committed_regions();
+ const CommittedMemoryRegion* rgn = itr.next();
+ while (rgn != NULL) {
+ _committed_regions.add(*rgn);
+ rgn = itr.next();
+ }
+ }
+ return *this;
+ }
+
+ private:
+ // The committed region contains the uncommitted region, subtract the uncommitted
+ // region from this committed region
+ bool remove_uncommitted_region(LinkedListNode<CommittedMemoryRegion>* node,
+ address addr, size_t sz);
+
+ bool add_committed_region(const CommittedMemoryRegion& rgn) {
+ assert(rgn.base() != NULL, "Invalid base address");
+ assert(size() > 0, "Invalid size");
+ return _committed_regions.add(rgn) != NULL;
+ }
+};
+
+int compare_reserved_region_base(const ReservedMemoryRegion& r1, const ReservedMemoryRegion& r2);
+
+class VirtualMemoryWalker : public StackObj {
+ public:
+ virtual bool do_allocation_site(const ReservedMemoryRegion* rgn) { return false; }
+};
+
+// Main class called from MemTracker to track virtual memory allocations, commits and releases.
+class VirtualMemoryTracker : AllStatic {
+ public:
+ static bool initialize(NMT_TrackingLevel level);
+
+ static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack,
+ MEMFLAGS flag = mtNone, bool all_committed = false);
+
+ static bool add_committed_region (address base_addr, size_t size, const NativeCallStack& stack);
+ static bool remove_uncommitted_region (address base_addr, size_t size);
+ static bool remove_released_region (address base_addr, size_t size);
+ static void set_reserved_region_type (address addr, MEMFLAGS flag);
+
+ // Walk virtual memory data structure for creating baseline, etc.
+ static bool walk_virtual_memory(VirtualMemoryWalker* walker);
+
+ static bool transition(NMT_TrackingLevel from, NMT_TrackingLevel to);
+
+ private:
+ static SortedLinkedList<ReservedMemoryRegion, compare_reserved_region_base> _reserved_regions;
+};
+
+
+#endif // INCLUDE_NMT
+
+#endif // SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP
diff --git a/hotspot/src/share/vm/shark/sharkBuilder.cpp b/hotspot/src/share/vm/shark/sharkBuilder.cpp
index 34de273..329a94a 100644
--- a/hotspot/src/share/vm/shark/sharkBuilder.cpp
+++ b/hotspot/src/share/vm/shark/sharkBuilder.cpp
@@ -413,7 +413,7 @@
const char *name;
if (value->hasName())
// XXX this leaks, but it's only debug code
- name = strdup(value->getName().str().c_str());
+ name = os::strdup(value->getName().str().c_str());
else
name = "unnamed_value";
diff --git a/hotspot/src/share/vm/utilities/bitMap.cpp b/hotspot/src/share/vm/utilities/bitMap.cpp
index acb5d6d..865ae79 100644
--- a/hotspot/src/share/vm/utilities/bitMap.cpp
+++ b/hotspot/src/share/vm/utilities/bitMap.cpp
@@ -567,7 +567,7 @@
}
static void testResizeNonResource() {
- const uintx bitmap_bytes = BITMAP_SIZE / BitsPerByte;
+ const size_t bitmap_bytes = BITMAP_SIZE / BitsPerByte;
// Test the default behavior
testResize(false);
@@ -575,13 +575,13 @@
{
// Make sure that AllocatorMallocLimit is larger than our allocation request
// forcing it to call standard malloc()
- UIntFlagSetting fs(ArrayAllocatorMallocLimit, bitmap_bytes * 4);
+ SizeTFlagSetting fs(ArrayAllocatorMallocLimit, bitmap_bytes * 4);
testResize(false);
}
{
// Make sure that AllocatorMallocLimit is smaller than our allocation request
// forcing it to call mmap() (or equivalent)
- UIntFlagSetting fs(ArrayAllocatorMallocLimit, bitmap_bytes / 4);
+ SizeTFlagSetting fs(ArrayAllocatorMallocLimit, bitmap_bytes / 4);
testResize(false);
}
}
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
index 2bbd31a..269853e 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
@@ -558,6 +558,27 @@
return fabs(value);
}
+//----------------------------------------------------------------------------------------------------
+// Special casts
+// Cast floats into same-size integers and vice-versa w/o changing bit-pattern
+typedef union {
+ jfloat f;
+ jint i;
+} FloatIntConv;
+
+typedef union {
+ jdouble d;
+ jlong l;
+ julong ul;
+} DoubleLongConv;
+
+inline jint jint_cast (jfloat x) { return ((FloatIntConv*)&x)->i; }
+inline jfloat jfloat_cast (jint x) { return ((FloatIntConv*)&x)->f; }
+
+inline jlong jlong_cast (jdouble x) { return ((DoubleLongConv*)&x)->l; }
+inline julong julong_cast (jdouble x) { return ((DoubleLongConv*)&x)->ul; }
+inline jdouble jdouble_cast (jlong x) { return ((DoubleLongConv*)&x)->d; }
+
inline jint low (jlong value) { return jint(value); }
inline jint high(jlong value) { return jint(value >> 32); }
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
index 22e5d27..576b023 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
@@ -167,17 +167,6 @@
typedef uint32_t juint;
typedef uint64_t julong;
-//----------------------------------------------------------------------------------------------------
-// Special (possibly not-portable) casts
-// Cast floats into same-size integers and vice-versa w/o changing bit-pattern
-// %%%%%% These seem like standard C++ to me--how about factoring them out? - Ungar
-
-inline jint jint_cast (jfloat x) { return *(jint* )&x; }
-inline jlong jlong_cast (jdouble x) { return *(jlong* )&x; }
-inline julong julong_cast (jdouble x) { return *(julong* )&x; }
-
-inline jfloat jfloat_cast (jint x) { return *(jfloat* )&x; }
-inline jdouble jdouble_cast(jlong x) { return *(jdouble*)&x; }
//----------------------------------------------------------------------------------------------------
// Constant for jlong (specifying an long long canstant is C++ compiler specific)
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
index e91e607..b64bbf8 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
@@ -183,15 +183,6 @@
typedef unsigned int juint;
typedef unsigned long long julong;
-//----------------------------------------------------------------------------------------------------
-// Special (possibly not-portable) casts
-// Cast floats into same-size integers and vice-versa w/o changing bit-pattern
-
-inline jint jint_cast (jfloat x) { return *(jint* )&x; }
-inline jlong jlong_cast (jdouble x) { return *(jlong* )&x; }
-
-inline jfloat jfloat_cast (jint x) { return *(jfloat* )&x; }
-inline jdouble jdouble_cast(jlong x) { return *(jdouble*)&x; }
//----------------------------------------------------------------------------------------------------
// Constant for jlong (specifying an long long constant is C++ compiler specific)
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
index db22cc8..46e8f9e 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
@@ -116,16 +116,6 @@
typedef unsigned int juint;
typedef unsigned __int64 julong;
-//----------------------------------------------------------------------------------------------------
-// Special (possibly not-portable) casts
-// Cast floats into same-size integers and vice-versa w/o changing bit-pattern
-
-inline jint jint_cast (jfloat x) { return *(jint* )&x; }
-inline jlong jlong_cast (jdouble x) { return *(jlong* )&x; }
-
-inline jfloat jfloat_cast (jint x) { return *(jfloat* )&x; }
-inline jdouble jdouble_cast(jlong x) { return *(jdouble*)&x; }
-
//----------------------------------------------------------------------------------------------------
// Non-standard stdlib-like stuff:
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp
index 8a34006..ad71883 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_xlc.hpp
@@ -114,16 +114,6 @@
typedef uint32_t juint;
typedef uint64_t julong;
-//----------------------------------------------------------------------------------------------------
-// Special (possibly not-portable) casts
-// Cast floats into same-size integers and vice-versa w/o changing bit-pattern
-// %%%%%% These seem like standard C++ to me--how about factoring them out? - Ungar
-
-inline jint jint_cast (jfloat x) { return *(jint* )&x; }
-inline jlong jlong_cast (jdouble x) { return *(jlong* )&x; }
-
-inline jfloat jfloat_cast (jint x) { return *(jfloat* )&x; }
-inline jdouble jdouble_cast(jlong x) { return *(jdouble*)&x; }
//----------------------------------------------------------------------------------------------------
// Constant for jlong (specifying an long long canstant is C++ compiler specific)
diff --git a/hotspot/src/share/vm/utilities/linkedlist.cpp b/hotspot/src/share/vm/utilities/linkedlist.cpp
new file mode 100644
index 0000000..ba96b2e
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/linkedlist.cpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+
+/////////////// Unit tests ///////////////
+
+#ifndef PRODUCT
+
+#include "runtime/os.hpp"
+#include "utilities/linkedlist.hpp"
+#include "memory/allocation.hpp"
+#include "memory/allocation.inline.hpp"
+
+class Integer : public StackObj {
+ private:
+ int _value;
+ public:
+ Integer(int i) : _value(i) { }
+
+ int value() const { return _value; }
+ bool equals(const Integer& i) const {
+ return _value == i.value();
+ }
+};
+
+int compare_Integer(const Integer& i1, const Integer& i2) {
+ return i1.value() - i2.value();
+}
+
+void check_list_values(const int* expected, const LinkedList<Integer>* list) {
+ LinkedListNode<Integer>* head = list->head();
+ int index = 0;
+ while (head != NULL) {
+ assert(head->peek()->value() == expected[index], "Unexpected value");
+ head = head->next();
+ index ++;
+ }
+}
+
+void Test_linked_list() {
+ LinkedListImpl<Integer, ResourceObj::C_HEAP, mtTest> ll;
+
+
+ // Test regular linked list
+ assert(ll.is_empty(), "Start with empty list");
+ Integer one(1), two(2), three(3), four(4), five(5), six(6);
+
+ ll.add(six);
+ assert(!ll.is_empty(), "Should not be empty");
+
+ Integer* i = ll.find(six);
+ assert(i != NULL, "Should find it");
+
+ i = ll.find(three);
+ assert(i == NULL, "Not in the list");
+
+ LinkedListNode<Integer>* node = ll.find_node(six);
+ assert(node != NULL, "6 is in the list");
+
+ ll.insert_after(three, node);
+ ll.insert_before(one, node);
+ int expected[3] = {1, 6, 3};
+ check_list_values(expected, &ll);
+
+ ll.add(two);
+ ll.add(four);
+ ll.add(five);
+
+ // Test sorted linked list
+ SortedLinkedList<Integer, compare_Integer, ResourceObj::C_HEAP, mtTest> sl;
+ assert(sl.is_empty(), "Start with empty list");
+
+ size_t ll_size = ll.size();
+ sl.move(&ll);
+ size_t sl_size = sl.size();
+
+ assert(ll_size == sl_size, "Should be the same size");
+ assert(ll.is_empty(), "No more entires");
+
+ // sorted result
+ int sorted_result[] = {1, 2, 3, 4, 5, 6};
+ check_list_values(sorted_result, &sl);
+
+ node = sl.find_node(four);
+ assert(node != NULL, "4 is in the list");
+ sl.remove_before(node);
+ sl.remove_after(node);
+ int remains[] = {1, 2, 4, 6};
+ check_list_values(remains, &sl);
+}
+#endif // PRODUCT
+
diff --git a/hotspot/src/share/vm/utilities/linkedlist.hpp b/hotspot/src/share/vm/utilities/linkedlist.hpp
new file mode 100644
index 0000000..a76c15c
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/linkedlist.hpp
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_LINKED_LIST_HPP
+#define SHARE_VM_UTILITIES_LINKED_LIST_HPP
+
+#include "memory/allocation.hpp"
+
+/*
+ * The implementation of a generic linked list, which uses various
+ * backing storages, such as C heap, arena and resource, etc.
+ */
+
+
+// An entry in a linked list. It should use the same backing storage
+// as the linked list that contains this entry.
+template <class E> class LinkedListNode : public ResourceObj {
+ private:
+ E _data; // embedded content
+ LinkedListNode<E>* _next; // next entry
+
+ protected:
+ LinkedListNode() : _next(NULL) { }
+
+ public:
+ LinkedListNode(const E& e): _data(e), _next(NULL) { }
+
+ inline void set_next(LinkedListNode<E>* node) { _next = node; }
+ inline LinkedListNode<E> * next() const { return _next; }
+
+ E* data() { return &_data; }
+ const E* peek() const { return &_data; }
+};
+
+// A linked list interface. It does not specify
+// any storage type it uses, so all methods involving
+// memory allocation or deallocation are pure virtual
+template <class E> class LinkedList : public ResourceObj {
+ protected:
+ LinkedListNode<E>* _head;
+
+ public:
+ LinkedList() : _head(NULL) { }
+
+ inline void set_head(LinkedListNode<E>* h) { _head = h; }
+ inline LinkedListNode<E>* head() const { return _head; }
+ inline bool is_empty() const { return head() == NULL; }
+
+ inline size_t size() const {
+ LinkedListNode<E>* p;
+ size_t count = 0;
+ for (p = head(); p != NULL; count++, p = p->next());
+ return count;
+ }
+
+ // Move all entries from specified linked list to this one
+ virtual void move(LinkedList<E>* list) = 0;
+
+ // Add an entry to this linked list
+ virtual LinkedListNode<E>* add(const E& e) = 0;
+ // Add all entries from specified linked list to this one,
+ virtual void add(LinkedListNode<E>* node) = 0;
+
+ // Add a linked list to this linked list
+ virtual bool add(const LinkedList<E>* list) = 0;
+
+ // Search entry in the linked list
+ virtual LinkedListNode<E>* find_node(const E& e) = 0;
+ virtual E* find(const E& e) = 0;
+
+ // Insert entry to the linked list
+ virtual LinkedListNode<E>* insert_before(const E& e, LinkedListNode<E>* ref) = 0;
+ virtual LinkedListNode<E>* insert_after (const E& e, LinkedListNode<E>* ref) = 0;
+
+ // Remove entry from the linked list
+ virtual bool remove(const E& e) = 0;
+ virtual bool remove(LinkedListNode<E>* node) = 0;
+ virtual bool remove_before(LinkedListNode<E>* ref) = 0;
+ virtual bool remove_after(LinkedListNode<E>* ref) = 0;
+
+ LinkedListNode<E>* unlink_head() {
+ LinkedListNode<E>* h = this->head();
+ if (h != NULL) {
+ this->set_head(h->next());
+ }
+ return h;
+ }
+
+ DEBUG_ONLY(virtual ResourceObj::allocation_type storage_type() = 0;)
+};
+
+// A linked list implementation.
+// The linked list can be allocated in various type of memory: C heap, arena and resource area, etc.
+template <class E, ResourceObj::allocation_type T = ResourceObj::C_HEAP,
+ MEMFLAGS F = mtNMT, AllocFailType alloc_failmode = AllocFailStrategy::RETURN_NULL>
+ class LinkedListImpl : public LinkedList<E> {
+ protected:
+ Arena* _arena;
+ public:
+ LinkedListImpl() : _arena(NULL) { }
+ LinkedListImpl(Arena* a) : _arena(a) { }
+
+ virtual ~LinkedListImpl() {
+ clear();
+ }
+
+ virtual void clear() {
+ LinkedListNode<E>* p = this->head();
+ this->set_head(NULL);
+ while (p != NULL) {
+ LinkedListNode<E>* to_delete = p;
+ p = p->next();
+ delete_node(to_delete);
+ }
+ }
+
+ // Add an entry to the linked list
+ virtual LinkedListNode<E>* add(const E& e) {
+ LinkedListNode<E>* node = this->new_node(e);
+ if (node != NULL) {
+ this->add(node);
+ }
+
+ return node;
+ }
+
+ virtual void add(LinkedListNode<E>* node) {
+ assert(node != NULL, "NULL pointer");
+ node->set_next(this->head());
+ this->set_head(node);
+ }
+
+ // Move a linked list to this linked list, both have to be allocated on the same
+ // storage type.
+ virtual void move(LinkedList<E>* list) {
+ assert(list->storage_type() == this->storage_type(), "Different storage type");
+ LinkedListNode<E>* node = this->head();
+ while (node != NULL && node->next() != NULL) {
+ node = node->next();
+ }
+ if (node == NULL) {
+ this->set_head(list->head());
+ } else {
+ node->set_next(list->head());
+ }
+ // All entries are moved
+ list->set_head(NULL);
+ }
+
+ virtual bool add(const LinkedList<E>* list) {
+ LinkedListNode<E>* node = list->head();
+ while (node != NULL) {
+ if (this->add(*node->peek()) == NULL) {
+ return false;
+ }
+ node = node->next();
+ }
+ return true;
+ }
+
+
+ virtual LinkedListNode<E>* find_node(const E& e) {
+ LinkedListNode<E>* p = this->head();
+ while (p != NULL && !p->peek()->equals(e)) {
+ p = p->next();
+ }
+ return p;
+ }
+
+ E* find(const E& e) {
+ LinkedListNode<E>* node = find_node(e);
+ return (node == NULL) ? NULL : node->data();
+ }
+
+
+ // Add an entry in front of the reference entry
+ LinkedListNode<E>* insert_before(const E& e, LinkedListNode<E>* ref_node) {
+ LinkedListNode<E>* node = this->new_node(e);
+ if (node == NULL) return NULL;
+ if (ref_node == this->head()) {
+ node->set_next(ref_node);
+ this->set_head(node);
+ } else {
+ LinkedListNode<E>* p = this->head();
+ while (p != NULL && p->next() != ref_node) {
+ p = p->next();
+ }
+ assert(p != NULL, "ref_node not in the list");
+ node->set_next(ref_node);
+ p->set_next(node);
+ }
+ return node;
+ }
+
+ // Add an entry behind the reference entry
+ LinkedListNode<E>* insert_after(const E& e, LinkedListNode<E>* ref_node) {
+ LinkedListNode<E>* node = this->new_node(e);
+ if (node == NULL) return NULL;
+ node->set_next(ref_node->next());
+ ref_node->set_next(node);
+ return node;
+ }
+
+ // Remove an entry from the linked list.
+ // Return true if the entry is successfully removed
+ virtual bool remove(const E& e) {
+ LinkedListNode<E>* tmp = this->head();
+ LinkedListNode<E>* prev = NULL;
+
+ while (tmp != NULL) {
+ if (tmp->peek()->equals(e)) {
+ return remove_after(prev);
+ }
+ prev = tmp;
+ tmp = tmp->next();
+ }
+ return false;
+ }
+
+ // Remove the node after the reference entry
+ virtual bool remove_after(LinkedListNode<E>* prev) {
+ LinkedListNode<E>* to_delete;
+ if (prev == NULL) {
+ to_delete = this->unlink_head();
+ } else {
+ to_delete = prev->next();
+ if (to_delete != NULL) {
+ prev->set_next(to_delete->next());
+ }
+ }
+
+ if (to_delete != NULL) {
+ delete_node(to_delete);
+ return true;
+ }
+ return false;
+ }
+
+ virtual bool remove(LinkedListNode<E>* node) {
+ LinkedListNode<E>* p = this->head();
+ while (p != NULL && p->next() != node) {
+ p = p->next();
+ }
+ if (p != NULL) {
+ p->set_next(node->next());
+ delete_node(node);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ virtual bool remove_before(LinkedListNode<E>* ref) {
+ assert(ref != NULL, "NULL pointer");
+ LinkedListNode<E>* p = this->head();
+ LinkedListNode<E>* to_delete = NULL; // to be deleted
+ LinkedListNode<E>* prev = NULL; // node before the node to be deleted
+ while (p != NULL && p != ref) {
+ prev = to_delete;
+ to_delete = p;
+ p = p->next();
+ }
+ if (p == NULL || to_delete == NULL) return false;
+ assert(to_delete->next() == ref, "Wrong node to delete");
+ assert(prev == NULL || prev->next() == to_delete,
+ "Sanity check");
+ if (prev == NULL) {
+ assert(to_delete == this->head(), "Must be head");
+ this->set_head(to_delete->next());
+ } else {
+ prev->set_next(to_delete->next());
+ }
+ delete_node(to_delete);
+ return true;
+ }
+
+ DEBUG_ONLY(ResourceObj::allocation_type storage_type() { return T; })
+ protected:
+ // Create new linked list node object in specified storage
+ LinkedListNode<E>* new_node(const E& e) const {
+ switch(T) {
+ case ResourceObj::ARENA: {
+ assert(_arena != NULL, "Arena not set");
+ return new(_arena) LinkedListNode<E>(e);
+ }
+ case ResourceObj::RESOURCE_AREA:
+ case ResourceObj::C_HEAP: {
+ if (alloc_failmode == AllocFailStrategy::RETURN_NULL) {
+ return new(std::nothrow, T, F) LinkedListNode<E>(e);
+ } else {
+ return new(T, F) LinkedListNode<E>(e);
+ }
+ }
+ default:
+ ShouldNotReachHere();
+ }
+ return NULL;
+ }
+
+ // Delete linked list node object
+ void delete_node(LinkedListNode<E>* node) {
+ if (T == ResourceObj::C_HEAP) {
+ delete node;
+ }
+ }
+};
+
+// Sorted linked list. The linked list maintains sorting order specified by the comparison
+// function
+template <class E, int (*FUNC)(const E&, const E&),
+ ResourceObj::allocation_type T = ResourceObj::C_HEAP,
+ MEMFLAGS F = mtNMT, AllocFailType alloc_failmode = AllocFailStrategy::RETURN_NULL>
+ class SortedLinkedList : public LinkedListImpl<E, T, F, alloc_failmode> {
+ public:
+ SortedLinkedList() { }
+ SortedLinkedList(Arena* a) : LinkedListImpl<E, T, F, alloc_failmode>(a) { }
+
+ virtual LinkedListNode<E>* add(const E& e) {
+ return LinkedListImpl<E, T, F, alloc_failmode>::add(e);
+ }
+
+ virtual void move(LinkedList<E>* list) {
+ assert(list->storage_type() == this->storage_type(), "Different storage type");
+ LinkedListNode<E>* node;
+ while ((node = list->unlink_head()) != NULL) {
+ this->add(node);
+ }
+ assert(list->is_empty(), "All entries are moved");
+ }
+
+ virtual void add(LinkedListNode<E>* node) {
+ assert(node != NULL, "NULL pointer");
+ LinkedListNode<E>* tmp = this->head();
+ LinkedListNode<E>* prev = NULL;
+
+ int cmp_val;
+ while (tmp != NULL) {
+ cmp_val = FUNC(*tmp->peek(), *node->peek());
+ if (cmp_val >= 0) {
+ break;
+ }
+ prev = tmp;
+ tmp = tmp->next();
+ }
+
+ if (prev != NULL) {
+ node->set_next(prev->next());
+ prev->set_next(node);
+ } else {
+ node->set_next(this->head());
+ this->set_head(node);
+ }
+ }
+
+ virtual bool add(const LinkedList<E>* list) {
+ return LinkedListImpl<E, T, F, alloc_failmode>::add(list);
+ }
+
+ virtual LinkedListNode<E>* find_node(const E& e) {
+ LinkedListNode<E>* p = this->head();
+
+ while (p != NULL) {
+ int comp_val = FUNC(*p->peek(), e);
+ if (comp_val == 0) {
+ return p;
+ } else if (comp_val > 0) {
+ return NULL;
+ }
+ p = p->next();
+ }
+ return NULL;
+ }
+};
+
+// Iterates all entries in the list
+template <class E> class LinkedListIterator : public StackObj {
+ private:
+ LinkedListNode<E>* _p;
+ bool _is_empty;
+ public:
+ LinkedListIterator(LinkedListNode<E>* head) : _p(head) {
+ _is_empty = (head == NULL);
+ }
+
+ bool is_empty() const { return _is_empty; }
+
+ const E* next() {
+ if (_p == NULL) return NULL;
+ const E* e = _p->peek();
+ _p = _p->next();
+ return e;
+ }
+};
+
+#endif
diff --git a/hotspot/src/share/vm/utilities/nativeCallStack.cpp b/hotspot/src/share/vm/utilities/nativeCallStack.cpp
new file mode 100644
index 0000000..c50ff41
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/nativeCallStack.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/os.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/nativeCallStack.hpp"
+
+
+NativeCallStack::NativeCallStack(int toSkip, bool fillStack) :
+ _hash_value(0) {
+
+#if !PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
+ fillStack = false;
+#endif
+
+ if (fillStack) {
+ os::get_native_stack(_stack, NMT_TrackingStackDepth, toSkip);
+ } else {
+ for (int index = 0; index < NMT_TrackingStackDepth; index ++) {
+ _stack[index] = NULL;
+ }
+ }
+}
+
+NativeCallStack::NativeCallStack(address* pc, int frameCount) {
+ int frameToCopy = (frameCount < NMT_TrackingStackDepth) ?
+ frameCount : NMT_TrackingStackDepth;
+ int index;
+ for (index = 0; index < frameToCopy; index ++) {
+ _stack[index] = pc[index];
+ }
+ for (; index < NMT_TrackingStackDepth; index ++) {
+ _stack[index] = NULL;
+ }
+}
+
+// number of stack frames captured
+int NativeCallStack::frames() const {
+ int index;
+ for (index = 0; index < NMT_TrackingStackDepth; index ++) {
+ if (_stack[index] == NULL) {
+ break;
+ }
+ }
+ return index;
+}
+
+// Hash code. Any better algorithm?
+int NativeCallStack::hash() const {
+ long hash_val = _hash_value;
+ if (hash_val == 0) {
+ long pc;
+ int index;
+ for (index = 0; index < NMT_TrackingStackDepth; index ++) {
+ pc = (long)_stack[index];
+ if (pc == 0) break;
+ hash_val += pc;
+ }
+
+ NativeCallStack* p = const_cast<NativeCallStack*>(this);
+ p->_hash_value = (int)(hash_val & 0xFFFFFFFF);
+ }
+ return _hash_value;
+}
+
+void NativeCallStack::print_on(outputStream* out) const {
+ print_on(out, 0);
+}
+
+// Decode and print this call path
+void NativeCallStack::print_on(outputStream* out, int indent) const {
+ address pc;
+ char buf[1024];
+ int offset;
+ if (is_empty()) {
+ for (int index = 0; index < indent; index ++) out->print(" ");
+#if PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
+ out->print("[BOOTSTRAP]");
+#else
+ out->print("[No stack]");
+#endif
+ } else {
+ for (int frame = 0; frame < NMT_TrackingStackDepth; frame ++) {
+ pc = get_frame(frame);
+ if (pc == NULL) break;
+ // Print indent
+ for (int index = 0; index < indent; index ++) out->print(" ");
+ if (os::dll_address_to_function_name(pc, buf, sizeof(buf), &offset)) {
+ out->print_cr("[" PTR_FORMAT "] %s+0x%x", p2i(pc), buf, offset);
+ } else {
+ out->print_cr("[" PTR_FORMAT "]", p2i(pc));
+ }
+ }
+ }
+}
+
diff --git a/hotspot/src/share/vm/utilities/nativeCallStack.hpp b/hotspot/src/share/vm/utilities/nativeCallStack.hpp
new file mode 100644
index 0000000..957090b
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/nativeCallStack.hpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_NATIVE_CALL_STACK_HPP
+#define SHARE_VM_UTILITIES_NATIVE_CALL_STACK_HPP
+
+#include "memory/allocation.hpp"
+#include "services/nmtCommon.hpp"
+#include "utilities/ostream.hpp"
+
+/*
+ * This class represents a native call path (does not include Java frame)
+ *
+ * This class is developed in the context of native memory tracking, it can
+ * be an useful tool for debugging purpose.
+ *
+ * For example, following code should print out native call path:
+ *
+ * ....
+ * NativeCallStack here;
+ * here.print_on(tty);
+ * ....
+ *
+ * However, there are a couple of restrictions on this class. If the restrictions are
+ * not strictly followed, it may break native memory tracking badly.
+ *
+ * 1. Number of stack frames to capture, is defined by native memory tracking.
+ * This number has impacts on how much memory to be used by native
+ * memory tracking.
+ * 2. The class is strict stack object, no heap or virtual memory can be allocated
+ * from it.
+ */
+class NativeCallStack : public StackObj {
+ private:
+ address _stack[NMT_TrackingStackDepth];
+ int _hash_value;
+
+ public:
+ NativeCallStack(int toSkip = 0, bool fillStack = false);
+ NativeCallStack(address* pc, int frameCount);
+
+
+ // if it is an empty stack
+ inline bool is_empty() const {
+ return _stack[0] == NULL;
+ }
+
+ // number of stack frames captured
+ int frames() const;
+
+ inline int compare(const NativeCallStack& other) const {
+ return memcmp(_stack, other._stack, sizeof(_stack));
+ }
+
+ inline bool equals(const NativeCallStack& other) const {
+ // compare hash values
+ if (hash() != other.hash()) return false;
+ // compare each frame
+ return compare(other) == 0;
+ }
+
+ inline address get_frame(int index) const {
+ assert(index >= 0 && index < NMT_TrackingStackDepth, "Index out of bound");
+ return _stack[index];
+ }
+
+ // Hash code. Any better algorithm?
+ int hash() const;
+
+ void print_on(outputStream* out) const;
+ void print_on(outputStream* out, int indent) const;
+};
+
+#endif
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index 2bff5f5..3678068 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -774,6 +774,11 @@
st->cr();
}
+ STEP(228, "(Native Memory Tracking)" )
+ if (_verbose) {
+ MemTracker::final_report(st);
+ }
+
STEP(230, "" )
if (_verbose) {
@@ -897,9 +902,6 @@
static bool log_done = false; // done saving error log
static bool transmit_report_done = false; // done error reporting
- // disble NMT to avoid further exception
- MemTracker::shutdown(MemTracker::NMT_error_reporting);
-
if (SuppressFatalErrorMessage) {
os::abort();
}
diff --git a/hotspot/test/TEST.ROOT b/hotspot/test/TEST.ROOT
index e646c1a..6bf9e9a 100644
--- a/hotspot/test/TEST.ROOT
+++ b/hotspot/test/TEST.ROOT
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,6 @@
# It also contains test-suite configuration information.
# The list of keywords supported in this test suite
-keys=cte_test jcmd nmt regression gc
+keys=cte_test jcmd nmt regression gc stress
groups=TEST.groups [closed/TEST.groups]
diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups
index b882436..e4f1ee3 100644
--- a/hotspot/test/TEST.groups
+++ b/hotspot/test/TEST.groups
@@ -70,21 +70,29 @@
runtime/7194254/Test7194254.java \
runtime/Metaspace/FragmentMetaspace.java \
runtime/NMT/BaselineWithParameter.java \
+ runtime/NMT/JcmdBaselineDetail.java \
+ runtime/NMT/JcmdDetailDiff.java \
+ runtime/NMT/JcmdScaleDetail.java \
runtime/NMT/JcmdScale.java \
+ runtime/NMT/JcmdSummaryDiff.java \
runtime/NMT/JcmdWithNMTDisabled.java \
+ runtime/NMT/MallocRoundingReportTest.java \
+ runtime/NMT/MallocSiteHashOverflow.java \
+ runtime/NMT/MallocStressTest.java \
runtime/NMT/MallocTestType.java \
runtime/NMT/ReleaseCommittedMemory.java \
+ runtime/NMT/ReleaseNoCommit.java \
runtime/NMT/ShutdownTwice.java \
runtime/NMT/SummaryAfterShutdown.java \
runtime/NMT/SummarySanityCheck.java \
runtime/NMT/ThreadedMallocTestType.java \
runtime/NMT/ThreadedVirtualAllocTestType.java \
+ runtime/NMT/VirtualAllocCommitUncommitRecommit.java \
runtime/NMT/VirtualAllocTestType.java \
runtime/RedefineObject/TestRedefineObject.java \
runtime/Thread/TestThreadDumpMonitorContention.java \
runtime/XCheckJniJsig/XCheckJSig.java \
serviceability/attach/AttachWithStalePidFile.java \
- serviceability/jvmti/8036666/GetObjectLockCount.java \
serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java \
serviceability/dcmd/DynLibDcmdTest.java
@@ -120,16 +128,12 @@
gc/6581734/Test6581734.java \
gc/7072527/TestFullGCCount.java \
gc/g1/TestHumongousAllocInitialMark.java \
- gc/g1/TestHumongousShrinkHeap.java \
gc/arguments/TestG1HeapRegionSize.java \
gc/metaspace/TestMetaspaceMemoryPool.java \
gc/arguments/TestDynMinHeapFreeRatio.java \
gc/arguments/TestDynMaxHeapFreeRatio.java \
- gc/parallelScavenge/TestDynShrinkHeap.java \
runtime/InternalApi/ThreadCpuTimesDeadlock.java \
serviceability/threads/TestFalseDeadLock.java \
- serviceability/jvmti/GetObjectSizeOverflow.java \
- serviceability/jvmti/TestRedefineWithUnresolvedClass.java
# Compact 2 adds full VM tests
compact2 = \
@@ -217,6 +221,7 @@
gc/arguments/TestMaxHeapSizeTools.java \
gc/arguments/TestMaxNewSize.java \
gc/arguments/TestUseCompressedOopsErgo.java \
+ gc/class_unloading/TestG1ClassUnloadingHWM.java \
gc/g1/ \
gc/metaspace/G1AddMetaspaceDependency.java \
gc/metaspace/TestMetaspacePerfCounters.java \
@@ -257,7 +262,7 @@
gc/arguments/TestCMSHeapSizeFlags.java \
gc/arguments/TestMaxNewSize.java \
gc/arguments/TestUseCompressedOopsErgo.java \
- gc/class_unloading/TestCMSClassUnloadingDisabledHWM.java \
+ gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java \
gc/concurrentMarkSweep/ \
gc/startup_warnings/TestCMS.java \
gc/startup_warnings/TestCMSIncrementalMode.java \
diff --git a/hotspot/test/compiler/5091921/Test7005594.sh b/hotspot/test/compiler/5091921/Test7005594.sh
index 2ca434a..4fa458c 100644
--- a/hotspot/test/compiler/5091921/Test7005594.sh
+++ b/hotspot/test/compiler/5091921/Test7005594.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7005594.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xmx1600m -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
+${TESTJAVA}/bin/java ${TESTOPTS} -Xmx1600m -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
result=$?
diff --git a/hotspot/test/compiler/6857159/Test6857159.sh b/hotspot/test/compiler/6857159/Test6857159.sh
index e0430c4..cb79012 100644
--- a/hotspot/test/compiler/6857159/Test6857159.sh
+++ b/hotspot/test/compiler/6857159/Test6857159.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test6857159.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbatch -XX:+PrintCompilation -XX:CompileOnly=Test6857159\$ct.run Test6857159 > test.out 2>&1
+${TESTJAVA}/bin/java ${TESTOPTS} -Xbatch -XX:+PrintCompilation -XX:CompileOnly=Test6857159\$ct.run Test6857159 > test.out 2>&1
grep "COMPILE SKIPPED" test.out
diff --git a/hotspot/test/compiler/6894807/IsInstanceTest.java b/hotspot/test/compiler/6894807/IsInstanceTest.java
index ddc3fed..d838c6e 100644
--- a/hotspot/test/compiler/6894807/IsInstanceTest.java
+++ b/hotspot/test/compiler/6894807/IsInstanceTest.java
@@ -1,4 +1,27 @@
/*
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
* @test
* @bug 6894807
* @summary No ClassCastException for HashAttributeSet constructors if run with -Xcomp
diff --git a/hotspot/test/compiler/6894807/Test6894807.sh b/hotspot/test/compiler/6894807/Test6894807.sh
index 229fb54..609af07 100644
--- a/hotspot/test/compiler/6894807/Test6894807.sh
+++ b/hotspot/test/compiler/6894807/Test6894807.sh
@@ -1,55 +1,38 @@
#!/bin/sh
+#
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
if [ "${TESTSRC}" = "" ]
-then TESTSRC=.
-fi
-
-if [ "${TESTJAVA}" = "" ]
then
- PARENT=`dirname \`which java\``
- TESTJAVA=`dirname ${PARENT}`
- echo "TESTJAVA not set, selecting " ${TESTJAVA}
- echo "If this is incorrect, try setting the variable manually."
+ TESTSRC=${PWD}
+ echo "TESTSRC not set. Using "${TESTSRC}" as default"
fi
+echo "TESTSRC=${TESTSRC}"
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
+## Adding common setup Variables for running shell tests.
+. ${TESTSRC}/../../test_env.sh
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin )
- NULL=/dev/null
- PS=":"
- FS="/"
- ;;
- Windows_* )
- NULL=NUL
- PS=";"
- FS="\\"
- ;;
- CYGWIN_* )
- NULL=/dev/null
- PS=";"
- FS="/"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-JEMMYPATH=${CPAPPEND}
-CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
-
-THIS_DIR=`pwd`
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} IsInstanceTest > test.out 2>&1
+${TESTJAVA}${FS}bin${FS}java ${TESTOPTS} IsInstanceTest > test.out 2>&1
cat test.out
diff --git a/hotspot/test/compiler/6932496/Test6932496.java b/hotspot/test/compiler/6932496/Test6932496.java
index 721b4e0..7f3c169 100644
--- a/hotspot/test/compiler/6932496/Test6932496.java
+++ b/hotspot/test/compiler/6932496/Test6932496.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,26 +26,162 @@
* @test
* @bug 6932496
* @summary incorrect deopt of jsr subroutine on 64 bit c1
- *
- * @compile -source 1.5 -target 1.5 -XDjsrlimit=0 Test6932496.java
- * @run main/othervm -Xcomp -XX:CompileOnly=Test6932496.m Test6932496
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test.test Test6932496
*/
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.io.IOException;
-public class Test6932496 {
- static class A {
- volatile boolean flag = false;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.Label;
+
+public class Test6932496 extends ClassLoader {
+ private static final int CLASS_FILE_VERSION = 49;
+ private static final String CLASS_TEST = "Test";
+ private static final String CLASS_OBJECT = "java/lang/Object";
+ private static final String METHOD_INIT = "<init>";
+ private static final String METHOD_TEST = "test";
+ private static final String DESC_VOID_METHOD = "()V";
+ private static final String FIELD_FLAG = "flag";
+
+ public static void main(String[] args) {
+ Test6932496 test = new Test6932496();
+ test.execute();
}
- static void m() {
+ private void execute() {
+ byte[] bytecode = Test6932496.generateTestClass();
+
try {
- } finally {
- A a = new A();
- a.flag = true;
+ Files.write(Paths.get("Test.class.dump"), bytecode);
+ } catch (IOException e) {
+ System.err.println("classfile dump failed : " + e.getMessage());
+ e.printStackTrace();
+ }
+ try {
+ Class aClass = defineClass(CLASS_TEST, bytecode, 0, bytecode.length);
+ Method test = aClass.getDeclaredMethod(METHOD_TEST);
+ test.invoke(null);
+ } catch (ClassFormatError | IllegalArgumentException
+ | ReflectiveOperationException e) {
+ throw new RuntimeException("TESTBUG : generated class is invalid", e);
}
}
+ /*
+ public class Test {
+ volatile boolean flag = false;
+ public static void m() {
+ try {
+ } finally {
+ Test test = new Test();
+ test.flag = true;
+ }
+ }
+ }
+ */
+ private static byte[] generateTestClass() {
+ ClassWriter cw = new ClassWriter(0);
+ cw.visit(CLASS_FILE_VERSION, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER,
+ CLASS_TEST, null, CLASS_OBJECT, null);
+ // volatile boolean flag;
+ {
+ FieldVisitor fv = cw.visitField(Opcodes.ACC_VOLATILE, FIELD_FLAG,
+ Type.BOOLEAN_TYPE.getDescriptor(),
+ /* signature = */ null, /* value = */ null);
+ }
- static public void main(String[] args) {
- m();
+ /*
+ public Test() {
+ flag = false;
+ }
+ */
+ {
+ MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
+ METHOD_INIT, DESC_VOID_METHOD,
+ /* signature = */ null, /* exceptions = */ null);
+
+ mv.visitCode();
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, CLASS_OBJECT, METHOD_INIT,
+ DESC_VOID_METHOD, false);
+
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ mv.visitInsn(Opcodes.ICONST_0);
+ mv.visitFieldInsn(Opcodes.PUTFIELD, CLASS_TEST, FIELD_FLAG,
+ Type.BOOLEAN_TYPE.getDescriptor());
+
+ mv.visitInsn(Opcodes.RETURN);
+ mv.visitMaxs(/* stack = */ 2, /* locals = */ 1);
+ mv.visitEnd();
+ }
+
+ /*
+ public static void m() {
+ try {
+ } finally {
+ Test test = new Test();
+ test.flag = true;
+ }
+ }
+ */
+ {
+ MethodVisitor mv = cw.visitMethod(
+ Opcodes.ACC_STATIC + Opcodes.ACC_PUBLIC,
+ METHOD_TEST, DESC_VOID_METHOD,
+ /* signature = */ null, /* exceptions = */ null);
+ Label beginLabel = new Label();
+ Label block1EndLabel = new Label();
+ Label handlerLabel = new Label();
+ Label block2EndLabel = new Label();
+ Label label = new Label();
+ Label endLabel = new Label();
+
+ mv.visitCode();
+ mv.visitTryCatchBlock(beginLabel, block1EndLabel, handlerLabel,
+ /* type = <any> */ null);
+ mv.visitTryCatchBlock(handlerLabel, block2EndLabel, handlerLabel,
+ /* type = <any> */ null);
+
+ mv.visitLabel(beginLabel);
+ mv.visitJumpInsn(Opcodes.JSR, label);
+ mv.visitLabel(block1EndLabel);
+ mv.visitJumpInsn(Opcodes.GOTO, endLabel);
+
+ mv.visitLabel(handlerLabel);
+ mv.visitVarInsn(Opcodes.ASTORE, 0);
+ mv.visitJumpInsn(Opcodes.JSR, label);
+ mv.visitLabel(block2EndLabel);
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ mv.visitInsn(Opcodes.ATHROW);
+
+ mv.visitLabel(label);
+ mv.visitVarInsn(Opcodes.ASTORE, 1);
+ mv.visitTypeInsn(Opcodes.NEW, CLASS_TEST);
+ mv.visitInsn(Opcodes.DUP);
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, CLASS_TEST, METHOD_INIT,
+ DESC_VOID_METHOD);
+ mv.visitVarInsn(Opcodes.ASTORE, 2);
+
+ mv.visitVarInsn(Opcodes.ALOAD, 2);
+ mv.visitInsn(Opcodes.ICONST_1);
+ mv.visitFieldInsn(Opcodes.PUTFIELD, CLASS_TEST, FIELD_FLAG,
+ Type.BOOLEAN_TYPE.getDescriptor());
+
+ mv.visitVarInsn(Opcodes.RET, 1);
+
+ mv.visitLabel(endLabel);
+ mv.visitInsn(Opcodes.RETURN);
+ mv.visitMaxs(/* stack = */ 2, /* locals = */ 3);
+ mv.visitEnd();
+ }
+
+ cw.visitEnd();
+ return cw.toByteArray();
}
}
diff --git a/hotspot/test/compiler/7068051/Test7068051.sh b/hotspot/test/compiler/7068051/Test7068051.sh
index e287c24..35bc0f7 100644
--- a/hotspot/test/compiler/7068051/Test7068051.sh
+++ b/hotspot/test/compiler/7068051/Test7068051.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -41,5 +41,5 @@
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7068051.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} -showversion -Xbatch Test7068051 foo.jar
+${TESTJAVA}/bin/java ${TESTOPTS} -showversion -Xbatch Test7068051 foo.jar
diff --git a/hotspot/test/compiler/7070134/Test7070134.sh b/hotspot/test/compiler/7070134/Test7070134.sh
index 2ef12d0..8761861 100644
--- a/hotspot/test/compiler/7070134/Test7070134.sh
+++ b/hotspot/test/compiler/7070134/Test7070134.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Stemmer.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbatch Stemmer words > test.out 2>&1
+${TESTJAVA}/bin/java ${TESTOPTS} -Xbatch Stemmer words > test.out 2>&1
exit $?
diff --git a/hotspot/test/compiler/7200264/Test7200264.sh b/hotspot/test/compiler/7200264/Test7200264.sh
index da1a59a..5e7e508 100644
--- a/hotspot/test/compiler/7200264/Test7200264.sh
+++ b/hotspot/test/compiler/7200264/Test7200264.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
## Adding common setup Variables for running shell tests.
. ${TESTSRC}/../../test_env.sh
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xinternalversion | sed 's/amd64/x86/' | grep "x86" | grep "Server VM" | grep "debug"
+${TESTJAVA}${FS}bin${FS}java ${TESTOPTS} -Xinternalversion | sed 's/amd64/x86/' | grep "x86" | grep "Server VM" | grep "debug"
# Only test fastdebug Server VM on x86
if [ $? != 0 ]
@@ -43,7 +43,7 @@
fi
# grep for support integer multiply vectors (cpu with SSE4.1)
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -XX:+PrintMiscellaneous -XX:+Verbose -version | grep "cores per cpu" | grep "sse4.1"
+${TESTJAVA}${FS}bin${FS}java ${TESTOPTS} -XX:+PrintMiscellaneous -XX:+Verbose -version | grep "cores per cpu" | grep "sse4.1"
if [ $? != 0 ]
then
@@ -55,7 +55,7 @@
cp ${TESTSRC}${FS}TestIntVect.java .
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} -d . TestIntVect.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+PrintCompilation -XX:+TraceNewVectors TestIntVect > test.out 2>&1
+${TESTJAVA}${FS}bin${FS}java ${TESTOPTS} -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 -XX:+PrintCompilation -XX:+TraceNewVectors TestIntVect > test.out 2>&1
COUNT=`grep AddVI test.out | wc -l | awk '{print $1}'`
if [ $COUNT -lt 4 ]
diff --git a/hotspot/test/compiler/8009761/Test8009761.java b/hotspot/test/compiler/8009761/Test8009761.java
index ed0f946..46aad28 100644
--- a/hotspot/test/compiler/8009761/Test8009761.java
+++ b/hotspot/test/compiler/8009761/Test8009761.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
* @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
* @build Test8009761
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761
*/
public class Test8009761 {
diff --git a/hotspot/test/compiler/8010927/Test8010927.java b/hotspot/test/compiler/8010927/Test8010927.java
index 6c9d9ab..3c0f091 100644
--- a/hotspot/test/compiler/8010927/Test8010927.java
+++ b/hotspot/test/compiler/8010927/Test8010927.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
* @library /testlibrary/whitebox /testlibrary
* @build Test8010927
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xmx64m -XX:NewSize=20971520 -XX:MaxNewSize=32m -XX:-UseTLAB -XX:-UseParNewGC -XX:-UseAdaptiveSizePolicy Test8010927
*/
diff --git a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java b/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java
index 559c3a6..bf797b1 100644
--- a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java
+++ b/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java
@@ -30,6 +30,7 @@
* @build TestUseBMI1InstructionsOnSupportedCPU
* BMISupportedCPUTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseBMI1InstructionsOnSupportedCPU
*/
diff --git a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java b/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java
index 3df8d65..2347181 100644
--- a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java
@@ -30,6 +30,7 @@
* @build TestUseBMI1InstructionsOnUnsupportedCPU
* BMIUnsupportedCPUTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseBMI1InstructionsOnUnsupportedCPU
*/
diff --git a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java b/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java
index c843774..68f2267 100644
--- a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java
+++ b/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java
@@ -30,6 +30,7 @@
* @build TestUseCountLeadingZerosInstructionOnSupportedCPU
* BMISupportedCPUTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseCountLeadingZerosInstructionOnSupportedCPU
diff --git a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java b/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java
index e2ffba2..68c855a 100644
--- a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java
@@ -30,6 +30,7 @@
* @build TestUseCountLeadingZerosInstructionOnUnsupportedCPU
* BMIUnsupportedCPUTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseCountLeadingZerosInstructionOnUnsupportedCPU
diff --git a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java b/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java
index d6628b1..2e4400b 100644
--- a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java
+++ b/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java
@@ -30,6 +30,7 @@
* @build TestUseCountTrailingZerosInstructionOnSupportedCPU
* BMISupportedCPUTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseCountTrailingZerosInstructionOnSupportedCPU
diff --git a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java b/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java
index 67b6ea3..648c112 100644
--- a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java
@@ -30,6 +30,7 @@
* @build TestUseCountTrailingZerosInstructionOnUnsupportedCPU
* BMIUnsupportedCPUTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseCountTrailingZerosInstructionOnUnsupportedCPU
diff --git a/hotspot/test/compiler/ciReplay/TestSA.sh b/hotspot/test/compiler/ciReplay/TestSA.sh
index 56736c7..cc5f503 100644
--- a/hotspot/test/compiler/ciReplay/TestSA.sh
+++ b/hotspot/test/compiler/ciReplay/TestSA.sh
@@ -68,7 +68,7 @@
fi
echo "dumpreplaydata -a > ${replay_data}" | \
- ${JAVA} ${TESTVMOPTS} \
+ ${JAVA} ${TESTOPTS} \
-cp ${TESTJAVA}${FS}lib${FS}sa-jdi.jar \
sun.jvm.hotspot.CLHSDB ${JAVA} ${core_file}
diff --git a/hotspot/test/compiler/ciReplay/common.sh b/hotspot/test/compiler/ciReplay/common.sh
index b7c5b7b..c7b656d 100644
--- a/hotspot/test/compiler/ciReplay/common.sh
+++ b/hotspot/test/compiler/ciReplay/common.sh
@@ -22,6 +22,7 @@
# questions.
#
#
+set -x
# $1 - error code
# $2 - test name
@@ -56,7 +57,7 @@
shift
name=$1
shift
- VMOPTS="${TESTVMOPTS} $@"
+ VMOPTS="${TESTOPTS} $@"
echo "POSITIVE TEST [$name]"
start_test ${VMOPTS}
exit_code=$?
@@ -75,7 +76,7 @@
shift
name=$1
shift
- VMOPTS="${TESTVMOPTS} $@"
+ VMOPTS="${TESTOPTS} $@"
echo "NEGATIVE TEST [$name]"
start_test ${VMOPTS}
exit_code=$?
@@ -149,7 +150,7 @@
replay_data=test_replay.txt
-${JAVA} ${TESTVMOPTS} -Xinternalversion 2>&1 | grep debug
+${JAVA} ${TESTOPTS} -Xinternalversion 2>&1 | grep debug
# Only test fastdebug
if [ $? -ne 0 ]
@@ -158,7 +159,7 @@
exit 0
fi
-is_int=`${JAVA} ${TESTVMOPTS} -version 2>&1 | grep -c "interpreted mode"`
+is_int=`${JAVA} ${TESTOPTS} -version 2>&1 | grep -c "interpreted mode"`
# Not applicable for Xint
if [ $is_int -ne 0 ]
then
@@ -168,14 +169,14 @@
cleanup
-client_available=`${JAVA} ${TESTVMOPTS} -client -Xinternalversion 2>&1 | \
+client_available=`${JAVA} ${TESTOPTS} -client -Xinternalversion 2>&1 | \
grep -c Client`
-server_available=`${JAVA} ${TESTVMOPTS} -server -Xinternalversion 2>&1 | \
+server_available=`${JAVA} ${TESTOPTS} -server -Xinternalversion 2>&1 | \
grep -c Server`
-tiered_available=`${JAVA} ${TESTVMOPTS} -XX:+TieredCompilation -XX:+PrintFlagsFinal -version | \
+tiered_available=`${JAVA} ${TESTOPTS} -XX:+TieredCompilation -XX:+PrintFlagsFinal -version | \
grep TieredCompilation | \
grep -c true`
-is_tiered=`${JAVA} ${TESTVMOPTS} -XX:+PrintFlagsFinal -version | \
+is_tiered=`${JAVA} ${TESTOPTS} -XX:+PrintFlagsFinal -version | \
grep TieredCompilation | \
grep -c true`
# CompLevel_simple -- C1
@@ -207,7 +208,7 @@
fi
fi
- cmd="${JAVA} ${TESTVMOPTS} $@ \
+ cmd="${JAVA} ${TESTOPTS} $@ \
-Xms8m \
-Xmx32m \
-XX:MetaspaceSize=4m \
diff --git a/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java b/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java
new file mode 100644
index 0000000..14b3da6d
--- /dev/null
+++ b/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.hotspot.WhiteBox;
+
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/*
+ * @test MethodUnloadingTest
+ * @bug 8029443
+ * @summary "Tests the unloading of methods to to class unloading"
+ * @library /testlibrary /testlibrary/whitebox
+ * @build TestMethodUnloading
+ * @build WorkerClass
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-BackgroundCompilation -XX:-UseCompressedOops -XX:+UseParallelGC -XX:CompileOnly=TestMethodUnloading::doWork TestMethodUnloading
+ */
+public class TestMethodUnloading {
+ private static final String workerClassName = "WorkerClass";
+ private static int work = -1;
+
+ private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
+ private static int COMP_LEVEL_SIMPLE = 1;
+ private static int COMP_LEVEL_FULL_OPTIMIZATION = 4;
+
+ /**
+ * Does some work by either using the workerClass or locally producing values.
+ * @param workerClass Class performing some work (will be unloaded)
+ * @param useWorker If true the workerClass is used
+ */
+ static private void doWork(Class<?> workerClass, boolean useWorker) throws InstantiationException, IllegalAccessException {
+ if (useWorker) {
+ // Create a new instance
+ Object worker = workerClass.newInstance();
+ // We would like to call a method of WorkerClass here but we cannot cast to WorkerClass
+ // because the class was loaded by a different class loader. One solution would be to use
+ // reflection but since we want C2 to implement the call as an optimized IC we call
+ // Object::hashCode() here which actually calls WorkerClass::hashCode().
+ // C2 will then implement this call as an optimized IC that points to a to-interpreter stub
+ // referencing the Method* for WorkerClass::hashCode().
+ work = worker.hashCode();
+ if (work != 42) {
+ new RuntimeException("Work not done");
+ }
+ } else {
+ // Do some important work here
+ work = 1;
+ }
+ }
+
+ /**
+ * Makes sure that method is compiled by forcing compilation if not yet compiled.
+ * @param m Method to be checked
+ */
+ static private void makeSureIsCompiled(Method m) {
+ // Make sure background compilation is disabled
+ if (WHITE_BOX.getBooleanVMFlag("BackgroundCompilation")) {
+ throw new RuntimeException("Background compilation enabled");
+ }
+
+ // Check if already compiled
+ if (!WHITE_BOX.isMethodCompiled(m)) {
+ // If not, try to compile it with C2
+ if(!WHITE_BOX.enqueueMethodForCompilation(m, COMP_LEVEL_FULL_OPTIMIZATION)) {
+ // C2 compiler not available, try to compile with C1
+ WHITE_BOX.enqueueMethodForCompilation(m, COMP_LEVEL_SIMPLE);
+ }
+ // Because background compilation is disabled, method should now be compiled
+ if(!WHITE_BOX.isMethodCompiled(m)) {
+ throw new RuntimeException(m + " not compiled");
+ }
+ }
+ }
+
+ /**
+ * This test creates stale Method* metadata in a to-interpreter stub of an optimized IC.
+ *
+ * The following steps are performed:
+ * (1) A workerClass is loaded by a custom class loader
+ * (2) The method doWork that calls a method of the workerClass is compiled. The call
+ * is implemented as an optimized IC calling a to-interpreted stub. The to-interpreter
+ * stub contains a Method* to a workerClass method.
+ * (3) Unloading of the workerClass is enforced. The to-interpreter stub now contains a dead Method*.
+ * (4) Depending on the implementation of the IC, the compiled version of doWork should still be
+ * valid. We call it again without using the workerClass.
+ */
+ static public void main(String[] args) throws Exception {
+ // (1) Create a custom class loader with no parent class loader
+ URL url = TestMethodUnloading.class.getProtectionDomain().getCodeSource().getLocation();
+ URLClassLoader loader = new URLClassLoader(new URL[] {url}, null);
+
+ // Load worker class with custom class loader
+ Class<?> workerClass = Class.forName(workerClassName, true, loader);
+
+ // (2) Make sure all paths of doWork are profiled and compiled
+ for (int i = 0; i < 100000; ++i) {
+ doWork(workerClass, true);
+ doWork(workerClass, false);
+ }
+
+ // Make sure doWork is compiled now
+ Method doWork = TestMethodUnloading.class.getDeclaredMethod("doWork", Class.class, boolean.class);
+ makeSureIsCompiled(doWork);
+
+ // (3) Throw away class loader and reference to workerClass to allow unloading
+ loader.close();
+ loader = null;
+ workerClass = null;
+
+ // Force garbage collection to trigger unloading of workerClass
+ // Dead reference to WorkerClass::hashCode triggers JDK-8029443
+ WHITE_BOX.fullGC();
+
+ // (4) Depending on the implementation of the IC, the compiled version of doWork
+ // may still be valid here. Execute it without a workerClass.
+ doWork(null, false);
+ if (work != 1) {
+ throw new RuntimeException("Work not done");
+ }
+
+ doWork(Object.class, false);
+ }
+}
diff --git a/hotspot/test/compiler/classUnloading/methodUnloading/WorkerClass.java b/hotspot/test/compiler/classUnloading/methodUnloading/WorkerClass.java
new file mode 100644
index 0000000..c67154f
--- /dev/null
+++ b/hotspot/test/compiler/classUnloading/methodUnloading/WorkerClass.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Worker class that is dynamically loaded/unloaded by TestMethodUnloading.
+ */
+public class WorkerClass {
+ /**
+ * We override hashCode here to be able to access this implementation
+ * via an Object reference (we cannot cast to WorkerClass).
+ */
+ @Override
+ public int hashCode() {
+ return 42;
+ }
+}
+
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java b/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java
index e8cfaa2..45a79b0 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestAndnI BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestAndnI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java b/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java
index 0dca7aa..8746fef 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestAndnL BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestAndnL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java b/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java
index 9f998bc..7ced524 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestBlsiI BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestBlsiI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java b/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java
index b7a36c6..d1fe59c 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestBlsiL BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestBlsiL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java
index a06b429..7cba5d8 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestBlsmskI BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestBlsmskI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java
index 794c4c8..d2f3a3f 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestBlsmskL BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestBlsmskL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java b/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java
index 73ea886..53e7251 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestBlsrI BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestBlsrI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java b/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java
index 861f160..5e3c885 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestBlsrL BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestBlsrL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java b/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java
index a3720dc..d13b89c 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestLzcntI BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestLzcntI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java b/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java
index a3d7887..b75830d 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestLzcntL BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestLzcntL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java b/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java
index d74c82a..2855195 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestTzcntI BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestTzcntI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java b/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java
index 0c18419..36683fe 100644
--- a/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestTzcntL BMITestRunner Expr
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestTzcntL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java
index 2a77347..3b6f2f3 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build AddnTestI
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AddnTestI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java
index 72da9a0..c034693 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build AddnTestL
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AddnTestL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
index ce234a9..92a8787 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build BlsiTestI
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
index f8544f3..2894a53 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build BlsiTestL
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
index 1a7dd8f..2f0be6a 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build BlsmskTestI
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
index e061206..f2b7345 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build BlsmskTestL
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
index e086f9b..67d1b90 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build BlsrTestI
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
index 0185aeb..158f344 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build BlsrTestL
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
index 62c8642..d74c19a 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build LZcntTestI
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
index 16caae2..5c164ff 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build LZcntTestL
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestL
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
index 2502641..7fa47ba 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build TZcntTestI
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestI
*/
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
index c08dbcc..e06f9dd 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
* @build TZcntTestL
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestL
*/
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
index a2770dc..7f70f1c 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build AddExactIntTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
index c575644..e577202 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build AddExactLongTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
index 19641a1..ae37263 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build DecrementExactIntTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
index a582169..5e42bb1 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build DecrementExactLongTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
index bca840a..32bf0c6 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build IncrementExactIntTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
index 5348b77..b0f5086 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build IncrementExactLongTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
index a09c124..d565ce7 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build MultiplyExactIntTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
index 23154e9..e7ac530 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build MultiplyExactLongTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
index f41bb79..5aacf77 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build NegateExactIntTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
index 27af655..37d13a5 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build NegateExactLongTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
index c2cbbc4..7cd2247 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build SubtractExactIntTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
index bee6d3b..4ab2609 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build SubtractExactLongTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
diff --git a/hotspot/test/compiler/macronodes/TestEliminateAllocationPhi.java b/hotspot/test/compiler/macronodes/TestEliminateAllocationPhi.java
new file mode 100644
index 0000000..e9a5154
--- /dev/null
+++ b/hotspot/test/compiler/macronodes/TestEliminateAllocationPhi.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8046698
+ * @summary PhiNode inserted between AllocateNode and Initialization node confuses allocation elimination
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestEliminateAllocationPhi
+ *
+ */
+
+public class TestEliminateAllocationPhi {
+
+ // This will return I when called from m(0 and once optimized will
+ // go away but this will confuse escape analysis in m(): it will
+ // find I as non escaping but non scalar replaceable. In its own
+ // method so that we can make the profile of the if() branch look
+ // like it's taken sometimes.
+ static Integer m2(Integer I, int i) {
+ for (; i < 10; i=(i+2)*(i+2)) {
+ }
+ if (i == 121) {
+ return II;
+ }
+ return I;
+ }
+
+ static Integer II = new Integer(42);
+
+ static int m(int[] integers, boolean flag) {
+ int j = 0;
+ while(true) {
+ try {
+ int k = integers[j++];
+ // A branch that will cause loop unswitching
+ if (flag) {
+ k += 42;
+ }
+ if (k < 1000) {
+ throw new Exception();
+ }
+ // Because of the try/catch the Allocate node for this
+ // new will be in the loop while the Initialization
+ // node will be outside the loop. When loop
+ // unswitching happens, the Allocate node will be
+ // cloned and the results of both will be inputs to a
+ // Phi that will be between the Allocate nodes and the
+ // Initialization nodes.
+ Integer I = new Integer(k);
+
+ I = m2(I, 0);
+
+ int i = I.intValue();
+ return i;
+ } catch(Exception e) {
+ }
+ }
+ }
+
+ static public void main(String[] args) {
+ for (int i = 0; i < 5000; i++) {
+ m2(null, 1);
+ }
+
+ int[] integers = { 2000 };
+ for (int i = 0; i < 6000; i++) {
+ m(integers, (i%2) == 0);
+ }
+ int[] integers2 = { 1, 2, 3, 4, 5, 2000 };
+ for (int i = 0; i < 10000; i++) {
+ m(integers2, (i%2) == 0);
+ }
+ }
+}
diff --git a/hotspot/test/compiler/osr/TestOSRWithNonEmptyStack.java b/hotspot/test/compiler/osr/TestOSRWithNonEmptyStack.java
new file mode 100644
index 0000000..82bbfc2
--- /dev/null
+++ b/hotspot/test/compiler/osr/TestOSRWithNonEmptyStack.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+/**
+ * @test
+ * @bug 8051344
+ * @summary Force OSR compilation with non-empty stack at the OSR entry point.
+ * @compile -XDignore.symbol.file TestOSRWithNonEmptyStack.java
+ * @run main/othervm -XX:CompileOnly=TestCase.test TestOSRWithNonEmptyStack
+ */
+public class TestOSRWithNonEmptyStack extends ClassLoader {
+ private static final int CLASS_FILE_VERSION = 52;
+ private static final String CLASS_NAME = "TestCase";
+ private static final String METHOD_NAME = "test";
+ private static final int ITERATIONS = 1_000_000;
+
+ private static byte[] generateTestClass() {
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+
+ cw.visit(TestOSRWithNonEmptyStack.CLASS_FILE_VERSION, ACC_PUBLIC,
+ TestOSRWithNonEmptyStack.CLASS_NAME, null, "java/lang/Object",
+ null);
+
+ TestOSRWithNonEmptyStack.generateConstructor(cw);
+ TestOSRWithNonEmptyStack.generateTestMethod(cw);
+
+ cw.visitEnd();
+ return cw.toByteArray();
+ }
+
+ private static void generateConstructor(ClassWriter classWriter) {
+ MethodVisitor mv = classWriter.visitMethod(ACC_PUBLIC, "<init>", "()V",
+ null, null);
+
+ mv.visitCode();
+
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V",
+ false);
+ mv.visitInsn(RETURN);
+
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+
+ private static void generateTestMethod(ClassWriter classWriter) {
+ MethodVisitor mv = classWriter.visitMethod(ACC_PUBLIC,
+ TestOSRWithNonEmptyStack.METHOD_NAME, "()V", null, null);
+ Label osrEntryPoint = new Label();
+
+ mv.visitCode();
+ // Push 'this' into stack before OSR entry point to bail out compilation
+ mv.visitVarInsn(ALOAD, 0);
+ // Setup loop counter
+ mv.visitInsn(ICONST_0);
+ mv.visitVarInsn(ISTORE, 1);
+ // Begin loop
+ mv.visitLabel(osrEntryPoint);
+ // Increment loop counter
+ mv.visitVarInsn(ILOAD, 1);
+ mv.visitInsn(ICONST_1);
+ mv.visitInsn(IADD);
+ // Duplicate it for loop condition check
+ mv.visitInsn(DUP);
+ mv.visitVarInsn(ISTORE, 1);
+ // Check loop condition
+ mv.visitLdcInsn(TestOSRWithNonEmptyStack.ITERATIONS);
+ mv.visitJumpInsn(IF_ICMPLT, osrEntryPoint);
+ // Pop 'this'.
+ mv.visitInsn(POP);
+ mv.visitInsn(RETURN);
+
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+
+ private void run() {
+ byte[] bytecode = TestOSRWithNonEmptyStack.generateTestClass();
+
+ try {
+ Class klass = defineClass(TestOSRWithNonEmptyStack.CLASS_NAME,
+ bytecode, 0, bytecode.length);
+
+ Constructor ctor = klass.getConstructor();
+ Method method = klass.getDeclaredMethod(
+ TestOSRWithNonEmptyStack.METHOD_NAME);
+
+ Object testCase = ctor.newInstance();
+ method.invoke(testCase);
+ } catch (Exception e) {
+ throw new RuntimeException(
+ "Test bug: generated class should be valid.", e);
+ }
+ }
+
+ public static void main(String args[]) {
+ new TestOSRWithNonEmptyStack().run();
+ }
+}
diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
index 0b336c8..93b1a48 100644
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
index b22c6ab..5190bb8 100644
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
index ea3d2d3..ffa4bb4 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMAbortRatioOptionOnSupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnSupportedConfig
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
index d480774..eb952ee 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMAbortRatioOptionOnUnsupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnUnsupportedConfig
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
index 86ddcdc..979615d 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMTotalCountIncrRateOptionOnSupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestRTMTotalCountIncrRateOptionOnSupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
index 32cd417..8dcffde 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
@@ -35,6 +35,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
index bd9d782..999f73c 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMDeoptOptionOnSupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnSupportedConfig
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
index 2f3b836..6679df1 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMDeoptOptionOnUnsupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnUnsupportedConfig
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
index b01a6a7..f04c154 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMForStackLocksOptionOnSupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseRTMForStackLocksOptionOnSupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
index 557f17a4..bf84bde 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMForStackLocksOptionOnUnsupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseRTMForStackLocksOptionOnUnsupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
index 72af535..ebb6964 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMLockingOptionOnSupportedConfig
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnSupportedConfig
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
index 6e10024..a4fe7d0 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMLockingOptionOnUnsupportedCPU
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedCPU
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
index 0121856..8119019 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMLockingOptionOnUnsupportedVM
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedVM
*/
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
index 89b30bf..c4c6511 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMLockingOptionWithBiasedLocking
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionWithBiasedLocking
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
index 2c179d8..f4eb6a9 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMAbortRatio
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortRatio
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java b/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
index dbed5f0..9447b88 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMAbortThreshold
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortThreshold
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
index 2cf81f7..d46433d 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
@@ -32,6 +32,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMAfterNonRTMDeopt
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAfterNonRTMDeopt
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
index 911cc21..4c662e0 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMDeoptOnHighAbortRatio
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMDeoptOnHighAbortRatio
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
index bcadaab..4101cbf 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMDeoptOnLowAbortRatio
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMDeoptOnLowAbortRatio
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java b/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
index 61f84e4..6355d97 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMLockingCalculationDelay
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java b/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
index 548a09c..a30ee9a 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMLockingThreshold
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMLockingThreshold
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java b/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
index 1a0c20c..4fceef2 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMRetryCount
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMRetryCount
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java b/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
index 8cb4bbb..1d78747 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMSpinLoopCount
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMSpinLoopCount
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java b/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
index e1f94d3..4af5a59 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestRTMTotalCountIncrRate
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMTotalCountIncrRate
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java b/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
index f1fa139..d6ee5b6 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMAfterLockInflation
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMAfterLockInflation
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java b/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
index 2e0dcbc..9b93ad7 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMDeopt
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMDeopt
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java b/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
index 34fa34c..936abf8 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMForInflatedLocks
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMForInflatedLocks
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java b/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
index 0a54511..b3b4498 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMForStackLocks
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMForStackLocks
*/
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java b/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
index 4fc5d99..899f96d 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMXendForLockBusy
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMXendForLockBusy
*/
diff --git a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java b/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
index 46c9482..265f9e8 100644
--- a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
+++ b/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestNoRTMLockElidingOption
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestNoRTMLockElidingOption
*/
diff --git a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java b/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
index 701cf8d..e2ded9c 100644
--- a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
+++ b/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
@@ -31,6 +31,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestUseRTMLockElidingOption
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockElidingOption
*/
diff --git a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java b/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
index eebaac2..39dbd25 100644
--- a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
+++ b/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
@@ -32,6 +32,7 @@
* @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
* @build TestPrintPreciseRTMLockingStatistics
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestPrintPreciseRTMLockingStatistics
*/
diff --git a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java
index ab975e4..f84903c 100644
--- a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java
+++ b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java
@@ -29,6 +29,7 @@
* @ignore 8046268
* @build NonTieredLevelsTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*
diff --git a/hotspot/test/compiler/tiered/TieredLevelsTest.java b/hotspot/test/compiler/tiered/TieredLevelsTest.java
index d862f50..882762b 100644
--- a/hotspot/test/compiler/tiered/TieredLevelsTest.java
+++ b/hotspot/test/compiler/tiered/TieredLevelsTest.java
@@ -27,6 +27,7 @@
* @ignore 8046268
* @build TieredLevelsTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*
diff --git a/hotspot/test/compiler/types/correctness/CorrectnessTest.java b/hotspot/test/compiler/types/correctness/CorrectnessTest.java
index 9c84167..3d0bca7 100644
--- a/hotspot/test/compiler/types/correctness/CorrectnessTest.java
+++ b/hotspot/test/compiler/types/correctness/CorrectnessTest.java
@@ -29,6 +29,7 @@
* execution/MethodHandleDelegate.java
* @build CorrectnessTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation
diff --git a/hotspot/test/compiler/types/correctness/OffTest.java b/hotspot/test/compiler/types/correctness/OffTest.java
index 52bd894..04be21c 100644
--- a/hotspot/test/compiler/types/correctness/OffTest.java
+++ b/hotspot/test/compiler/types/correctness/OffTest.java
@@ -30,6 +30,7 @@
* @build CorrectnessTest
* @build OffTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=1200 OffTest
*/
diff --git a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java b/hotspot/test/compiler/whitebox/ClearMethodStateTest.java
index 8adbf20..94d822a 100644
--- a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java
+++ b/hotspot/test/compiler/whitebox/ClearMethodStateTest.java
@@ -30,6 +30,7 @@
* @ignore 8046268
* @build ClearMethodStateTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* ClearMethodStateTest
* @summary testing of WB::clearMethodState()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java
index 1a297ae..7c55fe3 100644
--- a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java
+++ b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java
@@ -28,6 +28,7 @@
* @ignore 8046268
* @build DeoptimizeAllTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeAllTest
* @summary testing of WB::deoptimizeAll()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java
index bee232d..ce9cfe8 100644
--- a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java
@@ -28,6 +28,7 @@
* @ignore 8046268
* @build DeoptimizeMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeMethodTest
* @summary testing of WB::deoptimizeMethod()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java b/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java
index 5c6c4f3..f0895ba 100644
--- a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java
+++ b/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java
@@ -28,6 +28,7 @@
* @ignore 8046268
* @build EnqueueMethodForCompilationTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* EnqueueMethodForCompilationTest
* @summary testing of WB::enqueueMethodForCompilation()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/GetNMethodTest.java b/hotspot/test/compiler/whitebox/GetNMethodTest.java
index 14bc762..8a24fce 100644
--- a/hotspot/test/compiler/whitebox/GetNMethodTest.java
+++ b/hotspot/test/compiler/whitebox/GetNMethodTest.java
@@ -31,6 +31,7 @@
* @ignore 8046268
* @build GetNMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* GetNMethodTest
* @summary testing of WB::getNMethod()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java
index acede60..0e340f9 100644
--- a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java
+++ b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /testlibrary/com/oracle/java/testlibrary
* @build IsMethodCompilableTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
* @run main/othervm/timeout=2400 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
* @summary testing of WB::isMethodCompilable()
diff --git a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java
index 651002d..5891ef7 100644
--- a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java
+++ b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java
@@ -28,6 +28,7 @@
* @ignore 8046268
* @build MakeMethodNotCompilableTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* MakeMethodNotCompilableTest
* @summary testing of WB::makeMethodNotCompilable()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java
index ae42d53..67e323e 100644
--- a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java
+++ b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build SetDontInlineMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetDontInlineMethodTest
* @summary testing of WB::testSetDontInlineMethod()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java b/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java
index 086d7c2..560ad02 100644
--- a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java
+++ b/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build SetForceInlineMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetForceInlineMethodTest
* @summary testing of WB::testSetForceInlineMethod()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java b/hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java
new file mode 100644
index 0000000..3bbe150
--- /dev/null
+++ b/hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test TestArrayAllocatorMallocLimit
+ * @summary Sanity check that the ArrayAllocatorMallocLimit flag can be set.
+ * The test helps verifying that size_t flags can be set/read.
+ * @bug 8054823
+ * @key gc
+ * @library /testlibrary
+ * @run driver TestArrayAllocatorMallocLimit
+ */
+
+import com.oracle.java.testlibrary.Asserts;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+import java.math.BigInteger;
+
+public class TestArrayAllocatorMallocLimit {
+ public static void main(String [] args) throws Exception {
+ testDefaultValue();
+ testSetValue();
+ }
+
+ private static final String flagName = "ArrayAllocatorMallocLimit";
+
+ // size_t ArrayAllocatorMallocLimit = 18446744073709551615{experimental}
+ private static final String printFlagsFinalPattern = " *size_t *" + flagName + " *:?= *(\\d+) *\\{experimental\\} *";
+
+ public static void testDefaultValue() throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UnlockExperimentalVMOptions", "-XX:+PrintFlagsFinal", "-version");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ String value = output.firstMatch(printFlagsFinalPattern, 1);
+
+ try {
+ Asserts.assertNotNull(value, "Couldn't find size_t flag " + flagName);
+
+ // A size_t is not always parseable with Long.parseValue,
+ // use BigInteger instead.
+ BigInteger biValue = new BigInteger(value);
+
+ // Sanity check that we got a non-zero value.
+ Asserts.assertNotEquals(biValue, "0");
+
+ output.shouldHaveExitValue(0);
+ } catch (Exception e) {
+ System.err.println(output.getOutput());
+ throw e;
+ }
+ }
+
+ public static void testSetValue() throws Exception {
+ long flagValue = 2048;
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UnlockExperimentalVMOptions", "-XX:" + flagName + "=" + flagValue, "-XX:+PrintFlagsFinal", "-version");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ String value = output.firstMatch(printFlagsFinalPattern, 1);
+
+ try {
+ Asserts.assertNotNull("Couldn't find size_t flag " + flagName);
+
+ long longValue = Long.parseLong(value);
+
+ Asserts.assertEquals(longValue, flagValue);
+
+ output.shouldHaveExitValue(0);
+ } catch (Exception e) {
+ System.err.println(output.getOutput());
+ throw e;
+ }
+ }
+
+}
diff --git a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java b/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java
index 3dc688c..f142964 100644
--- a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java
+++ b/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestCMSHeapSizeFlags TestMaxHeapSizeTools
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestCMSHeapSizeFlags
* @author thomas.schatzl@oracle.com
*/
diff --git a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java b/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java
index 31ab5e3..fabc4f0 100644
--- a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java
+++ b/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestG1HeapSizeFlags TestMaxHeapSizeTools
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestG1HeapSizeFlags
* @author thomas.schatzl@oracle.com
*/
diff --git a/hotspot/test/gc/arguments/TestMinInitialErgonomics.java b/hotspot/test/gc/arguments/TestMinInitialErgonomics.java
index 8352d92..1f90bec 100644
--- a/hotspot/test/gc/arguments/TestMinInitialErgonomics.java
+++ b/hotspot/test/gc/arguments/TestMinInitialErgonomics.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestMinInitialErgonomics TestMaxHeapSizeTools
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestMinInitialErgonomics
* @author thomas.schatzl@oracle.com
*/
diff --git a/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java b/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java
index 947fd0f..5d7b603 100644
--- a/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java
+++ b/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestParallelHeapSizeFlags TestMaxHeapSizeTools
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestParallelHeapSizeFlags
* @author thomas.schatzl@oracle.com
*/
diff --git a/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java b/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java
index 967adf6..0313da5 100644
--- a/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java
+++ b/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestSerialHeapSizeFlags TestMaxHeapSizeTools
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestSerialHeapSizeFlags
* @author thomas.schatzl@oracle.com
*/
diff --git a/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java b/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java
index 14ca6ed..eb947c1 100644
--- a/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java
+++ b/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC
* @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC
* @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC -XX:-UseParallelOldGC
diff --git a/hotspot/test/gc/class_unloading/AllocateBeyondMetaspaceSize.java b/hotspot/test/gc/class_unloading/AllocateBeyondMetaspaceSize.java
new file mode 100644
index 0000000..4998fa8
--- /dev/null
+++ b/hotspot/test/gc/class_unloading/AllocateBeyondMetaspaceSize.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.hotspot.WhiteBox;
+
+class AllocateBeyondMetaspaceSize {
+ public static Object dummy;
+
+ public static void main(String [] args) {
+ if (args.length != 2) {
+ throw new IllegalArgumentException("Usage: <MetaspaceSize> <YoungGenSize>");
+ }
+
+ long metaspaceSize = Long.parseLong(args[0]);
+ long youngGenSize = Long.parseLong(args[1]);
+
+ run(metaspaceSize, youngGenSize);
+ }
+
+ private static void run(long metaspaceSize, long youngGenSize) {
+ WhiteBox wb = WhiteBox.getWhiteBox();
+
+ long allocationBeyondMetaspaceSize = metaspaceSize * 2;
+ long metaspace = wb.allocateMetaspace(null, allocationBeyondMetaspaceSize);
+
+ triggerYoungGC(youngGenSize);
+
+ wb.freeMetaspace(null, metaspace, metaspace);
+ }
+
+ private static void triggerYoungGC(long youngGenSize) {
+ long approxAllocSize = 32 * 1024;
+ long numAllocations = 2 * youngGenSize / approxAllocSize;
+
+ for (long i = 0; i < numAllocations; i++) {
+ dummy = new byte[(int)approxAllocSize];
+ }
+ }
+}
diff --git a/hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java b/hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
new file mode 100644
index 0000000..2f2a9bb
--- /dev/null
+++ b/hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key gc
+ * @bug 8049831
+ * @library /testlibrary /testlibrary/whitebox
+ * @build TestCMSClassUnloadingEnabledHWM AllocateBeyondMetaspaceSize
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver TestCMSClassUnloadingEnabledHWM
+ * @summary Test that -XX:-CMSClassUnloadingEnabled will trigger a Full GC when more than MetaspaceSize metadata is allocated.
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class TestCMSClassUnloadingEnabledHWM {
+ private static long MetaspaceSize = 32 * 1024 * 1024;
+ private static long YoungGenSize = 32 * 1024 * 1024;
+
+ private static OutputAnalyzer run(boolean enableUnloading) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xbootclasspath/a:.",
+ "-XX:+WhiteBoxAPI",
+ "-XX:MetaspaceSize=" + MetaspaceSize,
+ "-Xmn" + YoungGenSize,
+ "-XX:+UseConcMarkSweepGC",
+ "-XX:" + (enableUnloading ? "+" : "-") + "CMSClassUnloadingEnabled",
+ "-XX:+PrintHeapAtGC",
+ "-XX:+PrintGCDetails",
+ "AllocateBeyondMetaspaceSize",
+ "" + MetaspaceSize,
+ "" + YoungGenSize);
+ return new OutputAnalyzer(pb.start());
+ }
+
+ public static OutputAnalyzer runWithCMSClassUnloading() throws Exception {
+ return run(true);
+ }
+
+ public static OutputAnalyzer runWithoutCMSClassUnloading() throws Exception {
+ return run(false);
+ }
+
+ public static void testWithoutCMSClassUnloading() throws Exception {
+ // -XX:-CMSClassUnloadingEnabled is used, so we expect a full GC instead of a concurrent cycle.
+ OutputAnalyzer out = runWithoutCMSClassUnloading();
+
+ out.shouldMatch(".*Full GC.*");
+ out.shouldNotMatch(".*CMS Initial Mark.*");
+ }
+
+ public static void testWithCMSClassUnloading() throws Exception {
+ // -XX:+CMSClassUnloadingEnabled is used, so we expect a concurrent cycle instead of a full GC.
+ OutputAnalyzer out = runWithCMSClassUnloading();
+
+ out.shouldMatch(".*CMS Initial Mark.*");
+ out.shouldNotMatch(".*Full GC.*");
+ }
+
+ public static void main(String args[]) throws Exception {
+ testWithCMSClassUnloading();
+ testWithoutCMSClassUnloading();
+ }
+}
+
diff --git a/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java b/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java
new file mode 100644
index 0000000..b6e677b
--- /dev/null
+++ b/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key gc
+ * @bug 8049831
+ * @library /testlibrary /testlibrary/whitebox
+ * @build TestG1ClassUnloadingHWM AllocateBeyondMetaspaceSize
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver TestG1ClassUnloadingHWM
+ * @summary Test that -XX:-ClassUnloadingWithConcurrentMark will trigger a Full GC when more than MetaspaceSize metadata is allocated.
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class TestG1ClassUnloadingHWM {
+ private static long MetaspaceSize = 32 * 1024 * 1024;
+ private static long YoungGenSize = 32 * 1024 * 1024;
+
+ private static OutputAnalyzer run(boolean enableUnloading) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xbootclasspath/a:.",
+ "-XX:+WhiteBoxAPI",
+ "-XX:MetaspaceSize=" + MetaspaceSize,
+ "-Xmn" + YoungGenSize,
+ "-XX:+UseG1GC",
+ "-XX:" + (enableUnloading ? "+" : "-") + "ClassUnloadingWithConcurrentMark",
+ "-XX:+PrintHeapAtGC",
+ "-XX:+PrintGCDetails",
+ "AllocateBeyondMetaspaceSize",
+ "" + MetaspaceSize,
+ "" + YoungGenSize);
+ return new OutputAnalyzer(pb.start());
+ }
+
+ public static OutputAnalyzer runWithG1ClassUnloading() throws Exception {
+ return run(true);
+ }
+
+ public static OutputAnalyzer runWithoutG1ClassUnloading() throws Exception {
+ return run(false);
+ }
+
+ public static void testWithoutG1ClassUnloading() throws Exception {
+ // -XX:-ClassUnloadingWithConcurrentMark is used, so we expect a full GC instead of a concurrent cycle.
+ OutputAnalyzer out = runWithoutG1ClassUnloading();
+
+ out.shouldMatch(".*Full GC.*");
+ out.shouldNotMatch(".*initial-mark.*");
+ }
+
+ public static void testWithG1ClassUnloading() throws Exception {
+ // -XX:+ClassUnloadingWithConcurrentMark is used, so we expect a concurrent cycle instead of a full GC.
+ OutputAnalyzer out = runWithG1ClassUnloading();
+
+ out.shouldMatch(".*initial-mark.*");
+ out.shouldNotMatch(".*Full GC.*");
+ }
+
+ public static void main(String args[]) throws Exception {
+ testWithG1ClassUnloading();
+ testWithoutG1ClassUnloading();
+ }
+}
+
diff --git a/hotspot/test/gc/g1/TestDeferredRSUpdate.java b/hotspot/test/gc/g1/TestDeferredRSUpdate.java
index 7d2ebdc..f00967d 100644
--- a/hotspot/test/gc/g1/TestDeferredRSUpdate.java
+++ b/hotspot/test/gc/g1/TestDeferredRSUpdate.java
@@ -23,7 +23,7 @@
/*
* @test TestDeferredRSUpdate
- * @bug 8040977
+ * @bug 8040977 8052170
* @summary Ensure that running with -XX:-G1DeferredRSUpdate does not crash the VM
* @key gc
* @library /testlibrary
@@ -38,6 +38,7 @@
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
"-Xmx10M",
+ "-XX:+PrintGCDetails",
// G1DeferredRSUpdate is a develop option, but we cannot limit execution of this test to only debug VMs.
"-XX:+IgnoreUnrecognizedVMOptions",
"-XX:-G1DeferredRSUpdate",
diff --git a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java
new file mode 100644
index 0000000..b920e7a
--- /dev/null
+++ b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test TestEagerReclaimHumongousRegions
+ * @bug 8027959
+ * @summary Test to make sure that eager reclaim of humongous objects work. We simply try to fill
+ * up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC.
+ * @key gc
+ * @library /testlibrary
+ */
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.util.LinkedList;
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+import com.oracle.java.testlibrary.Asserts;
+
+class ReclaimRegionFast {
+ public static final int M = 1024*1024;
+
+ public static LinkedList<Object> garbageList = new LinkedList<Object>();
+
+ public static void genGarbage() {
+ for (int i = 0; i < 32*1024; i++) {
+ garbageList.add(new int[100]);
+ }
+ garbageList.clear();
+ }
+
+ // A large object referenced by a static.
+ static int[] filler = new int[10 * M];
+
+ public static void main(String[] args) {
+
+ int[] large = new int[M];
+
+ Object ref_from_stack = large;
+
+ for (int i = 0; i < 100; i++) {
+ // A large object that will be reclaimed eagerly.
+ large = new int[6*M];
+ genGarbage();
+ // Make sure that the compiler cannot completely remove
+ // the allocation of the large object until here.
+ System.out.println(large);
+ }
+
+ // Keep the reference to the first object alive.
+ System.out.println(ref_from_stack);
+ }
+}
+
+public class TestEagerReclaimHumongousRegions {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseG1GC",
+ "-Xms128M",
+ "-Xmx128M",
+ "-Xmn16M",
+ "-XX:+PrintGC",
+ ReclaimRegionFast.class.getName());
+
+ Pattern p = Pattern.compile("Full GC");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ int found = 0;
+ Matcher m = p.matcher(output.getStdout());
+ while (m.find()) { found++; }
+ System.out.println("Issued " + found + " Full GCs");
+ Asserts.assertLT(found, 10, "Found that " + found + " Full GCs were issued. This is larger than the bound. Eager reclaim seems to not work at all");
+
+ output.shouldHaveExitValue(0);
+ }
+}
diff --git a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions2.java b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions2.java
new file mode 100644
index 0000000..147dc48
--- /dev/null
+++ b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions2.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test TestEagerReclaimHumongousRegions2
+ * @bug 8051973
+ * @summary Test to make sure that eager reclaim of humongous objects correctly clears
+ * mark bitmaps at reclaim.
+ * @key gc
+ * @library /testlibrary
+ */
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Random;
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+// An object that has a few references to other instances to slow down marking.
+class ObjectWithSomeRefs {
+ public ObjectWithSomeRefs other1;
+ public ObjectWithSomeRefs other2;
+ public ObjectWithSomeRefs other3;
+ public ObjectWithSomeRefs other4;
+}
+
+class ReclaimRegionFast {
+ public static final int M = 1024*1024;
+
+ public static LinkedList<Object> garbageList = new LinkedList<Object>();
+
+ public static void genGarbage(Object large) {
+ for (int i = 0; i < 64*1024; i++) {
+ Object[] garbage = new Object[50];
+ garbage[0] = large;
+ garbageList.add(garbage);
+ }
+ garbageList.clear();
+ }
+
+ public static ArrayList<ObjectWithSomeRefs> longList = new ArrayList<ObjectWithSomeRefs>();
+
+ public static void main(String[] args) {
+
+ for (int i = 0; i < 16*1024; i++) {
+ longList.add(new ObjectWithSomeRefs());
+ }
+
+ Random rnd = new Random();
+ for (int i = 0; i < longList.size(); i++) {
+ int len = longList.size();
+ longList.get(i).other1 = longList.get(rnd.nextInt(len));
+ longList.get(i).other2 = longList.get(rnd.nextInt(len));
+ longList.get(i).other3 = longList.get(rnd.nextInt(len));
+ longList.get(i).other4 = longList.get(rnd.nextInt(len));
+ }
+
+ int[] large1 = new int[M];
+ int[] large2 = null;
+ int[] large3 = null;
+ int[] large4 = null;
+
+ Object ref_from_stack = large1;
+
+ for (int i = 0; i < 20; i++) {
+ // A set of large objects that will be reclaimed eagerly - and hopefully marked.
+ large1 = new int[M - 20];
+ large2 = new int[M - 20];
+ large3 = new int[M - 20];
+ large4 = new int[M - 20];
+ genGarbage(large1);
+ // Make sure that the compiler cannot completely remove
+ // the allocation of the large object until here.
+ System.out.println(large1 + " " + large2 + " " + large3 + " " + large4);
+ }
+
+ // Keep the reference to the first object alive.
+ System.out.println(ref_from_stack);
+ }
+}
+
+public class TestEagerReclaimHumongousRegions2 {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseG1GC",
+ "-Xms128M",
+ "-Xmx128M",
+ "-Xmn2M",
+ "-XX:G1HeapRegionSize=1M",
+ "-XX:InitiatingHeapOccupancyPercent=0", // Want to have as much as possible initial marks.
+ "-XX:+PrintGC",
+ "-XX:+VerifyAfterGC",
+ "-XX:ConcGCThreads=1", // Want to make marking as slow as possible.
+ "-XX:+IgnoreUnrecognizedVMOptions", // G1VerifyBitmaps is develop only.
+ "-XX:+G1VerifyBitmaps",
+ ReclaimRegionFast.class.getName());
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldHaveExitValue(0);
+ }
+}
+
diff --git a/hotspot/test/gc/g1/TestGCLogMessages.java b/hotspot/test/gc/g1/TestGCLogMessages.java
index dbb6170..ee33801 100644
--- a/hotspot/test/gc/g1/TestGCLogMessages.java
+++ b/hotspot/test/gc/g1/TestGCLogMessages.java
@@ -23,7 +23,7 @@
/*
* @test TestGCLogMessages
- * @bug 8035406 8027295 8035398 8019342
+ * @bug 8035406 8027295 8035398 8019342 8027959
* @summary Ensure that the PrintGCDetails output for a minor GC with G1
* includes the expected necessary messages.
* @key gc
@@ -54,6 +54,7 @@
output.shouldNotContain("[String Dedup Fixup");
output.shouldNotContain("[Young Free CSet");
output.shouldNotContain("[Non-Young Free CSet");
+ output.shouldNotContain("[Humongous Reclaim");
output.shouldHaveExitValue(0);
pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
@@ -71,6 +72,10 @@
output.shouldContain("[String Dedup Fixup");
output.shouldNotContain("[Young Free CSet");
output.shouldNotContain("[Non-Young Free CSet");
+ output.shouldContain("[Humongous Reclaim");
+ output.shouldNotContain("[Humongous Total");
+ output.shouldNotContain("[Humongous Candidate");
+ output.shouldNotContain("[Humongous Reclaimed");
output.shouldHaveExitValue(0);
pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
@@ -90,6 +95,10 @@
output.shouldContain("[String Dedup Fixup");
output.shouldContain("[Young Free CSet");
output.shouldContain("[Non-Young Free CSet");
+ output.shouldContain("[Humongous Reclaim");
+ output.shouldContain("[Humongous Total");
+ output.shouldContain("[Humongous Candidate");
+ output.shouldContain("[Humongous Reclaimed");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java b/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java
index 0d3ad50..122597a 100644
--- a/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java
+++ b/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build TestHumongousCodeCacheRoots
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @summary Humongous objects may have references from the code cache
* @run main TestHumongousCodeCacheRoots
*/
diff --git a/hotspot/test/runtime/6626217/Test6626217.sh b/hotspot/test/runtime/6626217/Test6626217.sh
index 99ee83a..a697191 100644
--- a/hotspot/test/runtime/6626217/Test6626217.sh
+++ b/hotspot/test/runtime/6626217/Test6626217.sh
@@ -69,7 +69,7 @@
${MV} many_loader.impl1 many_loader.class
${RM} many_loader.java
-${JAVA} ${TESTVMOPTS} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
+${JAVA} ${TESTOPTS} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
grep "loader constraint" test.out
exit $?
diff --git a/hotspot/test/runtime/6888954/vmerrors.sh b/hotspot/test/runtime/6888954/vmerrors.sh
index 0fdd4ca..28f6eea 100644
--- a/hotspot/test/runtime/6888954/vmerrors.sh
+++ b/hotspot/test/runtime/6888954/vmerrors.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,16 @@
# export TESTJAVA TESTVMOPTS
# sh test/runtime/6888954/vmerrors.sh
+if [ "${TESTSRC}" = "" ]
+then
+ TESTSRC=${PWD}
+ echo "TESTSRC not set. Using "${TESTSRC}" as default"
+fi
+echo "TESTSRC=${TESTSRC}"
+
+## Adding common setup Variables for running shell tests.
+. ${TESTSRC}/../../test_env.sh
+
ulimit -c 0 # no core files
i=1
@@ -84,7 +94,7 @@
i2=$i
[ $i -lt 10 ] && i2=0$i
- "$TESTJAVA/bin/java" $TESTVMOPTS -XX:+IgnoreUnrecognizedVMOptions \
+ "$TESTJAVA/bin/java" $TESTOPTS -XX:+IgnoreUnrecognizedVMOptions \
-XX:-TransmitErrorReport -XX:-CreateMinidumpOnCrash \
-XX:ErrorHandlerTest=${i} -version > ${i2}.out 2>&1
diff --git a/hotspot/test/runtime/7107135/Test7107135.sh b/hotspot/test/runtime/7107135/Test7107135.sh
index 0aa0e86..30604ff 100644
--- a/hotspot/test/runtime/7107135/Test7107135.sh
+++ b/hotspot/test/runtime/7107135/Test7107135.sh
@@ -25,7 +25,6 @@
#
##
-## @ignore 8025519
## @test Test7107135.sh
## @bug 7107135
## @bug 8021296
diff --git a/hotspot/test/runtime/7116786/Test7116786.java b/hotspot/test/runtime/7116786/Test7116786.java
index b914019..48eaf44 100644
--- a/hotspot/test/runtime/7116786/Test7116786.java
+++ b/hotspot/test/runtime/7116786/Test7116786.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -147,7 +147,8 @@
"no stackmap frame at jump location or bad jump",
"Inconsistent stackmap frames at branch target "),
- new Case("case15", "stackMapTable.cpp", true, "check_new_object",
+ /* Backward jump with uninit is allowed starting with JDK 8 */
+ new Case("case15", "stackMapTable.cpp", false, "check_new_object",
"backward jump with uninit",
"Uninitialized object exists on backward branch "),
diff --git a/hotspot/test/runtime/7162488/Test7162488.sh b/hotspot/test/runtime/7162488/Test7162488.sh
index fa47ad9..b87d92b 100644
--- a/hotspot/test/runtime/7162488/Test7162488.sh
+++ b/hotspot/test/runtime/7162488/Test7162488.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -45,14 +45,14 @@
#
OPTION=this_is_not_an_option
-${JAVA} ${TESTVMOPTS} -showversion -XX:${OPTION} 2>&1 | grep "Unrecognized VM option"
+${JAVA} -showversion -XX:${OPTION} 2>&1 | grep "Unrecognized VM option"
if [ "$?" != "0" ]
then
printf "FAILED: option not flagged as unrecognized.\n"
exit 1
fi
-${JAVA} ${TESTVMOPTS} -showversion -XX:${OPTION} 2>&1 | grep ${OPTION}
+${JAVA} -showversion -XX:${OPTION} 2>&1 | grep ${OPTION}
if [ "$?" != "0" ]
then
printf "FAILED: bad option not named as being bad.\n"
diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveClass.java b/hotspot/test/runtime/ClassUnload/KeepAliveClass.java
index 5759002..4b9d9e4 100644
--- a/hotspot/test/runtime/ClassUnload/KeepAliveClass.java
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @build KeepAliveClass test.Empty
* @build ClassUnloadCommon
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass
*/
diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java b/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java
index a14cf0f..3b1f814 100644
--- a/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @build KeepAliveClassLoader test.Empty
* @build ClassUnloadCommon
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader
*/
diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveObject.java b/hotspot/test/runtime/ClassUnload/KeepAliveObject.java
index dd460d4..8c46a0b 100644
--- a/hotspot/test/runtime/ClassUnload/KeepAliveObject.java
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @build KeepAliveObject test.Empty
* @build ClassUnloadCommon
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject
*/
diff --git a/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java b/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java
index a7613b8..80258dc 100644
--- a/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @build KeepAliveSoftReference test.Empty
* @build ClassUnloadCommon
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference
*/
diff --git a/hotspot/test/runtime/ClassUnload/UnloadTest.java b/hotspot/test/runtime/ClassUnload/UnloadTest.java
index 1dca14b..6398a07 100644
--- a/hotspot/test/runtime/ClassUnload/UnloadTest.java
+++ b/hotspot/test/runtime/ClassUnload/UnloadTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
* @build ClassUnloadCommon test.Empty
* @build UnloadTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
*/
import sun.hotspot.WhiteBox;
diff --git a/hotspot/test/runtime/NMT/AutoshutdownNMT.java b/hotspot/test/runtime/NMT/AutoshutdownNMT.java
new file mode 100644
index 0000000..afb1df8
--- /dev/null
+++ b/hotspot/test/runtime/NMT/AutoshutdownNMT.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key nmt
+ * @summary Test for deprecated message if -XX:-AutoShutdownNMT is specified
+ * @library /testlibrary
+ * @ignore
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class AutoshutdownNMT {
+
+ public static void main(String args[]) throws Exception {
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:NativeMemoryTracking=detail",
+ "-XX:-AutoShutdownNMT",
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("ignoring option AutoShutdownNMT");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/BaselineWithParameter.java b/hotspot/test/runtime/NMT/BaselineWithParameter.java
index ff10b28..ef34a11 100644
--- a/hotspot/test/runtime/NMT/BaselineWithParameter.java
+++ b/hotspot/test/runtime/NMT/BaselineWithParameter.java
@@ -27,6 +27,7 @@
* @key nmt jcmd regression
* @summary Regression test for invoking a jcmd with baseline=false, result was that the target VM crashed
* @library /testlibrary
+ * @ignore
* @run main/othervm -XX:NativeMemoryTracking=detail BaselineWithParameter
*/
diff --git a/hotspot/test/runtime/NMT/CommandLineDetail.java b/hotspot/test/runtime/NMT/CommandLineDetail.java
index 01b0d0d..b3ff104 100644
--- a/hotspot/test/runtime/NMT/CommandLineDetail.java
+++ b/hotspot/test/runtime/NMT/CommandLineDetail.java
@@ -26,6 +26,7 @@
* @key nmt
* @summary Running with NMT detail should not result in an error
* @library /testlibrary
+ * @ignore
*/
import com.oracle.java.testlibrary.*;
diff --git a/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java b/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java
index 956cdd2..1c05a19 100644
--- a/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java
+++ b/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java
@@ -26,6 +26,7 @@
* @key nmt
* @summary Empty argument to NMT should result in an informative error message
* @library /testlibrary
+ * @ignore
*/
import com.oracle.java.testlibrary.*;
diff --git a/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java b/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java
index 79cc2de..6cc4510 100644
--- a/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java
+++ b/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java
@@ -26,6 +26,7 @@
* @key nmt
* @summary Invalid argument to NMT should result in an informative error message
* @library /testlibrary
+ * @ignore
*/
import com.oracle.java.testlibrary.*;
diff --git a/hotspot/test/runtime/NMT/CommandLineSummary.java b/hotspot/test/runtime/NMT/CommandLineSummary.java
index d07bc7e..bef1ab9 100644
--- a/hotspot/test/runtime/NMT/CommandLineSummary.java
+++ b/hotspot/test/runtime/NMT/CommandLineSummary.java
@@ -26,6 +26,7 @@
* @key nmt
* @summary Running with NMT summary should not result in an error
* @library /testlibrary
+ * @ignore
*/
import com.oracle.java.testlibrary.*;
diff --git a/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java b/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java
index 4193c97..a33e2ca 100644
--- a/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java
+++ b/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java
@@ -26,6 +26,7 @@
* @key nmt
* @summary Turning off NMT should not result in an error
* @library /testlibrary
+ * @ignore
*/
import com.oracle.java.testlibrary.*;
diff --git a/hotspot/test/runtime/NMT/JcmdBaselineDetail.java b/hotspot/test/runtime/NMT/JcmdBaselineDetail.java
new file mode 100644
index 0000000..dc802f2
--- /dev/null
+++ b/hotspot/test/runtime/NMT/JcmdBaselineDetail.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Verify that jcmd correctly reports that baseline succeeds with NMT enabled with detailed tracking.
+ * @library /testlibrary
+ * @ignore
+ * @run main/othervm -XX:NativeMemoryTracking=detail JcmdBaselineDetail
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class JcmdBaselineDetail {
+
+ public static void main(String args[]) throws Exception {
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ OutputAnalyzer output;
+
+ ProcessBuilder pb = new ProcessBuilder();
+
+ // Run 'jcmd <pid> VM.native_memory baseline=true'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=true"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Baseline succeeded");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/JcmdDetailDiff.java b/hotspot/test/runtime/NMT/JcmdDetailDiff.java
new file mode 100644
index 0000000..858883f
--- /dev/null
+++ b/hotspot/test/runtime/NMT/JcmdDetailDiff.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary run NMT baseline, allocate memory and verify output from detail.diff
+ * @key nmt jcmd
+ * @library /testlibrary /testlibrary/whitebox
+ * @ignore
+ * @build JcmdDetailDiff
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff
+ */
+
+import com.oracle.java.testlibrary.*;
+
+import sun.hotspot.WhiteBox;
+
+public class JcmdDetailDiff {
+
+ public static WhiteBox wb = WhiteBox.getWhiteBox();
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = new ProcessBuilder();
+ OutputAnalyzer output;
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+
+ long commitSize = 128 * 1024;
+ long reserveSize = 256 * 1024;
+ long addr;
+
+ // Run 'jcmd <pid> VM.native_memory baseline=true'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=true"});
+ pb.start().waitFor();
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Baseline succeeded");
+
+ addr = wb.NMTReserveMemory(reserveSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=256KB +256KB, committed=0KB)");
+ output.shouldContain("WB_NMTReserveMemory");
+
+ wb.NMTCommitMemory(addr, commitSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=256KB +256KB, committed=128KB +128KB)");
+ output.shouldContain("WB_NMTReserveMemory");
+
+ wb.NMTUncommitMemory(addr, commitSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=256KB +256KB, committed=0KB)");
+ output.shouldContain("WB_NMTReserveMemory");
+
+ wb.NMTReleaseMemory(addr, reserveSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/JcmdScale.java b/hotspot/test/runtime/NMT/JcmdScale.java
index e57d27b..42b7393 100644
--- a/hotspot/test/runtime/NMT/JcmdScale.java
+++ b/hotspot/test/runtime/NMT/JcmdScale.java
@@ -26,6 +26,7 @@
* @key nmt jcmd
* @summary Test the NMT scale parameter
* @library /testlibrary
+ * @ignore
* @run main/othervm -XX:NativeMemoryTracking=summary JcmdScale
*/
@@ -41,15 +42,15 @@
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=KB"});
output = new OutputAnalyzer(pb.start());
- output.shouldContain("KB, committed=");
+ output.shouldContain("KB, committed=");
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=MB"});
output = new OutputAnalyzer(pb.start());
- output.shouldContain("MB, committed=");
+ output.shouldContain("MB, committed=");
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=GB"});
output = new OutputAnalyzer(pb.start());
- output.shouldContain("GB, committed=");
+ output.shouldContain("GB, committed=");
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=apa"});
output = new OutputAnalyzer(pb.start());
@@ -57,7 +58,7 @@
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary", "scale=GB"});
output = new OutputAnalyzer(pb.start());
- output.shouldContain("GB, committed=");
+ output.shouldContain("GB, committed=");
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary", "scale=apa"});
output = new OutputAnalyzer(pb.start());
diff --git a/hotspot/test/runtime/NMT/JcmdScaleDetail.java b/hotspot/test/runtime/NMT/JcmdScaleDetail.java
new file mode 100644
index 0000000..9e2430b
--- /dev/null
+++ b/hotspot/test/runtime/NMT/JcmdScaleDetail.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Test the NMT scale parameter with detail tracking level
+ * @library /testlibrary
+ * @ignore
+ * @run main/othervm -XX:NativeMemoryTracking=detail JcmdScaleDetail
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class JcmdScaleDetail {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = new ProcessBuilder();
+ OutputAnalyzer output;
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=KB"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("KB, committed=");
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=MB"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("MB, committed=");
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=GB"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("GB, committed=");
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=apa"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Incorrect scale value: apa");
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary", "scale=GB"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("GB, committed=");
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary", "scale=apa"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Incorrect scale value: apa");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/JcmdSummaryDiff.java b/hotspot/test/runtime/NMT/JcmdSummaryDiff.java
new file mode 100644
index 0000000..7ee6c9f
--- /dev/null
+++ b/hotspot/test/runtime/NMT/JcmdSummaryDiff.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary run NMT baseline, allocate memory and verify output from summary.diff
+ * @key nmt jcmd
+ * @library /testlibrary /testlibrary/whitebox
+ * @build JcmdSummaryDiff
+ * @ignore
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary JcmdSummaryDiff
+ */
+
+import com.oracle.java.testlibrary.*;
+
+import sun.hotspot.WhiteBox;
+
+public class JcmdSummaryDiff {
+
+ public static WhiteBox wb = WhiteBox.getWhiteBox();
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = new ProcessBuilder();
+ OutputAnalyzer output;
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+
+ long commitSize = 128 * 1024;
+ long reserveSize = 256 * 1024;
+ long addr;
+
+ // Run 'jcmd <pid> VM.native_memory baseline=true'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=true"});
+ pb.start().waitFor();
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Baseline succeeded");
+
+ addr = wb.NMTReserveMemory(reserveSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=256KB +256KB, committed=0KB)");
+
+ wb.NMTCommitMemory(addr, commitSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=256KB +256KB, committed=128KB +128KB)");
+
+ wb.NMTUncommitMemory(addr, commitSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=256KB +256KB, committed=0KB)");
+
+ wb.NMTReleaseMemory(addr, reserveSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary.diff", "scale=KB"});
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java b/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java
index 9ef3743..086038e 100644
--- a/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java
+++ b/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java
@@ -26,6 +26,7 @@
* @key nmt jcmd
* @summary Verify that jcmd correctly reports that NMT is not enabled
* @library /testlibrary
+ * @ignore
* @run main JcmdWithNMTDisabled 1
*/
diff --git a/hotspot/test/runtime/NMT/MallocRoundingReportTest.java b/hotspot/test/runtime/NMT/MallocRoundingReportTest.java
new file mode 100644
index 0000000..2cf43bc
--- /dev/null
+++ b/hotspot/test/runtime/NMT/MallocRoundingReportTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test consistency of NMT by creating allocations of the Test type with various sizes and verifying visibility with jcmd
+ * @key nmt jcmd
+ * @library /testlibrary /testlibrary/whitebox
+ * @build MallocRoundingReportTest
+ * @ignore
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocRoundingReportTest
+ *
+ */
+
+import com.oracle.java.testlibrary.*;
+
+import sun.hotspot.WhiteBox;
+
+public class MallocRoundingReportTest {
+ private static long K = 1024;
+
+ public static void main(String args[]) throws Exception {
+ OutputAnalyzer output;
+ WhiteBox wb = WhiteBox.getWhiteBox();
+
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ ProcessBuilder pb = new ProcessBuilder();
+
+ long[] additionalBytes = {0, 1, 512, 650};
+ long[] kByteSize = {1024, 2048};
+ long mallocd_total = 0;
+ for ( int i = 0; i < kByteSize.length; i++)
+ {
+ for (int j = 0; j < (additionalBytes.length); j++) {
+ long curKB = kByteSize[i] + additionalBytes[j];
+ // round up/down to the nearest KB to match NMT reporting
+ long numKB = (curKB % kByteSize[i] >= 512) ? ((curKB / K) + 1) : curKB / K;
+ // Use WB API to alloc and free with the mtTest type
+ mallocd_total = wb.NMTMalloc(curKB);
+ // Run 'jcmd <pid> VM.native_memory summary', check for expected output
+ // NMT does not track memory allocations less than 1KB, and rounds to the nearest KB
+ String expectedOut = ("Test (reserved=" + numKB + "KB, committed=" + numKB + "KB)");
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary" });
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain(expectedOut);
+
+ wb.NMTFree(mallocd_total);
+ // Run 'jcmd <pid> VM.native_memory summary', check for expected output
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary" });
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+ }
+ }
+ }
+}
diff --git a/hotspot/test/runtime/NMT/MallocSiteHashOverflow.java b/hotspot/test/runtime/NMT/MallocSiteHashOverflow.java
new file mode 100644
index 0000000..32f7443
--- /dev/null
+++ b/hotspot/test/runtime/NMT/MallocSiteHashOverflow.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @key stress
+ * @test
+ * @summary Test corner case that overflows malloc site hashtable bucket
+ * @key nmt jcmd
+ * @library /testlibrary /testlibrary/whitebox
+ * @ignore - This test is disabled since it will stress NMT and timeout during normal testing
+ * @build MallocSiteHashOverflow
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm/timeout=480 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow
+ */
+
+import com.oracle.java.testlibrary.*;
+import sun.hotspot.WhiteBox;
+
+public class MallocSiteHashOverflow {
+ private static long K = 1024;
+ public static void main(String args[]) throws Exception {
+ String vm_name = System.getProperty("java.vm.name");
+
+ // For 32-bit systems, create 257 malloc sites with the same hash bucket to overflow a hash bucket
+ // For 64-bit systems, create 64K + 1 malloc sites with the same hash bucket to overflow a hash bucket
+ long entries = 257;
+ if (Platform.is64bit()) {
+ entries = 64 * K + 1;
+ }
+
+ OutputAnalyzer output;
+ WhiteBox wb = WhiteBox.getWhiteBox();
+
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ ProcessBuilder pb = new ProcessBuilder();
+
+ wb.NMTOverflowHashBucket(entries);
+
+ // Run 'jcmd <pid> VM.native_memory summary'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "statistics"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Tracking level has been downgraded due to lack of resources");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/MallocStressTest.java b/hotspot/test/runtime/NMT/MallocStressTest.java
new file mode 100644
index 0000000..4ac71c9
--- /dev/null
+++ b/hotspot/test/runtime/NMT/MallocStressTest.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @key stress
+ * @test
+ * @summary Stress test for malloc tracking
+ * @key nmt jcmd
+ * @library /testlibrary /testlibrary/whitebox
+ * @build MallocStressTest
+ * @ignore - This test is disabled since it will stress NMT and timeout during normal testing
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
+ */
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import com.oracle.java.testlibrary.*;
+import sun.hotspot.WhiteBox;
+
+public class MallocStressTest {
+ private static int K = 1024;
+
+ // The stress test runs in three phases:
+ // 1. alloc: A lot of malloc with fewer free, which simulates a burst memory allocation
+ // that is usually seen during startup or class loading.
+ // 2. pause: Pause the test to check accuracy of native memory tracking
+ // 3. release: Release all malloc'd memory and check native memory tracking result.
+ public enum TestPhase {
+ alloc,
+ pause,
+ release
+ };
+
+ static TestPhase phase = TestPhase.alloc;
+
+ // malloc'd memory
+ static ArrayList<MallocMemory> mallocd_memory = new ArrayList<MallocMemory>();
+ static long mallocd_total = 0;
+ static WhiteBox whiteBox;
+ static AtomicInteger pause_count = new AtomicInteger();
+
+ static boolean is_64_bit_system;
+
+ private static boolean is_64_bit_system() { return is_64_bit_system; }
+
+ public static void main(String args[]) throws Exception {
+ is_64_bit_system = (Platform.is64bit());
+
+ OutputAnalyzer output;
+ whiteBox = WhiteBox.getWhiteBox();
+
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ ProcessBuilder pb = new ProcessBuilder();
+
+ AllocThread[] alloc_threads = new AllocThread[256];
+ ReleaseThread[] release_threads = new ReleaseThread[64];
+
+ int index;
+ // Create many allocation threads
+ for (index = 0; index < alloc_threads.length; index ++) {
+ alloc_threads[index] = new AllocThread();
+ }
+
+ // Fewer release threads
+ for (index = 0; index < release_threads.length; index ++) {
+ release_threads[index] = new ReleaseThread();
+ }
+
+ if (is_64_bit_system()) {
+ sleep_wait(2*60*1000);
+ } else {
+ sleep_wait(60*1000);
+ }
+ // pause the stress test
+ phase = TestPhase.pause;
+ while (pause_count.intValue() < alloc_threads.length + release_threads.length) {
+ sleep_wait(10);
+ }
+
+ long mallocd_total_in_KB = (mallocd_total + K / 2) / K;
+
+ // Now check if the result from NMT matches the total memory allocated.
+ String expected_test_summary = "Test (reserved=" + mallocd_total_in_KB +"KB, committed=" + mallocd_total_in_KB + "KB)";
+ // Run 'jcmd <pid> VM.native_memory summary'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain(expected_test_summary);
+
+ // Release all allocated memory
+ phase = TestPhase.release;
+ synchronized(mallocd_memory) {
+ mallocd_memory.notifyAll();
+ }
+
+ // Join all threads
+ for (index = 0; index < alloc_threads.length; index ++) {
+ try {
+ alloc_threads[index].join();
+ } catch (InterruptedException e) {
+ }
+ }
+
+ for (index = 0; index < release_threads.length; index ++) {
+ try {
+ release_threads[index].join();
+ } catch (InterruptedException e) {
+ }
+ }
+
+ // All test memory allocated should be released
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+
+ // Verify that tracking level has not been downgraded
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "statistics"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Tracking level has been downgraded due to lack of resources");
+ }
+
+ private static void sleep_wait(int n) {
+ try {
+ Thread.sleep(n);
+ } catch (InterruptedException e) {
+ }
+ }
+
+
+ static class MallocMemory {
+ private long addr;
+ private int size;
+
+ MallocMemory(long addr, int size) {
+ this.addr = addr;
+ this.size = size;
+ }
+
+ long addr() { return this.addr; }
+ int size() { return this.size; }
+ }
+
+ static class AllocThread extends Thread {
+ AllocThread() {
+ this.setName("MallocThread");
+ this.start();
+ }
+
+ // AllocThread only runs "Alloc" phase
+ public void run() {
+ Random random = new Random();
+ while (MallocStressTest.phase == TestPhase.alloc) {
+ int r = Math.abs(random.nextInt());
+ // Only malloc small amount to avoid OOM
+ int size = r % 32;
+ if (is_64_bit_system()) {
+ r = r % 32 * K;
+ } else {
+ r = r % 64;
+ }
+ if (size == 0) size = 1;
+ long addr = MallocStressTest.whiteBox.NMTMallocWithPseudoStack(size, r);
+ if (addr != 0) {
+ MallocMemory mem = new MallocMemory(addr, size);
+ synchronized(MallocStressTest.mallocd_memory) {
+ MallocStressTest.mallocd_memory.add(mem);
+ MallocStressTest.mallocd_total += size;
+ }
+ } else {
+ System.out.println("Out of malloc memory");
+ break;
+ }
+ }
+ MallocStressTest.pause_count.incrementAndGet();
+ }
+ }
+
+ static class ReleaseThread extends Thread {
+ private Random random = new Random();
+ ReleaseThread() {
+ this.setName("ReleaseThread");
+ this.start();
+ }
+
+ public void run() {
+ while(true) {
+ switch(MallocStressTest.phase) {
+ case alloc:
+ slow_release();
+ break;
+ case pause:
+ enter_pause();
+ break;
+ case release:
+ quick_release();
+ return;
+ }
+ }
+ }
+
+ private void enter_pause() {
+ MallocStressTest.pause_count.incrementAndGet();
+ while (MallocStressTest.phase != MallocStressTest.TestPhase.release) {
+ try {
+ synchronized(MallocStressTest.mallocd_memory) {
+ MallocStressTest.mallocd_memory.wait(10);
+ }
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+
+ private void quick_release() {
+ List<MallocMemory> free_list;
+ while (true) {
+ synchronized(MallocStressTest.mallocd_memory) {
+ if (MallocStressTest.mallocd_memory.isEmpty()) return;
+ int size = Math.min(MallocStressTest.mallocd_memory.size(), 5000);
+ List<MallocMemory> subList = MallocStressTest.mallocd_memory.subList(0, size);
+ free_list = new ArrayList<MallocMemory>(subList);
+ subList.clear();
+ }
+ for (int index = 0; index < free_list.size(); index ++) {
+ MallocMemory mem = free_list.get(index);
+ MallocStressTest.whiteBox.NMTFree(mem.addr());
+ }
+ }
+ }
+
+ private void slow_release() {
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ }
+ synchronized(MallocStressTest.mallocd_memory) {
+ if (MallocStressTest.mallocd_memory.isEmpty()) return;
+ int n = Math.abs(random.nextInt()) % MallocStressTest.mallocd_memory.size();
+ MallocMemory mem = mallocd_memory.remove(n);
+ MallocStressTest.whiteBox.NMTFree(mem.addr());
+ MallocStressTest.mallocd_total -= mem.size();
+ }
+ }
+ }
+}
diff --git a/hotspot/test/runtime/NMT/MallocTestType.java b/hotspot/test/runtime/NMT/MallocTestType.java
index 8a39af7..e7339a5 100644
--- a/hotspot/test/runtime/NMT/MallocTestType.java
+++ b/hotspot/test/runtime/NMT/MallocTestType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
* @key nmt jcmd
* @library /testlibrary /testlibrary/whitebox
* @build MallocTestType
+ * @ignore
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType
*/
@@ -51,11 +53,6 @@
long memAlloc1 = wb.NMTMalloc(512 * 1024);
wb.NMTFree(memAlloc2);
- // Use WB API to ensure that all data has been merged before we continue
- if (!wb.NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
- }
-
// Run 'jcmd <pid> VM.native_memory summary'
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary"});
output = new OutputAnalyzer(pb.start());
@@ -64,10 +61,6 @@
// Free the memory allocated by NMTAllocTest
wb.NMTFree(memAlloc1);
- // Use WB API to ensure that all data has been merged before we continue
- if (!wb.NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
- }
output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Test (reserved=");
}
diff --git a/hotspot/test/runtime/NMT/PrintNMTStatistics.java b/hotspot/test/runtime/NMT/PrintNMTStatistics.java
index 534fe7a..a188f74 100644
--- a/hotspot/test/runtime/NMT/PrintNMTStatistics.java
+++ b/hotspot/test/runtime/NMT/PrintNMTStatistics.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,9 @@
* @summary Make sure PrintNMTStatistics works on normal JVM exit
* @library /testlibrary /testlibrary/whitebox
* @build PrintNMTStatistics
+ * @ignore
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main PrintNMTStatistics
*/
@@ -45,10 +47,6 @@
// We start a new java process running with an argument and use WB API to ensure
// we have data for NMT on VM exit
if (args.length > 0) {
- // Use WB API to ensure that all data has been merged before we continue
- if (!WhiteBox.getWhiteBox().NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
- }
return;
}
diff --git a/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java b/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
index 1c25f28..cdc3ded 100644
--- a/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
+++ b/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
@@ -26,6 +26,7 @@
* @key nmt
* @summary Trying to enable PrintNMTStatistics should result in a warning
* @library /testlibrary
+ * @ignore
*/
import com.oracle.java.testlibrary.*;
diff --git a/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java b/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java
index 66bc3b1..8d18f50 100644
--- a/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java
+++ b/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,9 @@
* @key nmt regression
* @library /testlibrary /testlibrary/whitebox
* @build ReleaseCommittedMemory
+ * @ignore
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory
*/
@@ -44,7 +46,6 @@
addr = wb.NMTReserveMemory(reserveSize);
wb.NMTCommitMemory(addr, 128*1024);
wb.NMTReleaseMemory(addr, reserveSize);
- wb.NMTWaitForDataMerge();
}
}
diff --git a/hotspot/test/runtime/NMT/ReleaseNoCommit.java b/hotspot/test/runtime/NMT/ReleaseNoCommit.java
new file mode 100644
index 0000000..b7c2ea9
--- /dev/null
+++ b/hotspot/test/runtime/NMT/ReleaseNoCommit.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Release uncommitted memory and make sure NMT handles it correctly
+ * @key nmt regression
+ * @library /testlibrary /testlibrary/whitebox
+ * @build ReleaseNoCommit
+ * @ignore
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit
+ */
+
+import com.oracle.java.testlibrary.JDKToolFinder;
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+
+import sun.hotspot.WhiteBox;
+
+public class ReleaseNoCommit {
+
+ public static void main(String args[]) throws Exception {
+ WhiteBox wb = WhiteBox.getWhiteBox();
+ long reserveSize = 256 * 1024;
+ long addr;
+
+ ProcessBuilder pb = new ProcessBuilder();
+ OutputAnalyzer output;
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+
+ addr = wb.NMTReserveMemory(reserveSize);
+ // Check for reserved
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=KB"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain(" Test (reserved=256KB, committed=0KB)");
+
+ wb.NMTReleaseMemory(addr, reserveSize);
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=KB"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/ShutdownTwice.java b/hotspot/test/runtime/NMT/ShutdownTwice.java
index 1bb327a..d6dcf80 100644
--- a/hotspot/test/runtime/NMT/ShutdownTwice.java
+++ b/hotspot/test/runtime/NMT/ShutdownTwice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @key nmt jcmd
* @summary Run shutdown twice
* @library /testlibrary
+ * @ignore
* @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice
*/
@@ -45,12 +46,12 @@
output = new OutputAnalyzer(pb.start());
// Verify that jcmd reports that NMT is shutting down
- output.shouldContain("Shutdown is in progress, it will take a few moments to completely shutdown");
+ output.shouldContain("Native memory tracking has been turned off");
// Run shutdown again
output = new OutputAnalyzer(pb.start());
// Verify that jcmd reports that NMT has been shutdown already
- output.shouldContain("Native memory tracking has been shutdown by user");
+ output.shouldContain("Native memory tracking has been shutdown");
}
}
diff --git a/hotspot/test/runtime/NMT/SummaryAfterShutdown.java b/hotspot/test/runtime/NMT/SummaryAfterShutdown.java
index 96061f3..1baa484 100644
--- a/hotspot/test/runtime/NMT/SummaryAfterShutdown.java
+++ b/hotspot/test/runtime/NMT/SummaryAfterShutdown.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @key nmt jcmd
* @summary Verify that jcmd correctly reports that NMT is not enabled after a shutdown
* @library /testlibrary
+ * @ignore
* @run main/othervm -XX:NativeMemoryTracking=detail SummaryAfterShutdown
*/
@@ -44,13 +45,13 @@
output = new OutputAnalyzer(pb.start());
// Verify that jcmd reports that NMT is shutting down
- output.shouldContain("Shutdown is in progress, it will take a few moments to completely shutdown");
+ output.shouldContain("Native memory tracking has been turned off");
// Run 'jcmd <pid> VM.native_memory summary'
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary"});
output = new OutputAnalyzer(pb.start());
// Verify that jcmd reports that NMT has been shutdown
- output.shouldContain("Native memory tracking has been shutdown by user");
+ output.shouldContain("Native memory tracking has been shutdown");
}
}
diff --git a/hotspot/test/runtime/NMT/SummarySanityCheck.java b/hotspot/test/runtime/NMT/SummarySanityCheck.java
index 221ad93..e48123e 100644
--- a/hotspot/test/runtime/NMT/SummarySanityCheck.java
+++ b/hotspot/test/runtime/NMT/SummarySanityCheck.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
* @summary Sanity check the output of NMT
* @library /testlibrary /testlibrary/whitebox
* @build SummarySanityCheck
+ * @ignore
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
*/
@@ -44,11 +46,6 @@
// Grab my own PID
String pid = Integer.toString(ProcessTools.getProcessId());
- // Use WB API to ensure that all data has been merged before we continue
- if (!WhiteBox.getWhiteBox().NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
- }
-
ProcessBuilder pb = new ProcessBuilder();
// Run 'jcmd <pid> VM.native_memory summary scale=KB'
@@ -69,13 +66,13 @@
// Match '- <mtType> (reserved=<reserved>KB, committed=<committed>KB)
Pattern mtTypePattern = Pattern.compile("-\\s+(?<typename>[\\w\\s]+)\\(reserved=(?<reserved>\\d+)KB,\\scommitted=(?<committed>\\d+)KB\\)");
// Match 'Total: reserved=<reserved>KB, committed=<committed>KB'
- Pattern totalMemoryPattern = Pattern.compile("Total\\:\\s\\sreserved=(?<reserved>\\d+)KB,\\s\\scommitted=(?<committed>\\d+)KB");
+ Pattern totalMemoryPattern = Pattern.compile("Total\\:\\sreserved=(?<reserved>\\d+)KB,\\scommitted=(?<committed>\\d+)KB");
for (int i = 0; i < lines.length; i++) {
if (lines[i].startsWith("Total")) {
Matcher totalMemoryMatcher = totalMemoryPattern.matcher(lines[i]);
- if (totalMemoryMatcher.matches() && totalMemoryMatcher.groupCount() == 2) {
+ if (totalMemoryMatcher.matches()) {
totalCommitted = Integer.parseInt(totalMemoryMatcher.group("committed"));
totalReserved = Integer.parseInt(totalMemoryMatcher.group("reserved"));
} else {
diff --git a/hotspot/test/runtime/NMT/ThreadedMallocTestType.java b/hotspot/test/runtime/NMT/ThreadedMallocTestType.java
index eadb719..c26f0b0 100644
--- a/hotspot/test/runtime/NMT/ThreadedMallocTestType.java
+++ b/hotspot/test/runtime/NMT/ThreadedMallocTestType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@
* @key nmt jcmd
* @library /testlibrary /testlibrary/whitebox
* @build ThreadedMallocTestType
+ * @ignore
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
*/
@@ -58,11 +60,6 @@
allocThread.start();
allocThread.join();
- // Use WB API to ensure that all data has been merged before we continue
- if (!wb.NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
- }
-
// Run 'jcmd <pid> VM.native_memory summary'
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary"});
output = new OutputAnalyzer(pb.start());
@@ -80,11 +77,6 @@
freeThread.start();
freeThread.join();
- // Use WB API to ensure that all data has been merged before we continue
- if (!wb.NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
- }
-
output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Test (reserved=");
}
diff --git a/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java b/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java
index 1a7b929..1bd30c1 100644
--- a/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java
+++ b/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@
* @key nmt jcmd
* @library /testlibrary /testlibrary/whitebox
* @build ThreadedVirtualAllocTestType
+ * @ignore
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
*/
@@ -60,8 +62,6 @@
reserveThread.start();
reserveThread.join();
- mergeData();
-
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=512KB, committed=0KB)");
@@ -77,8 +77,6 @@
commitThread.start();
commitThread.join();
- mergeData();
-
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=512KB, committed=128KB)");
if (has_nmt_detail) {
@@ -93,8 +91,6 @@
uncommitThread.start();
uncommitThread.join();
- mergeData();
-
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=512KB, committed=0KB)");
output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed");
@@ -107,17 +103,9 @@
releaseThread.start();
releaseThread.join();
- mergeData();
-
output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Test (reserved=");
output.shouldNotContain("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved");
}
- public static void mergeData() throws Exception {
- // Use WB API to ensure that all data has been merged before we continue
- if (!wb.NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
}
- }
-}
diff --git a/hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java b/hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java
new file mode 100644
index 0000000..76a278b
--- /dev/null
+++ b/hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test reserve/commit/uncommit/release of virtual memory and that we track it correctly
+ * @key nmt jcmd
+ * @library /testlibrary /testlibrary/whitebox
+ * @ignore
+ * @build VirtualAllocCommitUncommitRecommit
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitUncommitRecommit
+ *
+ */
+
+import com.oracle.java.testlibrary.*;
+
+import sun.hotspot.WhiteBox;
+
+public class VirtualAllocCommitUncommitRecommit {
+
+ public static WhiteBox wb = WhiteBox.getWhiteBox();
+
+ public static void main(String args[]) throws Exception {
+ OutputAnalyzer output;
+ long commitSize = 4 * 1024; // 4KB
+ long reserveSize = 1024 * 1024; // 1024KB
+ long addr;
+
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ ProcessBuilder pb = new ProcessBuilder();
+
+ boolean has_nmt_detail = wb.NMTIsDetailSupported();
+ if (has_nmt_detail) {
+ System.out.println("NMT detail support detected.");
+ } else {
+ System.out.println("NMT detail support not detected.");
+ }
+
+ // reserve
+ addr = wb.NMTReserveMemory(reserveSize);
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid,
+ "VM.native_memory", "detail" });
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=0KB)");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+
+ long addrA = addr;
+ long addrB = addr + commitSize;
+ long addrC = addr + (2 * commitSize);
+ long addrD = addr + (3 * commitSize);
+ long addrE = addr + (4 * commitSize);
+ long addrF = addr + (5 * commitSize);
+
+ // commit ABCD
+ wb.NMTCommitMemory(addrA, commitSize);
+ wb.NMTCommitMemory(addrB, commitSize);
+ wb.NMTCommitMemory(addrC, commitSize);
+ wb.NMTCommitMemory(addrD, commitSize);
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=16KB)");
+
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+ // uncommit BC
+ wb.NMTUncommitMemory(addrB, commitSize);
+ wb.NMTUncommitMemory(addrC, commitSize);
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=8KB)");
+
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+
+ // commit EF
+ wb.NMTCommitMemory(addrE, commitSize);
+ wb.NMTCommitMemory(addrF, commitSize);
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=16KB)");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+
+ // uncommit A
+ wb.NMTUncommitMemory(addrA, commitSize);
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=12KB)");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+
+ // commit ABC
+ wb.NMTCommitMemory(addrA, commitSize);
+ wb.NMTCommitMemory(addrB, commitSize);
+ wb.NMTCommitMemory(addrC, commitSize);
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=24KB)");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+
+ // uncommit ABCDEF
+ wb.NMTUncommitMemory(addrA, commitSize);
+ wb.NMTUncommitMemory(addrB, commitSize);
+ wb.NMTUncommitMemory(addrC, commitSize);
+ wb.NMTUncommitMemory(addrD, commitSize);
+ wb.NMTUncommitMemory(addrE, commitSize);
+ wb.NMTUncommitMemory(addrF, commitSize);
+
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Test (reserved=1024KB, committed=0KB)");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize)
+ + "\\] reserved 1024KB for Test");
+ }
+
+ // release
+ wb.NMTReleaseMemory(addr, reserveSize);
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+ output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*"
+ + Long.toHexString(addr + reserveSize) + "\\] reserved");
+ }
+}
diff --git a/hotspot/test/runtime/NMT/VirtualAllocTestType.java b/hotspot/test/runtime/NMT/VirtualAllocTestType.java
index 86e751c..b298aed 100644
--- a/hotspot/test/runtime/NMT/VirtualAllocTestType.java
+++ b/hotspot/test/runtime/NMT/VirtualAllocTestType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,10 @@
* @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly
* @key nmt jcmd
* @library /testlibrary /testlibrary/whitebox
+ * @ignore
* @build VirtualAllocTestType
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType
*/
@@ -54,7 +56,6 @@
}
addr = wb.NMTReserveMemory(reserveSize);
- mergeData();
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
output = new OutputAnalyzer(pb.start());
@@ -65,7 +66,6 @@
wb.NMTCommitMemory(addr, commitSize);
- mergeData();
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=256KB, committed=128KB)");
@@ -75,24 +75,15 @@
wb.NMTUncommitMemory(addr, commitSize);
- mergeData();
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=256KB, committed=0KB)");
output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed");
wb.NMTReleaseMemory(addr, reserveSize);
- mergeData();
output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Test (reserved=");
output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved");
}
-
- public static void mergeData() throws Exception {
- // Use WB API to ensure that all data has been merged before we continue
- if (!wb.NMTWaitForDataMerge()) {
- throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
}
- }
-}
diff --git a/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java b/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java
index dff6192..6989a64 100644
--- a/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java
+++ b/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java
@@ -21,8 +21,7 @@
* questions.
*/
-/* @ignore JDK-8043896
- * @test LimitSharedSizes
+/* @test LimitSharedSizes
* @summary Test handling of limits on shared space size
* @library /testlibrary
* @run main LimitSharedSizes
diff --git a/hotspot/test/runtime/interned/SanityTest.java b/hotspot/test/runtime/interned/SanityTest.java
index 779d3fc..84bc1fe 100644
--- a/hotspot/test/runtime/interned/SanityTest.java
+++ b/hotspot/test/runtime/interned/SanityTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build SanityTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest
*/
diff --git a/hotspot/test/runtime/jsig/Test8017498.sh b/hotspot/test/runtime/jsig/Test8017498.sh
index a28bbe4..3ef0dd7 100644
--- a/hotspot/test/runtime/jsig/Test8017498.sh
+++ b/hotspot/test/runtime/jsig/Test8017498.sh
@@ -24,7 +24,6 @@
#
##
-## @ignore 8028806
## @test Test8017498.sh
## @bug 8017498
## @bug 8020791
@@ -75,7 +74,7 @@
$gcc_cmd -DLINUX -fPIC -shared \
${EXTRA_CFLAG} -z noexecstack \
- -o ${TESTSRC}${FS}libTestJNI.so \
+ -o libTestJNI.so \
-I${COMPILEJAVA}${FS}include \
-I${COMPILEJAVA}${FS}include${FS}linux \
${TESTSRC}${FS}TestJNI.c
@@ -83,7 +82,7 @@
# run the java test in the background
cmd="LD_PRELOAD=$MY_LD_PRELOAD \
${TESTJAVA}${FS}bin${FS}java \
- -Djava.library.path=${TESTSRC}${FS} -server TestJNI 100"
+ -Djava.library.path=. -server TestJNI 100"
echo "$cmd > test.out 2>&1"
eval $cmd > test.out 2>&1
diff --git a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java b/hotspot/test/runtime/memory/ReadFromNoaccessArea.java
index 4842402..7a6c71d 100644
--- a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java
+++ b/hotspot/test/runtime/memory/ReadFromNoaccessArea.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build ReadFromNoaccessArea
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ReadFromNoaccessArea
*/
diff --git a/hotspot/test/runtime/memory/ReserveMemory.java b/hotspot/test/runtime/memory/ReserveMemory.java
index 3a65ca6..1708657 100644
--- a/hotspot/test/runtime/memory/ReserveMemory.java
+++ b/hotspot/test/runtime/memory/ReserveMemory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build ReserveMemory
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ReserveMemory
*/
diff --git a/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java b/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java
index 35b855e..e979504 100644
--- a/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java
+++ b/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build RunUnitTestsConcurrently
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000
*/
diff --git a/hotspot/test/runtime/memory/StressVirtualSpaceResize.java b/hotspot/test/runtime/memory/StressVirtualSpaceResize.java
index df97801..ebe5110 100644
--- a/hotspot/test/runtime/memory/StressVirtualSpaceResize.java
+++ b/hotspot/test/runtime/memory/StressVirtualSpaceResize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build StressVirtualSpaceResize
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize
*/
diff --git a/hotspot/test/runtime/whitebox/WBStackSize.java b/hotspot/test/runtime/whitebox/WBStackSize.java
index ff1a4dc..b487bb4 100644
--- a/hotspot/test/runtime/whitebox/WBStackSize.java
+++ b/hotspot/test/runtime/whitebox/WBStackSize.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build WBStackSize
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xss512k WBStackSize
*/
diff --git a/hotspot/test/sanity/WBApi.java b/hotspot/test/sanity/WBApi.java
index 3d92677..58c100f 100644
--- a/hotspot/test/sanity/WBApi.java
+++ b/hotspot/test/sanity/WBApi.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build WBApi
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
*/
diff --git a/hotspot/test/sanity/WhiteBox.java b/hotspot/test/sanity/WhiteBox.java
index a366e4d..19e231a 100644
--- a/hotspot/test/sanity/WhiteBox.java
+++ b/hotspot/test/sanity/WhiteBox.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
* @library /testlibrary
* @compile WhiteBox.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox
* @clean sun.hotspot.WhiteBox
*/
diff --git a/hotspot/test/serviceability/ParserTest.java b/hotspot/test/serviceability/ParserTest.java
index 8db151f..264b25c 100644
--- a/hotspot/test/serviceability/ParserTest.java
+++ b/hotspot/test/serviceability/ParserTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.*
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
*/
diff --git a/hotspot/test/serviceability/attach/AttachSetGetFlag.java b/hotspot/test/serviceability/attach/AttachSetGetFlag.java
new file mode 100644
index 0000000..230ef3c
--- /dev/null
+++ b/hotspot/test/serviceability/attach/AttachSetGetFlag.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8054823
+ * @summary Tests the setFlag and printFlag attach command
+ * @library /testlibrary
+ * @build com.oracle.java.testlibrary.* AttachSetGetFlag
+ * @run driver AttachSetGetFlag
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import sun.tools.attach.HotSpotVirtualMachine;
+
+import com.oracle.java.testlibrary.Asserts;
+import com.oracle.java.testlibrary.Platform;
+import com.oracle.java.testlibrary.ProcessTools;
+import com.sun.tools.attach.VirtualMachine;
+
+public class AttachSetGetFlag {
+
+ public static void main(String... args) throws Exception {
+ // Test a manageable uintx flag.
+ testGetFlag("MaxHeapFreeRatio", "60");
+ testSetFlag("MaxHeapFreeRatio", "50", "60");
+
+ // Test a non-manageable size_t flag.
+ // Since it is not manageable, we can't test the setFlag functionality.
+ testGetFlag("ArrayAllocatorMallocLimit", "128");
+ // testSetFlag("ArrayAllocatorMallocLimit", "64", "128");
+ }
+
+ public static ProcessBuilder runTarget(String flagName, String flagValue) throws Exception {
+ return ProcessTools.createJavaProcessBuilder(
+ "-XX:+UnlockExperimentalVMOptions",
+ "-XX:" + flagName + "=" + flagValue,
+ "AttachSetGetFlag$Target");
+ }
+
+ public static void testGetFlag(String flagName, String flagValue) throws Exception {
+ ProcessBuilder pb = runTarget(flagName, flagValue);
+
+ Process target = pb.start();
+
+ try {
+ waitForReady(target);
+
+ int pid = (int)target.getPid();
+
+ HotSpotVirtualMachine vm = (HotSpotVirtualMachine)VirtualMachine.attach(((Integer)pid).toString());
+
+ // Test Get
+ BufferedReader remoteDataReader = new BufferedReader(new InputStreamReader(
+ vm.printFlag(flagName)));
+
+ boolean foundExpectedLine = false;
+
+ String line = null;
+ while((line = remoteDataReader.readLine()) != null) {
+ System.out.println("printFlag: " + line);
+ if (line.equals("-XX:" + flagName + "=" + flagValue)) {
+ foundExpectedLine = true;
+ }
+ }
+
+ Asserts.assertTrue(foundExpectedLine, "Didn't get the expected output: '-XX:" + flagName + "=" + flagValue + "'");
+
+ vm.detach();
+ }
+ finally {
+ target.destroy();
+ target.waitFor();
+ }
+ }
+
+ public static void testSetFlag(String flagName, String initialFlagValue, String flagValue) throws Exception {
+ ProcessBuilder pb = runTarget(flagName, initialFlagValue);
+
+ Process target = pb.start();
+
+ try {
+ waitForReady(target);
+
+ int pid = (int)target.getPid();
+
+ HotSpotVirtualMachine vm = (HotSpotVirtualMachine)VirtualMachine.attach(((Integer)pid).toString());
+
+ // First set the value.
+ BufferedReader remoteDataReader = new BufferedReader(new InputStreamReader(
+ vm.setFlag(flagName, flagValue)));
+
+ String line;
+ while((line = remoteDataReader.readLine()) != null) {
+ System.out.println("setFlag: " + line);
+ // Just empty the stream.
+ }
+ remoteDataReader.close();
+
+ // Then read and make sure we get back the set value.
+ remoteDataReader = new BufferedReader(new InputStreamReader(vm.printFlag(flagName)));
+
+ boolean foundExpectedLine = false;
+ line = null;
+ while((line = remoteDataReader.readLine()) != null) {
+ System.out.println("getFlag: " + line);
+ if (line.equals("-XX:" + flagName + "=" + flagValue)) {
+ foundExpectedLine = true;
+ }
+ }
+
+ Asserts.assertTrue(foundExpectedLine, "Didn't get the expected output: '-XX:" + flagName + "=" + flagValue + "'");
+
+ vm.detach();
+
+ } finally {
+ target.destroy();
+ target.waitFor();
+ }
+ }
+
+ private static void waitForReady(Process target) throws Exception {
+ InputStream os = target.getInputStream();
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(os))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ if ("Ready".equals(line)) {
+ return;
+ }
+ }
+ }
+ }
+
+
+ public static class Target {
+ public static void main(String [] args) throws Exception {
+ System.out.println("Ready");
+ System.out.flush();
+ while (true) {
+ Thread.sleep(1000);
+ }
+ }
+ }
+}
diff --git a/hotspot/test/test_env.sh b/hotspot/test/test_env.sh
index fa912dd..e9fc3ab 100644
--- a/hotspot/test/test_env.sh
+++ b/hotspot/test/test_env.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,9 @@
fi
echo "TESTCLASSES=${TESTCLASSES}"
+TESTOPTS="${TESTVMOPTS} ${TESTJAVAOPTS}"
+echo "TESTOPTS=${TESTOPTS}"
+
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
@@ -101,14 +104,14 @@
echo "THIS_DIR=${THIS_DIR}"
# Check to ensure the java defined actually works
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
+${TESTJAVA}${FS}bin${FS}java ${TESTOPTS} -version
if [ $? != 0 ]; then
- echo "Wrong TESTJAVA or TESTVMOPTS:"
- echo $TESTJAVA TESTVMOPTS
+ echo "Wrong TESTJAVA or TESTJAVAOPTS or TESTVMOPTS:"
+ echo ''$TESTJAVA'' ''$TESTJAVAOPTS'' ''$TESTVMOPTS''
exit 1
fi
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Xinternalversion > vm_version.out 2>&1
+${TESTJAVA}${FS}bin${FS}java ${TESTOPTS} -Xinternalversion > vm_version.out 2>&1
VM_TYPE="unknown"
grep "Server" vm_version.out > ${NULL}
diff --git a/hotspot/test/testlibrary/ctw/test/ClassesDirTest.java b/hotspot/test/testlibrary/ctw/test/ClassesDirTest.java
index cc28d40..5cbaaf9 100644
--- a/hotspot/test/testlibrary/ctw/test/ClassesDirTest.java
+++ b/hotspot/test/testlibrary/ctw/test/ClassesDirTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
* @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassesDirTest prepare
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes
* @run main ClassesDirTest check ctw.log
diff --git a/hotspot/test/testlibrary/ctw/test/ClassesListTest.java b/hotspot/test/testlibrary/ctw/test/ClassesListTest.java
index 64c5203..ea8abe2 100644
--- a/hotspot/test/testlibrary/ctw/test/ClassesListTest.java
+++ b/hotspot/test/testlibrary/ctw/test/ClassesListTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
* @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassesListTest prepare
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes.lst
* @run main ClassesListTest check ctw.log
diff --git a/hotspot/test/testlibrary/ctw/test/JarDirTest.java b/hotspot/test/testlibrary/ctw/test/JarDirTest.java
index abc5a08..193aea4 100644
--- a/hotspot/test/testlibrary/ctw/test/JarDirTest.java
+++ b/hotspot/test/testlibrary/ctw/test/JarDirTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
* @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main JarDirTest prepare
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/*
* @run main JarDirTest check ctw.log
diff --git a/hotspot/test/testlibrary/ctw/test/JarsTest.java b/hotspot/test/testlibrary/ctw/test/JarsTest.java
index c9bfb30..87bafe8 100644
--- a/hotspot/test/testlibrary/ctw/test/JarsTest.java
+++ b/hotspot/test/testlibrary/ctw/test/JarsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
* @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main JarsTest prepare
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld foo.jar bar.jar
* @run main JarsTest check ctw.log
diff --git a/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java b/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java
index bb58361..84f97aa 100644
--- a/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java
+++ b/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java
@@ -95,7 +95,8 @@
public native void NMTCommitMemory(long addr, long size);
public native void NMTUncommitMemory(long addr, long size);
public native void NMTReleaseMemory(long addr, long size);
- public native boolean NMTWaitForDataMerge();
+ public native void NMTOverflowHashBucket(long num);
+ public native long NMTMallocWithPseudoStack(long size, int index);
public native boolean NMTIsDetailSupported();
// Compiler
@@ -167,17 +168,20 @@
public native void setIntxVMFlag(String name, long value);
public native void setUintxVMFlag(String name, long value);
public native void setUint64VMFlag(String name, long value);
+ public native void setSizeTVMFlag(String name, long value);
public native void setStringVMFlag(String name, String value);
public native void setDoubleVMFlag(String name, double value);
public native Boolean getBooleanVMFlag(String name);
public native Long getIntxVMFlag(String name);
public native Long getUintxVMFlag(String name);
public native Long getUint64VMFlag(String name);
+ public native Long getSizeTVMFlag(String name);
public native String getStringVMFlag(String name);
public native Double getDoubleVMFlag(String name);
private final List<Function<String,Object>> flagsGetters = Arrays.asList(
this::getBooleanVMFlag, this::getIntxVMFlag, this::getUintxVMFlag,
- this::getUint64VMFlag, this::getStringVMFlag, this::getDoubleVMFlag);
+ this::getUint64VMFlag, this::getSizeTVMFlag, this::getStringVMFlag,
+ this::getDoubleVMFlag);
public Object getVMFlag(String name) {
return flagsGetters.stream()
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java
index a76fd4d..ae068f8 100644
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build BooleanTest ClassFileInstaller sun.hotspot.WhiteBox com.oracle.java.testlibrary.*
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BooleanTest
* @summary testing of WB::set/getBooleanVMFlag()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java
index 2110fb9..0b320e7 100644
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build DoubleTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DoubleTest
* @summary testing of WB::set/getDoubleVMFlag()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java
index 6ffbd83..3b957ef 100644
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build IntxTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI IntxTest
* @summary testing of WB::set/getIntxVMFlag()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java
new file mode 100644
index 0000000..51559cf
--- /dev/null
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test SizeTTest
+ * @bug 8054823
+ * @library /testlibrary /testlibrary/whitebox
+ * @build SizeTTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions SizeTTest
+ * @summary testing of WB::set/getSizeTVMFlag()
+ */
+import com.oracle.java.testlibrary.Platform;
+
+public class SizeTTest {
+ private static final String FLAG_NAME = "ArrayAllocatorMallocLimit";
+ private static final Long[] TESTS = {0L, 100L, (long) Integer.MAX_VALUE,
+ (1L << 32L) - 1L, 1L << 32L};
+ private static final Long[] EXPECTED_64 = TESTS;
+ private static final Long[] EXPECTED_32 = {0L, 100L,
+ (long) Integer.MAX_VALUE, (1L << 32L) - 1L, 0L};
+
+ public static void main(String[] args) throws Exception {
+ VmFlagTest.runTest(FLAG_NAME, TESTS,
+ Platform.is64bit() ? EXPECTED_64 : EXPECTED_32,
+ VmFlagTest.WHITE_BOX::setSizeTVMFlag,
+ VmFlagTest.WHITE_BOX::getSizeTVMFlag);
+ }
+}
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java
index 70aa066..77a02d3 100644
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build StringTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StringTest
* @summary testing of WB::set/getStringVMFlag()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java
index 2f616d4..fd3a82c 100644
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build Uint64Test
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Uint64Test
* @summary testing of WB::set/getUint64VMFlag()
* @author igor.ignatyev@oracle.com
diff --git a/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java b/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java
index 7141221..40eb85f 100644
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java
@@ -27,6 +27,7 @@
* @library /testlibrary /testlibrary/whitebox
* @build UintxTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UintxTest
* @summary testing of WB::set/getUintxVMFlag()
* @author igor.ignatyev@oracle.com
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 051c0879..13a0df7 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -269,3 +269,4 @@
345af113f57206711f75089c3ebf84a36a789122 jdk9-b24
73757f4b8aa353ca8937abc07e79e7ece4c011a1 jdk9-b25
a5aea8318ae4a9c2105228568688875142d70344 jdk9-b26
+2bfaf29cc90b19948938e3ef1a0983eee68806c7 jdk9-b27
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 121910c..6e435e0 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -272,3 +272,4 @@
0b35542d6bf32af23a9fc59a37c52aa091fee388 jdk9-b24
ab8726a0fcde897e4cfd1ea581ed90b0d8a7cbb7 jdk9-b25
9b43f3993b96c2213428e95127a2d3fd0e709d3a jdk9-b26
+dcaa586ab756420e9a62643793bacef2c84bf637 jdk9-b27
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 9b0360a..d14f384 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -269,3 +269,4 @@
875450e7ef8dde8f59db662ec1351ea30b8cb35d jdk9-b24
a31efe49556a7c12f9ea2c9ee8b4fae8aa67723a jdk9-b25
dde9f5cfde5f46e62ceb5fab81151578e5277aef jdk9-b26
+f0870554049807d3392bd7976ab114f7f2b7bafa jdk9-b27
diff --git a/jdk/make/CopyIntoClasses.gmk b/jdk/make/CopyIntoClasses.gmk
index a80c661..c3420c0 100644
--- a/jdk/make/CopyIntoClasses.gmk
+++ b/jdk/make/CopyIntoClasses.gmk
@@ -164,15 +164,15 @@
################################################################################
ifneq ($(OPENJDK_TARGET_OS), macosx)
- OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/awt/datatransfer/flavormap.properties
+ OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/datatransfer/resources/flavormap.properties
else
- OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/macosx/classes/sun/awt/datatransfer/flavormap.properties
+ OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/java.desktop/macosx/classes/sun/datatransfer/resources/flavormap.properties
endif
-$(JDK_OUTPUTDIR)/classes/sun/awt/datatransfer/flavormap.properties: $(OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES)
+$(JDK_OUTPUTDIR)/classes/sun/datatransfer/resources/flavormap.properties: $(OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES)
$(install-file)
-COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/awt/datatransfer/flavormap.properties
+COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/datatransfer/resources/flavormap.properties
################################################################################
diff --git a/jdk/make/Tools.gmk b/jdk/make/Tools.gmk
index c384643..a61ac62 100644
--- a/jdk/make/Tools.gmk
+++ b/jdk/make/Tools.gmk
@@ -101,6 +101,9 @@
TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
+TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.makejavasecurity.MakeJavaSecurity
+
# TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
# and nbproject/project.properties in the same dir. Needs to be looked at.
@@ -136,9 +139,6 @@
-cp "$(JDK_OUTPUTDIR)/btclasses$(PATH_SEP)$(JDK_OUTPUTDIR)" \
build.tools.module.GenerateModulesXml
-TOOL_ADDTORESTRICTEDPKGS = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.addtorestrictedpkgs.AddToRestrictedPkgs
-
##########################################################################################
# Tools needed on solaris because OBJCOPY is broken.
diff --git a/jdk/make/gendata/Gendata-java.base.gmk b/jdk/make/gendata/Gendata-java.base.gmk
index 71ee403..4c7f7a5 100644
--- a/jdk/make/gendata/Gendata-java.base.gmk
+++ b/jdk/make/gendata/Gendata-java.base.gmk
@@ -62,25 +62,18 @@
##########################################################################################
-PROPS_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security-$(OPENJDK_TARGET_OS)
-PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security
-
-# Optionally set this variable to a file to add extra restricted packages.
-ifneq ($(RESTRICTED_PKGS_SRC), )
-
- $(PROPS_DST): $(PROPS_SRC) $(RESTRICTED_PKGS_SRC)
+GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
+GENDATA_JAVA_SECURITY := $(JDK_OUTPUTDIR)/lib/security/java.security
+
+# RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile
+
+$(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC)
+ $(ECHO) "Generating java.security"
$(MKDIR) -p $(@D)
- $(TOOL_ADDTORESTRICTEDPKGS) $(PROPS_SRC) $@.tmp `$(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " "`
- $(MV) $@.tmp $@
-
-else
-
- $(PROPS_DST): $(PROPS_SRC)
- $(call install-file)
-
-endif
-
-GENDATA += $(PROPS_DST)
+ $(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \
+ $(RESTRICTED_PKGS_SRC) || exit 1
+
+GENDATA += $(GENDATA_JAVA_SECURITY)
##########################################################################################
diff --git a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
index b3f0335..12b80d7 100644
--- a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
+++ b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,8 @@
-name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
-name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
-name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
- -name "CalendarData_*.java" -o -name "CalendarData_*.properties")
+ -name "CalendarData_*.java" -o -name "CalendarData_*.properties" -o \
+ -name "BreakIteratorInfo_*.java" -o -name "BreakIteratorRules_*.java")
# Then translate the locale files into for example: FormatData_sv
LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
@@ -86,6 +87,12 @@
#sun.text.resources.CollationData
$(eval $(call CaptureLocale,CollationData))
+#sun.text.resources.BreakIteratorInfo
+$(eval $(call CaptureLocale,BreakIteratorInfo))
+
+#sun.text.resources.BreakIteratorRules
+$(eval $(call CaptureLocale,BreakIteratorRules))
+
#sun.util.resources.TimeZoneNames
$(eval $(call CaptureLocale,TimeZoneNames))
diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
index 774a267..694db74 100644
--- a/jdk/make/lib/Awt2dLibraries.gmk
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -973,7 +973,6 @@
#
ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
diff --git a/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java b/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
deleted file mode 100644
index ee9deb4..0000000
--- a/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.addtorestrictedpkgs;
-
-import java.io.*;
-
-/**
- * Adds additional packages to the package.access and package.definition
- * security properties.
- */
-public class AddToRestrictedPkgs {
-
- private static final String PKG_ACC = "package.access";
- private static final String PKG_DEF = "package.definition";
- private static final int PKG_ACC_INDENT = 15;
- private static final int PKG_DEF_INDENT = 19;
-
- public static void main(String[] args) throws Exception {
-
- if (args.length < 3) {
- System.err.println("Usage: java AddToRestrictedPkgs " +
- "[input java.security file name] " +
- "[output java.security file name] " +
- "[packages ...]");
- System.exit(1);
- }
-
- try (FileReader fr = new FileReader(args[0]);
- BufferedReader br = new BufferedReader(fr);
- FileWriter fw = new FileWriter(args[1]);
- BufferedWriter bw = new BufferedWriter(fw))
- {
- // parse the file line-by-line, looking for pkg access properties
- String line = br.readLine();
- while (line != null) {
- if (line.startsWith(PKG_ACC)) {
- writePackages(br, bw, line, PKG_ACC_INDENT, args);
- } else if (line.startsWith(PKG_DEF)) {
- writePackages(br, bw, line, PKG_DEF_INDENT, args);
- } else {
- writeLine(bw, line);
- }
- line = br.readLine();
- }
- bw.flush();
- }
- }
-
- private static void writePackages(BufferedReader br, BufferedWriter bw,
- String line, int numSpaces,
- String[] args) throws IOException {
- // parse property until EOL, not including line breaks
- while (line.endsWith("\\")) {
- writeLine(bw, line);
- line = br.readLine();
- }
- // append comma and line-break to last package
- writeLine(bw, line + ",\\");
- // add new packages, one per line
- for (int i = 2; i < args.length - 1; i++) {
- indent(bw, numSpaces);
- writeLine(bw, args[i] + ",\\");
- }
- indent(bw, numSpaces);
- writeLine(bw, args[args.length - 1]);
- }
-
- private static void writeLine(BufferedWriter bw, String line)
- throws IOException
- {
- bw.write(line);
- bw.newLine();
- }
-
- private static void indent(BufferedWriter bw, int numSpaces)
- throws IOException
- {
- for (int i = 0; i < numSpaces; i++) {
- bw.append(' ');
- }
- }
-}
diff --git a/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java b/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java
new file mode 100644
index 0000000..d5c6e14
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.makejavasecurity;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
+
+/**
+ * Builds the java.security file, including
+ *
+ * 1. Adds additional packages to the package.access and
+ * package.definition security properties.
+ * 2. Filter out platform-unrelated parts
+ *
+ * In order to easily maintain platform-related entries, every item
+ * (including the last line) in package.access and package.definition
+ * MUST end with ',\'. A blank line MUST exist after the last line.
+ */
+public class MakeJavaSecurity {
+
+ private static final String PKG_ACC = "package.access";
+ private static final String PKG_DEF = "package.definition";
+ private static final int PKG_ACC_INDENT = 15;
+ private static final int PKG_DEF_INDENT = 19;
+
+ public static void main(String[] args) throws Exception {
+
+ if (args.length < 3) {
+ System.err.println("Usage: java MakeJavaSecurity " +
+ "[input java.security file name] " +
+ "[output java.security file name] " +
+ "[openjdk target os] " +
+ "[more restricted packages file name?]");
+ System.exit(1);
+ }
+
+ // more restricted packages
+ List<String> extraLines;
+ if (args.length == 4) {
+ extraLines = Files.readAllLines(Paths.get(args[3]));
+ } else {
+ extraLines = Collections.emptyList();
+ }
+
+ List<String> lines = new ArrayList<>();
+
+ // read raw java.security and add more restricted packages
+ try (FileReader fr = new FileReader(args[0]);
+ BufferedReader br = new BufferedReader(fr)) {
+ // looking for pkg access properties
+ String line = br.readLine();
+ while (line != null) {
+ if (line.startsWith(PKG_ACC)) {
+ addPackages(br, lines, line, PKG_ACC_INDENT, extraLines);
+ } else if (line.startsWith(PKG_DEF)) {
+ addPackages(br, lines, line, PKG_DEF_INDENT, extraLines);
+ } else {
+ lines.add(line);
+ }
+ line = br.readLine();
+ }
+ }
+
+ // Filter out platform-unrelated ones. We only support
+ // #ifdef, #ifndef, and #endif.
+ int mode = 0; // 0: out of block, 1: in match, 2: in non-match
+ Iterator<String> iter = lines.iterator();
+ while (iter.hasNext()) {
+ String line = iter.next();
+ if (line.startsWith("#endif")) {
+ mode = 0;
+ iter.remove();
+ } else if (line.startsWith("#ifdef ")) {
+ mode = line.endsWith(args[2])?1:2;
+ iter.remove();
+ } else if (line.startsWith("#ifndef ")) {
+ mode = line.endsWith(args[2])?2:1;
+ iter.remove();
+ } else {
+ if (mode == 2) iter.remove();
+ }
+ }
+
+ // Update .tbd to .1, .2, etc.
+ Map<String,Integer> count = new HashMap<>();
+ for (int i=0; i<lines.size(); i++) {
+ String line = lines.get(i);
+ int index = line.indexOf(".tbd");
+ if (index >= 0) {
+ String prefix = line.substring(0, index);
+ int n = count.getOrDefault(prefix, 1);
+ count.put(prefix, n+1);
+ lines.set(i, prefix + "." + n + line.substring(index+4));
+ }
+ }
+
+ // Clean up the last line of PKG_ACC and PKG_DEF blocks.
+ // Not really necessary since a blank line follows.
+ boolean inBlock = false;
+ for (int i=0; i<lines.size(); i++) {
+ String line = lines.get(i);
+ if (line.startsWith(PKG_ACC) || line.startsWith(PKG_DEF)) {
+ inBlock = true;
+ }
+ if (inBlock) {
+ if (line.isEmpty()) {
+ String lastLine = lines.get(i-1);
+ lines.set(i-1, lastLine.substring(0, lastLine.length()-2));
+ inBlock = false;
+ }
+ }
+ }
+
+ Files.write(Paths.get(args[1]), lines);
+ }
+
+ private static void addPackages(BufferedReader br, List<String> lines,
+ String line, int numSpaces,
+ List<String> args) throws IOException {
+ // parse property until EOL, not including line breaks
+ boolean first = true;
+ while (!line.isEmpty()) {
+ if (!line.startsWith("#")) {
+ if (!line.endsWith(",\\") ||
+ (!first && line.contains("="))) {
+ throw new IOException("Invalid line: " + line);
+ }
+ }
+ lines.add(line);
+ line = br.readLine();
+ first = false;
+ }
+ // add new packages, one per line
+ for (String arg: args) {
+ if (arg.startsWith("#")) {
+ lines.add(arg);
+ } else {
+ lines.add(String.format("%"+numSpaces+"s", "") + arg + ",\\");
+ }
+ }
+ lines.add(line);
+ }
+}
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources.properties
deleted file mode 100644
index 1bbea03..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=This is Java 2D! (Default)
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_de.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_de.properties
deleted file mode 100644
index d38794c..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=This is Java 2D! (German) \u00f6 \u00df \u00dc
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_en.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_en.properties
deleted file mode 100644
index efff7d0..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_en.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=This is Java 2D! (English) A B C
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_en_GB.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_en_GB.properties
deleted file mode 100644
index be4261d..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_en_GB.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=This is Java 2D! (English in Great Britain) \u0075 \u006b Z
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_ja.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_ja.properties
deleted file mode 100644
index f5cb9d7..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_ja.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=Java 2D\u3067\u3059\u3002(\u30C7\u30D5\u30A9\u30EB\u30C8)
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_ko.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_ko.properties
deleted file mode 100644
index 819d2c3..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_ko.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=This is Java 2D! (Korean)
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_zh_CN.properties b/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_zh_CN.properties
deleted file mode 100644
index 7f7fa0d..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/TextResources_zh_CN.properties
+++ /dev/null
@@ -1 +0,0 @@
-string=\u8FD9\u662F Java 2D! (\u9ED8\u8BA4\u503C)
diff --git a/jdk/src/demo/share/jfc/Font2DTest/resources/resource.data b/jdk/src/demo/share/jfc/Font2DTest/resources/resource.data
deleted file mode 100644
index f18b78e..0000000
--- a/jdk/src/demo/share/jfc/Font2DTest/resources/resource.data
+++ /dev/null
@@ -1,5 +0,0 @@
-en US
-en GB
-ko KO
-ab KO
-de DE
diff --git a/jdk/src/java.base/share/classes/java/lang/Class.java b/jdk/src/java.base/share/classes/java/lang/Class.java
index cd26ab1..1afbf5e 100644
--- a/jdk/src/java.base/share/classes/java/lang/Class.java
+++ b/jdk/src/java.base/share/classes/java/lang/Class.java
@@ -1322,7 +1322,7 @@
// (for anonymous classes): 1 or more digits.
// Since getSimpleBinaryName() will strip the binary name of
- // the immediatly enclosing class, we are now looking at a
+ // the immediately enclosing class, we are now looking at a
// string that matches the regular expression "\$[0-9]*"
// followed by a simple name (considering the simple of an
// anonymous class to be the empty string).
diff --git a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java
index 1652d6c..1def66a 100644
--- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -205,7 +205,7 @@
}
/**
- * Registers the given class loader type as parallel capabale.
+ * Registers the given class loader type as parallel capable.
* Returns {@code true} is successfully registered; {@code false} if
* loader's super class is not registered.
*/
@@ -832,7 +832,7 @@
{
int len = b.remaining();
- // Use byte[] if not a direct ByteBufer:
+ // Use byte[] if not a direct ByteBuffer:
if (!b.isDirect()) {
if (b.hasArray()) {
return defineClass(name, b.array(),
diff --git a/jdk/src/java.base/share/classes/java/lang/StringCoding.java b/jdk/src/java.base/share/classes/java/lang/StringCoding.java
index 24ed0c0..a4c71b4 100644
--- a/jdk/src/java.base/share/classes/java/lang/StringCoding.java
+++ b/jdk/src/java.base/share/classes/java/lang/StringCoding.java
@@ -196,19 +196,19 @@
static char[] decode(Charset cs, byte[] ba, int off, int len) {
// (1)We never cache the "external" cs, the only benefit of creating
// an additional StringDe/Encoder object to wrap it is to share the
- // de/encode() method. These SD/E objects are short-lifed, the young-gen
- // gc should be able to take care of them well. But the best approash
+ // de/encode() method. These SD/E objects are short-lived, the young-gen
+ // gc should be able to take care of them well. But the best approach
// is still not to generate them if not really necessary.
// (2)The defensive copy of the input byte/char[] has a big performance
// impact, as well as the outgoing result byte/char[]. Need to do the
// optimization check of (sm==null && classLoader0==null) for both.
// (3)getClass().getClassLoader0() is expensive
// (4)There might be a timing gap in isTrusted setting. getClassLoader0()
- // is only chcked (and then isTrusted gets set) when (SM==null). It is
+ // is only checked (and then isTrusted gets set) when (SM==null). It is
// possible that the SM==null for now but then SM is NOT null later
// when safeTrim() is invoked...the "safe" way to do is to redundant
// check (... && (isTrusted || SM == null || getClassLoader0())) in trim
- // but it then can be argued that the SM is null when the opertaion
+ // but it then can be argued that the SM is null when the operation
// is started...
CharsetDecoder cd = cs.newDecoder();
int en = scale(len, cd.maxCharsPerByte());
diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java
index fbac697..345cdae 100644
--- a/jdk/src/java.base/share/classes/java/lang/System.java
+++ b/jdk/src/java.base/share/classes/java/lang/System.java
@@ -1193,7 +1193,7 @@
// Setup Java signal handlers for HUP, TERM, and INT (where available).
Terminator.setup();
- // Initialize any miscellenous operating system settings that need to be
+ // Initialize any miscellaneous operating system settings that need to be
// set for the class libraries. Currently this is no-op everywhere except
// for Windows where the process-wide error mode is set before the java.io
// classes are used.
diff --git a/jdk/src/java.base/share/classes/java/lang/Throwable.java b/jdk/src/java.base/share/classes/java/lang/Throwable.java
index 396d8e9..d71f9ec 100644
--- a/jdk/src/java.base/share/classes/java/lang/Throwable.java
+++ b/jdk/src/java.base/share/classes/java/lang/Throwable.java
@@ -139,7 +139,7 @@
* {@linkplain #setStackTrace(StackTraceElement[]) Setting the
* stack trace} to a one-element array containing this sentinel
* value indicates future attempts to set the stack trace will be
- * ignored. The sentinal is equal to the result of calling:<br>
+ * ignored. The sentinel is equal to the result of calling:<br>
* {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)}
*/
public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL =
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index 752c097..9d8db4e 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -98,7 +98,7 @@
private final String implMethodClassName; // Name of type containing implementation "CC"
private final String implMethodName; // Name of implementation method "impl"
private final String implMethodDesc; // Type descriptor for implementation methods "(I)Ljava/lang/String;"
- private final Class<?> implMethodReturnClass; // class for implementaion method return type "Ljava/lang/String;"
+ private final Class<?> implMethodReturnClass; // class for implementation method return type "Ljava/lang/String;"
private final MethodType constructorType; // Generated class constructor type "(CC)void"
private final ClassWriter cw; // ASM class writer
private final String[] argNames; // Generated names for the constructor arguments
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index 3ab5d9c..58e56dd 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -209,7 +209,7 @@
throw new InternalError("observed CP placeholder twice: " + cpPlaceholder);
}
// insert placeholder in CP and remember the patch
- int index = cw.newConst((Object) cpPlaceholder); // TODO check if aready in the constant pool
+ int index = cw.newConst((Object) cpPlaceholder); // TODO check if already in the constant pool
cpPatches.put(cpPlaceholder, new CpPatch(index, cpPlaceholder, arg));
return cpPlaceholder;
}
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
index b9c18b5..d3116d1 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
@@ -37,7 +37,7 @@
* @author jrose
*/
class Invokers {
- // exact type (sans leading taget MH) for the outgoing call
+ // exact type (sans leading target MH) for the outgoing call
private final MethodType targetType;
// FIXME: Get rid of the invokers that are not useful.
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java
index 9cc901e..75b26be 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -59,7 +59,7 @@
* and properly use the named member.
* <p>
* When resolved, a member name's internal implementation may include references to JVM metadata.
- * This representation is stateless and only decriptive.
+ * This representation is stateless and only descriptive.
* It provides no private information and no capability to use the member.
* <p>
* By contrast, a {@linkplain java.lang.reflect.Method} contains fuller information
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
index 1966452..5ed091e 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
@@ -679,7 +679,7 @@
* This method provides the crucial behavioral difference between
* {@link #invokeExact invokeExact} and plain, inexact {@link #invoke invoke}.
* The two methods
- * perform the same steps when the caller's type descriptor exactly m atches
+ * perform the same steps when the caller's type descriptor exactly matches
* the callee's, but when the types differ, plain {@link #invoke invoke}
* also calls {@code asType} (or some internal equivalent) in order
* to match up the caller's and callee's types.
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index abd8999..3e4ee65 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -621,7 +621,7 @@
}
/**
- * The LambaForm shape for catchException combinator is the following:
+ * The LambdaForm shape for catchException combinator is the following:
* <blockquote><pre>{@code
* guardWithCatch=Lambda(a0:L,a1:L,a2:L)=>{
* t3:L=BoundMethodHandle$Species_LLLLL.argL0(a0:L);
@@ -702,7 +702,7 @@
MethodType type = target.type();
LambdaForm form = makeGuardWithCatchForm(type.basicType());
- // Prepare auxiliary method handles used during LambdaForm interpreation.
+ // Prepare auxiliary method handles used during LambdaForm interpretation.
// Box arguments and wrap them into Object[]: ValueConversions.array().
MethodType varargsType = type.changeReturnType(Object[].class);
MethodHandle collectArgs = ValueConversions.varargsArray(type.parameterCount())
diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
index 0f5169e..01c3b33 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -509,7 +509,7 @@
/**
* Is this method a caller-sensitive method?
- * I.e., does it call Reflection.getCallerClass or a similer method
+ * I.e., does it call Reflection.getCallerClass or a similar method
* to ask about the identity of its caller?
*/
static boolean isCallerSensitive(MemberName mem) {
diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
index f85ab43..01a074f 100644
--- a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
@@ -78,7 +78,7 @@
* object is a {@link Constructor} object for the class {@link
* java.lang.Class}). In the event of such a SecurityException, the
* accessibility of objects is set to {@code flag} for array elements
- * upto (and excluding) the element for which the exception occurred; the
+ * up to (and excluding) the element for which the exception occurred; the
* accessibility of elements beyond (and including) the element for which
* the exception occurred is unchanged.
*
diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java
index f424dee..4b112bf 100644
--- a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -544,15 +544,33 @@
*/
@Override
public AnnotatedType getAnnotatedReceiverType() {
- if (getDeclaringClass().getEnclosingClass() == null)
- return super.getAnnotatedReceiverType();
+ Class<?> thisDeclClass = getDeclaringClass();
+ Class<?> enclosingClass = thisDeclClass.getEnclosingClass();
+ if (enclosingClass == null) {
+ // A Constructor for a top-level class
+ return null;
+ }
+
+ Class<?> outerDeclaringClass = thisDeclClass.getDeclaringClass();
+ if (outerDeclaringClass == null) {
+ // A constructor for a local or anonymous class
+ return null;
+ }
+
+ // Either static nested or inner class
+ if (Modifier.isStatic(thisDeclClass.getModifiers())) {
+ // static nested
+ return null;
+ }
+
+ // A Constructor for an inner class
return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes0(),
sun.misc.SharedSecrets.getJavaLangAccess().
- getConstantPool(getDeclaringClass()),
+ getConstantPool(thisDeclClass),
this,
- getDeclaringClass(),
- getDeclaringClass().getEnclosingClass(),
+ thisDeclClass,
+ enclosingClass,
TypeAnnotation.TypeAnnotationTarget.METHOD_RECEIVER);
}
}
diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java
index 8493d10..99eb1eb 100644
--- a/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -585,21 +585,24 @@
/**
* Returns an {@code AnnotatedType} object that represents the use of a
* type to specify the receiver type of the method/constructor represented
- * by this Executable object. The receiver type of a method/constructor is
- * available only if the method/constructor has a <em>receiver
- * parameter</em> (JLS 8.4.1).
+ * by this {@code Executable} object.
*
- * If this {@code Executable} object represents a constructor or instance
- * method that does not have a receiver parameter, or has a receiver
- * parameter with no annotations on its type, then the return value is an
- * {@code AnnotatedType} object representing an element with no
+ * The receiver type of a method/constructor is available only if the
+ * method/constructor has a receiver parameter (JLS 8.4.1). If this {@code
+ * Executable} object <em>represents an instance method or represents a
+ * constructor of an inner member class</em>, and the
+ * method/constructor <em>either</em> has no receiver parameter or has a
+ * receiver parameter with no annotations on its type, then the return
+ * value is an {@code AnnotatedType} object representing an element with no
* annotations.
*
- * If this {@code Executable} object represents a static method, then the
- * return value is null.
+ * If this {@code Executable} object represents a static method or
+ * represents a constructor of a top level, static member, local, or
+ * anoymous class, then the return value is null.
*
* @return an object representing the receiver type of the method or
- * constructor represented by this {@code Executable}
+ * constructor represented by this {@code Executable} or {@code null} if
+ * this {@code Executable} can not have a receiver parameter
*/
public AnnotatedType getAnnotatedReceiverType() {
if (Modifier.isStatic(this.getModifiers()))
diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java b/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java
index f035b8e..69c568f 100644
--- a/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Parameter.java
@@ -173,7 +173,7 @@
* a name.
*/
public String getName() {
- // Note: empty strings as paramete names are now outlawed.
+ // Note: empty strings as parameter names are now outlawed.
// The .equals("") is for compatibility with current JVM
// behavior. It may be removed at some point.
if(name == null || name.equals(""))
diff --git a/jdk/src/java.base/share/classes/java/security/SecureRandom.java b/jdk/src/java.base/share/classes/java/security/SecureRandom.java
index b9ae722..0accb4c 100644
--- a/jdk/src/java.base/share/classes/java/security/SecureRandom.java
+++ b/jdk/src/java.base/share/classes/java/security/SecureRandom.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,15 +39,16 @@
*
* <p>A cryptographically strong random number
* minimally complies with the statistical random number generator tests
- * specified in <a href="http://csrc.nist.gov/cryptval/140-2.htm">
+ * specified in
+ * <a href="http://csrc.nist.gov/publications/fips/fips140-2/fips1402.pdf">
* <i>FIPS 140-2, Security Requirements for Cryptographic Modules</i></a>,
* section 4.9.1.
* Additionally, SecureRandom must produce non-deterministic output.
* Therefore any seed material passed to a SecureRandom object must be
* unpredictable, and all SecureRandom output sequences must be
* cryptographically strong, as described in
- * <a href="http://www.ietf.org/rfc/rfc1750.txt">
- * <i>RFC 1750: Randomness Recommendations for Security</i></a>.
+ * <a href="http://tools.ietf.org/html/rfc4086">
+ * <i>RFC 4086: Randomness Requirements for Security</i></a>.
*
* <p>A caller obtains a SecureRandom instance via the
* no-argument constructor or one of the {@code getInstance} methods:
diff --git a/jdk/src/java.base/share/classes/java/time/Duration.java b/jdk/src/java.base/share/classes/java/time/Duration.java
index cb672c4..30d146d 100644
--- a/jdk/src/java.base/share/classes/java/time/Duration.java
+++ b/jdk/src/java.base/share/classes/java/time/Duration.java
@@ -388,19 +388,21 @@
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
// check for letter T but no time sections
- if ("T".equals(matcher.group(3)) == false) {
- boolean negate = "-".equals(matcher.group(1));
- String dayMatch = matcher.group(2);
- String hourMatch = matcher.group(4);
- String minuteMatch = matcher.group(5);
- String secondMatch = matcher.group(6);
- String fractionMatch = matcher.group(7);
- if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null) {
- long daysAsSecs = parseNumber(text, dayMatch, SECONDS_PER_DAY, "days");
- long hoursAsSecs = parseNumber(text, hourMatch, SECONDS_PER_HOUR, "hours");
- long minsAsSecs = parseNumber(text, minuteMatch, SECONDS_PER_MINUTE, "minutes");
- long seconds = parseNumber(text, secondMatch, 1, "seconds");
- int nanos = parseFraction(text, fractionMatch, seconds < 0 ? -1 : 1);
+ if (!charMatch(text, matcher.start(3), matcher.end(3), 'T')) {
+ boolean negate = charMatch(text, matcher.start(1), matcher.end(1), '-');
+
+ int dayStart = matcher.start(2), dayEnd = matcher.end(2);
+ int hourStart = matcher.start(4), hourEnd = matcher.end(4);
+ int minuteStart = matcher.start(5), minuteEnd = matcher.end(5);
+ int secondStart = matcher.start(6), secondEnd = matcher.end(6);
+ int fractionStart = matcher.start(7), fractionEnd = matcher.end(7);
+
+ if (dayStart >= 0 || hourStart >= 0 || minuteStart >= 0 || secondStart >= 0) {
+ long daysAsSecs = parseNumber(text, dayStart, dayEnd, SECONDS_PER_DAY, "days");
+ long hoursAsSecs = parseNumber(text, hourStart, hourEnd, SECONDS_PER_HOUR, "hours");
+ long minsAsSecs = parseNumber(text, minuteStart, minuteEnd, SECONDS_PER_MINUTE, "minutes");
+ long seconds = parseNumber(text, secondStart, secondEnd, 1, "seconds");
+ int nanos = parseFraction(text, fractionStart, fractionEnd, seconds < 0 ? -1 : 1);
try {
return create(negate, daysAsSecs, hoursAsSecs, minsAsSecs, seconds, nanos);
} catch (ArithmeticException ex) {
@@ -412,27 +414,37 @@
throw new DateTimeParseException("Text cannot be parsed to a Duration", text, 0);
}
- private static long parseNumber(CharSequence text, String parsed, int multiplier, String errorText) {
+ private static boolean charMatch(CharSequence text, int start, int end, char c) {
+ return (start >= 0 && end == start + 1 && text.charAt(start) == c);
+ }
+
+ private static long parseNumber(CharSequence text, int start, int end, int multiplier, String errorText) {
// regex limits to [-+]?[0-9]+
- if (parsed == null) {
+ if (start < 0 || end < 0) {
return 0;
}
try {
- long val = Long.parseLong(parsed);
+ long val = Long.parseLong(text, 10, start, end);
return Math.multiplyExact(val, multiplier);
} catch (NumberFormatException | ArithmeticException ex) {
throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: " + errorText, text, 0).initCause(ex);
}
}
- private static int parseFraction(CharSequence text, String parsed, int negate) {
+ private static int parseFraction(CharSequence text, int start, int end, int negate) {
// regex limits to [0-9]{0,9}
- if (parsed == null || parsed.length() == 0) {
+ if (start < 0 || end < 0 || end - start == 0) {
return 0;
}
try {
- parsed = (parsed + "000000000").substring(0, 9);
- return Integer.parseInt(parsed) * negate;
+ int fraction = Integer.parseInt(text, 10, start, end);
+
+ // for number strings smaller than 9 digits, interpret as if there
+ // were trailing zeros
+ for (int i = end - start; i < 9; i++) {
+ fraction *= 10;
+ }
+ return fraction * negate;
} catch (NumberFormatException | ArithmeticException ex) {
throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: fraction", text, 0).initCause(ex);
}
diff --git a/jdk/src/java.base/share/classes/java/time/Period.java b/jdk/src/java.base/share/classes/java/time/Period.java
index 5d808a4..88adb95 100644
--- a/jdk/src/java.base/share/classes/java/time/Period.java
+++ b/jdk/src/java.base/share/classes/java/time/Period.java
@@ -329,17 +329,17 @@
Objects.requireNonNull(text, "text");
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
- int negate = ("-".equals(matcher.group(1)) ? -1 : 1);
- String yearMatch = matcher.group(2);
- String monthMatch = matcher.group(3);
- String weekMatch = matcher.group(4);
- String dayMatch = matcher.group(5);
- if (yearMatch != null || monthMatch != null || dayMatch != null || weekMatch != null) {
+ int negate = (charMatch(text, matcher.start(1), matcher.end(1), '-') ? -1 : 1);
+ int yearStart = matcher.start(2), yearEnd = matcher.end(2);
+ int monthStart = matcher.start(3), monthEnd = matcher.end(3);
+ int weekStart = matcher.start(4), weekEnd = matcher.end(4);
+ int dayStart = matcher.start(5), dayEnd = matcher.end(5);
+ if (yearStart >= 0 || monthStart >= 0 || weekStart >= 0 || dayStart >= 0) {
try {
- int years = parseNumber(text, yearMatch, negate);
- int months = parseNumber(text, monthMatch, negate);
- int weeks = parseNumber(text, weekMatch, negate);
- int days = parseNumber(text, dayMatch, negate);
+ int years = parseNumber(text, yearStart, yearEnd, negate);
+ int months = parseNumber(text, monthStart, monthEnd, negate);
+ int weeks = parseNumber(text, weekStart, weekEnd, negate);
+ int days = parseNumber(text, dayStart, dayEnd, negate);
days = Math.addExact(days, Math.multiplyExact(weeks, 7));
return create(years, months, days);
} catch (NumberFormatException ex) {
@@ -350,11 +350,15 @@
throw new DateTimeParseException("Text cannot be parsed to a Period", text, 0);
}
- private static int parseNumber(CharSequence text, String str, int negate) {
- if (str == null) {
+ private static boolean charMatch(CharSequence text, int start, int end, char c) {
+ return (start >= 0 && end == start + 1 && text.charAt(start) == c);
+ }
+
+ private static int parseNumber(CharSequence text, int start, int end, int negate) {
+ if (start < 0 || end < 0) {
return 0;
}
- int val = Integer.parseInt(str);
+ int val = Integer.parseInt(text, 10, start, end);
try {
return Math.multiplyExact(val, negate);
} catch (ArithmeticException ex) {
diff --git a/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
index e37374a..81b769a 100644
--- a/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
+++ b/jdk/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,20 +38,20 @@
import sun.util.calendar.ZoneInfo;
/**
- * <code>JapaneseImperialCalendar</code> implements a Japanese
+ * {@code JapaneseImperialCalendar} implements a Japanese
* calendar system in which the imperial era-based year numbering is
* supported from the Meiji era. The following are the eras supported
* by this calendar system.
- * <pre><tt>
+ * <pre>{@code
* ERA value Era name Since (in Gregorian)
* ------------------------------------------------------
* 0 N/A N/A
- * 1 Meiji 1868-01-01 midnight local time
- * 2 Taisho 1912-07-30 midnight local time
- * 3 Showa 1926-12-25 midnight local time
- * 4 Heisei 1989-01-08 midnight local time
+ * 1 Meiji 1868-01-01T00:00:00 local time
+ * 2 Taisho 1912-07-30T00:00:00 local time
+ * 3 Showa 1926-12-25T00:00:00 local time
+ * 4 Heisei 1989-01-08T00:00:00 local time
* ------------------------------------------------------
- * </tt></pre>
+ * }</pre>
*
* <p><code>ERA</code> value 0 specifies the years before Meiji and
* the Gregorian year values are used. Unlike {@link
@@ -63,6 +63,31 @@
* with time differences for applying the era transitions. This
* calendar implementation assumes local time for all transitions.
*
+ * <p>A new era can be specified using property
+ * jdk.calendar.japanese.supplemental.era. The new era is added to the
+ * predefined eras. The syntax of the property is as follows.
+ * <p><pre>
+ * {@code name=<name>,abbr=<abbr>,since=<time['u']>}
+ * </pre>
+ * where
+ * <dl>
+ * <dt>{@code <name>:}<dd>the full name of the new era (non-ASCII characters allowed)
+ * <dt>{@code <abbr>:}<dd>the abbreviation of the new era (non-ASCII characters allowed)
+ * <dt>{@code <time['u']>:}<dd>the start time of the new era represented by
+ * milliseconds from 1970-01-01T00:00:00 local time or UTC if {@code 'u'} is
+ * appended to the milliseconds value. (ASCII digits only)
+ * </dl>
+ *
+ * <p>If the given era is invalid, such as the since value before the
+ * beginning of the last predefined era, the given era will be
+ * ignored.
+ *
+ * <p>The following is an example of the property usage.
+ * <p><pre>
+ * java -Djdk.calendar.japanese.supplemental.era="name=NewEra,abbr=N,since=253374307200000"
+ * </pre>
+ * The property specifies an era change to NewEra at 9999-02-11T00:00:00 local time.
+ *
* @author Masayoshi Okutsu
* @since 1.6
*/
@@ -102,7 +127,6 @@
public static final int HEISEI = 4;
private static final int EPOCH_OFFSET = 719163; // Fixed date of January 1, 1970 (Gregorian)
- private static final int EPOCH_YEAR = 1970;
// Useful millisecond constants. Although ONE_DAY and ONE_WEEK can fit
// into ints, they must be longs in order to prevent arithmetic overflow
@@ -111,7 +135,6 @@
private static final int ONE_MINUTE = 60*ONE_SECOND;
private static final int ONE_HOUR = 60*ONE_MINUTE;
private static final long ONE_DAY = 24*ONE_HOUR;
- private static final long ONE_WEEK = 7*ONE_DAY;
// Reference to the sun.util.calendar.LocalGregorianCalendar instance (singleton).
private static final LocalGregorianCalendar jcal
@@ -217,6 +240,7 @@
};
// Proclaim serialization compatibility with JDK 1.6
+ @SuppressWarnings("FieldNameHidesFieldInSuperclass")
private static final long serialVersionUID = -3364572813905467929L;
static {
@@ -340,6 +364,7 @@
* <code>false</code> otherwise.
* @see Calendar#compareTo(Calendar)
*/
+ @Override
public boolean equals(Object obj) {
return obj instanceof JapaneseImperialCalendar &&
super.equals(obj);
@@ -349,6 +374,7 @@
* Generates the hash code for this
* <code>JapaneseImperialCalendar</code> object.
*/
+ @Override
public int hashCode() {
return super.hashCode() ^ jdate.hashCode();
}
@@ -381,6 +407,7 @@
* or if any calendar fields have out-of-range values in
* non-lenient mode.
*/
+ @Override
public void add(int field, int amount) {
// If amount == 0, do nothing even the given field is out of
// range. This is tested by JCK.
@@ -509,6 +536,7 @@
}
}
+ @Override
public void roll(int field, boolean up) {
roll(field, up ? +1 : -1);
}
@@ -533,6 +561,7 @@
* @see #add(int,int)
* @see #set(int,int)
*/
+ @Override
public void roll(int field, int amount) {
// If amount == 0, do nothing even the given field is out of
// range. This is tested by JCK.
diff --git a/jdk/src/java.base/share/classes/java/util/StringJoiner.java b/jdk/src/java.base/share/classes/java/util/StringJoiner.java
index b6ba84c..b08a2f9 100644
--- a/jdk/src/java.base/share/classes/java/util/StringJoiner.java
+++ b/jdk/src/java.base/share/classes/java/util/StringJoiner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,9 @@
*/
package java.util;
+import sun.misc.JavaLangAccess;
+import sun.misc.SharedSecrets;
+
/**
* {@code StringJoiner} is used to construct a sequence of characters separated
* by a delimiter and optionally starting with a supplied prefix
@@ -67,22 +70,24 @@
private final String delimiter;
private final String suffix;
- /*
- * StringBuilder value -- at any time, the characters constructed from the
- * prefix, the added element separated by the delimiter, but without the
- * suffix, so that we can more easily add elements without having to jigger
- * the suffix each time.
- */
- private StringBuilder value;
+ /** Contains all the string components added so far. */
+ private String[] elts;
- /*
- * By default, the string consisting of prefix+suffix, returned by
- * toString(), or properties of value, when no elements have yet been added,
- * i.e. when it is empty. This may be overridden by the user to be some
- * other value including the empty String.
+ /** The number of string components added so far. */
+ private int size;
+
+ /** Total length in chars so far, excluding prefix and suffix. */
+ private int len;
+
+ /**
+ * When overriden by the user to be non-null via {@link setEmptyValue}, the
+ * string returned by toString() when no elements have yet been added.
+ * When null, prefix + suffix is used as the empty value.
*/
private String emptyValue;
+ private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
+
/**
* Constructs a {@code StringJoiner} with no characters in it, with no
* {@code prefix} or {@code suffix}, and a copy of the supplied
@@ -125,7 +130,6 @@
this.prefix = prefix.toString();
this.delimiter = delimiter.toString();
this.suffix = suffix.toString();
- this.emptyValue = this.prefix + this.suffix;
}
/**
@@ -148,29 +152,44 @@
return this;
}
+ private static int getChars(String s, char[] chars, int start) {
+ int len = s.length();
+ s.getChars(0, len, chars, start);
+ return len;
+ }
+
/**
* Returns the current value, consisting of the {@code prefix}, the values
* added so far separated by the {@code delimiter}, and the {@code suffix},
* unless no elements have been added in which case, the
- * {@code prefix + suffix} or the {@code emptyValue} characters are returned
+ * {@code prefix + suffix} or the {@code emptyValue} characters are returned.
*
* @return the string representation of this {@code StringJoiner}
*/
@Override
public String toString() {
- if (value == null) {
+ final String[] elts = this.elts;
+ if (elts == null && emptyValue != null) {
return emptyValue;
- } else {
- if (suffix.equals("")) {
- return value.toString();
- } else {
- int initialLength = value.length();
- String result = value.append(suffix).toString();
- // reset value to pre-append initialLength
- value.setLength(initialLength);
- return result;
+ }
+ final int size = this.size;
+ final int addLen = prefix.length() + suffix.length();
+ if (addLen == 0) {
+ compactElts();
+ return size == 0 ? "" : elts[0];
+ }
+ final String delimiter = this.delimiter;
+ final char[] chars = new char[len + addLen];
+ int k = getChars(prefix, chars, 0);
+ if (size > 0) {
+ k += getChars(elts[0], chars, k);
+ for (int i = 1; i < size; i++) {
+ k += getChars(delimiter, chars, k);
+ k += getChars(elts[i], chars, k);
}
}
+ k += getChars(suffix, chars, k);
+ return jla.newStringUnsafe(chars);
}
/**
@@ -182,7 +201,16 @@
* @return a reference to this {@code StringJoiner}
*/
public StringJoiner add(CharSequence newElement) {
- prepareBuilder().append(newElement);
+ final String elt = String.valueOf(newElement);
+ if (elts == null) {
+ elts = new String[8];
+ } else {
+ if (size == elts.length)
+ elts = Arrays.copyOf(elts, 2 * size);
+ len += delimiter.length();
+ }
+ len += elt.length();
+ elts[size++] = elt;
return this;
}
@@ -207,24 +235,25 @@
*/
public StringJoiner merge(StringJoiner other) {
Objects.requireNonNull(other);
- if (other.value != null) {
- final int length = other.value.length();
- // lock the length so that we can seize the data to be appended
- // before initiate copying to avoid interference, especially when
- // merge 'this'
- StringBuilder builder = prepareBuilder();
- builder.append(other.value, other.prefix.length(), length);
+ if (other.elts == null) {
+ return this;
}
- return this;
+ other.compactElts();
+ return add(other.elts[0]);
}
- private StringBuilder prepareBuilder() {
- if (value != null) {
- value.append(delimiter);
- } else {
- value = new StringBuilder().append(prefix);
+ private void compactElts() {
+ if (size > 1) {
+ final char[] chars = new char[len];
+ int i = 1, k = getChars(elts[0], chars, 0);
+ do {
+ k += getChars(delimiter, chars, k);
+ k += getChars(elts[i], chars, k);
+ elts[i] = null;
+ } while (++i < size);
+ size = 1;
+ elts[0] = jla.newStringUnsafe(chars);
}
- return value;
}
/**
@@ -238,10 +267,7 @@
* @return the length of the current value of {@code StringJoiner}
*/
public int length() {
- // Remember that we never actually append the suffix unless we return
- // the full (present) value or some sub-string or length of it, so that
- // we can add on more if we need to.
- return (value != null ? value.length() + suffix.length() :
- emptyValue.length());
+ return (size == 0 && emptyValue != null) ? emptyValue.length() :
+ len + prefix.length() + suffix.length();
}
}
diff --git a/jdk/src/java.base/share/classes/javax/security/auth/Subject.java b/jdk/src/java.base/share/classes/javax/security/auth/Subject.java
index e8ce12c..0eee83c 100644
--- a/jdk/src/java.base/share/classes/javax/security/auth/Subject.java
+++ b/jdk/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -182,21 +182,20 @@
* {@code AuthPermission("modifyPublicCredentials")}.
* To modify the private credential Set, the caller must have
* {@code AuthPermission("modifyPrivateCredentials")}.
- * <p>
*
* @param readOnly true if the {@code Subject} is to be read-only,
- * and false otherwise. <p>
+ * and false otherwise.
*
* @param principals the {@code Set} of Principals
- * to be associated with this {@code Subject}. <p>
+ * to be associated with this {@code Subject}.
*
* @param pubCredentials the {@code Set} of public credentials
- * to be associated with this {@code Subject}. <p>
+ * to be associated with this {@code Subject}.
*
* @param privCredentials the {@code Set} of private credentials
* to be associated with this {@code Subject}.
*
- * @exception NullPointerException if the specified
+ * @throws NullPointerException if the specified
* {@code principals}, {@code pubCredentials},
* or {@code privCredentials} are {@code null},
* or a null value exists within any of these three
@@ -233,10 +232,11 @@
* Also, once a {@code Subject} is read-only,
* it can not be reset to being writable again.
*
- * <p>
- *
- * @exception SecurityException if the caller does not have permission
- * to set this {@code Subject} to be read-only.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have an
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("setReadOnly")} permission to set this
+ * {@code Subject} to be read-only.
*/
public void setReadOnly() {
java.lang.SecurityManager sm = System.getSecurityManager();
@@ -250,8 +250,6 @@
/**
* Query whether this {@code Subject} is read-only.
*
- * <p>
- *
* @return true if this {@code Subject} is read-only, false otherwise.
*/
public boolean isReadOnly() {
@@ -267,8 +265,6 @@
* In this situation, the most recent {@code Subject} associated
* with the {@code AccessControlContext} is returned.
*
- * <p>
- *
* @param acc the {@code AccessControlContext} from which to retrieve
* the {@code Subject}.
*
@@ -277,10 +273,13 @@
* if no {@code Subject} is associated
* with the provided {@code AccessControlContext}.
*
- * @exception SecurityException if the caller does not have permission
- * to get the {@code Subject}. <p>
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have an
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("getSubject")} permission to get the
+ * {@code Subject}.
*
- * @exception NullPointerException if the provided
+ * @throws NullPointerException if the provided
* {@code AccessControlContext} is {@code null}.
*/
public static Subject getSubject(final AccessControlContext acc) {
@@ -321,26 +320,27 @@
* passing it the provided {@code PrivilegedAction},
* as well as the newly constructed {@code AccessControlContext}.
*
- * <p>
- *
* @param subject the {@code Subject} that the specified
* {@code action} will run as. This parameter
- * may be {@code null}. <p>
+ * may be {@code null}.
*
* @param <T> the type of the value returned by the PrivilegedAction's
* {@code run} method.
*
* @param action the code to be run as the specified
- * {@code Subject}. <p>
+ * {@code Subject}.
*
* @return the value returned by the PrivilegedAction's
* {@code run} method.
*
- * @exception NullPointerException if the {@code PrivilegedAction}
- * is {@code null}. <p>
+ * @throws NullPointerException if the {@code PrivilegedAction}
+ * is {@code null}.
*
- * @exception SecurityException if the caller does not have permission
- * to invoke this method.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have an
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("doAs")} permission to invoke this
+ * method.
*/
public static <T> T doAs(final Subject subject,
final java.security.PrivilegedAction<T> action) {
@@ -377,31 +377,32 @@
* passing it the provided {@code PrivilegedExceptionAction},
* as well as the newly constructed {@code AccessControlContext}.
*
- * <p>
- *
* @param subject the {@code Subject} that the specified
* {@code action} will run as. This parameter
- * may be {@code null}. <p>
+ * may be {@code null}.
*
* @param <T> the type of the value returned by the
* PrivilegedExceptionAction's {@code run} method.
*
* @param action the code to be run as the specified
- * {@code Subject}. <p>
+ * {@code Subject}.
*
* @return the value returned by the
* PrivilegedExceptionAction's {@code run} method.
*
- * @exception PrivilegedActionException if the
+ * @throws PrivilegedActionException if the
* {@code PrivilegedExceptionAction.run}
- * method throws a checked exception. <p>
+ * method throws a checked exception.
*
- * @exception NullPointerException if the specified
+ * @throws NullPointerException if the specified
* {@code PrivilegedExceptionAction} is
- * {@code null}. <p>
+ * {@code null}.
*
- * @exception SecurityException if the caller does not have permission
- * to invoke this method.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have an
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("doAs")} permission to invoke this
+ * method.
*/
public static <T> T doAs(final Subject subject,
final java.security.PrivilegedExceptionAction<T> action)
@@ -435,29 +436,30 @@
* this method instantiates a new {@code AccessControlContext}
* with an empty collection of ProtectionDomains.
*
- * <p>
- *
* @param subject the {@code Subject} that the specified
* {@code action} will run as. This parameter
- * may be {@code null}. <p>
+ * may be {@code null}.
*
* @param <T> the type of the value returned by the PrivilegedAction's
* {@code run} method.
*
* @param action the code to be run as the specified
- * {@code Subject}. <p>
+ * {@code Subject}.
*
* @param acc the {@code AccessControlContext} to be tied to the
- * specified <i>subject</i> and <i>action</i>. <p>
+ * specified <i>subject</i> and <i>action</i>.
*
* @return the value returned by the PrivilegedAction's
* {@code run} method.
*
- * @exception NullPointerException if the {@code PrivilegedAction}
- * is {@code null}. <p>
+ * @throws NullPointerException if the {@code PrivilegedAction}
+ * is {@code null}.
*
- * @exception SecurityException if the caller does not have permission
- * to invoke this method.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have a
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("doAsPrivileged")} permission to invoke
+ * this method.
*/
public static <T> T doAsPrivileged(final Subject subject,
final java.security.PrivilegedAction<T> action,
@@ -495,34 +497,35 @@
* this method instantiates a new {@code AccessControlContext}
* with an empty collection of ProtectionDomains.
*
- * <p>
- *
* @param subject the {@code Subject} that the specified
* {@code action} will run as. This parameter
- * may be {@code null}. <p>
+ * may be {@code null}.
*
* @param <T> the type of the value returned by the
* PrivilegedExceptionAction's {@code run} method.
*
* @param action the code to be run as the specified
- * {@code Subject}. <p>
+ * {@code Subject}.
*
* @param acc the {@code AccessControlContext} to be tied to the
- * specified <i>subject</i> and <i>action</i>. <p>
+ * specified <i>subject</i> and <i>action</i>.
*
* @return the value returned by the
* PrivilegedExceptionAction's {@code run} method.
*
- * @exception PrivilegedActionException if the
+ * @throws PrivilegedActionException if the
* {@code PrivilegedExceptionAction.run}
- * method throws a checked exception. <p>
+ * method throws a checked exception.
*
- * @exception NullPointerException if the specified
+ * @throws NullPointerException if the specified
* {@code PrivilegedExceptionAction} is
- * {@code null}. <p>
+ * {@code null}.
*
- * @exception SecurityException if the caller does not have permission
- * to invoke this method.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have a
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("doAsPrivileged")} permission to invoke
+ * this method.
*/
public static <T> T doAsPrivileged(final Subject subject,
final java.security.PrivilegedExceptionAction<T> action,
@@ -577,9 +580,12 @@
* to the returned {@code Set} affects the internal
* {@code Principal} {@code Set} as well.
*
- * <p>
+ * <p> If a security manager is installed, the caller must have a
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("modifyPrincipals")} permission to modify
+ * the returned set, or a {@code SecurityException} will be thrown.
*
- * @return The {@code Set} of Principals associated with this
+ * @return the {@code Set} of Principals associated with this
* {@code Subject}.
*/
public Set<Principal> getPrincipals() {
@@ -600,8 +606,6 @@
* Modifications to the returned {@code Set}
* will not affect the internal {@code Principal} {@code Set}.
*
- * <p>
- *
* @param <T> the type of the class modeled by {@code c}
*
* @param c the returned {@code Set} of Principals will all be
@@ -610,8 +614,8 @@
* @return a {@code Set} of Principals that are instances of the
* specified {@code Class}.
*
- * @exception NullPointerException if the specified {@code Class}
- * is {@code null}.
+ * @throws NullPointerException if the specified {@code Class}
+ * is {@code null}.
*/
public <T extends Principal> Set<T> getPrincipals(Class<T> c) {
@@ -632,9 +636,12 @@
* to the returned {@code Set} affects the internal public
* Credential {@code Set} as well.
*
- * <p>
+ * <p> If a security manager is installed, the caller must have a
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("modifyPublicCredentials")} permission to modify
+ * the returned set, or a {@code SecurityException} will be thrown.
*
- * @return A {@code Set} of public credentials held by this
+ * @return a {@code Set} of public credentials held by this
* {@code Subject}.
*/
public Set<Object> getPublicCredentials() {
@@ -653,20 +660,18 @@
* to the returned {@code Set} affects the internal private
* Credential {@code Set} as well.
*
- * <p> A caller requires permissions to access the Credentials
- * in the returned {@code Set}, or to modify the
- * {@code Set} itself. A {@code SecurityException}
- * is thrown if the caller does not have the proper permissions.
+ * <p> If a security manager is installed, the caller must have a
+ * {@link AuthPermission#AuthPermission(String)
+ * AuthPermission("modifyPrivateCredentials")} permission to modify
+ * the returned set, or a {@code SecurityException} will be thrown.
*
* <p> While iterating through the {@code Set},
- * a {@code SecurityException} is thrown
- * if the caller does not have permission to access a
- * particular Credential. The {@code Iterator}
- * is nevertheless advanced to next element in the {@code Set}.
+ * a {@code SecurityException} is thrown if a security manager is installed
+ * and the caller does not have a {@link PrivateCredentialPermission}
+ * to access a particular Credential. The {@code Iterator}
+ * is nevertheless advanced to the next element in the {@code Set}.
*
- * <p>
- *
- * @return A {@code Set} of private credentials held by this
+ * @return a {@code Set} of private credentials held by this
* {@code Subject}.
*/
public Set<Object> getPrivateCredentials() {
@@ -695,8 +700,6 @@
* Modifications to the returned {@code Set}
* will not affect the internal public Credential {@code Set}.
*
- * <p>
- *
* @param <T> the type of the class modeled by {@code c}
*
* @param c the returned {@code Set} of public credentials will all be
@@ -705,7 +708,7 @@
* @return a {@code Set} of public credentials that are instances
* of the specified {@code Class}.
*
- * @exception NullPointerException if the specified {@code Class}
+ * @throws NullPointerException if the specified {@code Class}
* is {@code null}.
*/
public <T> Set<T> getPublicCredentials(Class<T> c) {
@@ -723,9 +726,9 @@
* {@code Subject} that are instances or subclasses of the specified
* {@code Class}.
*
- * <p> The caller must have permission to access all of the
- * requested Credentials, or a {@code SecurityException}
- * will be thrown.
+ * <p> If a security manager is installed, the caller must have a
+ * {@link PrivateCredentialPermission} to access all of the requested
+ * Credentials, or a {@code SecurityException} will be thrown.
*
* <p> The returned {@code Set} is not backed by this Subject's
* internal private Credential {@code Set}. A new
@@ -733,8 +736,6 @@
* Modifications to the returned {@code Set}
* will not affect the internal private Credential {@code Set}.
*
- * <p>
- *
* @param <T> the type of the class modeled by {@code c}
*
* @param c the returned {@code Set} of private credentials will all be
@@ -743,7 +744,7 @@
* @return a {@code Set} of private credentials that are instances
* of the specified {@code Class}.
*
- * @exception NullPointerException if the specified {@code Class}
+ * @throws NullPointerException if the specified {@code Class}
* is {@code null}.
*/
public <T> Set<T> getPrivateCredentials(Class<T> c) {
@@ -772,19 +773,18 @@
* equal if their {@code Principal} and {@code Credential}
* Sets are equal.
*
- * <p>
- *
* @param o Object to be compared for equality with this
* {@code Subject}.
*
* @return true if the specified Object is equal to this
* {@code Subject}.
*
- * @exception SecurityException if the caller does not have permission
- * to access the private credentials for this {@code Subject},
- * or if the caller does not have permission to access the
- * private credentials for the provided {@code Subject}.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have a {@link PrivateCredentialPermission}
+ * permission to access the private credentials for this
+ * {@code Subject} or the provided {@code Subject}.
*/
+ @Override
public boolean equals(Object o) {
if (o == null) {
@@ -834,10 +834,9 @@
/**
* Return the String representation of this {@code Subject}.
*
- * <p>
- *
* @return the String representation of this {@code Subject}.
*/
+ @Override
public String toString() {
return toString(true);
}
@@ -895,13 +894,13 @@
/**
* Returns a hashcode for this {@code Subject}.
*
- * <p>
- *
* @return a hashcode for this {@code Subject}.
*
- * @exception SecurityException if the caller does not have permission
- * to access this Subject's private credentials.
+ * @throws SecurityException if a security manager is installed and the
+ * caller does not have a {@link PrivateCredentialPermission}
+ * permission to access this Subject's private credentials.
*/
+ @Override
public int hashCode() {
/**
@@ -996,7 +995,7 @@
*
* @param coll A {@code Collection} to be tested for null references
*
- * @exception NullPointerException if the specified collection is either
+ * @throws NullPointerException if the specified collection is either
* {@code null} or contains a {@code null} element
*/
private static void collectionNullClean(Collection<?> coll) {
@@ -1546,7 +1545,7 @@
}
}
- static class AuthPermissionHolder {
+ static final class AuthPermissionHolder {
static final AuthPermission DO_AS_PERMISSION =
new AuthPermission("doAs");
diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/Era.java b/jdk/src/java.base/share/classes/sun/util/calendar/Era.java
index a013c57..3ab0411 100644
--- a/jdk/src/java.base/share/classes/sun/util/calendar/Era.java
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/Era.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,20 +41,15 @@
* <code>CalendarDate</code>.
*
* <p>The following era names are defined in this release.
- * <!-- TODO: use HTML table -->
- * <pre><tt>
+ * <pre>{@code
* Calendar system Era name Since (in Gregorian)
* -----------------------------------------------------------------------
- * Japanese calendar Meiji 1868-01-01 midnight local time
- * Taisho 1912-07-30 midnight local time
- * Showa 1926-12-26 midnight local time
- * Heisei 1989-01-08 midnight local time
- * Julian calendar BeforeCommonEra -292275055-05-16T16:47:04.192Z
- * CommonEra 0000-12-30 midnight local time
- * Taiwanese calendar MinGuo 1911-01-01 midnight local time
- * Thai Buddhist calendar BuddhistEra -543-01-01 midnight local time
+ * Japanese calendar Meiji 1868-01-01T00:00:00 local time
+ * Taisho 1912-07-30T00:00:00 local time
+ * Showa 1926-12-25T00:00:00 local time
+ * Heisei 1989-01-08T00:00:00 local time
* -----------------------------------------------------------------------
- * </tt></pre>
+ * }</pre>
*
* @author Masayoshi Okutsu
* @since 1.5
diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java b/jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
index 9a9b663..10cbbdc 100644
--- a/jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,7 @@
package sun.util.calendar;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
+import java.security.AccessController;
import java.util.TimeZone;
/**
@@ -39,6 +35,28 @@
*/
public class LocalGregorianCalendar extends BaseCalendar {
+ private static final Era[] JAPANESE_ERAS = {
+ new Era("Meiji", "M", -3218832000000L, true),
+ new Era("Taisho", "T", -1812153600000L, true),
+ new Era("Showa", "S", -1357603200000L, true),
+ new Era("Heisei", "H", 600220800000L, true),
+ };
+
+ private static boolean isValidEra(Era newEra, Era[] eras) {
+ Era last = eras[eras.length - 1];
+ if (last.getSinceDate().getYear() >= newEra.getSinceDate().getYear()) {
+ return false;
+ }
+ // The new era name should be unique. Its abbr may not.
+ String newName = newEra.getName();
+ for (Era era : eras) {
+ if (era.getName().equals(newName)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
private String name;
private Era[] eras;
@@ -118,58 +136,70 @@
}
static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
- Properties calendarProps;
- try {
- calendarProps = CalendarSystem.getCalendarProperties();
- } catch (IOException | IllegalArgumentException e) {
- throw new InternalError(e);
- }
- // Parse calendar.*.eras
- String props = calendarProps.getProperty("calendar." + name + ".eras");
- if (props == null) {
+ // Only the Japanese calendar is supported.
+ if (!"japanese".equals(name)) {
return null;
}
- List<Era> eras = new ArrayList<>();
- StringTokenizer eraTokens = new StringTokenizer(props, ";");
- while (eraTokens.hasMoreTokens()) {
- String items = eraTokens.nextToken().trim();
- StringTokenizer itemTokens = new StringTokenizer(items, ",");
- String eraName = null;
- boolean localTime = true;
- long since = 0;
- String abbr = null;
- while (itemTokens.hasMoreTokens()) {
- String item = itemTokens.nextToken();
- int index = item.indexOf('=');
- // it must be in the key=value form.
- if (index == -1) {
- return null;
- }
- String key = item.substring(0, index);
- String value = item.substring(index + 1);
- if ("name".equals(key)) {
- eraName = value;
- } else if ("since".equals(key)) {
- if (value.endsWith("u")) {
- localTime = false;
- since = Long.parseLong(value.substring(0, value.length() - 1));
- } else {
- since = Long.parseLong(value);
- }
- } else if ("abbr".equals(key)) {
- abbr = value;
- } else {
- throw new RuntimeException("Unknown key word: " + key);
+ // Append an era to the predefined eras if it's given by the property.
+ String prop = AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("jdk.calendar.japanese.supplemental.era"));
+ if (prop != null) {
+ Era era = parseEraEntry(prop);
+ if (era != null) {
+ if (isValidEra(era, JAPANESE_ERAS)) {
+ int length = JAPANESE_ERAS.length;
+ Era[] eras = new Era[length + 1];
+ System.arraycopy(JAPANESE_ERAS, 0, eras, 0, length);
+ eras[length] = era;
+ return new LocalGregorianCalendar(name, eras);
}
}
- Era era = new Era(eraName, abbr, since, localTime);
- eras.add(era);
}
- Era[] eraArray = new Era[eras.size()];
- eras.toArray(eraArray);
+ return new LocalGregorianCalendar(name, JAPANESE_ERAS);
+ }
- return new LocalGregorianCalendar(name, eraArray);
+ private static Era parseEraEntry(String entry) {
+ String[] keyValuePairs = entry.split(",");
+ String eraName = null;
+ boolean localTime = true;
+ long since = 0;
+ String abbr = null;
+
+ for (String item : keyValuePairs) {
+ String[] keyvalue = item.split("=");
+ if (keyvalue.length != 2) {
+ return null;
+ }
+ String key = keyvalue[0].trim();
+ String value = keyvalue[1].trim();
+ switch (key) {
+ case "name":
+ eraName = value;
+ break;
+ case "since":
+ if (value.endsWith("u")) {
+ localTime = false;
+ value = value.substring(0, value.length() - 1);
+ }
+ try {
+ since = Long.parseLong(value);
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ break;
+ case "abbr":
+ abbr = value;
+ break;
+ default:
+ return null;
+ }
+ }
+ if (eraName == null || eraName.isEmpty()
+ || abbr == null || abbr.isEmpty()) {
+ return null;
+ }
+ return new Era(eraName, abbr, since, localTime);
}
private LocalGregorianCalendar(String name, Era[] eras) {
@@ -262,9 +292,8 @@
}
private boolean validateEra(Era era) {
- // Validate the era
- for (int i = 0; i < eras.length; i++) {
- if (era == eras[i]) {
+ for (Era era1 : eras) {
+ if (era == era1) {
return true;
}
}
@@ -333,6 +362,7 @@
}
if (i >= 0) {
ldate.setLocalEra(era);
+ @SuppressWarnings("null")
int y = ldate.getNormalizedYear() - era.getSinceDate().getYear() + 1;
ldate.setLocalYear(y);
} else {
diff --git a/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
index 77f7b84..bda94f6 100644
--- a/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
+++ b/jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
import java.security.PrivilegedAction;
import java.text.spi.BreakIteratorProvider;
import java.text.spi.CollatorProvider;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -102,6 +103,9 @@
@Override
protected Set<String> createLanguageTagSet(String category) {
ResourceBundle rb = ResourceBundle.getBundle("sun.util.cldr.CLDRLocaleDataMetaInfo", Locale.ROOT);
+ if (rb.containsKey(category)) {
+ return Collections.emptySet();
+ }
String supportedLocaleString = rb.getString(category);
Set<String> tagset = new HashSet<>();
StringTokenizer tokens = new StringTokenizer(supportedLocaleString);
diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
index 50473cd..f07d793 100644
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
import java.text.spi.DateFormatSymbolsProvider;
import java.text.spi.DecimalFormatSymbolsProvider;
import java.text.spi.NumberFormatProvider;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
@@ -356,6 +357,9 @@
protected Set<String> createLanguageTagSet(String category) {
String supportedLocaleString = LocaleDataMetaInfo.getSupportedLocaleString(category);
+ if (supportedLocaleString == null) {
+ return Collections.emptySet();
+ }
Set<String> tagset = new HashSet<>();
StringTokenizer tokens = new StringTokenizer(supportedLocaleString);
while (tokens.hasMoreTokens()) {
diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
index 17d9af6..52ac29d 100644
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,12 @@
resourceNameToLocales.put("CollationData",
" #CollationData_ENLocales# | #CollationData_NonENLocales# ");
+ resourceNameToLocales.put("BreakIteratorInfo",
+ " #BreakIteratorInfo_ENLocales# | #BreakIteratorInfo_NonENLocales# ");
+
+ resourceNameToLocales.put("BreakIteratorRules",
+ " #BreakIteratorRules_ENLocales# | #BreakIteratorRules_NonENLocales# ");
+
resourceNameToLocales.put("TimeZoneNames",
" #TimeZoneNames_ENLocales# | #TimeZoneNames_NonENLocales# ");
diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
index b7ba736..3f72221 100644
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -295,7 +295,7 @@
* A utility method for implementing the default LocaleServiceProvider.isSupportedLocale
* for the JRE, CLDR, and FALLBACK adapters.
*/
- static boolean isSupportedLocale(Locale locale, LocaleProviderAdapter.Type type, Set<String> langtags) {
+ public static boolean isSupportedLocale(Locale locale, LocaleProviderAdapter.Type type, Set<String> langtags) {
assert type == Type.JRE || type == Type.CLDR || type == Type.FALLBACK;
if (Locale.ROOT.equals(locale)) {
return true;
diff --git a/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java b/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
index 00ba6de..679baf6 100644
--- a/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
+++ b/jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,8 +48,11 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.util.Set;
+import sun.util.locale.provider.JRELocaleProviderAdapter;
import sun.util.locale.provider.LocaleDataMetaInfo;
import sun.util.locale.provider.LocaleProviderAdapter;
+import static sun.util.locale.provider.LocaleProviderAdapter.Type.CLDR;
import static sun.util.locale.provider.LocaleProviderAdapter.Type.JRE;
/**
@@ -204,35 +207,23 @@
@Override
public List<Locale> getCandidateLocales(String baseName, Locale locale) {
List<Locale> candidates = super.getCandidateLocales(baseName, locale);
- /* Get the locale string list from LocaleDataMetaInfo class. */
- String localeString = LocaleDataMetaInfo.getSupportedLocaleString(baseName);
-
- if (localeString != null && localeString.length() != 0) {
- for (Iterator<Locale> l = candidates.iterator(); l.hasNext();) {
- Locale loc = l.next();
- String lstr;
- if (loc.getScript().length() > 0) {
- lstr = loc.toLanguageTag().replace('-', '_');
- } else {
- lstr = loc.toString();
- int idx = lstr.indexOf("_#");
- if (idx >= 0) {
- lstr = lstr.substring(0, idx);
- }
- }
- /* Every locale string in the locale string list returned from
- the above getSupportedLocaleString is enclosed
- within two white spaces so that we could check some locale
- such as "en".
- */
- if (lstr.length() != 0 && localeString.indexOf(" " + lstr + " ") == -1) {
- l.remove();
+ // Weed out Locales which are known to have no resource bundles
+ int lastDot = baseName.lastIndexOf('.');
+ String category = (lastDot >= 0) ? baseName.substring(lastDot + 1) : baseName;
+ LocaleProviderAdapter.Type type = baseName.contains(DOTCLDR) ? CLDR : JRE;
+ LocaleProviderAdapter adapter = LocaleProviderAdapter.forType(type);
+ Set<String> langtags = ((JRELocaleProviderAdapter)adapter).getLanguageTagSet(category);
+ if (!langtags.isEmpty()) {
+ for (Iterator<Locale> itr = candidates.iterator(); itr.hasNext();) {
+ if (!LocaleProviderAdapter.isSupportedLocale(itr.next(), type, langtags)) {
+ itr.remove();
}
}
}
+
// Force fallback to Locale.ENGLISH for CLDR time zone names support
if (locale.getLanguage() != "en"
- && baseName.contains(CLDR) && baseName.endsWith("TimeZoneNames")) {
+ && type == CLDR && category.equals("TimeZoneNames")) {
candidates.add(candidates.size() - 1, Locale.ENGLISH);
}
return candidates;
@@ -254,7 +245,7 @@
return null;
}
- private static final String CLDR = ".cldr";
+ private static final String DOTCLDR = ".cldr";
/**
* Changes baseName to its per-language package name and
@@ -275,8 +266,8 @@
assert JRE.getUtilResourcesPackage().length()
== JRE.getTextResourcesPackage().length();
int index = JRE.getUtilResourcesPackage().length();
- if (baseName.indexOf(CLDR, index) > 0) {
- index += CLDR.length();
+ if (baseName.indexOf(DOTCLDR, index) > 0) {
+ index += DOTCLDR.length();
}
newBaseName = baseName.substring(0, index + 1) + lang
+ baseName.substring(index);
diff --git a/jdk/src/java.base/share/conf/calendars.properties b/jdk/src/java.base/share/conf/calendars.properties
index 49f68ac..46bb0e2 100644
--- a/jdk/src/java.base/share/conf/calendars.properties
+++ b/jdk/src/java.base/share/conf/calendars.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,37 +23,6 @@
#
#
-# Japanese imperial calendar
-#
-# Meiji since 1868-01-01 00:00:00 local time (Gregorian)
-# Taisho since 1912-07-30 00:00:00 local time (Gregorian)
-# Showa since 1926-12-25 00:00:00 local time (Gregorian)
-# Heisei since 1989-01-08 00:00:00 local time (Gregorian)
-calendar.japanese.type: LocalGregorianCalendar
-calendar.japanese.eras: \
- name=Meiji,abbr=M,since=-3218832000000; \
- name=Taisho,abbr=T,since=-1812153600000; \
- name=Showa,abbr=S,since=-1357603200000; \
- name=Heisei,abbr=H,since=600220800000
-
-#
-# Taiwanese calendar
-# Minguo since 1911-01-01 00:00:00 local time (Gregorian)
-calendar.taiwanese.type: LocalGregorianCalendar
-calendar.taiwanese.eras: \
- name=MinGuo,since=-1830384000000
-
-#
-# Thai Buddhist calendar
-# Buddhist Era since -542-01-01 00:00:00 local time (Gregorian)
-calendar.thai-buddhist.type: LocalGregorianCalendar
-calendar.thai-buddhist.eras: \
- name=BuddhistEra,abbr=B.E.,since=-79302585600000
-calendar.thai-buddhist.year-boundary: \
- day1=4-1,since=-79302585600000; \
- day1=1-1,since=-915148800000
-
-#
# Hijrah calendars
#
calendar.hijrah.Hijrah-umalqura: hijrah-config-umalqura.properties
diff --git a/jdk/src/java.base/share/conf/security/java.security-windows b/jdk/src/java.base/share/conf/security/java.security
similarity index 94%
rename from jdk/src/java.base/share/conf/security/java.security-windows
rename to jdk/src/java.base/share/conf/security/java.security
index bd34766..7f7bc9c 100644
--- a/jdk/src/java.base/share/conf/security/java.security-windows
+++ b/jdk/src/java.base/share/conf/security/java.security
@@ -65,16 +65,25 @@
#
# List of providers and their preference orders (see above):
#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=sun.security.ec.SunEC
-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-security.provider.5=com.sun.crypto.provider.SunJCE
-security.provider.6=sun.security.jgss.SunProvider
-security.provider.7=com.sun.security.sasl.Provider
-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.9=sun.security.smartcardio.SunPCSC
-security.provider.10=sun.security.mscapi.SunMSCAPI
+#ifdef solaris
+security.provider.tbd=com.oracle.security.ucrypto.UcryptoProvider ${java.home}/lib/security/ucrypto-solaris.cfg
+security.provider.tbd=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
+#endif
+security.provider.tbd=sun.security.provider.Sun
+security.provider.tbd=sun.security.rsa.SunRsaSign
+security.provider.tbd=sun.security.ec.SunEC
+security.provider.tbd=com.sun.net.ssl.internal.ssl.Provider
+security.provider.tbd=com.sun.crypto.provider.SunJCE
+security.provider.tbd=sun.security.jgss.SunProvider
+security.provider.tbd=com.sun.security.sasl.Provider
+security.provider.tbd=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+security.provider.tbd=sun.security.smartcardio.SunPCSC
+#ifdef windows
+security.provider.tbd=sun.security.mscapi.SunMSCAPI
+#endif
+#ifdef macosx
+security.provider.tbd=apple.security.AppleProvider
+#endif
#
# Sun Provider SecureRandom seed source.
@@ -127,7 +136,12 @@
# This is a comma-separated list of algorithm and/or algorithm:provider
# entries.
#
+#ifdef windows
securerandom.strongAlgorithms=Windows-PRNG:SunMSCAPI,SHA1PRNG:SUN
+#endif
+#ifndef windows
+securerandom.strongAlgorithms=NativePRNGBlocking:SUN
+#endif
#
# Class to instantiate as the javax.security.auth.login.Configuration
@@ -212,7 +226,9 @@
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
com.sun.activation.registries.,\
- com.sun.java.accessibility.
+#ifdef macosx
+ apple.,\
+#endif
#
# List of comma-separated packages that start with or equal this string
@@ -259,7 +275,9 @@
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
com.sun.activation.registries.,\
- com.sun.java.accessibility.
+#ifdef macosx
+ apple.,\
+#endif
#
# Determines whether this properties file can be appended to
diff --git a/jdk/src/java.base/share/conf/security/java.security-aix b/jdk/src/java.base/share/conf/security/java.security-aix
deleted file mode 100644
index 77540a3..0000000
--- a/jdk/src/java.base/share/conf/security/java.security-aix
+++ /dev/null
@@ -1,496 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-# -Djava.security.properties=<URL>
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-# -Djava.security.properties==<URL> (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-# security.provider.<n>=<className>
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-# <className> must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-# security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=sun.security.ec.SunEC
-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-security.provider.5=com.sun.crypto.provider.SunJCE
-security.provider.6=sun.security.jgss.SunProvider
-security.provider.7=com.sun.security.sasl.Provider
-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.9=sun.security.smartcardio.SunPCSC
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property. If an
-# exception occurs while accessing the specified URL:
-#
-# SHA1PRNG:
-# the traditional system/thread activity algorithm will be used.
-#
-# NativePRNG:
-# a default value of /dev/random will be used. If neither
-# are available, the implementation will be disabled.
-# "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-# % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.
-
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.
-
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-# serious security implications. Do not set it unless
-# you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-# ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-# ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-# ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-# ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-# ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-# KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-# KDCs in the blacklist are still tried by their order in the configuration,
-# but with smaller max_retries and timeout values. max_retries and timeout
-# are optional numerical parameters (default 1 and 5000, which means once
-# and 5 seconds). Please notes that if any of the values defined here is
-# more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-# krb5.kdc.bad.policy = tryLast
-# krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation. For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm. This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length. This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-# DisabledAlgorithms:
-# " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-# DisabledAlgorithm:
-# AlgorithmName [Constraint]
-#
-# AlgorithmName:
-# (see below)
-#
-# Constraint:
-# KeySizeConstraint
-#
-# KeySizeConstraint:
-# keySize Operator DecimalInteger
-#
-# Operator:
-# <= | < | == | != | >= | >
-#
-# DecimalInteger:
-# DecimalDigits
-#
-# DecimalDigits:
-# DecimalDigit {DecimalDigit}
-#
-# DecimalDigit: one of
-# 1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names. Matching
-# is performed using a case-insensitive sub-element matching rule. (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.) If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation. For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the
-# key size specified in number of bits. For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS. This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/java.base/share/conf/security/java.security-linux b/jdk/src/java.base/share/conf/security/java.security-linux
deleted file mode 100644
index 6f4204c..0000000
--- a/jdk/src/java.base/share/conf/security/java.security-linux
+++ /dev/null
@@ -1,496 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-# -Djava.security.properties=<URL>
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-# -Djava.security.properties==<URL> (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-# security.provider.<n>=<className>
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-# <className> must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-# security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=sun.security.ec.SunEC
-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-security.provider.5=com.sun.crypto.provider.SunJCE
-security.provider.6=sun.security.jgss.SunProvider
-security.provider.7=com.sun.security.sasl.Provider
-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.9=sun.security.smartcardio.SunPCSC
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property. If an
-# exception occurs while accessing the specified URL:
-#
-# SHA1PRNG:
-# the traditional system/thread activity algorithm will be used.
-#
-# NativePRNG:
-# a default value of /dev/random will be used. If neither
-# are available, the implementation will be disabled.
-# "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-# % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- com.sun.activation.registries.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- com.sun.activation.registries.
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-# serious security implications. Do not set it unless
-# you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-# ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-# ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-# ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-# ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-# ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-# KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-# KDCs in the blacklist are still tried by their order in the configuration,
-# but with smaller max_retries and timeout values. max_retries and timeout
-# are optional numerical parameters (default 1 and 5000, which means once
-# and 5 seconds). Please notes that if any of the values defined here is
-# more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-# krb5.kdc.bad.policy = tryLast
-# krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation. For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm. This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length. This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-# DisabledAlgorithms:
-# " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-# DisabledAlgorithm:
-# AlgorithmName [Constraint]
-#
-# AlgorithmName:
-# (see below)
-#
-# Constraint:
-# KeySizeConstraint
-#
-# KeySizeConstraint:
-# keySize Operator DecimalInteger
-#
-# Operator:
-# <= | < | == | != | >= | >
-#
-# DecimalInteger:
-# DecimalDigits
-#
-# DecimalDigits:
-# DecimalDigit {DecimalDigit}
-#
-# DecimalDigit: one of
-# 1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names. Matching
-# is performed using a case-insensitive sub-element matching rule. (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.) If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation. For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the
-# key size specified in number of bits. For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS. This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/java.base/share/conf/security/java.security-macosx b/jdk/src/java.base/share/conf/security/java.security-macosx
deleted file mode 100644
index ff72699..0000000
--- a/jdk/src/java.base/share/conf/security/java.security-macosx
+++ /dev/null
@@ -1,499 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-# -Djava.security.properties=<URL>
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-# -Djava.security.properties==<URL> (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-# security.provider.<n>=<className>
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-# <className> must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-# security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=sun.security.provider.Sun
-security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=sun.security.ec.SunEC
-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-security.provider.5=com.sun.crypto.provider.SunJCE
-security.provider.6=sun.security.jgss.SunProvider
-security.provider.7=com.sun.security.sasl.Provider
-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.9=sun.security.smartcardio.SunPCSC
-security.provider.10=apple.security.AppleProvider
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property. If an
-# exception occurs while accessing the specified URL:
-#
-# SHA1PRNG:
-# the traditional system/thread activity algorithm will be used.
-#
-# NativePRNG:
-# a default value of /dev/random will be used. If neither
-# are available, the implementation will be disabled.
-# "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-# % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- com.sun.activation.registries.,\
- apple.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- com.sun.activation.registries.,\
- apple.
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-# serious security implications. Do not set it unless
-# you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-# ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-# ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-# ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-# ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-# ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-# KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-# KDCs in the blacklist are still tried by their order in the configuration,
-# but with smaller max_retries and timeout values. max_retries and timeout
-# are optional numerical parameters (default 1 and 5000, which means once
-# and 5 seconds). Please notes that if any of the values defined here is
-# more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-# krb5.kdc.bad.policy = tryLast
-# krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation. For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm. This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length. This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-# DisabledAlgorithms:
-# " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-# DisabledAlgorithm:
-# AlgorithmName [Constraint]
-#
-# AlgorithmName:
-# (see below)
-#
-# Constraint:
-# KeySizeConstraint
-#
-# KeySizeConstraint:
-# keySize Operator DecimalInteger
-#
-# Operator:
-# <= | < | == | != | >= | >
-#
-# DecimalInteger:
-# DecimalDigits
-#
-# DecimalDigits:
-# DecimalDigit {DecimalDigit}
-#
-# DecimalDigit: one of
-# 1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names. Matching
-# is performed using a case-insensitive sub-element matching rule. (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.) If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation. For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the
-# key size specified in number of bits. For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS. This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/java.base/share/conf/security/java.security-solaris b/jdk/src/java.base/share/conf/security/java.security-solaris
deleted file mode 100644
index e26ff14..0000000
--- a/jdk/src/java.base/share/conf/security/java.security-solaris
+++ /dev/null
@@ -1,498 +0,0 @@
-#
-# This is the "master security properties file".
-#
-# An alternate java.security properties file may be specified
-# from the command line via the system property
-#
-# -Djava.security.properties=<URL>
-#
-# This properties file appends to the master security properties file.
-# If both properties files specify values for the same key, the value
-# from the command-line properties file is selected, as it is the last
-# one loaded.
-#
-# Also, if you specify
-#
-# -Djava.security.properties==<URL> (2 equals),
-#
-# then that properties file completely overrides the master security
-# properties file.
-#
-# To disable the ability to specify an additional properties file from
-# the command line, set the key security.overridePropertiesFile
-# to false in the master security properties file. It is set to true
-# by default.
-
-# In this file, various security properties are set for use by
-# java.security classes. This is where users can statically register
-# Cryptography Package Providers ("providers" for short). The term
-# "provider" refers to a package or set of packages that supply a
-# concrete implementation of a subset of the cryptography aspects of
-# the Java Security API. A provider may, for example, implement one or
-# more digital signature algorithms or message digest algorithms.
-#
-# Each provider must implement a subclass of the Provider class.
-# To register a provider in this master security properties file,
-# specify the Provider subclass name and priority in the format
-#
-# security.provider.<n>=<className>
-#
-# This declares a provider, and specifies its preference
-# order n. The preference order is the order in which providers are
-# searched for requested algorithms (when no specific provider is
-# requested). The order is 1-based; 1 is the most preferred, followed
-# by 2, and so on.
-#
-# <className> must specify the subclass of the Provider class whose
-# constructor sets the values of various properties that are required
-# for the Java Security API to look up the algorithms or other
-# facilities implemented by the provider.
-#
-# There must be at least one provider specification in java.security.
-# There is a default provider that comes standard with the JDK. It
-# is called the "SUN" provider, and its Provider subclass
-# named Sun appears in the sun.security.provider package. Thus, the
-# "SUN" provider is registered via the following:
-#
-# security.provider.1=sun.security.provider.Sun
-#
-# (The number 1 is used for the default provider.)
-#
-# Note: Providers can be dynamically registered instead by calls to
-# either the addProvider or insertProviderAt method in the Security
-# class.
-
-#
-# List of providers and their preference orders (see above):
-#
-security.provider.1=com.oracle.security.ucrypto.UcryptoProvider ${java.home}/lib/security/ucrypto-solaris.cfg
-security.provider.2=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
-security.provider.3=sun.security.provider.Sun
-security.provider.4=sun.security.rsa.SunRsaSign
-security.provider.5=sun.security.ec.SunEC
-security.provider.6=com.sun.net.ssl.internal.ssl.Provider
-security.provider.7=com.sun.crypto.provider.SunJCE
-security.provider.8=sun.security.jgss.SunProvider
-security.provider.9=com.sun.security.sasl.Provider
-security.provider.10=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.11=sun.security.smartcardio.SunPCSC
-
-#
-# Sun Provider SecureRandom seed source.
-#
-# Select the primary source of seed data for the "SHA1PRNG" and
-# "NativePRNG" SecureRandom implementations in the "Sun" provider.
-# (Other SecureRandom implementations might also use this property.)
-#
-# On Unix-like systems (for example, Solaris/Linux/MacOS), the
-# "NativePRNG" and "SHA1PRNG" implementations obtains seed data from
-# special device files such as file:/dev/random.
-#
-# On Windows systems, specifying the URLs "file:/dev/random" or
-# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding
-# mechanism for SHA1PRNG.
-#
-# By default, an attempt is made to use the entropy gathering device
-# specified by the "securerandom.source" Security property. If an
-# exception occurs while accessing the specified URL:
-#
-# SHA1PRNG:
-# the traditional system/thread activity algorithm will be used.
-#
-# NativePRNG:
-# a default value of /dev/random will be used. If neither
-# are available, the implementation will be disabled.
-# "file" is the only currently supported protocol type.
-#
-# The entropy gathering device can also be specified with the System
-# property "java.security.egd". For example:
-#
-# % java -Djava.security.egd=file:/dev/random MainClass
-#
-# Specifying this System property will override the
-# "securerandom.source" Security property.
-#
-# In addition, if "file:/dev/random" or "file:/dev/urandom" is
-# specified, the "NativePRNG" implementation will be more preferred than
-# SHA1PRNG in the Sun provider.
-#
-securerandom.source=file:/dev/random
-
-#
-# A list of known strong SecureRandom implementations.
-#
-# To help guide applications in selecting a suitable strong
-# java.security.SecureRandom implementation, Java distributions should
-# indicate a list of known strong implementations using the property.
-#
-# This is a comma-separated list of algorithm and/or algorithm:provider
-# entries.
-#
-securerandom.strongAlgorithms=NativePRNGBlocking:SUN
-
-#
-# Class to instantiate as the javax.security.auth.login.Configuration
-# provider.
-#
-login.configuration.provider=sun.security.provider.ConfigFile
-
-#
-# Default login configuration file
-#
-#login.config.url.1=file:${user.home}/.java.login.config
-
-#
-# Class to instantiate as the system Policy. This is the name of the class
-# that will be used as the Policy object.
-#
-policy.provider=sun.security.provider.PolicyFile
-
-# The default is to have a single system-wide policy file,
-# and a policy file in the user's home directory.
-policy.url.1=file:${java.home}/lib/security/java.policy
-policy.url.2=file:${user.home}/.java.policy
-
-# whether or not we expand properties in the policy file
-# if this is set to false, properties (${...}) will not be expanded in policy
-# files.
-policy.expandProperties=true
-
-# whether or not we allow an extra policy to be passed on the command line
-# with -Djava.security.policy=somefile. Comment out this line to disable
-# this feature.
-policy.allowSystemProperty=true
-
-# whether or not we look into the IdentityScope for trusted Identities
-# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
-policy.ignoreIdentityScope=false
-
-#
-# Default keystore type.
-#
-keystore.type=jks
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- com.sun.activation.registries.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, none of the class loaders supplied with the JDK call
-# checkPackageDefinition.
-#
-package.definition=sun.,\
- com.sun.xml.internal.,\
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
- com.sun.media.sound.,\
- com.sun.naming.internal.,\
- com.sun.proxy.,\
- com.sun.corba.se.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
- com.sun.org.apache.xpath.internal.,\
- com.sun.org.apache.xalan.internal.extensions.,\
- com.sun.org.apache.xalan.internal.lib.,\
- com.sun.org.apache.xalan.internal.res.,\
- com.sun.org.apache.xalan.internal.templates.,\
- com.sun.org.apache.xalan.internal.utils.,\
- com.sun.org.apache.xalan.internal.xslt.,\
- com.sun.org.apache.xalan.internal.xsltc.cmdline.,\
- com.sun.org.apache.xalan.internal.xsltc.compiler.,\
- com.sun.org.apache.xalan.internal.xsltc.trax.,\
- com.sun.org.apache.xalan.internal.xsltc.util.,\
- com.sun.org.apache.xml.internal.res.,\
- com.sun.org.apache.xml.internal.security.,\
- com.sun.org.apache.xml.internal.serializer.utils.,\
- com.sun.org.apache.xml.internal.utils.,\
- com.sun.org.glassfish.,\
- com.oracle.xmlns.internal.,\
- com.oracle.webservices.internal.,\
- org.jcp.xml.dsig.internal.,\
- jdk.internal.,\
- jdk.nashorn.internal.,\
- jdk.nashorn.tools.,\
- com.sun.activation.registries.
-
-#
-# Determines whether this properties file can be appended to
-# or overridden on the command line via -Djava.security.properties
-#
-security.overridePropertiesFile=true
-
-#
-# Determines the default key and trust manager factory algorithms for
-# the javax.net.ssl package.
-#
-ssl.KeyManagerFactory.algorithm=SunX509
-ssl.TrustManagerFactory.algorithm=PKIX
-
-#
-# The Java-level namelookup cache policy for successful lookups:
-#
-# any negative value: caching forever
-# any positive value: the number of seconds to cache an address for
-# zero: do not cache
-#
-# default value is forever (FOREVER). For security reasons, this
-# caching is made forever when a security manager is set. When a security
-# manager is not set, the default behavior in this implementation
-# is to cache for 30 seconds.
-#
-# NOTE: setting this to anything other than the default value can have
-# serious security implications. Do not set it unless
-# you are sure you are not exposed to DNS spoofing attack.
-#
-#networkaddress.cache.ttl=-1
-
-# The Java-level namelookup cache policy for failed lookups:
-#
-# any negative value: cache forever
-# any positive value: the number of seconds to cache negative lookup results
-# zero: do not cache
-#
-# In some Microsoft Windows networking environments that employ
-# the WINS name service in addition to DNS, name service lookups
-# that fail may take a noticeably long time to return (approx. 5 seconds).
-# For this reason the default caching policy is to maintain these
-# results for 10 seconds.
-#
-#
-networkaddress.cache.negative.ttl=10
-
-#
-# Properties to configure OCSP for certificate revocation checking
-#
-
-# Enable OCSP
-#
-# By default, OCSP is not used for certificate revocation checking.
-# This property enables the use of OCSP when set to the value "true".
-#
-# NOTE: SocketPermission is required to connect to an OCSP responder.
-#
-# Example,
-# ocsp.enable=true
-
-#
-# Location of the OCSP responder
-#
-# By default, the location of the OCSP responder is determined implicitly
-# from the certificate being validated. This property explicitly specifies
-# the location of the OCSP responder. The property is used when the
-# Authority Information Access extension (defined in RFC 3280) is absent
-# from the certificate or when it requires overriding.
-#
-# Example,
-# ocsp.responderURL=http://ocsp.example.net:80
-
-#
-# Subject name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. In cases where
-# the subject name alone is not sufficient to uniquely identify the certificate
-# then both the "ocsp.responderCertIssuerName" and
-# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-# property is set then those two properties are ignored.
-#
-# Example,
-# ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-
-#
-# Issuer name of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# distinguished name (defined in RFC 2253) which identifies a certificate in
-# the set of certificates supplied during cert path validation. When this
-# property is set then the "ocsp.responderCertSerialNumber" property must also
-# be set. When the "ocsp.responderCertSubjectName" property is set then this
-# property is ignored.
-#
-# Example,
-# ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-
-#
-# Serial number of the OCSP responder's certificate
-#
-# By default, the certificate of the OCSP responder is that of the issuer
-# of the certificate being validated. This property identifies the certificate
-# of the OCSP responder when the default does not apply. Its value is a string
-# of hexadecimal digits (colon or space separators may be present) which
-# identifies a certificate in the set of certificates supplied during cert path
-# validation. When this property is set then the "ocsp.responderCertIssuerName"
-# property must also be set. When the "ocsp.responderCertSubjectName" property
-# is set then this property is ignored.
-#
-# Example,
-# ocsp.responderCertSerialNumber=2A:FF:00
-
-#
-# Policy for failed Kerberos KDC lookups:
-#
-# When a KDC is unavailable (network error, service failure, etc), it is
-# put inside a blacklist and accessed less often for future requests. The
-# value (case-insensitive) for this policy can be:
-#
-# tryLast
-# KDCs in the blacklist are always tried after those not on the list.
-#
-# tryLess[:max_retries,timeout]
-# KDCs in the blacklist are still tried by their order in the configuration,
-# but with smaller max_retries and timeout values. max_retries and timeout
-# are optional numerical parameters (default 1 and 5000, which means once
-# and 5 seconds). Please notes that if any of the values defined here is
-# more than what is defined in krb5.conf, it will be ignored.
-#
-# Whenever a KDC is detected as available, it is removed from the blacklist.
-# The blacklist is reset when krb5.conf is reloaded. You can add
-# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is
-# reloaded whenever a JAAS authentication is attempted.
-#
-# Example,
-# krb5.kdc.bad.policy = tryLast
-# krb5.kdc.bad.policy = tryLess:2,2000
-krb5.kdc.bad.policy = tryLast
-
-# Algorithm restrictions for certification path (CertPath) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# for certification path building and validation. For example, "MD2" is
-# generally no longer considered to be a secure hash algorithm. This section
-# describes the mechanism for disabling algorithms based on algorithm name
-# and/or key length. This includes algorithms used in certificates, as well
-# as revocation information such as CRLs and signed OCSP Responses.
-#
-# The syntax of the disabled algorithm string is described as this Java
-# BNF-style:
-# DisabledAlgorithms:
-# " DisabledAlgorithm { , DisabledAlgorithm } "
-#
-# DisabledAlgorithm:
-# AlgorithmName [Constraint]
-#
-# AlgorithmName:
-# (see below)
-#
-# Constraint:
-# KeySizeConstraint
-#
-# KeySizeConstraint:
-# keySize Operator DecimalInteger
-#
-# Operator:
-# <= | < | == | != | >= | >
-#
-# DecimalInteger:
-# DecimalDigits
-#
-# DecimalDigits:
-# DecimalDigit {DecimalDigit}
-#
-# DecimalDigit: one of
-# 1 2 3 4 5 6 7 8 9 0
-#
-# The "AlgorithmName" is the standard algorithm name of the disabled
-# algorithm. See "Java Cryptography Architecture Standard Algorithm Name
-# Documentation" for information about Standard Algorithm Names. Matching
-# is performed using a case-insensitive sub-element matching rule. (For
-# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and
-# "ECDSA" for signatures.) If the assertion "AlgorithmName" is a
-# sub-element of the certificate algorithm name, the algorithm will be
-# rejected during certification path building and validation. For example,
-# the assertion algorithm name "DSA" will disable all certificate algorithms
-# that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion
-# will not disable algorithms related to "ECDSA".
-#
-# A "Constraint" provides further guidance for the algorithm being specified.
-# The "KeySizeConstraint" requires a key of a valid size range if the
-# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the
-# key size specified in number of bits. For example, "RSA keySize <= 1024"
-# indicates that any RSA key with key size less than or equal to 1024 bits
-# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates
-# that any RSA key with key size less than 1024 or greater than 2048 should
-# be disabled. Note that the "KeySizeConstraint" only makes sense to key
-# algorithms.
-#
-# Note: This property is currently used by Oracle's PKIX implementation. It
-# is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
-#
-#
-jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
-
-# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
-# (SSL/TLS) processing
-#
-# In some environments, certain algorithms or key lengths may be undesirable
-# when using SSL/TLS. This section describes the mechanism for disabling
-# algorithms during SSL/TLS security parameters negotiation, including cipher
-# suites selection, peer authentication and key exchange mechanisms.
-#
-# For PKI-based peer authentication and key exchange mechanisms, this list
-# of disabled algorithms will also be checked during certification path
-# building and validation, including algorithms used in certificates, as
-# well as revocation information such as CRLs and signed OCSP Responses.
-# This is in addition to the jdk.certpath.disabledAlgorithms property above.
-#
-# See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string.
-#
-# Note: This property is currently used by Oracle's JSSE implementation.
-# It is not guaranteed to be examined and used by other implementations.
-#
-# Example:
-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
diff --git a/jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c b/jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c
index da5be22..18dee4d 100644
--- a/jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c
+++ b/jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c
@@ -599,9 +599,9 @@
*/
assert(prog != NULL && argBlock != NULL);
if ((phelperpath = getBytes(env, helperpath)) == NULL) goto Catch;
- if ((pprog = getBytes(env, prog)) == NULL) goto Catch;
- if ((pargBlock = getBytes(env, argBlock)) == NULL) goto Catch;
- if ((c->argv = NEW(const char *, argc + 3)) == NULL) goto Catch;
+ if ((pprog = getBytes(env, prog)) == NULL) goto Catch;
+ if ((pargBlock = getBytes(env, argBlock)) == NULL) goto Catch;
+ if ((c->argv = NEW(const char *, argc + 3)) == NULL) goto Catch;
c->argv[0] = pprog;
c->argc = argc + 2;
initVectorFromBlock(c->argv+1, pargBlock, argc);
@@ -690,10 +690,11 @@
closeSafely(childenv[0]);
closeSafely(childenv[1]);
- releaseBytes(env, prog, pprog);
- releaseBytes(env, argBlock, pargBlock);
- releaseBytes(env, envBlock, penvBlock);
- releaseBytes(env, dir, c->pdir);
+ releaseBytes(env, helperpath, phelperpath);
+ releaseBytes(env, prog, pprog);
+ releaseBytes(env, argBlock, pargBlock);
+ releaseBytes(env, envBlock, penvBlock);
+ releaseBytes(env, dir, c->pdir);
free(c->argv);
free(c->envv);
diff --git a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
index 28df9de..eeed61d 100644
--- a/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
+++ b/jdk/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
@@ -114,7 +114,7 @@
changes.putAll(other.changes);
}
- protected synchronized final void finalize() throws Throwable {
+ protected synchronized void finalize() throws Throwable {
if (cfDictionaryPtr == 0) return;
disposeCFDictionary(cfDictionaryPtr);
cfDictionaryPtr = 0;
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
index 90ce8ca..2ba95f6 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
@@ -938,7 +938,11 @@
final Point pt = new Point();
final Component c = getComponentToForwardTo(e, pt);
if (c == null) return;
- c.dispatchEvent(new MouseWheelEvent(c, e.getID(), e.getWhen(), e.getModifiers(), pt.x, pt.y, e.getClickCount(), e.isPopupTrigger(), e.getScrollType(), e.getScrollAmount(), e.getWheelRotation()));
+ c.dispatchEvent(new MouseWheelEvent(c, e.getID(), e.getWhen(),
+ e.getModifiers(), pt.x, pt.y, e.getXOnScreen(), e.getYOnScreen(),
+ e.getClickCount(), e.isPopupTrigger(), e.getScrollType(),
+ e.getScrollAmount(), e.getWheelRotation(),
+ e.getPreciseWheelRotation()));
}
public void componentResized(final ComponentEvent e) {
diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
index 8dd4fa6..3e40b84 100644
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
@@ -3307,7 +3307,7 @@
pane.repaint();
} else if (name == "indexForTitle") {
calculatedBaseline = false;
- updateHtmlViews((Integer) e.getNewValue());
+ updateHtmlViews((Integer) e.getNewValue(), false);
} else if (name == "tabLayoutPolicy") {
AquaTabbedPaneCopyFromBasicUI.this.uninstallUI(pane);
AquaTabbedPaneCopyFromBasicUI.this.installUI(pane);
@@ -3345,7 +3345,7 @@
calculatedBaseline = false;
} else if (name == "indexForNullComponent") {
isRunsDirty = true;
- updateHtmlViews((Integer) e.getNewValue());
+ updateHtmlViews((Integer) e.getNewValue(), true);
} else if (name == "font") {
calculatedBaseline = false;
}
@@ -3464,10 +3464,10 @@
return;
}
isRunsDirty = true;
- updateHtmlViews(tp.indexOfComponent(child));
+ updateHtmlViews(tp.indexOfComponent(child), true);
}
- private void updateHtmlViews(int index) {
+ private void updateHtmlViews(int index, boolean inserted) {
final String title = tabPane.getTitleAt(index);
final boolean isHTML = BasicHTML.isHTMLString(title);
if (isHTML) {
@@ -3475,16 +3475,24 @@
htmlViews = createHTMLVector();
} else { // Vector already exists
final View v = BasicHTML.createHTMLView(tabPane, title);
- htmlViews.insertElementAt(v, index);
+ setHtmlView(v, inserted, index);
}
} else { // Not HTML
if (htmlViews != null) { // Add placeholder
- htmlViews.insertElementAt(null, index);
+ setHtmlView(null, inserted, index);
} // else nada!
}
updateMnemonics();
}
+ private void setHtmlView(View v, boolean inserted, int index) {
+ if (inserted || index >= htmlViews.size()) {
+ htmlViews.insertElementAt(v, index);
+ } else {
+ htmlViews.setElementAt(v, index);
+ }
+ }
+
public void componentRemoved(final ContainerEvent e) {
final JTabbedPane tp = (JTabbedPane)e.getContainer();
final Component child = e.getChild();
diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java
index 8e1cead..28c5971 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java
+++ b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java
@@ -43,7 +43,7 @@
import sun.awt.util.ThreadGroupUtils;
import sun.lwawt.macosx.*;
-public class CFontManager extends SunFontManager {
+public final class CFontManager extends SunFontManager {
private FontConfigManager fcManager = null;
private static Hashtable<String, Font2D> genericFonts = new Hashtable<String, Font2D>();
@@ -61,20 +61,14 @@
return new CFontConfiguration(this, preferLocaleFonts, preferPropFonts);
}
- private static String[] defaultPlatformFont = null;
-
/*
* Returns an array of two strings. The first element is the
* name of the font. The second element is the file name.
*/
@Override
- public synchronized String[] getDefaultPlatformFont() {
- if (defaultPlatformFont == null) {
- defaultPlatformFont = new String[2];
- defaultPlatformFont[0] = "Lucida Grande";
- defaultPlatformFont[1] = "/System/Library/Fonts/LucidaGrande.ttc";
- }
- return defaultPlatformFont;
+ protected String[] getDefaultPlatformFont() {
+ return new String[]{"Lucida Grande",
+ "/System/Library/Fonts/LucidaGrande.ttc"};
}
// This is a way to register any kind of Font2D, not just files and composites.
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
index 408862f..ca731ba 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java
@@ -1233,11 +1233,13 @@
delegate, me.getID(), me.getWhen(),
me.getModifiers(),
me.getX(), me.getY(),
+ me.getXOnScreen(), me.getYOnScreen(),
me.getClickCount(),
me.isPopupTrigger(),
me.getScrollType(),
me.getScrollAmount(),
- me.getWheelRotation());
+ me.getWheelRotation(),
+ me.getPreciseWheelRotation());
} else if (e instanceof MouseEvent) {
MouseEvent me = (MouseEvent) e;
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
index b72ef77..4655d2b 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -105,6 +105,8 @@
private final SecurityWarningWindow warningWindow;
+ private volatile boolean targetFocusable;
+
/**
* Current modal blocker or null.
*
@@ -240,13 +242,12 @@
if (!visible && warningWindow != null) {
warningWindow.setVisible(false, false);
}
-
+ updateFocusableWindowState();
super.setVisibleImpl(visible);
// TODO: update graphicsConfig, see 4868278
platformWindow.setVisible(visible);
if (isSimpleWindow()) {
KeyboardFocusManagerPeer kfmPeer = LWKeyboardFocusManagerPeer.getInstance();
-
if (visible) {
if (!getTarget().isAutoRequestFocus()) {
return;
@@ -397,6 +398,7 @@
@Override
public void updateFocusableWindowState() {
+ targetFocusable = getTarget().isFocusableWindow();
platformWindow.updateFocusableWindowState();
}
@@ -1220,13 +1222,13 @@
}
private boolean isFocusableWindow() {
- boolean focusable = getTarget().isFocusableWindow();
+ boolean focusable = targetFocusable;
if (isSimpleWindow()) {
LWWindowPeer ownerPeer = getOwnerFrameDialog(this);
if (ownerPeer == null) {
return false;
}
- return focusable && ownerPeer.getTarget().isFocusableWindow();
+ return focusable && ownerPeer.targetFocusable;
}
return focusable;
}
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
index c241aae..7618bbe 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
@@ -38,7 +38,8 @@
private CPlatformResponder responder;
private static final Object classLock = new Object();
- private static volatile CEmbeddedFrame focusedWindow;
+ private static volatile CEmbeddedFrame globalFocusedWindow;
+ private CEmbeddedFrame browserWindowFocusedApplet;
private boolean parentWindowActive = true;
public CEmbeddedFrame() {
@@ -111,10 +112,10 @@
synchronized (classLock) {
// In some cases an applet may not receive the focus lost event
// from the parent window (see 8012330)
- focusedWindow = (focused) ? this
- : ((focusedWindow == this) ? null : focusedWindow);
+ globalFocusedWindow = (focused) ? this
+ : ((globalFocusedWindow == this) ? null : globalFocusedWindow);
}
- if (focusedWindow == this) {
+ if (globalFocusedWindow == this) {
// see bug 8010925
// we can't put this to handleWindowFocusEvent because
// it won't be invoced if focuse is moved to a html element
@@ -145,9 +146,23 @@
// non-focused applet. This method can be called from different threads.
public void handleWindowFocusEvent(boolean parentWindowActive) {
this.parentWindowActive = parentWindowActive;
+ // If several applets are running in different browser's windows, it is necessary to
+ // detect the switching between the parent windows and update globalFocusedWindow accordingly.
+ synchronized (classLock) {
+ if (!parentWindowActive) {
+ this.browserWindowFocusedApplet = globalFocusedWindow;
+ }
+ if (parentWindowActive && globalFocusedWindow != this && isParentWindowChanged()) {
+ // It looks like we have switched to another browser window, let's restore focus to
+ // the previously focused applet in this window. If no applets were focused in the
+ // window, we will set focus to the first applet in the window.
+ globalFocusedWindow = (this.browserWindowFocusedApplet != null) ? this.browserWindowFocusedApplet
+ : this;
+ }
+ }
// ignore focus "lost" native request as it may mistakenly
// deactivate active window (see 8001161)
- if (focusedWindow == this && parentWindowActive) {
+ if (globalFocusedWindow == this && parentWindowActive) {
responder.handleWindowFocusEvent(parentWindowActive, null);
}
}
@@ -155,4 +170,10 @@
public boolean isParentWindowActive() {
return parentWindowActive;
}
+
+ private boolean isParentWindowChanged() {
+ // If globalFocusedWindow is located at inactive parent window or null, we have swithed to
+ // another window.
+ return globalFocusedWindow != null ? !globalFocusedWindow.isParentWindowActive() : true;
+ }
}
diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java
index 16bada2..7a33fdf 100644
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java
@@ -54,11 +54,11 @@
return "" + fNSPrintInfo;
}
- public final Class<? extends Attribute> getCategory() {
+ public Class<? extends Attribute> getCategory() {
return NSPrintInfo.class;
}
- public final String getName() {
+ public String getName() {
return "nsPrintInfo";
}
}
diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m
index e0de795..1b3ec43 100644
--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m
@@ -1108,7 +1108,10 @@
JNIEnv *env = [ThreadUtilities getJNIEnv];
id value = nil;
+ NSWindow* hostWindow = [[self->fView window] retain];
jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
+ [hostWindow release];
+
if (focused != NULL) {
if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java
index b378c8c..8b14367 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/FFT.java
@@ -68,7 +68,7 @@
calc(fftFrameSize, data, sign, w);
}
- private final static double[] computeTwiddleFactors(int fftFrameSize,
+ private static double[] computeTwiddleFactors(int fftFrameSize,
int sign) {
int imax = (int) (Math.log(fftFrameSize) / Math.log(2.));
@@ -122,7 +122,7 @@
return warray;
}
- private final static void calc(int fftFrameSize, double[] data, int sign,
+ private static void calc(int fftFrameSize, double[] data, int sign,
double[] w) {
final int fftFrameSize2 = fftFrameSize << 1;
@@ -139,7 +139,7 @@
}
- private final static void calcF2E(int fftFrameSize, double[] data, int i,
+ private static void calcF2E(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
int jmax = nstep;
for (int n = 0; n < jmax; n += 2) {
@@ -163,7 +163,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4F(int fftFrameSize, double[] data, int i,
+ private static void calcF4F(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -331,7 +331,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4I(int fftFrameSize, double[] data, int i,
+ private static void calcF4I(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -499,7 +499,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4FE(int fftFrameSize, double[] data, int i,
+ private static void calcF4FE(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -593,7 +593,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4IE(int fftFrameSize, double[] data, int i,
+ private static void calcF4IE(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -685,7 +685,7 @@
}
- private final void bitreversal(double[] data) {
+ private void bitreversal(double[] data) {
if (fftFrameSize < 4)
return;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
index 9c93d06..3805bb8 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JDK13Services.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.media.sound;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -176,11 +178,11 @@
&& !Sequencer.class.equals(typeClass)) {
return null;
}
- String value;
- String propertyName = typeClass.getName();
- value = JSSecurityManager.getProperty(propertyName);
+ String name = typeClass.getName();
+ String value = AccessController.doPrivileged(
+ (PrivilegedAction<String>) () -> System.getProperty(name));
if (value == null) {
- value = getProperties().getProperty(propertyName);
+ value = getProperties().getProperty(name);
}
if ("".equals(value)) {
value = null;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
index 60549a7..6614b08 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -73,33 +73,6 @@
}
}
- static String getProperty(final String propertyName) {
- String propertyValue;
- if (hasSecurityManager()) {
- if(Printer.debug) Printer.debug("using JDK 1.2 security to get property");
- try{
- PrivilegedAction<String> action = new PrivilegedAction<String>() {
- public String run() {
- try {
- return System.getProperty(propertyName);
- } catch (Throwable t) {
- return null;
- }
- }
- };
- propertyValue = AccessController.doPrivileged(action);
- } catch( Exception e ) {
- if(Printer.debug) Printer.debug("not using JDK 1.2 security to get properties");
- propertyValue = System.getProperty(propertyName);
- }
- } else {
- if(Printer.debug) Printer.debug("not using JDK 1.2 security to get properties");
- propertyValue = System.getProperty(propertyName);
- }
- return propertyValue;
- }
-
-
/** Load properties from a file.
This method tries to load properties from the filename give into
the passed properties object.
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
index 766e485..493aa7e 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,17 +74,6 @@
// intel is little-endian. sparc is big-endian.
private static boolean bigEndian;
- // this is the value of the "java.home" system property. i am looking it up here
- // for use when trying to load the soundbank, just so
- // that all the privileged code is localized in this file....
- private static String javahome;
-
- // this is the value of the "java.class.path" system property
- private static String classpath;
-
-
-
-
static {
if(Printer.trace)Printer.trace(">> Platform.java: static");
@@ -129,26 +118,6 @@
return signed8;
}
-
- /**
- * Obtain javahome.
- * $$kk: 04.16.99: this is *bad*!!
- */
- static String getJavahome() {
-
- return javahome;
- }
-
- /**
- * Obtain classpath.
- * $$jb: 04.21.99: this is *bad* too!!
- */
- static String getClasspath() {
-
- return classpath;
- }
-
-
// PRIVATE METHODS
/**
@@ -157,21 +126,13 @@
private static void loadLibraries() {
if(Printer.trace)Printer.trace(">>Platform.loadLibraries");
- try {
- // load the main library
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- @Override
- public Void run() {
- System.loadLibrary(libNameMain);
- return null;
- }
- });
- // just for the heck of it...
- loadedLibs |= LIB_MAIN;
- } catch (SecurityException e) {
- if(Printer.err)Printer.err("Security exception loading main native library. JavaSound requires access to these resources.");
- throw(e);
- }
+ // load the main library
+ AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+ System.loadLibrary(libNameMain);
+ return null;
+ });
+ // just for the heck of it...
+ loadedLibs |= LIB_MAIN;
// now try to load extra libs. They are defined at compile time in the Makefile
// with the define EXTRA_SOUND_JNI_LIBS
@@ -181,12 +142,9 @@
while (st.hasMoreTokens()) {
final String lib = st.nextToken();
try {
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- @Override
- public Void run() {
- System.loadLibrary(lib);
- return null;
- }
+ AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+ System.loadLibrary(lib);
+ return null;
});
if (lib.equals(libNameALSA)) {
@@ -239,7 +197,5 @@
// $$fb 2002-03-06: implement check for endianness in native. Facilitates porting !
bigEndian = nIsBigEndian();
signed8 = nIsSigned8(); // Solaris on Sparc: signed, all others unsigned
- javahome = JSSecurityManager.getProperty("java.home");
- classpath = JSSecurityManager.getProperty("java.class.path");
}
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java
index 7969a5d..9849fbc 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,21 +39,20 @@
private long filepointer = 0;
private final String fourcc;
private String riff_type = null;
- private long ckSize = 0;
+ private long ckSize = Integer.MAX_VALUE;
private InputStream stream;
- private long avail;
+ private long avail = Integer.MAX_VALUE;
private RIFFReader lastiterator = null;
public RIFFReader(InputStream stream) throws IOException {
- if (stream instanceof RIFFReader)
- root = ((RIFFReader)stream).root;
- else
+ if (stream instanceof RIFFReader) {
+ root = ((RIFFReader) stream).root;
+ } else {
root = this;
+ }
this.stream = stream;
- avail = Integer.MAX_VALUE;
- ckSize = Integer.MAX_VALUE;
// Check for RIFF null paddings,
int b;
@@ -76,10 +75,12 @@
readFully(fourcc, 1, 3);
this.fourcc = new String(fourcc, "ascii");
ckSize = readUnsignedInt();
-
- avail = this.ckSize;
+ avail = ckSize;
if (getFormat().equals("RIFF") || getFormat().equals("LIST")) {
+ if (avail > Integer.MAX_VALUE) {
+ throw new RIFFInvalidDataException("Chunk size too big");
+ }
byte[] format = new byte[4];
readFully(format);
this.riff_type = new String(format, "ascii");
@@ -118,19 +119,23 @@
}
public int read() throws IOException {
- if (avail == 0)
+ if (avail == 0) {
return -1;
+ }
int b = stream.read();
- if (b == -1)
+ if (b == -1) {
+ avail = 0;
return -1;
+ }
avail--;
filepointer++;
return b;
}
public int read(byte[] b, int offset, int len) throws IOException {
- if (avail == 0)
+ if (avail == 0) {
return -1;
+ }
if (len > avail) {
int rlen = stream.read(b, offset, (int)avail);
if (rlen != -1)
@@ -139,19 +144,21 @@
return rlen;
} else {
int ret = stream.read(b, offset, len);
- if (ret == -1)
+ if (ret == -1) {
+ avail = 0;
return -1;
+ }
avail -= ret;
filepointer += ret;
return ret;
}
}
- public final void readFully(byte b[]) throws IOException {
+ public void readFully(byte b[]) throws IOException {
readFully(b, 0, b.length);
}
- public final void readFully(byte b[], int off, int len) throws IOException {
+ public void readFully(byte b[], int off, int len) throws IOException {
if (len < 0)
throw new IndexOutOfBoundsException();
while (len > 0) {
@@ -165,7 +172,7 @@
}
}
- public final long skipBytes(long n) throws IOException {
+ public long skipBytes(long n) throws IOException {
if (n < 0)
return 0;
long skipped = 0;
@@ -191,8 +198,10 @@
return len;
} else {
long ret = stream.skip(n);
- if (ret == -1)
+ if (ret == -1) {
+ avail = 0;
return -1;
+ }
avail -= ret;
filepointer += ret;
return ret;
@@ -210,8 +219,13 @@
}
// Read ASCII chars from stream
- public String readString(int len) throws IOException {
- byte[] buff = new byte[len];
+ public String readString(final int len) throws IOException {
+ final byte[] buff;
+ try {
+ buff = new byte[len];
+ } catch (final OutOfMemoryError oom) {
+ throw new IOException("Length too big", oom);
+ }
readFully(buff);
for (int i = 0; i < buff.length; i++) {
if (buff[i] == 0) {
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java
index 83c8848..d45d501 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java
@@ -276,6 +276,9 @@
count--;
}
+ if (presets_bagNdx.isEmpty()) {
+ throw new RIFFInvalidDataException();
+ }
int offset = presets_bagNdx.get(0);
// Offset should be 0 (but just case)
for (int i = 0; i < offset; i++) {
@@ -360,6 +363,9 @@
count--;
}
+ if (instruments_bagNdx.isEmpty()) {
+ throw new RIFFInvalidDataException();
+ }
int offset = instruments_bagNdx.get(0);
// Offset should be 0 (but just case)
for (int i = 0; i < offset; i++) {
@@ -401,6 +407,9 @@
modulator.amount = chunk.readShort();
modulator.amountSourceOperator = chunk.readUnsignedShort();
modulator.transportOperator = chunk.readUnsignedShort();
+ if (i < 0 || i >= instruments_splits_gen.size()) {
+ throw new RIFFInvalidDataException();
+ }
SF2LayerRegion split = instruments_splits_gen.get(i);
if (split != null)
split.modulators.add(modulator);
@@ -424,7 +433,8 @@
sample.name = chunk.readString(20);
long start = chunk.readUnsignedInt();
long end = chunk.readUnsignedInt();
- sample.data = sampleData.subbuffer(start * 2, end * 2, true);
+ if (sampleData != null)
+ sample.data = sampleData.subbuffer(start * 2, end * 2, true);
if (sampleData24 != null)
sample.data24 = sampleData24.subbuffer(start, end, true);
/*
@@ -462,6 +472,9 @@
int sampleid = split.generators.get(
SF2LayerRegion.GENERATOR_SAMPLEID);
split.generators.remove(SF2LayerRegion.GENERATOR_SAMPLEID);
+ if (sampleid < 0 || sampleid >= samples.size()) {
+ throw new RIFFInvalidDataException();
+ }
split.sample = samples.get(sampleid);
} else {
globalsplit = split;
@@ -488,6 +501,9 @@
int instrumentid = split.generators.get(
SF2InstrumentRegion.GENERATOR_INSTRUMENT);
split.generators.remove(SF2LayerRegion.GENERATOR_INSTRUMENT);
+ if (instrumentid < 0 || instrumentid >= layers.size()) {
+ throw new RIFFInvalidDataException();
+ }
split.layer = layers.get(instrumentid);
} else {
globalsplit = split;
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
index 48ae72f..5089a87 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.media.sound;
import java.io.File;
@@ -39,14 +40,14 @@
import javax.sound.midi.Sequence;
import javax.sound.midi.Track;
import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFileFormat.Type;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.sound.sampled.AudioFileFormat.Type;
import javax.sound.sampled.spi.AudioFileReader;
/**
- * MIDI File Audio Renderer/Reader
+ * MIDI File Audio Renderer/Reader.
*
* @author Karl Helgason
*/
@@ -109,6 +110,9 @@
if (divtype == Sequence.PPQ) {
if (((MetaMessage) msg).getType() == 0x51) {
byte[] data = ((MetaMessage) msg).getData();
+ if (data.length < 3) {
+ throw new UnsupportedAudioFileException();
+ }
mpq = ((data[0] & 0xff) << 16)
| ((data[1] & 0xff) << 8) | (data[2] & 0xff);
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
index 2c6dff9..e895ead 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -732,31 +733,28 @@
* Save generated soundbank to disk for faster future use.
*/
OutputStream out = AccessController
- .doPrivileged(new PrivilegedAction<OutputStream>() {
- public OutputStream run() {
- try {
- File userhome = new File(System
- .getProperty("user.home"),
- ".gervill");
- if (!userhome.exists())
- userhome.mkdirs();
- File emg_soundbank_file = new File(
- userhome, "soundbank-emg.sf2");
- if (emg_soundbank_file.exists())
- return null;
- return new FileOutputStream(
- emg_soundbank_file);
- } catch (IOException e) {
- } catch (SecurityException e) {
+ .doPrivileged((PrivilegedAction<OutputStream>) () -> {
+ try {
+ File userhome = new File(System
+ .getProperty("user.home"), ".gervill");
+ if (!userhome.exists()) {
+ userhome.mkdirs();
}
- return null;
+ File emg_soundbank_file = new File(
+ userhome, "soundbank-emg.sf2");
+ if (emg_soundbank_file.exists()) {
+ return null;
+ }
+ return new FileOutputStream(emg_soundbank_file);
+ } catch (final FileNotFoundException ignored) {
}
+ return null;
});
if (out != null) {
try {
((SF2Soundbank) defaultSoundBank).save(out);
out.close();
- } catch (IOException e) {
+ } catch (final IOException ignored) {
}
}
}
@@ -846,26 +844,24 @@
private Properties getStoredProperties() {
return AccessController
- .doPrivileged(new PrivilegedAction<Properties>() {
- public Properties run() {
- Properties p = new Properties();
- String notePath = "/com/sun/media/sound/softsynthesizer";
- try {
- Preferences prefroot = Preferences.userRoot();
- if (prefroot.nodeExists(notePath)) {
- Preferences prefs = prefroot.node(notePath);
- String[] prefs_keys = prefs.keys();
- for (String prefs_key : prefs_keys) {
- String val = prefs.get(prefs_key, null);
- if (val != null)
- p.setProperty(prefs_key, val);
+ .doPrivileged((PrivilegedAction<Properties>) () -> {
+ Properties p = new Properties();
+ String notePath = "/com/sun/media/sound/softsynthesizer";
+ try {
+ Preferences prefroot = Preferences.userRoot();
+ if (prefroot.nodeExists(notePath)) {
+ Preferences prefs = prefroot.node(notePath);
+ String[] prefs_keys = prefs.keys();
+ for (String prefs_key : prefs_keys) {
+ String val = prefs.get(prefs_key, null);
+ if (val != null) {
+ p.setProperty(prefs_key, val);
}
}
- } catch (BackingStoreException e) {
- } catch (SecurityException e) {
}
- return p;
+ } catch (final BackingStoreException ignored) {
}
+ return p;
});
}
@@ -1044,7 +1040,6 @@
return;
}
synchronized (control_mutex) {
- Throwable causeException = null;
try {
if (line != null) {
// can throw IllegalArgumentException
@@ -1117,24 +1112,17 @@
weakstream.sourceDataLine = sourceDataLine;
}
- } catch (LineUnavailableException e) {
- causeException = e;
- } catch (IllegalArgumentException e) {
- causeException = e;
- } catch (SecurityException e) {
- causeException = e;
- }
-
- if (causeException != null) {
- if (isOpen())
+ } catch (final LineUnavailableException | SecurityException
+ | IllegalArgumentException e) {
+ if (isOpen()) {
close();
+ }
// am: need MidiUnavailableException(Throwable) ctor!
MidiUnavailableException ex = new MidiUnavailableException(
"Can not open line");
- ex.initCause(causeException);
+ ex.initCause(e);
throw ex;
}
-
}
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
index 1dbd72a..fd96039 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,25 @@
package com.sun.media.sound;
+import java.io.BufferedInputStream;
import java.io.DataInputStream;
+import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
-import java.io.EOFException;
-import java.io.BufferedInputStream;
+import java.io.InputStream;
import java.net.URL;
-import javax.sound.midi.MidiFileFormat;
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MetaMessage;
import javax.sound.midi.MidiEvent;
+import javax.sound.midi.MidiFileFormat;
import javax.sound.midi.MidiMessage;
import javax.sound.midi.Sequence;
import javax.sound.midi.SysexMessage;
import javax.sound.midi.Track;
import javax.sound.midi.spi.MidiFileReader;
-
-
/**
* MIDI file reader.
*
@@ -53,19 +51,23 @@
* @author Jan Borgersen
* @author Florian Bomers
*/
-
public final class StandardMidiFileReader extends MidiFileReader {
private static final int MThd_MAGIC = 0x4d546864; // 'MThd'
private static final int bisBufferSize = 1024; // buffer size in buffered input streams
- public MidiFileFormat getMidiFileFormat(InputStream stream) throws InvalidMidiDataException, IOException {
+ public MidiFileFormat getMidiFileFormat(InputStream stream)
+ throws InvalidMidiDataException, IOException {
return getMidiFileFormatFromStream(stream, MidiFileFormat.UNKNOWN_LENGTH, null);
}
- // $$fb 2002-04-17: part of fix for 4635286: MidiSystem.getMidiFileFormat() returns format having invalid length
- private MidiFileFormat getMidiFileFormatFromStream(InputStream stream, int fileLength, SMFParser smfParser) throws InvalidMidiDataException, IOException {
+ // $$fb 2002-04-17: part of fix for 4635286: MidiSystem.getMidiFileFormat()
+ // returns format having invalid length
+ private MidiFileFormat getMidiFileFormatFromStream(InputStream stream,
+ int fileLength,
+ SMFParser smfParser)
+ throws InvalidMidiDataException, IOException{
int maxReadLength = 16;
int duration = MidiFileFormat.UNKNOWN_LENGTH;
DataInputStream dis;
@@ -230,7 +232,7 @@
//=============================================================================================================
/**
- * State variables during parsing of a MIDI file
+ * State variables during parsing of a MIDI file.
*/
final class SMFParser {
private static final int MTrk_MAGIC = 0x4d54726b; // 'MTrk'
@@ -297,7 +299,11 @@
}
}
// now read track in a byte array
- trackData = new byte[trackLength];
+ try {
+ trackData = new byte[trackLength];
+ } catch (final OutOfMemoryError oom) {
+ throw new IOException("Track length too big", oom);
+ }
try {
// $$fb 2003-08-20: fix for 4910986: MIDI file parser breaks up on http connection
stream.readFully(trackData);
@@ -386,8 +392,13 @@
// meta
int metaType = readUnsigned();
int metaLength = (int) readVarInt();
+ final byte[] metaData;
+ try {
+ metaData = new byte[metaLength];
+ } catch (final OutOfMemoryError oom) {
+ throw new IOException("Meta length too big", oom);
+ }
- byte[] metaData = new byte[metaLength];
read(metaData);
MetaMessage metaMessage = new MetaMessage();
@@ -413,5 +424,4 @@
throw new EOFException("invalid MIDI file");
}
}
-
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java
index 210c700..6211692 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/Clipboard.java
@@ -25,7 +25,7 @@
package java.awt.datatransfer;
-import java.awt.EventQueue;
+import sun.datatransfer.DataFlavorUtil;
import java.util.Objects;
import java.util.Set;
@@ -130,7 +130,8 @@
this.contents = contents;
if (oldOwner != null && oldOwner != owner) {
- EventQueue.invokeLater(() -> oldOwner.lostOwnership(Clipboard.this, oldContents));
+ DataFlavorUtil.getDesktopService().invokeOnEventThread(() ->
+ oldOwner.lostOwnership(Clipboard.this, oldContents));
}
fireFlavorsChanged();
}
@@ -324,7 +325,7 @@
return;
}
flavorListeners.forEach(listener ->
- EventQueue.invokeLater(() ->
+ DataFlavorUtil.getDesktopService().invokeOnEventThread(() ->
listener.flavorsChanged(new FlavorEvent(Clipboard.this))));
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java
index 57132f2..84b18fc 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/DataFlavor.java
@@ -25,7 +25,7 @@
package java.awt.datatransfer;
-import sun.awt.datatransfer.DataTransferer;
+import sun.datatransfer.DataFlavorUtil;
import sun.reflect.misc.ReflectUtil;
import java.io.ByteArrayInputStream;
@@ -44,7 +44,6 @@
import java.nio.CharBuffer;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Objects;
import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
@@ -582,12 +581,12 @@
} else {
params += representationClass.getName();
}
- if (DataTransferer.isFlavorCharsetTextType(this) &&
+ if (DataFlavorUtil.isFlavorCharsetTextType(this) &&
(isRepresentationClassInputStream() ||
isRepresentationClassByteBuffer() ||
byte[].class.equals(representationClass)))
{
- params += ";charset=" + DataTransferer.getTextCharset(this);
+ params += ";charset=" + DataFlavorUtil.getTextCharset(this);
}
return params;
}
@@ -609,13 +608,8 @@
* @since 1.3
*/
public static final DataFlavor getTextPlainUnicodeFlavor() {
- String encoding = null;
- DataTransferer transferer = DataTransferer.getInstance();
- if (transferer != null) {
- encoding = transferer.getDefaultUnicodeEncoding();
- }
return new DataFlavor(
- "text/plain;charset="+encoding
+ "text/plain;charset=" + DataFlavorUtil.getDesktopService().getDefaultUnicodeEncoding()
+";class=java.io.InputStream", "Plain Text");
}
@@ -741,12 +735,8 @@
return null;
}
- if (textFlavorComparator == null) {
- textFlavorComparator = new TextFlavorComparator();
- }
-
DataFlavor bestFlavor = Collections.max(Arrays.asList(availableFlavors),
- textFlavorComparator);
+ DataFlavorUtil.getTextFlavorComparator());
if (!bestFlavor.isFlavorTextType()) {
return null;
@@ -755,46 +745,6 @@
return bestFlavor;
}
- private static Comparator<DataFlavor> textFlavorComparator;
-
- static class TextFlavorComparator
- extends DataTransferer.DataFlavorComparator {
-
- /**
- * Compares two <code>DataFlavor</code> objects. Returns a negative
- * integer, zero, or a positive integer as the first
- * <code>DataFlavor</code> is worse than, equal to, or better than the
- * second.
- * <p>
- * <code>DataFlavor</code>s are ordered according to the rules outlined
- * for <code>selectBestTextFlavor</code>.
- *
- * @param flavor1 the first <code>DataFlavor</code> to be compared
- * @param flavor2 the second <code>DataFlavor</code> to be compared
- * @return a negative integer, zero, or a positive integer as the first
- * argument is worse, equal to, or better than the second
- * @throws ClassCastException if either of the arguments is not an
- * instance of <code>DataFlavor</code>
- * @throws NullPointerException if either of the arguments is
- * <code>null</code>
- *
- * @see #selectBestTextFlavor
- */
- public int compare(DataFlavor flavor1, DataFlavor flavor2) {
- if (flavor1.isFlavorTextType()) {
- if (flavor2.isFlavorTextType()) {
- return super.compare(flavor1, flavor2);
- } else {
- return 1;
- }
- } else if (flavor2.isFlavorTextType()) {
- return -1;
- } else {
- return 0;
- }
- }
- }
-
/**
* Gets a Reader for a text flavor, decoded, if necessary, for the expected
* charset (encoding). The supported representation classes are
@@ -1015,13 +965,13 @@
}
if ("text".equals(getPrimaryType())) {
- if (DataTransferer.doesSubtypeSupportCharset(this)
+ if (DataFlavorUtil.doesSubtypeSupportCharset(this)
&& representationClass != null
&& !isStandardTextRepresentationClass()) {
String thisCharset =
- DataTransferer.canonicalName(this.getParameter("charset"));
+ DataFlavorUtil.canonicalName(this.getParameter("charset"));
String thatCharset =
- DataTransferer.canonicalName(that.getParameter("charset"));
+ DataFlavorUtil.canonicalName(that.getParameter("charset"));
if (!Objects.equals(thisCharset, thatCharset)) {
return false;
}
@@ -1088,10 +1038,10 @@
// subTypes is '*', regardless of the other subType.
if ("text".equals(primaryType)) {
- if (DataTransferer.doesSubtypeSupportCharset(this)
+ if (DataFlavorUtil.doesSubtypeSupportCharset(this)
&& representationClass != null
&& !isStandardTextRepresentationClass()) {
- String charset = DataTransferer.canonicalName(getParameter("charset"));
+ String charset = DataFlavorUtil.canonicalName(getParameter("charset"));
if (charset != null) {
total += charset.hashCode();
}
@@ -1280,9 +1230,8 @@
* Returns true if the representation class is <code>Remote</code>.
* @return true if the representation class is <code>Remote</code>
*/
-
public boolean isRepresentationClassRemote() {
- return DataTransferer.isRemote(representationClass);
+ return DataFlavorUtil.RMI.isRemote(representationClass);
}
/**
@@ -1356,8 +1305,8 @@
* @since 1.4
*/
public boolean isFlavorTextType() {
- return (DataTransferer.isFlavorCharsetTextType(this) ||
- DataTransferer.isFlavorNoncharsetTextType(this));
+ return (DataFlavorUtil.isFlavorCharsetTextType(this) ||
+ DataFlavorUtil.isFlavorNoncharsetTextType(this));
}
/**
diff --git a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java
index e799020..8bd47fe 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java
@@ -25,22 +25,15 @@
package java.awt.datatransfer;
-import java.awt.Toolkit;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.lang.ref.SoftReference;
+import sun.datatransfer.DataFlavorUtil;
+import sun.datatransfer.DesktopDatatransferService;
import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
import java.io.IOException;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.ref.SoftReference;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -48,12 +41,8 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Properties;
import java.util.Set;
-import sun.awt.AppContext;
-import sun.awt.datatransfer.DataTransferer;
-
/**
* The SystemFlavorMap is a configurable map between "natives" (Strings), which
* correspond to platform-specific data formats, and "flavors" (DataFlavors),
@@ -74,13 +63,6 @@
private static final Object FLAVOR_MAP_KEY = new Object();
/**
- * Copied from java.util.Properties.
- */
- private static final String keyValueSeparators = "=: \t\r\n\f";
- private static final String strictKeyValueSeparators = "=:";
- private static final String whiteSpaceChars = " \t\r\n\f";
-
- /**
* The list of valid, decoded text flavor representation classes, in order
* from best to worst.
*/
@@ -198,16 +180,11 @@
/**
* Returns the default FlavorMap for this thread's ClassLoader.
+ *
* @return the default FlavorMap for this thread's ClassLoader
*/
public static FlavorMap getDefaultFlavorMap() {
- AppContext context = AppContext.getAppContext();
- FlavorMap fm = (FlavorMap) context.get(FLAVOR_MAP_KEY);
- if (fm == null) {
- fm = new SystemFlavorMap();
- context.put(FLAVOR_MAP_KEY, fm);
- }
- return fm;
+ return DataFlavorUtil.getDesktopService().getFlavorMap(SystemFlavorMap::new);
}
private SystemFlavorMap() {
@@ -223,7 +200,7 @@
}
isMapInitialized = true;
- InputStream is = SystemFlavorMap.class.getResourceAsStream("/sun/awt/datatransfer/flavormap.properties");
+ InputStream is = SystemFlavorMap.class.getResourceAsStream("/sun/datatransfer/resources/flavormap.properties");
if (is == null) {
throw new InternalError("Default flavor mapping not found");
}
@@ -238,22 +215,25 @@
line = line.substring(0, line.length() - 1) + reader.readLine().trim();
}
int delimiterPosition = line.indexOf('=');
- String key = line.substring(0, delimiterPosition).replace("\\ ", " ");
+ String key = line.substring(0, delimiterPosition).replaceAll("\\ ", " ");
String[] values = line.substring(delimiterPosition + 1, line.length()).split(",");
for (String value : values) {
try {
+ value = loadConvert(value);
MimeType mime = new MimeType(value);
if ("text".equals(mime.getPrimaryType())) {
String charset = mime.getParameter("charset");
- if (DataTransferer.doesSubtypeSupportCharset(mime.getSubType(), charset))
+ if (DataFlavorUtil.doesSubtypeSupportCharset(mime.getSubType(), charset))
{
// We need to store the charset and eoln
// parameters, if any, so that the
// DataTransferer will have this information
// for conversion into the native format.
- DataTransferer transferer = DataTransferer.getInstance();
- if (transferer != null) {
- transferer.registerTextFlavorProperties(key, charset,
+ DesktopDatatransferService desktopService =
+ DataFlavorUtil.getDesktopService();
+ if (desktopService.isDesktopPresent()) {
+ desktopService.registerTextFlavorProperties(
+ key, charset,
mime.getParameter("eoln"),
mime.getParameter("terminators"));
}
@@ -305,6 +285,63 @@
}
}
+ // Copied from java.util.Properties
+ private static String loadConvert(String theString) {
+ char aChar;
+ int len = theString.length();
+ StringBuilder outBuffer = new StringBuilder(len);
+
+ for (int x = 0; x < len; ) {
+ aChar = theString.charAt(x++);
+ if (aChar == '\\') {
+ aChar = theString.charAt(x++);
+ if (aChar == 'u') {
+ // Read the xxxx
+ int value = 0;
+ for (int i = 0; i < 4; i++) {
+ aChar = theString.charAt(x++);
+ switch (aChar) {
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9': {
+ value = (value << 4) + aChar - '0';
+ break;
+ }
+ case 'a': case 'b': case 'c':
+ case 'd': case 'e': case 'f': {
+ value = (value << 4) + 10 + aChar - 'a';
+ break;
+ }
+ case 'A': case 'B': case 'C':
+ case 'D': case 'E': case 'F': {
+ value = (value << 4) + 10 + aChar - 'A';
+ break;
+ }
+ default: {
+ throw new IllegalArgumentException(
+ "Malformed \\uxxxx encoding.");
+ }
+ }
+ }
+ outBuffer.append((char)value);
+ } else {
+ if (aChar == 't') {
+ aChar = '\t';
+ } else if (aChar == 'r') {
+ aChar = '\r';
+ } else if (aChar == 'n') {
+ aChar = '\n';
+ } else if (aChar == 'f') {
+ aChar = '\f';
+ }
+ outBuffer.append(aChar);
+ }
+ } else {
+ outBuffer.append(aChar);
+ }
+ }
+ return outBuffer.toString();
+ }
+
/**
* Stores the listed object under the specified hash key in map. Unlike a
* standard map, the listed object will not replace any object already at
@@ -332,10 +369,10 @@
LinkedHashSet<DataFlavor> flavors = getNativeToFlavor().get(nat);
if (nat != null && !disabledMappingGenerationKeys.contains(nat)) {
- DataTransferer transferer = DataTransferer.getInstance();
- if (transferer != null) {
+ DesktopDatatransferService desktopService = DataFlavorUtil.getDesktopService();
+ if (desktopService.isDesktopPresent()) {
LinkedHashSet<DataFlavor> platformFlavors =
- transferer.getPlatformMappingsForNative(nat);
+ desktopService.getPlatformMappingsForNative(nat);
if (!platformFlavors.isEmpty()) {
if (flavors != null) {
// Prepending the platform-specific mappings ensures
@@ -395,10 +432,10 @@
LinkedHashSet<String> natives = getFlavorToNative().get(flav);
if (flav != null && !disabledMappingGenerationKeys.contains(flav)) {
- DataTransferer transferer = DataTransferer.getInstance();
- if (transferer != null) {
+ DesktopDatatransferService desktopService = DataFlavorUtil.getDesktopService();
+ if (desktopService.isDesktopPresent()) {
LinkedHashSet<String> platformNatives =
- transferer.getPlatformMappingsForFlavor(flav);
+ desktopService.getPlatformMappingsForFlavor(flav);
if (!platformNatives.isEmpty()) {
if (natives != null) {
// Prepend the platform-specific mappings to ensure
@@ -474,7 +511,7 @@
// In this case we shouldn't synthesize a native for this flavor,
// since its mappings were explicitly specified.
retval = flavorToNativeLookup(flav, false);
- } else if (DataTransferer.isFlavorCharsetTextType(flav)) {
+ } else if (DataFlavorUtil.isFlavorCharsetTextType(flav)) {
retval = new LinkedHashSet<>(0);
// For text/* flavors, flavor-to-native mappings specified in
@@ -502,7 +539,7 @@
// addUnencodedNativeForFlavor(), so they have lower priority.
retval.addAll(flavorToNativeLookup(flav, false));
}
- } else if (DataTransferer.isFlavorNoncharsetTextType(flav)) {
+ } else if (DataFlavorUtil.isFlavorNoncharsetTextType(flav)) {
retval = getTextTypeToNative().get(flav.mimeType.getBaseType());
if (retval == null || retval.isEmpty()) {
@@ -602,7 +639,7 @@
// on load from flavormap.properties.
}
- if (DataTransferer.doesSubtypeSupportCharset(subType, null)) {
+ if (DataFlavorUtil.doesSubtypeSupportCharset(subType, null)) {
if (TEXT_PLAIN_BASE_TYPE.equals(baseType))
{
returnValue.add(DataFlavor.stringFlavor);
@@ -624,7 +661,7 @@
}
}
- for (String charset : DataTransferer.standardEncodings()) {
+ for (String charset : DataFlavorUtil.standardEncodings()) {
for (String encodedTextClass : ENCODED_TEXT_CLASSES) {
final String mimeType =
diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java
index 45da5af..f86779c 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java
@@ -1811,7 +1811,7 @@
* should be logical or visual counterparts. They are not
* checked for validity.
*/
- private final TextHitInfo getStrongHit(TextHitInfo hit1, TextHitInfo hit2) {
+ private TextHitInfo getStrongHit(TextHitInfo hit1, TextHitInfo hit2) {
// right now we're using the following rule for strong hits:
// A hit on a character with a lower level
diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
index 40e58ae..532fdea 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
@@ -544,7 +544,7 @@
/**
* {@inheritDoc}
*/
- public final PropertyChangeListener extract(PropertyChangeListener listener) {
+ public PropertyChangeListener extract(PropertyChangeListener listener) {
while (listener instanceof PropertyChangeListenerProxy) {
listener = ((PropertyChangeListenerProxy) listener).getListener();
}
diff --git a/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java b/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
index 14902cc..6f21137 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
@@ -533,7 +533,7 @@
/**
* {@inheritDoc}
*/
- public final VetoableChangeListener extract(VetoableChangeListener listener) {
+ public VetoableChangeListener extract(VetoableChangeListener listener) {
while (listener instanceof VetoableChangeListenerProxy) {
listener = ((VetoableChangeListenerProxy) listener).getListener();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java
index c9666bc..dba4e80 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/ControllerEventListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,38 +27,35 @@
import java.util.EventListener;
-
/**
- * The <code>ControllerEventListener</code> interface should be implemented
- * by classes whose instances need to be notified when a <code>Sequencer</code>
- * has processed a requested type of MIDI control-change event.
- * To register a <code>ControllerEventListener</code> object to receive such
- * notifications, invoke the
+ * The {@code ControllerEventListener} interface should be implemented by
+ * classes whose instances need to be notified when a {@link Sequencer} has
+ * processed a requested type of MIDI control-change event. To register a
+ * {@code ControllerEventListener} object to receive such notifications, invoke
+ * the
* {@link Sequencer#addControllerEventListener(ControllerEventListener, int[])
- * addControllerEventListener} method of <code>Sequencer</code>,
- * specifying the types of MIDI controllers about which you are interested in
- * getting control-change notifications.
- *
- * @see MidiChannel#controlChange(int, int)
+ * addControllerEventListener} method of {@code Sequencer}, specifying the types
+ * of MIDI controllers about which you are interested in getting control-change
+ * notifications.
*
* @author Kara Kytle
+ * @see MidiChannel#controlChange(int, int)
*/
public interface ControllerEventListener extends EventListener {
/**
- * Invoked when a <code>Sequencer</code> has encountered and processed
- * a control-change event of interest to this listener. The event passed
- * in is a <code>ShortMessage</code> whose first data byte indicates
- * the controller number and whose second data byte is the value to which
- * the controller was set.
+ * Invoked when a {@link Sequencer} has encountered and processed a
+ * control-change event of interest to this listener. The event passed in is
+ * a {@code ShortMessage} whose first data byte indicates the controller
+ * number and whose second data byte is the value to which the controller
+ * was set.
*
- * @param event the control-change event that the sequencer encountered in
- * the sequence it is processing
- *
+ * @param event the control-change event that the sequencer encountered in
+ * the sequence it is processing
* @see Sequencer#addControllerEventListener(ControllerEventListener, int[])
* @see MidiChannel#controlChange(int, int)
* @see ShortMessage#getData1
* @see ShortMessage#getData2
*/
- public void controlChange(ShortMessage event);
+ void controlChange(ShortMessage event);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java
index 3255aef..8bda9676 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Instrument.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,49 +25,41 @@
package javax.sound.midi;
-import java.net.URL;
-
-
-
/**
- * An instrument is a sound-synthesis algorithm with certain parameter
- * settings, usually designed to emulate a specific real-world
- * musical instrument or to achieve a specific sort of sound effect.
- * Instruments are typically stored in collections called soundbanks.
- * Before the instrument can be used to play notes, it must first be loaded
- * onto a synthesizer, and then it must be selected for use on
- * one or more channels, via a program-change command. MIDI notes
- * that are subsequently received on those channels will be played using
+ * An instrument is a sound-synthesis algorithm with certain parameter settings,
+ * usually designed to emulate a specific real-world musical instrument or to
+ * achieve a specific sort of sound effect. Instruments are typically stored in
+ * collections called soundbanks. Before the instrument can be used to play
+ * notes, it must first be loaded onto a synthesizer, and then it must be
+ * selected for use on one or more channels, via a program-change command. MIDI
+ * notes that are subsequently received on those channels will be played using
* the sound of the selected instrument.
*
+ * @author Kara Kytle
* @see Soundbank
* @see Soundbank#getInstruments
* @see Patch
* @see Synthesizer#loadInstrument(Instrument)
* @see MidiChannel#programChange(int, int)
- * @author Kara Kytle
*/
-
public abstract class Instrument extends SoundbankResource {
-
/**
- * Instrument patch
+ * Instrument patch.
*/
private final Patch patch;
-
/**
- * Constructs a new MIDI instrument from the specified <code>Patch</code>.
- * When a subsequent request is made to load the
- * instrument, the sound bank will search its contents for this instrument's <code>Patch</code>,
- * and the instrument will be loaded into the synthesizer at the
- * bank and program location indicated by the <code>Patch</code> object.
- * @param soundbank sound bank containing the instrument
- * @param patch the patch of this instrument
- * @param name the name of this instrument
- * @param dataClass the class used to represent the sample's data.
+ * Constructs a new MIDI instrument from the specified {@code Patch}. When a
+ * subsequent request is made to load the instrument, the sound bank will
+ * search its contents for this instrument's {@code Patch}, and the
+ * instrument will be loaded into the synthesizer at the bank and program
+ * location indicated by the {@code Patch} object.
*
+ * @param soundbank sound bank containing the instrument
+ * @param patch the patch of this instrument
+ * @param name the name of this instrument
+ * @param dataClass the class used to represent the sample's data
* @see Synthesizer#loadInstrument(Instrument)
*/
protected Instrument(Soundbank soundbank, Patch patch, String name, Class<?> dataClass) {
@@ -76,10 +68,10 @@
this.patch = patch;
}
-
/**
- * Obtains the <code>Patch</code> object that indicates the bank and program
+ * Obtains the {@code Patch} object that indicates the bank and program
* numbers where this instrument is to be stored in the synthesizer.
+ *
* @return this instrument's patch
*/
public Patch getPatch() {
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java
index ed20121f..28a75de 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/InvalidMidiDataException.java
@@ -25,25 +25,25 @@
package javax.sound.midi;
-
/**
- * An <code>InvalidMidiDataException</code> indicates that inappropriate MIDI
- * data was encountered. This often means that the data is invalid in and of
- * itself, from the perspective of the MIDI specification. An example would
- * be an undefined status byte. However, the exception might simply
- * mean that the data was invalid in the context it was used, or that
- * the object to which the data was given was unable to parse or use it.
- * For example, a file reader might not be able to parse a Type 2 MIDI file, even
- * though that format is defined in the MIDI specification.
+ * An {@code InvalidMidiDataException} indicates that inappropriate MIDI data
+ * was encountered. This often means that the data is invalid in and of itself,
+ * from the perspective of the MIDI specification. An example would be an
+ * undefined status byte. However, the exception might simply mean that the data
+ * was invalid in the context it was used, or that the object to which the data
+ * was given was unable to parse or use it. For example, a file reader might not
+ * be able to parse a Type 2 MIDI file, even though that format is defined in
+ * the MIDI specification.
*
* @author Kara Kytle
*/
public class InvalidMidiDataException extends Exception {
+
private static final long serialVersionUID = 2780771756789932067L;
/**
- * Constructs an <code>InvalidMidiDataException</code> with
- * <code>null</code> for its error detail message.
+ * Constructs an {@code InvalidMidiDataException} with {@code null} for its
+ * error detail message.
*/
public InvalidMidiDataException() {
@@ -51,10 +51,10 @@
}
/**
- * Constructs an <code>InvalidMidiDataException</code> with the
- * specified detail message.
+ * Constructs an {@code InvalidMidiDataException} with the specified detail
+ * message.
*
- * @param message the string to display as an error detail message
+ * @param message the string to display as an error detail message
*/
public InvalidMidiDataException(String message) {
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java
index 94fe3d8..6f431bf 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaEventListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,24 +27,23 @@
import java.util.EventListener;
-
/**
- * The <code>MetaEventListener</code> interface should be implemented
- * by classes whose instances need to be notified when a <code>{@link Sequencer}</code>
- * has processed a <code>{@link MetaMessage}</code>.
- * To register a <code>MetaEventListener</code> object to receive such
- * notifications, pass it as the argument to the
- * <code>{@link Sequencer#addMetaEventListener(MetaEventListener) addMetaEventListener}</code>
- * method of <code>Sequencer</code>.
+ * The {@code MetaEventListener} interface should be implemented by classes
+ * whose instances need to be notified when a {@link Sequencer} has processed a
+ * {@link MetaMessage}. To register a {@code MetaEventListener} object to
+ * receive such notifications, pass it as the argument to the
+ * {@link Sequencer#addMetaEventListener(MetaEventListener)
+ * addMetaEventListener} method of {@code Sequencer}.
*
* @author Kara Kytle
*/
public interface MetaEventListener extends EventListener {
/**
- * Invoked when a <code>{@link Sequencer}</code> has encountered and processed
- * a <code>MetaMessage</code> in the <code>{@link Sequence}</code> it is processing.
- * @param meta the meta-message that the sequencer encountered
+ * Invoked when a {@link Sequencer} has encountered and processed a
+ * {@code MetaMessage} in the {@code Sequence} it is processing.
+ *
+ * @param meta the meta-message that the sequencer encountered
*/
- public void meta(MetaMessage meta);
+ void meta(MetaMessage meta);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
index 6378435..2e73cc3 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,65 +25,54 @@
package javax.sound.midi;
-
/**
- * A <code>MetaMessage</code> is a <code>{@link MidiMessage}</code> that is not meaningful to synthesizers, but
- * that can be stored in a MIDI file and interpreted by a sequencer program.
- * (See the discussion in the <code>MidiMessage</code>
- * class description.) The Standard MIDI Files specification defines
- * various types of meta-events, such as sequence number, lyric, cue point,
- * and set tempo. There are also meta-events
- * for such information as lyrics, copyrights, tempo indications, time and key
- * signatures, markers, etc. For more information, see the Standard MIDI Files 1.0
- * specification, which is part of the Complete MIDI 1.0 Detailed Specification
- * published by the MIDI Manufacturer's Association
+ * A {@code MetaMessage} is a {@link MidiMessage} that is not meaningful to
+ * synthesizers, but that can be stored in a MIDI file and interpreted by a
+ * sequencer program. (See the discussion in the {@code MidiMessage} class
+ * description.) The Standard MIDI Files specification defines various types of
+ * meta-events, such as sequence number, lyric, cue point, and set tempo. There
+ * are also meta-events for such information as lyrics, copyrights, tempo
+ * indications, time and key signatures, markers, etc. For more information, see
+ * the Standard MIDI Files 1.0 specification, which is part of the Complete MIDI
+ * 1.0 Detailed Specification published by the MIDI Manufacturer's Association
* (<a href = http://www.midi.org>http://www.midi.org</a>).
- *
* <p>
- * When data is being transported using MIDI wire protocol,
- * a <code>{@link ShortMessage}</code> with the status value <code>0xFF</code> represents
- * a system reset message. In MIDI files, this same status value denotes a <code>MetaMessage</code>.
- * The types of meta-message are distinguished from each other by the first byte
- * that follows the status byte <code>0xFF</code>. The subsequent bytes are data
- * bytes. As with system exclusive messages, there are an arbitrary number of
- * data bytes, depending on the type of <code>MetaMessage</code>.
- *
- * @see MetaEventListener
+ * When data is being transported using MIDI wire protocol, a
+ * {@link ShortMessage} with the status value {@code 0xFF} represents a system
+ * reset message. In MIDI files, this same status value denotes a
+ * {@code MetaMessage}. The types of meta-message are distinguished from each
+ * other by the first byte that follows the status byte {@code 0xFF}. The
+ * subsequent bytes are data bytes. As with system exclusive messages, there are
+ * an arbitrary number of data bytes, depending on the type of
+ * {@code MetaMessage}.
*
* @author David Rivas
* @author Kara Kytle
+ * @see MetaEventListener
*/
-
public class MetaMessage extends MidiMessage {
-
- // Status byte defines
-
/**
- * Status byte for <code>MetaMessage</code> (0xFF, or 255), which is used
- * in MIDI files. It has the same value as SYSTEM_RESET, which
- * is used in the real-time "MIDI wire" protocol.
+ * Status byte for {@code MetaMessage} (0xFF, or 255), which is used in MIDI
+ * files. It has the same value as SYSTEM_RESET, which is used in the
+ * real-time "MIDI wire" protocol.
+ *
* @see MidiMessage#getStatus
*/
public static final int META = 0xFF; // 255
- // Instance variables
-
/**
- * The length of the actual message in the data array.
- * This is used to determine how many bytes of the data array
- * is the message, and how many are the status byte, the
- * type byte, and the variable-length-int describing the
- * length of the message.
+ * The length of the actual message in the data array. This is used to
+ * determine how many bytes of the data array is the message, and how many
+ * are the status byte, the type byte, and the variable-length-int
+ * describing the length of the message.
*/
private int dataLength = 0;
-
/**
- * Constructs a new <code>MetaMessage</code>. The contents of
- * the message are not set here; use
- * {@link #setMessage(int, byte[], int) setMessage}
- * to set them subsequently.
+ * Constructs a new {@code MetaMessage}. The contents of the message are not
+ * set here; use {@link #setMessage(int, byte[], int) setMessage} to set
+ * them subsequently.
*/
public MetaMessage() {
// Default meta message data: just the META status byte value
@@ -91,17 +80,17 @@
}
/**
- * Constructs a new {@code MetaMessage} and sets the message parameters.
- * The contents of the message can be changed by using
- * the {@code setMessage} method.
+ * Constructs a new {@code MetaMessage} and sets the message parameters. The
+ * contents of the message can be changed by using the {@code setMessage}
+ * method.
*
- * @param type meta-message type (must be less than 128)
- * @param data the data bytes in the MIDI message
- * @param length an amount of bytes in the {@code data} byte array;
- * it should be non-negative and less than or equal to
- * {@code data.length}
- * @throws InvalidMidiDataException if the parameter values do not specify
- * a valid MIDI meta message
+ * @param type meta-message type (must be less than 128)
+ * @param data the data bytes in the MIDI message
+ * @param length an amount of bytes in the {@code data} byte array; it
+ * should be non-negative and less than or equal to
+ * {@code data.length}
+ * @throws InvalidMidiDataException if the parameter values do not specify a
+ * valid MIDI meta message
* @see #setMessage(int, byte[], int)
* @see #getType()
* @see #getData()
@@ -113,12 +102,11 @@
setMessage(type, data, length); // can throw InvalidMidiDataException
}
-
/**
- * Constructs a new <code>MetaMessage</code>.
- * @param data an array of bytes containing the complete message.
- * The message data may be changed using the <code>setMessage</code>
- * method.
+ * Constructs a new {@code MetaMessage}.
+ *
+ * @param data an array of bytes containing the complete message. The
+ * message data may be changed using the {@code setMessage} method.
* @see #setMessage
*/
protected MetaMessage(byte[] data) {
@@ -133,24 +121,24 @@
}
}
-
/**
- * Sets the message parameters for a <code>MetaMessage</code>.
- * Since only one status byte value, <code>0xFF</code>, is allowed for meta-messages,
- * it does not need to be specified here. Calls to <code>{@link MidiMessage#getStatus getStatus}</code> return
- * <code>0xFF</code> for all meta-messages.
+ * Sets the message parameters for a {@code MetaMessage}. Since only one
+ * status byte value, {@code 0xFF}, is allowed for meta-messages, it does
+ * not need to be specified here. Calls to
+ * {@link MidiMessage#getStatus getStatus} return {@code 0xFF} for all
+ * meta-messages.
* <p>
- * The <code>type</code> argument should be a valid value for the byte that
- * follows the status byte in the <code>MetaMessage</code>. The <code>data</code> argument
- * should contain all the subsequent bytes of the <code>MetaMessage</code>. In other words,
- * the byte that specifies the type of <code>MetaMessage</code> is not considered a data byte.
+ * The {@code type} argument should be a valid value for the byte that
+ * follows the status byte in the {@code MetaMessage}. The {@code data}
+ * argument should contain all the subsequent bytes of the
+ * {@code MetaMessage}. In other words, the byte that specifies the type of
+ * {@code MetaMessage} is not considered a data byte.
*
- * @param type meta-message type (must be less than 128)
- * @param data the data bytes in the MIDI message
- * @param length the number of bytes in the <code>data</code>
- * byte array
- * @throws InvalidMidiDataException if the
- * parameter values do not specify a valid MIDI meta message
+ * @param type meta-message type (must be less than 128)
+ * @param data the data bytes in the MIDI message
+ * @param length the number of bytes in the {@code data} byte array
+ * @throws InvalidMidiDataException if the parameter values do not specify a
+ * valid MIDI meta message
*/
public void setMessage(int type, byte[] data, int length) throws InvalidMidiDataException {
@@ -172,10 +160,10 @@
}
}
-
/**
- * Obtains the type of the <code>MetaMessage</code>.
- * @return an integer representing the <code>MetaMessage</code> type
+ * Obtains the type of the {@code MetaMessage}.
+ *
+ * @return an integer representing the {@code MetaMessage} type
*/
public int getType() {
if (length>=2) {
@@ -184,16 +172,15 @@
return 0;
}
-
-
/**
- * Obtains a copy of the data for the meta message. The returned
- * array of bytes does not include the status byte or the message
- * length data. The length of the data for the meta message is
- * the length of the array. Note that the length of the entire
- * message includes the status byte and the meta message type
- * byte, and therefore may be longer than the returned array.
- * @return array containing the meta message data.
+ * Obtains a copy of the data for the meta message. The returned array of
+ * bytes does not include the status byte or the message length data. The
+ * length of the data for the meta message is the length of the array. Note
+ * that the length of the entire message includes the status byte and the
+ * meta message type byte, and therefore may be longer than the returned
+ * array.
+ *
+ * @return array containing the meta message data
* @see MidiMessage#getLength
*/
public byte[] getData() {
@@ -202,10 +189,10 @@
return returnedArray;
}
-
/**
- * Creates a new object of the same class and with the same contents
- * as this object.
+ * Creates a new object of the same class and with the same contents as this
+ * object.
+ *
* @return a clone of this instance
*/
public Object clone() {
@@ -240,5 +227,4 @@
}
data[off] = (byte) (value & mask);
}
-
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java
index e2f3767..6db7055 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiChannel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,513 +25,450 @@
package javax.sound.midi;
-
/**
- * A <code>MidiChannel</code> object represents a single MIDI channel.
- * Generally, each <code>MidiChannel</code> method processes a like-named MIDI
- * "channel voice" or "channel mode" message as defined by the MIDI specification. However,
- * <code>MidiChannel</code> adds some "get" methods that retrieve the value
- * most recently set by one of the standard MIDI channel messages. Similarly,
- * methods for per-channel solo and mute have been added.
+ * A {@code MidiChannel} object represents a single MIDI channel. Generally,
+ * each {@code MidiChannel} method processes a like-named MIDI "channel voice"
+ * or "channel mode" message as defined by the MIDI specification. However,
+ * {@code MidiChannel} adds some "get" methods that retrieve the value most
+ * recently set by one of the standard MIDI channel messages. Similarly, methods
+ * for per-channel solo and mute have been added.
* <p>
- * A <code>{@link Synthesizer}</code> object has a collection
- * of <code>MidiChannels</code>, usually one for each of the 16 channels
- * prescribed by the MIDI 1.0 specification. The <code>Synthesizer</code>
- * generates sound when its <code>MidiChannels</code> receive
- * <code>noteOn</code> messages.
+ * A {@link Synthesizer} object has a collection of {@code MidiChannels},
+ * usually one for each of the 16 channels prescribed by the MIDI 1.0
+ * specification. The {@code Synthesizer} generates sound when its
+ * {@code MidiChannels} receive {@code noteOn} messages.
* <p>
* See the MIDI 1.0 Specification for more information about the prescribed
- * behavior of the MIDI channel messages, which are not exhaustively
- * documented here. The specification is titled <code>MIDI Reference:
- * The Complete MIDI 1.0 Detailed Specification</code>, and is published by
- * the MIDI Manufacturer's Association (<a href = http://www.midi.org>
- * http://www.midi.org</a>).
+ * behavior of the MIDI channel messages, which are not exhaustively documented
+ * here. The specification is titled
+ * {@code MIDI Reference: The Complete MIDI 1.0 Detailed Specification}, and is
+ * published by the MIDI Manufacturer's Association
+ * (<a href = http://www.midi.org>http://www.midi.org</a>).
* <p>
* MIDI was originally a protocol for reporting the gestures of a keyboard
- * musician. This genesis is visible in the <code>MidiChannel</code> API, which
+ * musician. This genesis is visible in the {@code MidiChannel} API, which
* preserves such MIDI concepts as key number, key velocity, and key pressure.
* It should be understood that the MIDI data does not necessarily originate
* with a keyboard player (the source could be a different kind of musician, or
- * software). Some devices might generate constant values for velocity
- * and pressure, regardless of how the note was performed.
- * Also, the MIDI specification often leaves it up to the
- * synthesizer to use the data in the way the implementor sees fit. For
- * example, velocity data need not always be mapped to volume and/or brightness.
- *
- * @see Synthesizer#getChannels
+ * software). Some devices might generate constant values for velocity and
+ * pressure, regardless of how the note was performed. Also, the MIDI
+ * specification often leaves it up to the synthesizer to use the data in the
+ * way the implementor sees fit. For example, velocity data need not always be
+ * mapped to volume and/or brightness.
*
* @author David Rivas
* @author Kara Kytle
+ * @see Synthesizer#getChannels
*/
-
public interface MidiChannel {
/**
- * Starts the specified note sounding. The key-down velocity
- * usually controls the note's volume and/or brightness.
- * If <code>velocity</code> is zero, this method instead acts like
- * {@link #noteOff(int)}, terminating the note.
+ * Starts the specified note sounding. The key-down velocity usually
+ * controls the note's volume and/or brightness. If {@code velocity} is
+ * zero, this method instead acts like {@link #noteOff(int)}, terminating
+ * the note.
*
- * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
- * @param velocity the speed with which the key was depressed
- *
+ * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
+ * @param velocity the speed with which the key was depressed
* @see #noteOff(int, int)
*/
- public void noteOn(int noteNumber, int velocity);
+ void noteOn(int noteNumber, int velocity);
/**
- * Turns the specified note off. The key-up velocity, if not ignored, can
- * be used to affect how quickly the note decays.
- * In any case, the note might not die away instantaneously; its decay
- * rate is determined by the internals of the <code>Instrument</code>.
- * If the Hold Pedal (a controller; see
- * {@link #controlChange(int, int) controlChange})
- * is down, the effect of this method is deferred until the pedal is
- * released.
+ * Turns the specified note off. The key-up velocity, if not ignored, can be
+ * used to affect how quickly the note decays. In any case, the note might
+ * not die away instantaneously; its decay rate is determined by the
+ * internals of the {@code Instrument}. If the Hold Pedal (a controller; see
+ * {@link #controlChange(int, int) controlChange}) is down, the effect of
+ * this method is deferred until the pedal is released.
*
- *
- * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
- * @param velocity the speed with which the key was released
- *
+ * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
+ * @param velocity the speed with which the key was released
* @see #noteOff(int)
* @see #noteOn
* @see #allNotesOff
* @see #allSoundOff
*/
- public void noteOff(int noteNumber, int velocity);
+ void noteOff(int noteNumber, int velocity);
/**
* Turns the specified note off.
*
- * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
- *
+ * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
* @see #noteOff(int, int)
*/
- public void noteOff(int noteNumber);
+ void noteOff(int noteNumber);
/**
- * Reacts to a change in the specified note's key pressure.
- * Polyphonic key pressure
- * allows a keyboard player to press multiple keys simultaneously, each
- * with a different amount of pressure. The pressure, if not ignored,
- * is typically used to vary such features as the volume, brightness,
- * or vibrato of the note.
+ * Reacts to a change in the specified note's key pressure. Polyphonic key
+ * pressure allows a keyboard player to press multiple keys simultaneously,
+ * each with a different amount of pressure. The pressure, if not ignored,
+ * is typically used to vary such features as the volume, brightness, or
+ * vibrato of the note.
+ * <p>
+ * It is possible that the underlying synthesizer does not support this MIDI
+ * message. In order to verify that {@code setPolyPressure} was successful,
+ * use {@code getPolyPressure}.
*
- * It is possible that the underlying synthesizer
- * does not support this MIDI message. In order
- * to verify that <code>setPolyPressure</code>
- * was successful, use <code>getPolyPressure</code>.
- *
- * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
- * @param pressure value for the specified key, from 0 to 127 (127 =
- * maximum pressure)
- *
+ * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
+ * @param pressure value for the specified key, from 0 to 127
+ * (127 = maximum pressure)
* @see #getPolyPressure(int)
*/
- public void setPolyPressure(int noteNumber, int pressure);
+ void setPolyPressure(int noteNumber, int pressure);
/**
* Obtains the pressure with which the specified key is being depressed.
+ * <p>
+ * If the device does not support setting poly pressure, this method always
+ * returns 0. Calling {@code setPolyPressure} will have no effect then.
*
- * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
- *
- * If the device does not support setting poly pressure,
- * this method always returns 0. Calling
- * <code>setPolyPressure</code> will have no effect then.
- *
+ * @param noteNumber the MIDI note number, from 0 to 127 (60 = Middle C)
* @return the amount of pressure for that note, from 0 to 127
- * (127 = maximum pressure)
- *
+ * (127 = maximum pressure)
* @see #setPolyPressure(int, int)
*/
- public int getPolyPressure(int noteNumber);
+ int getPolyPressure(int noteNumber);
/**
- * Reacts to a change in the keyboard pressure. Channel
- * pressure indicates how hard the keyboard player is depressing
- * the entire keyboard. This can be the maximum or
- * average of the per-key pressure-sensor values, as set by
- * <code>setPolyPressure</code>. More commonly, it is a measurement of
- * a single sensor on a device that doesn't implement polyphonic key
- * pressure. Pressure can be used to control various aspects of the sound,
- * as described under {@link #setPolyPressure(int, int) setPolyPressure}.
+ * Reacts to a change in the keyboard pressure. Channel pressure indicates
+ * how hard the keyboard player is depressing the entire keyboard. This can
+ * be the maximum or average of the per-key pressure-sensor values, as set
+ * by {@code setPolyPressure}. More commonly, it is a measurement of a
+ * single sensor on a device that doesn't implement polyphonic key pressure.
+ * Pressure can be used to control various aspects of the sound, as
+ * described under {@link #setPolyPressure(int, int) setPolyPressure}.
+ * <p>
+ * It is possible that the underlying synthesizer does not support this MIDI
+ * message. In order to verify that {@code setChannelPressure} was
+ * successful, use {@code getChannelPressure}.
*
- * It is possible that the underlying synthesizer
- * does not support this MIDI message. In order
- * to verify that <code>setChannelPressure</code>
- * was successful, use <code>getChannelPressure</code>.
- *
- * @param pressure the pressure with which the keyboard is being depressed,
- * from 0 to 127 (127 = maximum pressure)
+ * @param pressure the pressure with which the keyboard is being depressed,
+ * from 0 to 127 (127 = maximum pressure)
* @see #setPolyPressure(int, int)
* @see #getChannelPressure
*/
- public void setChannelPressure(int pressure);
+ void setChannelPressure(int pressure);
/**
* Obtains the channel's keyboard pressure.
- * If the device does not support setting channel pressure,
- * this method always returns 0. Calling
- * <code>setChannelPressure</code> will have no effect then.
+ * <p>
+ * If the device does not support setting channel pressure, this method
+ * always returns 0. Calling {@code setChannelPressure} will have no effect
+ * then.
*
- * @return the amount of pressure for that note,
- * from 0 to 127 (127 = maximum pressure)
- *
+ * @return the amount of pressure for that note, from 0 to 127
+ * (127 = maximum pressure)
* @see #setChannelPressure(int)
*/
- public int getChannelPressure();
+ int getChannelPressure();
/**
- * Reacts to a change in the specified controller's value. A controller
- * is some control other than a keyboard key, such as a
- * switch, slider, pedal, wheel, or breath-pressure sensor.
- * The MIDI 1.0 Specification provides standard numbers for typical
- * controllers on MIDI devices, and describes the intended effect
- * for some of the controllers.
- * The way in which an
- * <code>Instrument</code> reacts to a controller change may be
- * specific to the <code>Instrument</code>.
+ * Reacts to a change in the specified controller's value. A controller is
+ * some control other than a keyboard key, such as a switch, slider, pedal,
+ * wheel, or breath-pressure sensor. The MIDI 1.0 Specification provides
+ * standard numbers for typical controllers on MIDI devices, and describes
+ * the intended effect for some of the controllers. The way in which an
+ * {@code Instrument} reacts to a controller change may be specific to the
+ * {@code Instrument}.
* <p>
- * The MIDI 1.0 Specification defines both 7-bit controllers
- * and 14-bit controllers. Continuous controllers, such
- * as wheels and sliders, typically have 14 bits (two MIDI bytes),
- * while discrete controllers, such as switches, typically have 7 bits
- * (one MIDI byte). Refer to the specification to see the
- * expected resolution for each type of control.
+ * The MIDI 1.0 Specification defines both 7-bit controllers and 14-bit
+ * controllers. Continuous controllers, such as wheels and sliders,
+ * typically have 14 bits (two MIDI bytes), while discrete controllers, such
+ * as switches, typically have 7 bits (one MIDI byte). Refer to the
+ * specification to see the expected resolution for each type of control.
* <p>
- * Controllers 64 through 95 (0x40 - 0x5F) allow 7-bit precision.
- * The value of a 7-bit controller is set completely by the
- * <code>value</code> argument. An additional set of controllers
- * provide 14-bit precision by using two controller numbers, one
- * for the most significant 7 bits and another for the least significant
- * 7 bits. Controller numbers 0 through 31 (0x00 - 0x1F) control the
- * most significant 7 bits of 14-bit controllers; controller numbers
- * 32 through 63 (0x20 - 0x3F) control the least significant 7 bits of
- * these controllers. For example, controller number 7 (0x07) controls
- * the upper 7 bits of the channel volume controller, and controller
- * number 39 (0x27) controls the lower 7 bits.
- * The value of a 14-bit controller is determined
- * by the interaction of the two halves. When the most significant 7 bits
- * of a controller are set (using controller numbers 0 through 31), the
- * lower 7 bits are automatically set to 0. The corresponding controller
- * number for the lower 7 bits may then be used to further modulate the
- * controller value.
+ * Controllers 64 through 95 (0x40 - 0x5F) allow 7-bit precision. The value
+ * of a 7-bit controller is set completely by the {@code value} argument. An
+ * additional set of controllers provide 14-bit precision by using two
+ * controller numbers, one for the most significant 7 bits and another for
+ * the least significant 7 bits. Controller numbers 0 through 31
+ * (0x00 - 0x1F) control the most significant 7 bits of 14-bit controllers;
+ * controller numbers 32 through 63 (0x20 - 0x3F) control the least
+ * significant 7 bits of these controllers. For example, controller number 7
+ * (0x07) controls the upper 7 bits of the channel volume controller, and
+ * controller number 39 (0x27) controls the lower 7 bits. The value of a
+ * 14-bit controller is determined by the interaction of the two halves.
+ * When the most significant 7 bits of a controller are set (using
+ * controller numbers 0 through 31), the lower 7 bits are automatically set
+ * to 0. The corresponding controller number for the lower 7 bits may then
+ * be used to further modulate the controller value.
+ * <p>
+ * It is possible that the underlying synthesizer does not support a
+ * specific controller message. In order to verify that a call to
+ * {@code controlChange} was successful, use {@code getController}.
*
- * It is possible that the underlying synthesizer
- * does not support a specific controller message. In order
- * to verify that a call to <code>controlChange</code>
- * was successful, use <code>getController</code>.
- *
- * @param controller the controller number (0 to 127; see the MIDI
- * 1.0 Specification for the interpretation)
- * @param value the value to which the specified controller is changed (0 to 127)
- *
+ * @param controller the controller number (0 to 127; see the MIDI 1.0
+ * Specification for the interpretation)
+ * @param value the value to which the specified controller is changed
+ * (0 to 127)
* @see #getController(int)
*/
- public void controlChange(int controller, int value);
+ void controlChange(int controller, int value);
/**
- * Obtains the current value of the specified controller. The return
- * value is represented with 7 bits. For 14-bit controllers, the MSB and
- * LSB controller value needs to be obtained separately. For example,
- * the 14-bit value of the volume controller can be calculated by
- * multiplying the value of controller 7 (0x07, channel volume MSB)
- * with 128 and adding the
- * value of controller 39 (0x27, channel volume LSB).
+ * Obtains the current value of the specified controller. The return value
+ * is represented with 7 bits. For 14-bit controllers, the MSB and LSB
+ * controller value needs to be obtained separately. For example, the 14-bit
+ * value of the volume controller can be calculated by multiplying the value
+ * of controller 7 (0x07, channel volume MSB) with 128 and adding the value
+ * of controller 39 (0x27, channel volume LSB).
+ * <p>
+ * If the device does not support setting a specific controller, this method
+ * returns 0 for that controller. Calling {@code controlChange} will have no
+ * effect then.
*
- * If the device does not support setting a specific controller,
- * this method returns 0 for that controller.
- * Calling <code>controlChange</code> will have no effect then.
- *
- * @param controller the number of the controller whose value is desired.
- * The allowed range is 0-127; see the MIDI
- * 1.0 Specification for the interpretation.
- *
+ * @param controller the number of the controller whose value is desired.
+ * The allowed range is 0-127; see the MIDI 1.0 Specification for
+ * the interpretation.
* @return the current value of the specified controller (0 to 127)
- *
* @see #controlChange(int, int)
*/
- public int getController(int controller);
+ int getController(int controller);
/**
- * Changes a program (patch). This selects a specific
- * instrument from the currently selected bank of instruments.
+ * Changes a program (patch). This selects a specific instrument from the
+ * currently selected bank of instruments.
* <p>
- * The MIDI specification does not
- * dictate whether notes that are already sounding should switch
- * to the new instrument (timbre) or continue with their original timbre
- * until terminated by a note-off.
+ * The MIDI specification does not dictate whether notes that are already
+ * sounding should switch to the new instrument (timbre) or continue with
+ * their original timbre until terminated by a note-off.
* <p>
- * The program number is zero-based (expressed from 0 to 127).
- * Note that MIDI hardware displays and literature about MIDI
- * typically use the range 1 to 128 instead.
+ * The program number is zero-based (expressed from 0 to 127). Note that
+ * MIDI hardware displays and literature about MIDI typically use the range
+ * 1 to 128 instead.
+ * <p>
+ * It is possible that the underlying synthesizer does not support a
+ * specific program. In order to verify that a call to {@code programChange}
+ * was successful, use {@code getProgram}.
*
- * It is possible that the underlying synthesizer
- * does not support a specific program. In order
- * to verify that a call to <code>programChange</code>
- * was successful, use <code>getProgram</code>.
- *
- * @param program the program number to switch to (0 to 127)
- *
+ * @param program the program number to switch to (0 to 127)
* @see #programChange(int, int)
* @see #getProgram()
*/
- public void programChange(int program);
+ void programChange(int program);
/**
* Changes the program using bank and program (patch) numbers.
- *
- * It is possible that the underlying synthesizer
- * does not support a specific bank, or program. In order
- * to verify that a call to <code>programChange</code>
- * was successful, use <code>getProgram</code> and
- * <code>getController</code>.
- * Since banks are changed by way of control changes,
- * you can verify the current bank with the following
- * statement:
+ * <p>
+ * It is possible that the underlying synthesizer does not support a
+ * specific bank, or program. In order to verify that a call to
+ * {@code programChange} was successful, use {@code getProgram} and
+ * {@code getController}. Since banks are changed by way of control changes,
+ * you can verify the current bank with the following statement:
* <pre>
- * int bank = (getController(0) * 128)
- * + getController(32);
+ * int bank = (getController(0) * 128) + getController(32);
* </pre>
*
- * @param bank the bank number to switch to (0 to 16383)
- * @param program the program (patch) to use in the specified bank (0 to 127)
+ * @param bank the bank number to switch to (0 to 16383)
+ * @param program the program (patch) to use in the specified bank
+ * (0 to 127)
* @see #programChange(int)
* @see #getProgram()
*/
- public void programChange(int bank, int program);
+ void programChange(int bank, int program);
/**
* Obtains the current program number for this channel.
+ *
* @return the program number of the currently selected patch
* @see Patch#getProgram
* @see Synthesizer#loadInstrument
* @see #programChange(int)
*/
- public int getProgram();
+ int getProgram();
/**
- * Changes the pitch offset for all notes on this channel.
- * This affects all currently sounding notes as well as subsequent ones.
- * (For pitch bend to cease, the value needs to be reset to the
- * center position.)
- * <p> The MIDI specification
- * stipulates that pitch bend be a 14-bit value, where zero
- * is maximum downward bend, 16383 is maximum upward bend, and
- * 8192 is the center (no pitch bend). The actual
- * amount of pitch change is not specified; it can be changed by
- * a pitch-bend sensitivity setting. However, the General MIDI
- * specification says that the default range should be two semitones
- * up and down from center.
+ * Changes the pitch offset for all notes on this channel. This affects all
+ * currently sounding notes as well as subsequent ones. (For pitch bend to
+ * cease, the value needs to be reset to the center position.)
+ * <p>
+ * The MIDI specification stipulates that pitch bend be a 14-bit value,
+ * where zero is maximum downward bend, 16383 is maximum upward bend, and
+ * 8192 is the center (no pitch bend). The actual amount of pitch change is
+ * not specified; it can be changed by a pitch-bend sensitivity setting.
+ * However, the General MIDI specification says that the default range
+ * should be two semitones up and down from center.
+ * <p>
+ * It is possible that the underlying synthesizer does not support this MIDI
+ * message. In order to verify that {@code setPitchBend} was successful, use
+ * {@code getPitchBend}.
*
- * It is possible that the underlying synthesizer
- * does not support this MIDI message. In order
- * to verify that <code>setPitchBend</code>
- * was successful, use <code>getPitchBend</code>.
- *
- * @param bend the amount of pitch change, as a nonnegative 14-bit value
- * (8192 = no bend)
- *
+ * @param bend the amount of pitch change, as a nonnegative 14-bit value
+ * (8192 = no bend)
* @see #getPitchBend
*/
- public void setPitchBend(int bend);
+ void setPitchBend(int bend);
/**
- * Obtains the upward or downward pitch offset for this channel.
- * If the device does not support setting pitch bend,
- * this method always returns 8192. Calling
- * <code>setPitchBend</code> will have no effect then.
+ * Obtains the upward or downward pitch offset for this channel. If the
+ * device does not support setting pitch bend, this method always returns
+ * 8192. Calling {@code setPitchBend} will have no effect then.
*
* @return bend amount, as a nonnegative 14-bit value (8192 = no bend)
- *
* @see #setPitchBend(int)
*/
- public int getPitchBend();
+ int getPitchBend();
/**
* Resets all the implemented controllers to their default values.
*
* @see #controlChange(int, int)
*/
- public void resetAllControllers();
+ void resetAllControllers();
/**
- * Turns off all notes that are currently sounding on this channel.
- * The notes might not die away instantaneously; their decay
- * rate is determined by the internals of the <code>Instrument</code>.
- * If the Hold Pedal controller (see
- * {@link #controlChange(int, int) controlChange})
- * is down, the effect of this method is deferred until the pedal is
- * released.
+ * Turns off all notes that are currently sounding on this channel. The
+ * notes might not die away instantaneously; their decay rate is determined
+ * by the internals of the {@code Instrument}. If the Hold Pedal controller
+ * (see {@link #controlChange(int, int) controlChange}) is down, the effect
+ * of this method is deferred until the pedal is released.
*
* @see #allSoundOff
* @see #noteOff(int)
*/
- public void allNotesOff();
+ void allNotesOff();
/**
* Immediately turns off all sounding notes on this channel, ignoring the
* state of the Hold Pedal and the internal decay rate of the current
- * <code>Instrument</code>.
+ * {@code Instrument}.
*
* @see #allNotesOff
*/
- public void allSoundOff();
+ void allSoundOff();
/**
- * Turns local control on or off. The default is for local control
- * to be on. The "on" setting means that if a device is capable
- * of both synthesizing sound and transmitting MIDI messages,
- * it will synthesize sound in response to the note-on and
- * note-off messages that it itself transmits. It will also respond
- * to messages received from other transmitting devices.
- * The "off" setting means that the synthesizer will ignore its
- * own transmitted MIDI messages, but not those received from other devices.
- *
- * It is possible that the underlying synthesizer
- * does not support local control. In order
- * to verify that a call to <code>localControl</code>
- * was successful, check the return value.
- *
- * @param on <code>true</code> to turn local control on, <code>false</code>
- * to turn local control off
- * @return the new local-control value, or false
- * if local control is not supported
- *
- */
- public boolean localControl(boolean on);
-
- /**
- * Turns mono mode on or off. In mono mode, the channel synthesizes
- * only one note at a time. In poly mode (identical to mono mode off),
- * the channel can synthesize multiple notes simultaneously.
- * The default is mono off (poly mode on).
+ * Turns local control on or off. The default is for local control to be on.
+ * The "on" setting means that if a device is capable of both synthesizing
+ * sound and transmitting MIDI messages, it will synthesize sound in
+ * response to the note-on and note-off messages that it itself transmits.
+ * It will also respond to messages received from other transmitting
+ * devices. The "off" setting means that the synthesizer will ignore its own
+ * transmitted MIDI messages, but not those received from other devices.
* <p>
- * "Mono" is short for the word "monophonic," which in this context
- * is opposed to the word "polyphonic" and refers to a single synthesizer
- * voice per MIDI channel. It
- * has nothing to do with how many audio channels there might be
- * (as in "monophonic" versus "stereophonic" recordings).
+ * It is possible that the underlying synthesizer does not support local
+ * control. In order to verify that a call to {@code localControl} was
+ * successful, check the return value.
*
- * It is possible that the underlying synthesizer
- * does not support mono mode. In order
- * to verify that a call to <code>setMono</code>
- * was successful, use <code>getMono</code>.
+ * @param on {@code true} to turn local control on, {@code false} to turn
+ * local control off
+ * @return the new local-control value, or false if local control is not
+ * supported
+ */
+ boolean localControl(boolean on);
+
+ /**
+ * Turns mono mode on or off. In mono mode, the channel synthesizes only one
+ * note at a time. In poly mode (identical to mono mode off), the channel
+ * can synthesize multiple notes simultaneously. The default is mono off
+ * (poly mode on).
+ * <p>
+ * "Mono" is short for the word "monophonic," which in this context is
+ * opposed to the word "polyphonic" and refers to a single synthesizer voice
+ * per MIDI channel. It has nothing to do with how many audio channels there
+ * might be (as in "monophonic" versus "stereophonic" recordings).
+ * <p>
+ * It is possible that the underlying synthesizer does not support mono
+ * mode. In order to verify that a call to {@code setMono} was successful,
+ * use {@code getMono}.
*
- * @param on <code>true</code> to turn mono mode on, <code>false</code> to
- * turn it off (which means turning poly mode on).
- *
+ * @param on {@code true} to turn mono mode on, {@code false} to turn it
+ * off (which means turning poly mode on)
* @see #getMono
* @see VoiceStatus
*/
- public void setMono(boolean on);
+ void setMono(boolean on);
/**
- * Obtains the current mono/poly mode.
- * Synthesizers that do not allow changing mono/poly mode
- * will always return the same value, regardless
- * of calls to <code>setMono</code>.
- * @return <code>true</code> if mono mode is on, otherwise
- * <code>false</code> (meaning poly mode is on).
+ * Obtains the current mono/poly mode. Synthesizers that do not allow
+ * changing mono/poly mode will always return the same value, regardless of
+ * calls to {@code setMono}.
*
+ * @return {@code true} if mono mode is on, otherwise {@code false} (meaning
+ * poly mode is on)
* @see #setMono(boolean)
*/
- public boolean getMono();
+ boolean getMono();
/**
- * Turns omni mode on or off. In omni mode, the channel responds
- * to messages sent on all channels. When omni is off, the channel
- * responds only to messages sent on its channel number.
- * The default is omni off.
+ * Turns omni mode on or off. In omni mode, the channel responds to messages
+ * sent on all channels. When omni is off, the channel responds only to
+ * messages sent on its channel number. The default is omni off.
+ * <p>
+ * It is possible that the underlying synthesizer does not support omni
+ * mode. In order to verify that {@code setOmni} was successful, use
+ * {@code getOmni}.
*
- * It is possible that the underlying synthesizer
- * does not support omni mode. In order
- * to verify that <code>setOmni</code>
- * was successful, use <code>getOmni</code>.
- *
- * @param on <code>true</code> to turn omni mode on, <code>false</code> to
- * turn it off.
- *
+ * @param on {@code true} to turn omni mode on, {@code false} to turn it
+ * off
* @see #getOmni
* @see VoiceStatus
*/
- public void setOmni(boolean on);
+ void setOmni(boolean on);
/**
- * Obtains the current omni mode.
- * Synthesizers that do not allow changing the omni mode
- * will always return the same value, regardless
- * of calls to <code>setOmni</code>.
- * @return <code>true</code> if omni mode is on, otherwise
- * <code>false</code> (meaning omni mode is off).
+ * Obtains the current omni mode. Synthesizers that do not allow changing
+ * the omni mode will always return the same value, regardless of calls to
+ * {@code setOmni}.
*
+ * @return {@code true} if omni mode is on, otherwise {@code false} (meaning
+ * omni mode is off)
* @see #setOmni(boolean)
*/
- public boolean getOmni();
+ boolean getOmni();
/**
- * Sets the mute state for this channel. A value of
- * <code>true</code> means the channel is to be muted, <code>false</code>
- * means the channel can sound (if other channels are not soloed).
+ * Sets the mute state for this channel. A value of {@code true} means the
+ * channel is to be muted, {@code false} means the channel can sound (if
+ * other channels are not soloed).
* <p>
- * Unlike {@link #allSoundOff()}, this method
- * applies to only a specific channel, not to all channels. Further, it
- * silences not only currently sounding notes, but also subsequently
- * received notes.
+ * Unlike {@link #allSoundOff()}, this method applies to only a specific
+ * channel, not to all channels. Further, it silences not only currently
+ * sounding notes, but also subsequently received notes.
+ * <p>
+ * It is possible that the underlying synthesizer does not support muting
+ * channels. In order to verify that a call to {@code setMute} was
+ * successful, use {@code getMute}.
*
- * It is possible that the underlying synthesizer
- * does not support muting channels. In order
- * to verify that a call to <code>setMute</code>
- * was successful, use <code>getMute</code>.
- *
- * @param mute the new mute state
- *
+ * @param mute the new mute state
* @see #getMute
* @see #setSolo(boolean)
*/
- public void setMute(boolean mute);
+ void setMute(boolean mute);
/**
- * Obtains the current mute state for this channel.
- * If the underlying synthesizer does not support
- * muting this channel, this method always returns
- * <code>false</code>.
+ * Obtains the current mute state for this channel. If the underlying
+ * synthesizer does not support muting this channel, this method always
+ * returns {@code false}.
*
- * @return <code>true</code> the channel is muted,
- * or <code>false</code> if not
- *
+ * @return {@code true} the channel is muted, or {@code false} if not
* @see #setMute(boolean)
*/
- public boolean getMute();
+ boolean getMute();
/**
- * Sets the solo state for this channel.
- * If <code>solo</code> is <code>true</code> only this channel
- * and other soloed channels will sound. If <code>solo</code>
- * is <code>false</code> then only other soloed channels will
- * sound, unless no channels are soloed, in which case all
- * unmuted channels will sound.
+ * Sets the solo state for this channel. If {@code solo} is {@code true}
+ * only this channel and other soloed channels will sound. If {@code solo}
+ * is {@code false} then only other soloed channels will sound, unless no
+ * channels are soloed, in which case all unmuted channels will sound.
+ * <p>
+ * It is possible that the underlying synthesizer does not support solo
+ * channels. In order to verify that a call to {@code setSolo} was
+ * successful, use {@code getSolo}.
*
- * It is possible that the underlying synthesizer
- * does not support solo channels. In order
- * to verify that a call to <code>setSolo</code>
- * was successful, use <code>getSolo</code>.
- *
- * @param soloState new solo state for the channel
+ * @param soloState new solo state for the channel
* @see #getSolo()
*/
- public void setSolo(boolean soloState);
+ void setSolo(boolean soloState);
/**
- * Obtains the current solo state for this channel.
- * If the underlying synthesizer does not support
- * solo on this channel, this method always returns
- * <code>false</code>.
+ * Obtains the current solo state for this channel. If the underlying
+ * synthesizer does not support solo on this channel, this method always
+ * returns {@code false}.
*
- * @return <code>true</code> the channel is solo,
- * or <code>false</code> if not
- *
+ * @return {@code true} the channel is solo, or {@code false} if not
* @see #setSolo(boolean)
*/
- public boolean getSolo();
+ boolean getSolo();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
index f53d4ff..43c8293 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,64 +27,52 @@
import java.util.List;
- /**
- * <code>MidiDevice</code> is the base interface for all MIDI devices.
- * Common devices include synthesizers, sequencers, MIDI input ports, and MIDI
- * output ports.
- *
- * <p>A <code>MidiDevice</code> can be a transmitter or a receiver of
- * MIDI events, or both. Therefore, it can provide {@link Transmitter}
- * or {@link Receiver} instances (or both). Typically, MIDI IN ports
- * provide transmitters, MIDI OUT ports and synthesizers provide
- * receivers. A Sequencer typically provides transmitters for playback
- * and receivers for recording.
- *
- * <p>A <code>MidiDevice</code> can be opened and closed explicitly as
- * well as implicitly. Explicit opening is accomplished by calling
- * {@link #open}, explicit closing is done by calling {@link
- * #close} on the <code>MidiDevice</code> instance.
- * If an application opens a <code>MidiDevice</code>
- * explicitly, it has to close it explicitly to free system resources
- * and enable the application to exit cleanly. Implicit opening is
- * done by calling {@link javax.sound.midi.MidiSystem#getReceiver
- * MidiSystem.getReceiver} and {@link
- * javax.sound.midi.MidiSystem#getTransmitter
- * MidiSystem.getTransmitter}. The <code>MidiDevice</code> used by
- * <code>MidiSystem.getReceiver</code> and
- * <code>MidiSystem.getTransmitter</code> is implementation-dependant
- * unless the properties <code>javax.sound.midi.Receiver</code>
- * and <code>javax.sound.midi.Transmitter</code> are used (see the
- * description of properties to select default providers in
- * {@link javax.sound.midi.MidiSystem}). A <code>MidiDevice</code>
- * that was opened implicitly, is closed implicitly by closing the
- * <code>Receiver</code> or <code>Transmitter</code> that resulted in
- * opening it. If more than one implicitly opening
- * <code>Receiver</code> or <code>Transmitter</code> were obtained by
- * the application, the device is closed after the last
- * <code>Receiver</code> or <code>Transmitter</code> has been
- * closed. On the other hand, calling <code>getReceiver</code> or
- * <code>getTransmitter</code> on the device instance directly does
- * not open the device implicitly. Closing these
- * <code>Transmitter</code>s and <code>Receiver</code>s does not close
- * the device implicitly. To use a device with <code>Receiver</code>s
- * or <code>Transmitter</code>s obtained this way, the device has to
- * be opened and closed explicitly.
- *
- * <p>If implicit and explicit opening and closing are mixed on the
- * same <code>MidiDevice</code> instance, the following rules apply:
+/**
+ * {@code MidiDevice} is the base interface for all MIDI devices. Common devices
+ * include synthesizers, sequencers, MIDI input ports, and MIDI output ports.
+ * <p>
+ * A {@code MidiDevice} can be a transmitter or a receiver of MIDI events, or
+ * both. Therefore, it can provide {@link Transmitter} or {@link Receiver}
+ * instances (or both). Typically, MIDI IN ports provide transmitters, MIDI OUT
+ * ports and synthesizers provide receivers. A Sequencer typically provides
+ * transmitters for playback and receivers for recording.
+ * <p>
+ * A {@code MidiDevice} can be opened and closed explicitly as well as
+ * implicitly. Explicit opening is accomplished by calling {@link #open},
+ * explicit closing is done by calling {@link #close} on the {@code MidiDevice}
+ * instance. If an application opens a {@code MidiDevice} explicitly, it has to
+ * close it explicitly to free system resources and enable the application to
+ * exit cleanly. Implicit opening is done by calling
+ * {@link MidiSystem#getReceiver} and {@link MidiSystem#getTransmitter}. The
+ * {@code MidiDevice} used by {@code MidiSystem.getReceiver} and
+ * {@code MidiSystem.getTransmitter} is implementation-dependant unless the
+ * properties {@code javax.sound.midi.Receiver} and
+ * {@code javax.sound.midi.Transmitter} are used (see the description of
+ * properties to select default providers in {@link MidiSystem}). A
+ * {@code MidiDevice} that was opened implicitly, is closed implicitly by
+ * closing the {@code Receiver} or {@code Transmitter} that resulted in opening
+ * it. If more than one implicitly opening {@code Receiver} or
+ * {@code Transmitter} were obtained by the application, the device is closed
+ * after the last {@code Receiver} or {@code Transmitter} has been closed. On
+ * the other hand, calling {@code getReceiver} or {@code getTransmitter} on the
+ * device instance directly does not open the device implicitly. Closing these
+ * {@code Transmitter}s and {@code Receiver}s does not close the device
+ * implicitly. To use a device with {@code Receiver}s or {@code Transmitter}s
+ * obtained this way, the device has to be opened and closed explicitly.
+ * <p>
+ * If implicit and explicit opening and closing are mixed on the same
+ * {@code MidiDevice} instance, the following rules apply:
*
* <ul>
- * <li>After an explicit open (either before or after implicit
- * opens), the device will not be closed by implicit closing. The only
- * way to close an explicitly opened device is an explicit close.</li>
- *
- * <li>An explicit close always closes the device, even if it also has
- * been opened implicitly. A subsequent implicit close has no further
- * effect.</li>
+ * <li>After an explicit open (either before or after implicit opens), the
+ * device will not be closed by implicit closing. The only way to close an
+ * explicitly opened device is an explicit close.</li>
+ * <li>An explicit close always closes the device, even if it also has been
+ * opened implicitly. A subsequent implicit close has no further effect.</li>
* </ul>
*
- * To detect if a MidiDevice represents a hardware MIDI port, the
- * following programming technique can be used:
+ * To detect if a MidiDevice represents a hardware MIDI port, the following
+ * programming technique can be used:
*
* <pre>{@code
* MidiDevice device = ...;
@@ -95,193 +83,171 @@
* }</pre>
*
* <p>
- * A <code>MidiDevice</code> includes a <code>{@link MidiDevice.Info}</code> object
- * to provide manufacturer information and so on.
+ * A {@code MidiDevice} includes a {@link Info} object to provide manufacturer
+ * information and so on.
*
+ * @author Kara Kytle
+ * @author Florian Bomers
* @see Synthesizer
* @see Sequencer
* @see Receiver
* @see Transmitter
- *
- * @author Kara Kytle
- * @author Florian Bomers
*/
-
public interface MidiDevice extends AutoCloseable {
-
/**
* Obtains information about the device, including its Java class and
- * <code>Strings</code> containing its name, vendor, and description.
+ * {@code Strings} containing its name, vendor, and description.
*
* @return device info
*/
- public Info getDeviceInfo();
-
+ Info getDeviceInfo();
/**
- * Opens the device, indicating that it should now acquire any
- * system resources it requires and become operational.
- *
- * <p>An application opening a device explicitly with this call
- * has to close the device by calling {@link #close}. This is
- * necessary to release system resources and allow applications to
- * exit cleanly.
- *
+ * Opens the device, indicating that it should now acquire any system
+ * resources it requires and become operational.
* <p>
- * Note that some devices, once closed, cannot be reopened. Attempts
- * to reopen such a device will always result in a MidiUnavailableException.
+ * An application opening a device explicitly with this call has to close
+ * the device by calling {@link #close}. This is necessary to release system
+ * resources and allow applications to exit cleanly.
+ * <p>
+ * Note that some devices, once closed, cannot be reopened. Attempts to
+ * reopen such a device will always result in a MidiUnavailableException.
*
- * @throws MidiUnavailableException thrown if the device cannot be
- * opened due to resource restrictions.
- * @throws SecurityException thrown if the device cannot be
- * opened due to security restrictions.
- *
+ * @throws MidiUnavailableException thrown if the device cannot be opened
+ * due to resource restrictions
+ * @throws SecurityException thrown if the device cannot be opened due to
+ * security restrictions
* @see #close
* @see #isOpen
*/
- public void open() throws MidiUnavailableException;
-
+ void open() throws MidiUnavailableException;
/**
- * Closes the device, indicating that the device should now release
- * any system resources it is using.
- *
- * <p>All <code>Receiver</code> and <code>Transmitter</code> instances
- * open from this device are closed. This includes instances retrieved
- * via <code>MidiSystem</code>.
+ * Closes the device, indicating that the device should now release any
+ * system resources it is using.
+ * <p>
+ * All {@code Receiver} and {@code Transmitter} instances open from this
+ * device are closed. This includes instances retrieved via
+ * {@code MidiSystem}.
*
* @see #open
* @see #isOpen
*/
- public void close();
-
+ void close();
/**
* Reports whether the device is open.
*
- * @return <code>true</code> if the device is open, otherwise
- * <code>false</code>
+ * @return {@code true} if the device is open, otherwise {@code false}
* @see #open
* @see #close
*/
- public boolean isOpen();
-
+ boolean isOpen();
/**
- * Obtains the current time-stamp of the device, in microseconds.
- * If a device supports time-stamps, it should start counting at
- * 0 when the device is opened and continue incrementing its
- * time-stamp in microseconds until the device is closed.
- * If it does not support time-stamps, it should always return
- * -1.
- * @return the current time-stamp of the device in microseconds,
- * or -1 if time-stamping is not supported by the device.
- */
- public long getMicrosecondPosition();
-
-
- /**
- * Obtains the maximum number of MIDI IN connections available on this
- * MIDI device for receiving MIDI data.
- * @return maximum number of MIDI IN connections,
- * or -1 if an unlimited number of connections is available.
- */
- public int getMaxReceivers();
-
-
- /**
- * Obtains the maximum number of MIDI OUT connections available on this
- * MIDI device for transmitting MIDI data.
- * @return maximum number of MIDI OUT connections,
- * or -1 if an unlimited number of connections is available.
- */
- public int getMaxTransmitters();
-
-
- /**
- * Obtains a MIDI IN receiver through which the MIDI device may receive
- * MIDI data. The returned receiver must be closed when the application
- * has finished using it.
+ * Obtains the current time-stamp of the device, in microseconds. If a
+ * device supports time-stamps, it should start counting at 0 when the
+ * device is opened and continue incrementing its time-stamp in microseconds
+ * until the device is closed. If it does not support time-stamps, it should
+ * always return -1.
*
- * <p>Usually the returned receiver implements
- * the {@code MidiDeviceReceiver} interface.
+ * @return the current time-stamp of the device in microseconds, or -1 if
+ * time-stamping is not supported by the device
+ */
+ long getMicrosecondPosition();
+
+ /**
+ * Obtains the maximum number of MIDI IN connections available on this MIDI
+ * device for receiving MIDI data.
*
- * <p>Obtaining a <code>Receiver</code> with this method does not
- * open the device. To be able to use the device, it has to be
- * opened explicitly by calling {@link #open}. Also, closing the
- * <code>Receiver</code> does not close the device. It has to be
- * closed explicitly by calling {@link #close}.
+ * @return maximum number of MIDI IN connections, or -1 if an unlimited
+ * number of connections is available
+ */
+ int getMaxReceivers();
+
+ /**
+ * Obtains the maximum number of MIDI OUT connections available on this MIDI
+ * device for transmitting MIDI data.
*
- * @return a receiver for the device.
+ * @return maximum number of MIDI OUT connections, or -1 if an unlimited
+ * number of connections is available
+ */
+ int getMaxTransmitters();
+
+ /**
+ * Obtains a MIDI IN receiver through which the MIDI device may receive MIDI
+ * data. The returned receiver must be closed when the application has
+ * finished using it.
+ * <p>
+ * Usually the returned receiver implements the {@code MidiDeviceReceiver}
+ * interface.
+ * <p>
+ * Obtaining a {@code Receiver} with this method does not open the device.
+ * To be able to use the device, it has to be opened explicitly by calling
+ * {@link #open}. Also, closing the {@code Receiver} does not close the
+ * device. It has to be closed explicitly by calling {@link #close}.
+ *
+ * @return a receiver for the device
* @throws MidiUnavailableException thrown if a receiver is not available
- * due to resource restrictions
+ * due to resource restrictions
* @see Receiver#close()
*/
- public Receiver getReceiver() throws MidiUnavailableException;
-
+ Receiver getReceiver() throws MidiUnavailableException;
/**
- * Returns all currently active, non-closed receivers
- * connected with this MidiDevice.
- * A receiver can be removed
- * from the device by closing it.
- *
- * <p>Usually the returned receivers implement
- * the {@code MidiDeviceReceiver} interface.
+ * Returns all currently active, non-closed receivers connected with this
+ * MidiDevice. A receiver can be removed from the device by closing it.
+ * <p>
+ * Usually the returned receivers implement the {@code MidiDeviceReceiver}
+ * interface.
*
* @return an unmodifiable list of the open receivers
* @since 1.5
*/
List<Receiver> getReceivers();
-
/**
* Obtains a MIDI OUT connection from which the MIDI device will transmit
- * MIDI data The returned transmitter must be closed when the application
+ * MIDI data. The returned transmitter must be closed when the application
* has finished using it.
+ * <p>
+ * Usually the returned transmitter implements the
+ * {@code MidiDeviceTransmitter} interface.
+ * <p>
+ * Obtaining a {@code Transmitter} with this method does not open the
+ * device. To be able to use the device, it has to be opened explicitly by
+ * calling {@link #open}. Also, closing the {@code Transmitter} does not
+ * close the device. It has to be closed explicitly by calling
+ * {@link #close}.
*
- * <p>Usually the returned transmitter implements
- * the {@code MidiDeviceTransmitter} interface.
- *
- * <p>Obtaining a <code>Transmitter</code> with this method does not
- * open the device. To be able to use the device, it has to be
- * opened explicitly by calling {@link #open}. Also, closing the
- * <code>Transmitter</code> does not close the device. It has to be
- * closed explicitly by calling {@link #close}.
- *
- * @return a MIDI OUT transmitter for the device.
+ * @return a MIDI OUT transmitter for the device
* @throws MidiUnavailableException thrown if a transmitter is not available
- * due to resource restrictions
+ * due to resource restrictions
* @see Transmitter#close()
*/
- public Transmitter getTransmitter() throws MidiUnavailableException;
-
+ Transmitter getTransmitter() throws MidiUnavailableException;
/**
- * Returns all currently active, non-closed transmitters
- * connected with this MidiDevice.
- * A transmitter can be removed
- * from the device by closing it.
- *
- * <p>Usually the returned transmitters implement
- * the {@code MidiDeviceTransmitter} interface.
+ * Returns all currently active, non-closed transmitters connected with this
+ * MidiDevice. A transmitter can be removed from the device by closing it.
+ * <p>
+ * Usually the returned transmitters implement the
+ * {@code MidiDeviceTransmitter} interface.
*
* @return an unmodifiable list of the open transmitters
* @since 1.5
*/
List<Transmitter> getTransmitters();
-
-
/**
- * A <code>MidiDevice.Info</code> object contains assorted
- * data about a <code>{@link MidiDevice}</code>, including its
- * name, the company who created it, and descriptive text.
+ * A {@code MidiDevice.Info} object contains assorted data about a
+ * {@link MidiDevice}, including its name, the company who created it, and
+ * descriptive text.
*
* @see MidiDevice#getDeviceInfo
*/
- public static class Info {
+ class Info {
/**
* The device's name.
@@ -303,16 +269,16 @@
*/
private String version;
-
/**
* Constructs a device info object.
*
- * @param name the name of the device
- * @param vendor the name of the company who provides the device
- * @param description a description of the device
- * @param version version information for the device
+ * @param name the name of the device
+ * @param vendor the name of the company who provides the device
+ * @param description a description of the device
+ * @param version version information for the device
*/
- protected Info(String name, String vendor, String description, String version) {
+ protected Info(String name, String vendor, String description,
+ String version) {
this.name = name;
this.vendor = vendor;
@@ -320,20 +286,18 @@
this.version = version;
}
-
/**
- * Reports whether two objects are equal.
- * Returns <code>true</code> if the objects are identical.
- * @param obj the reference object with which to compare this
- * object
- * @return <code>true</code> if this object is the same as the
- * <code>obj</code> argument; <code>false</code> otherwise
+ * Reports whether two objects are equal. Returns {@code true} if the
+ * objects are identical.
+ *
+ * @param obj the reference object with which to compare this object
+ * @return {@code true} if this object is the same as the {@code obj}
+ * argument; {@code false} otherwise
*/
public final boolean equals(Object obj) {
return super.equals(obj);
}
-
/**
* Finalizes the hashcode method.
*/
@@ -341,7 +305,6 @@
return super.hashCode();
}
-
/**
* Obtains the name of the device.
*
@@ -351,43 +314,40 @@
return name;
}
-
/**
* Obtains the name of the company who supplies the device.
+ *
* @return device the vendor's name
*/
public final String getVendor() {
return vendor;
}
-
/**
* Obtains the description of the device.
+ *
* @return a description of the device
*/
public final String getDescription() {
return description;
}
-
/**
* Obtains the version of the device.
+ *
* @return textual version information for the device.
*/
public final String getVersion() {
return version;
}
-
/**
* Provides a string representation of the device information.
-
+ *
* @return a description of the info object
*/
public final String toString() {
return name;
}
} // class Info
-
-
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java
index 550c7a4..5698508 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceReceiver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package javax.sound.midi;
/**
- * <p>{@code MidiDeviceReceiver} is a {@code Receiver} which represents
- * a MIDI input connector of a {@code MidiDevice}
- * (see {@link MidiDevice#getReceiver()}).
+ * {@code MidiDeviceReceiver} is a {@code Receiver} which represents a MIDI
+ * input connector of a {@code MidiDevice} (see
+ * {@link MidiDevice#getReceiver()}).
*
* @since 1.7
*/
public interface MidiDeviceReceiver extends Receiver {
+
/**
* Obtains a MidiDevice object which is an owner of this Receiver.
+ *
* @return a MidiDevice object which is an owner of this Receiver
*/
- public MidiDevice getMidiDevice();
+ MidiDevice getMidiDevice();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
index 730628c..aaf7aba 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
package javax.sound.midi;
-
/**
- * <p>{@code MidiDeviceTransmitter} is a {@code Transmitter} which represents
- * a MIDI input connector of a {@code MidiDevice}
- * (see {@link MidiDevice#getTransmitter()}).
+ * {@code MidiDeviceTransmitter} is a {@code Transmitter} which represents a
+ * MIDI input connector of a {@code MidiDevice} (see
+ * {@link MidiDevice#getTransmitter()}).
*
* @since 1.7
*/
@@ -37,7 +36,8 @@
/**
* Obtains a MidiDevice object which is an owner of this Transmitter.
+ *
* @return a MidiDevice object which is an owner of this Transmitter
*/
- public MidiDevice getMidiDevice();
+ MidiDevice getMidiDevice();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java
index b5f4c5c..caf6e79 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,41 +26,35 @@
package javax.sound.midi;
/**
- * MIDI events contain a MIDI message and a corresponding time-stamp
- * expressed in ticks, and can represent the MIDI event information
- * stored in a MIDI file or a <code>{@link Sequence}</code> object. The
- * duration of a tick is specified by the timing information contained
- * in the MIDI file or <code>Sequence</code> object.
+ * MIDI events contain a MIDI message and a corresponding time-stamp expressed
+ * in ticks, and can represent the MIDI event information stored in a MIDI file
+ * or a {@link Sequence} object. The duration of a tick is specified by the
+ * timing information contained in the MIDI file or {@code Sequence} object.
* <p>
- * In Java Sound, <code>MidiEvent</code> objects are typically contained in a
- * <code>{@link Track}</code>, and <code>Tracks</code> are likewise
- * contained in a <code>Sequence</code>.
- *
+ * In Java Sound, {@code MidiEvent} objects are typically contained in a
+ * {@link Track}, and {@code Tracks} are likewise contained in a
+ * {@code Sequence}.
*
* @author David Rivas
* @author Kara Kytle
*/
public class MidiEvent {
-
- // Instance variables
-
/**
* The MIDI message for this event.
*/
private final MidiMessage message;
-
/**
* The tick value for this event.
*/
private long tick;
-
/**
- * Constructs a new <code>MidiEvent</code>.
- * @param message the MIDI message contained in the event
- * @param tick the time-stamp for the event, in MIDI ticks
+ * Constructs a new {@code MidiEvent}.
+ *
+ * @param message the MIDI message contained in the event
+ * @param tick the time-stamp for the event, in MIDI ticks
*/
public MidiEvent(MidiMessage message, long tick) {
@@ -70,24 +64,25 @@
/**
* Obtains the MIDI message contained in the event.
+ *
* @return the MIDI message
*/
public MidiMessage getMessage() {
return message;
}
-
/**
- * Sets the time-stamp for the event, in MIDI ticks
- * @param tick the new time-stamp, in MIDI ticks
+ * Sets the time-stamp for the event, in MIDI ticks.
+ *
+ * @param tick the new time-stamp, in MIDI ticks
*/
public void setTick(long tick) {
this.tick = tick;
}
-
/**
- * Obtains the time-stamp for the event, in MIDI ticks
+ * Obtains the time-stamp for the event, in MIDI ticks.
+ *
* @return the time-stamp for the event, in MIDI ticks
*/
public long getTick() {
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java
index c34bb6d..4748815 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java
@@ -25,29 +25,23 @@
package javax.sound.midi;
-import java.io.InputStream;
-import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-
/**
- * A <code>MidiFileFormat</code> object encapsulates a MIDI file's
- * type, as well as its length and timing information.
- *
- * <p>A <code>MidiFileFormat</code> object can
- * include a set of properties. A property is a pair of key and value:
- * the key is of type <code>String</code>, the associated property
- * value is an arbitrary object.
- * Properties specify additional informational
- * meta data (like a author, or copyright).
- * Properties are optional information, and file reader and file
- * writer implementations are not required to provide or
- * recognize properties.
- *
- * <p>The following table lists some common properties that should
- * be used in implementations:
+ * A {@code MidiFileFormat} object encapsulates a MIDI file's type, as well as
+ * its length and timing information.
+ * <p>
+ * A {@code MidiFileFormat} object can include a set of properties. A property
+ * is a pair of key and value: the key is of type {@code String}, the associated
+ * property value is an arbitrary object. Properties specify additional
+ * informational meta data (like a author, or copyright). Properties are
+ * optional information, and file reader and file writer implementations are not
+ * required to provide or recognize properties.
+ * <p>
+ * The following table lists some common properties that should be used in
+ * implementations:
*
* <table border=1>
<caption>MIDI File Format Properties</caption>
@@ -83,24 +77,21 @@
* </tr>
* </table>
*
- * @see MidiSystem#getMidiFileFormat(java.io.File)
- * @see Sequencer#setSequence(java.io.InputStream stream)
- *
* @author Kara Kytle
* @author Florian Bomers
+ * @see MidiSystem#getMidiFileFormat(java.io.File)
+ * @see Sequencer#setSequence(java.io.InputStream stream)
*/
-
public class MidiFileFormat {
-
/**
* Represents unknown length.
+ *
* @see #getByteLength
* @see #getMicrosecondLength
*/
public static final int UNKNOWN_LENGTH = -1;
-
/**
* The type of MIDI file.
*/
@@ -132,19 +123,22 @@
*/
protected long microsecondLength;
-
- /** The set of properties */
+ /**
+ * The set of properties.
+ */
private HashMap<String, Object> properties;
-
/**
- * Constructs a <code>MidiFileFormat</code>.
+ * Constructs a {@code MidiFileFormat}.
*
- * @param type the MIDI file type (0, 1, or 2)
- * @param divisionType the timing division type (PPQ or one of the SMPTE types)
- * @param resolution the timing resolution
- * @param bytes the length of the MIDI file in bytes, or UNKNOWN_LENGTH if not known
- * @param microseconds the duration of the file in microseconds, or UNKNOWN_LENGTH if not known
+ * @param type the MIDI file type (0, 1, or 2)
+ * @param divisionType the timing division type (PPQ or one of the SMPTE
+ * types)
+ * @param resolution the timing resolution
+ * @param bytes the length of the MIDI file in bytes, or UNKNOWN_LENGTH if
+ * not known
+ * @param microseconds the duration of the file in microseconds, or
+ * UNKNOWN_LENGTH if not known
* @see #UNKNOWN_LENGTH
* @see Sequence#PPQ
* @see Sequence#SMPTE_24
@@ -162,21 +156,18 @@
this.properties = null;
}
-
/**
- * Construct a <code>MidiFileFormat</code> with a set of properties.
+ * Construct a {@code MidiFileFormat} with a set of properties.
*
- * @param type the MIDI file type (0, 1, or 2)
- * @param divisionType the timing division type
- * (PPQ or one of the SMPTE types)
- * @param resolution the timing resolution
- * @param bytes the length of the MIDI file in bytes,
- * or UNKNOWN_LENGTH if not known
- * @param microseconds the duration of the file in microseconds,
- * or UNKNOWN_LENGTH if not known
- * @param properties a <code>Map<String,Object></code> object
- * with properties
- *
+ * @param type the MIDI file type (0, 1, or 2)
+ * @param divisionType the timing division type (PPQ or one of the SMPTE
+ * types)
+ * @param resolution the timing resolution
+ * @param bytes the length of the MIDI file in bytes, or UNKNOWN_LENGTH if
+ * not known
+ * @param microseconds the duration of the file in microseconds, or
+ * UNKNOWN_LENGTH if not known
+ * @param properties a {@code Map<String,Object>} object with properties
* @see #UNKNOWN_LENGTH
* @see Sequence#PPQ
* @see Sequence#SMPTE_24
@@ -192,10 +183,9 @@
this.properties = new HashMap<String, Object>(properties);
}
-
-
/**
* Obtains the MIDI file type.
+ *
* @return the file's type (0, 1, or 2)
*/
public int getType() {
@@ -206,7 +196,6 @@
* Obtains the timing division type for the MIDI file.
*
* @return the division type (PPQ or one of the SMPTE types)
- *
* @see Sequence#Sequence(float, int)
* @see Sequence#PPQ
* @see Sequence#SMPTE_24
@@ -219,11 +208,10 @@
return divisionType;
}
-
/**
- * Obtains the timing resolution for the MIDI file.
- * If the division type is PPQ, the resolution is specified in ticks per beat.
- * For SMTPE timing, the resolution is specified in ticks per frame.
+ * Obtains the timing resolution for the MIDI file. If the division type is
+ * PPQ, the resolution is specified in ticks per beat. For SMTPE timing, the
+ * resolution is specified in ticks per frame.
*
* @return the number of ticks per beat (PPQ) or per frame (SMPTE)
* @see #getDivisionType
@@ -233,9 +221,9 @@
return resolution;
}
-
/**
* Obtains the length of the MIDI file, expressed in 8-bit bytes.
+ *
* @return the number of bytes in the file, or UNKNOWN_LENGTH if not known
* @see #UNKNOWN_LENGTH
*/
@@ -245,7 +233,9 @@
/**
* Obtains the length of the MIDI file, expressed in microseconds.
- * @return the file's duration in microseconds, or UNKNOWN_LENGTH if not known
+ *
+ * @return the file's duration in microseconds, or UNKNOWN_LENGTH if not
+ * known
* @see Sequence#getMicrosecondLength()
* @see #getByteLength
* @see #UNKNOWN_LENGTH
@@ -255,14 +245,11 @@
}
/**
- * Obtain an unmodifiable map of properties.
- * The concept of properties is further explained in
- * the {@link MidiFileFormat class description}.
+ * Obtain an unmodifiable map of properties. The concept of properties is
+ * further explained in the {@link MidiFileFormat class description}.
*
- * @return a <code>Map<String,Object></code> object containing
- * all properties. If no properties are recognized, an empty map is
- * returned.
- *
+ * @return a {@code Map<String,Object>} object containing all properties. If
+ * no properties are recognized, an empty map is returned.
* @see #getProperty(String)
* @since 1.5
*/
@@ -277,20 +264,16 @@
return Collections.unmodifiableMap(ret);
}
-
/**
- * Obtain the property value specified by the key.
- * The concept of properties is further explained in
- * the {@link MidiFileFormat class description}.
+ * Obtain the property value specified by the key. The concept of properties
+ * is further explained in the {@link MidiFileFormat class description}.
+ * <p>
+ * If the specified property is not defined for a particular file format,
+ * this method returns {@code null}.
*
- * <p>If the specified property is not defined for a
- * particular file format, this method returns
- * <code>null</code>.
- *
- * @param key the key of the desired property
- * @return the value of the property with the specified key,
- * or <code>null</code> if the property does not exist.
- *
+ * @param key the key of the desired property
+ * @return the value of the property with the specified key, or {@code null}
+ * if the property does not exist
* @see #properties()
* @since 1.5
*/
@@ -300,6 +283,4 @@
}
return properties.get(key);
}
-
-
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
index 728d654..0633c32 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,83 +26,76 @@
package javax.sound.midi;
/**
- * <code>MidiMessage</code> is the base class for MIDI messages. They include
- * not only the standard MIDI messages that a synthesizer can respond to, but also
- * "meta-events" that can be used by sequencer programs. There are meta-events
+ * {@code MidiMessage} is the base class for MIDI messages. They include not
+ * only the standard MIDI messages that a synthesizer can respond to, but also
+ * "meta-events" that can be used by sequencer programs. There are meta-events
* for such information as lyrics, copyrights, tempo indications, time and key
- * signatures, markers, etc. For more information, see the Standard MIDI Files 1.0
- * specification, which is part of the Complete MIDI 1.0 Detailed Specification
- * published by the MIDI Manufacturer's Association
+ * signatures, markers, etc. For more information, see the Standard MIDI Files
+ * 1.0 specification, which is part of the Complete MIDI 1.0 Detailed
+ * Specification published by the MIDI Manufacturer's Association
* (<a href = http://www.midi.org>http://www.midi.org</a>).
* <p>
- * The base <code>MidiMessage</code> class provides access to three types of
+ * The base {@code MidiMessage} class provides access to three types of
* information about a MIDI message:
* <ul>
* <li>The messages's status byte</li>
- * <li>The total length of the message in bytes (the status byte plus any data bytes)</li>
+ * <li>The total length of the message in bytes (the status byte plus any data
+ * bytes)</li>
* <li>A byte array containing the complete message</li>
* </ul>
*
- * <code>MidiMessage</code> includes methods to get, but not set, these values.
+ * {@code MidiMessage} includes methods to get, but not set, these values.
* Setting them is a subclass responsibility.
* <p>
- * <a name="integersVsBytes"></a>
- * The MIDI standard expresses MIDI data in bytes. However, because
- * Java<sup>TM</sup> uses signed bytes, the Java Sound API uses integers
- * instead of bytes when expressing MIDI data. For example, the
- * {@link #getStatus()} method of
- * <code>MidiMessage</code> returns MIDI status bytes as integers. If you are
- * processing MIDI data that originated outside Java Sound and now
- * is encoded as signed bytes, the bytes can
- * can be converted to integers using this conversion:
+ * <a name="integersVsBytes"></a> The MIDI standard expresses MIDI data in
+ * bytes. However, because Java<sup>TM</sup> uses signed bytes, the Java Sound
+ * API uses integers instead of bytes when expressing MIDI data. For example,
+ * the {@link #getStatus()} method of {@code MidiMessage} returns MIDI status
+ * bytes as integers. If you are processing MIDI data that originated outside
+ * Java Sound and now is encoded as signed bytes, the bytes can can be
+ * converted to integers using this conversion:
+ *
* <center>{@code int i = (int)(byte & 0xFF)}</center>
* <p>
- * If you simply need to pass a known MIDI byte value as a method parameter,
- * it can be expressed directly as an integer, using (for example) decimal or
- * hexadecimal notation. For instance, to pass the "active sensing" status byte
+ * If you simply need to pass a known MIDI byte value as a method parameter, it
+ * can be expressed directly as an integer, using (for example) decimal or
+ * hexadecimal notation. For instance, to pass the "active sensing" status byte
* as the first argument to ShortMessage's
- * {@link ShortMessage#setMessage(int) setMessage(int)}
- * method, you can express it as 254 or 0xFE.
- *
- * @see Track
- * @see Sequence
- * @see Receiver
+ * {@link ShortMessage#setMessage(int) setMessage(int)} method, you can express
+ * it as 254 or 0xFE.
*
* @author David Rivas
* @author Kara Kytle
+ * @see Track
+ * @see Sequence
+ * @see Receiver
*/
-
public abstract class MidiMessage implements Cloneable {
- // Instance variables
-
/**
- * The MIDI message data. The first byte is the status
- * byte for the message; subsequent bytes up to the length
- * of the message are data bytes for this message.
+ * The MIDI message data. The first byte is the status byte for the message;
+ * subsequent bytes up to the length of the message are data bytes for this
+ * message.
+ *
* @see #getLength
*/
protected byte[] data;
-
/**
- * The number of bytes in the MIDI message, including the
- * status byte and any data bytes.
+ * The number of bytes in the MIDI message, including the status byte and
+ * any data bytes.
+ *
* @see #getLength
*/
protected int length = 0;
-
/**
- * Constructs a new <code>MidiMessage</code>. This protected
- * constructor is called by concrete subclasses, which should
- * ensure that the data array specifies a complete, valid MIDI
- * message.
+ * Constructs a new {@code MidiMessage}. This protected constructor is
+ * called by concrete subclasses, which should ensure that the data array
+ * specifies a complete, valid MIDI message.
*
- * @param data an array of bytes containing the complete message.
- * The message data may be changed using the <code>setMessage</code>
- * method.
- *
+ * @param data an array of bytes containing the complete message. The
+ * message data may be changed using the {@code setMessage} method.
* @see #setMessage
*/
protected MidiMessage(byte[] data) {
@@ -112,20 +105,21 @@
}
}
-
/**
- * Sets the data for the MIDI message. This protected
- * method is called by concrete subclasses, which should
- * ensure that the data array specifies a complete, valid MIDI
- * message.
+ * Sets the data for the MIDI message. This protected method is called by
+ * concrete subclasses, which should ensure that the data array specifies a
+ * complete, valid MIDI message.
*
- * @param data the data bytes in the MIDI message
- * @param length the number of bytes in the data byte array
- * @throws InvalidMidiDataException if the parameter values do not specify a valid MIDI meta message
+ * @param data the data bytes in the MIDI message
+ * @param length the number of bytes in the data byte array
+ * @throws InvalidMidiDataException if the parameter values do not specify a
+ * valid MIDI meta message
*/
- protected void setMessage(byte[] data, int length) throws InvalidMidiDataException {
+ protected void setMessage(byte[] data, int length)
+ throws InvalidMidiDataException {
if (length < 0 || (length > 0 && length > data.length)) {
- throw new IndexOutOfBoundsException("length out of bounds: "+length);
+ throw new IndexOutOfBoundsException(
+ "length out of bounds: " + length);
}
this.length = length;
@@ -135,16 +129,14 @@
System.arraycopy(data, 0, this.data, 0, length);
}
-
/**
- * Obtains the MIDI message data. The first byte of the returned byte
- * array is the status byte of the message. Any subsequent bytes up to
- * the length of the message are data bytes. The byte array may have a
- * length which is greater than that of the actual message; the total
- * length of the message in bytes is reported by the <code>{@link #getLength}</code>
- * method.
+ * Obtains the MIDI message data. The first byte of the returned byte array
+ * is the status byte of the message. Any subsequent bytes up to the length
+ * of the message are data bytes. The byte array may have a length which is
+ * greater than that of the actual message; the total length of the message
+ * in bytes is reported by the {@link #getLength} method.
*
- * @return the byte array containing the complete <code>MidiMessage</code> data
+ * @return the byte array containing the complete {@code MidiMessage} data
*/
public byte[] getMessage() {
byte[] returnedArray = new byte[length];
@@ -152,12 +144,11 @@
return returnedArray;
}
-
/**
- * Obtains the status byte for the MIDI message. The status "byte" is
+ * Obtains the status byte for the MIDI message. The status "byte" is
* represented as an integer; see the
- * <a href="#integersVsBytes">discussion</a> in the
- * <code>MidiMessage</code> class description.
+ * <a href="#integersVsBytes">discussion</a> in the {@code MidiMessage}
+ * class description.
*
* @return the integer representation of this event's status byte
*/
@@ -168,13 +159,11 @@
return 0;
}
-
/**
- * Obtains the total length of the MIDI message in bytes. A
- * MIDI message consists of one status byte and zero or more
- * data bytes. The return value ranges from 1 for system real-time messages,
- * to 2 or 3 for channel messages, to any value for meta and system
- * exclusive messages.
+ * Obtains the total length of the MIDI message in bytes. A MIDI message
+ * consists of one status byte and zero or more data bytes. The return value
+ * ranges from 1 for system real-time messages, to 2 or 3 for channel
+ * messages, to any value for meta and system exclusive messages.
*
* @return the length of the message in bytes
*/
@@ -182,11 +171,11 @@
return length;
}
-
/**
- * Creates a new object of the same class and with the same contents
- * as this object.
- * @return a clone of this instance.
+ * Creates a new object of the same class and with the same contents as this
+ * object.
+ *
+ * @return a clone of this instance
*/
public abstract Object clone();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
index 635dc54..9f790fd 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java
@@ -25,59 +25,52 @@
package javax.sound.midi;
-import java.io.FileInputStream;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
-
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
-import java.net.URL;
-
-import javax.sound.midi.spi.MidiFileWriter;
-import javax.sound.midi.spi.MidiFileReader;
-import javax.sound.midi.spi.SoundbankReader;
import javax.sound.midi.spi.MidiDeviceProvider;
+import javax.sound.midi.spi.MidiFileReader;
+import javax.sound.midi.spi.MidiFileWriter;
+import javax.sound.midi.spi.SoundbankReader;
-import com.sun.media.sound.JDK13Services;
-import com.sun.media.sound.ReferenceCountingDevice;
import com.sun.media.sound.AutoConnectSequencer;
+import com.sun.media.sound.JDK13Services;
import com.sun.media.sound.MidiDeviceReceiverEnvelope;
import com.sun.media.sound.MidiDeviceTransmitterEnvelope;
-
+import com.sun.media.sound.ReferenceCountingDevice;
/**
- * The <code>MidiSystem</code> class provides access to the installed MIDI
- * system resources, including devices such as synthesizers, sequencers, and
- * MIDI input and output ports. A typical simple MIDI application might
- * begin by invoking one or more <code>MidiSystem</code> methods to learn
- * what devices are installed and to obtain the ones needed in that
- * application.
+ * The {@code MidiSystem} class provides access to the installed MIDI system
+ * resources, including devices such as synthesizers, sequencers, and MIDI input
+ * and output ports. A typical simple MIDI application might begin by invoking
+ * one or more {@code MidiSystem} methods to learn what devices are installed
+ * and to obtain the ones needed in that application.
* <p>
- * The class also has methods for reading files, streams, and URLs that
- * contain standard MIDI file data or soundbanks. You can query the
- * <code>MidiSystem</code> for the format of a specified MIDI file.
+ * The class also has methods for reading files, streams, and URLs that contain
+ * standard MIDI file data or soundbanks. You can query the {@code MidiSystem}
+ * for the format of a specified MIDI file.
* <p>
- * You cannot instantiate a <code>MidiSystem</code>; all the methods are
- * static.
- *
- * <p>Properties can be used to specify default MIDI devices.
- * Both system properties and a properties file are considered.
- * The <code>sound.properties</code> properties file is read from
- * an implementation-specific location (typically it is the <code>lib</code>
- * directory in the Java installation directory).
- * If a property exists both as a system property and in the
- * properties file, the system property takes precedence. If none is
- * specified, a suitable default is chosen among the available devices.
- * The syntax of the properties file is specified in
- * {@link java.util.Properties#load(InputStream) Properties.load}. The
- * following table lists the available property keys and which methods
- * consider them:
+ * You cannot instantiate a {@code MidiSystem}; all the methods are static.
+ * <p>
+ * Properties can be used to specify default MIDI devices. Both system
+ * properties and a properties file are considered. The "sound.properties"
+ * properties file is read from an implementation-specific location (typically
+ * it is the {@code lib} directory in the Java installation directory). If a
+ * property exists both as a system property and in the properties file, the
+ * system property takes precedence. If none is specified, a suitable default is
+ * chosen among the available devices. The syntax of the properties file is
+ * specified in {@link Properties#load(InputStream) Properties.load}. The
+ * following table lists the available property keys and which methods consider
+ * them:
*
* <table border=0>
* <caption>MIDI System Property Keys</caption>
@@ -87,80 +80,64 @@
* <th>Affected Method</th>
* </tr>
* <tr>
- * <td><code>javax.sound.midi.Receiver</code></td>
+ * <td>{@code javax.sound.midi.Receiver}</td>
* <td>{@link Receiver}</td>
* <td>{@link #getReceiver}</td>
* </tr>
* <tr>
- * <td><code>javax.sound.midi.Sequencer</code></td>
+ * <td>{@code javax.sound.midi.Sequencer}</td>
* <td>{@link Sequencer}</td>
* <td>{@link #getSequencer}</td>
* </tr>
* <tr>
- * <td><code>javax.sound.midi.Synthesizer</code></td>
+ * <td>{@code javax.sound.midi.Synthesizer}</td>
* <td>{@link Synthesizer}</td>
* <td>{@link #getSynthesizer}</td>
* </tr>
* <tr>
- * <td><code>javax.sound.midi.Transmitter</code></td>
+ * <td>{@code javax.sound.midi.Transmitter}</td>
* <td>{@link Transmitter}</td>
* <td>{@link #getTransmitter}</td>
* </tr>
* </table>
*
- * The property value consists of the provider class name
- * and the device name, separated by the hash mark ("#").
- * The provider class name is the fully-qualified
- * name of a concrete {@link javax.sound.midi.spi.MidiDeviceProvider
- * MIDI device provider} class. The device name is matched against
- * the <code>String</code> returned by the <code>getName</code>
- * method of <code>MidiDevice.Info</code>.
- * Either the class name, or the device name may be omitted.
- * If only the class name is specified, the trailing hash mark
- * is optional.
- *
- * <p>If the provider class is specified, and it can be
- * successfully retrieved from the installed providers,
- * the list of
- * <code>MidiDevice.Info</code> objects is retrieved
- * from the provider. Otherwise, or when these devices
- * do not provide a subsequent match, the list is retrieved
- * from {@link #getMidiDeviceInfo} to contain
- * all available <code>MidiDevice.Info</code> objects.
- *
- * <p>If a device name is specified, the resulting list of
- * <code>MidiDevice.Info</code> objects is searched:
- * the first one with a matching name, and whose
- * <code>MidiDevice</code> implements the
- * respective interface, will be returned.
- * If no matching <code>MidiDevice.Info</code> object
- * is found, or the device name is not specified,
- * the first suitable device from the resulting
- * list will be returned. For Sequencer and Synthesizer,
- * a device is suitable if it implements the respective
- * interface; whereas for Receiver and Transmitter, a device is
- * suitable if it
- * implements neither Sequencer nor Synthesizer and provides
- * at least one Receiver or Transmitter, respectively.
- *
- * For example, the property <code>javax.sound.midi.Receiver</code>
- * with a value
- * <code>"com.sun.media.sound.MidiProvider#SunMIDI1"</code>
- * will have the following consequences when
- * <code>getReceiver</code> is called:
- * if the class <code>com.sun.media.sound.MidiProvider</code> exists
- * in the list of installed MIDI device providers,
- * the first <code>Receiver</code> device with name
- * <code>"SunMIDI1"</code> will be returned. If it cannot
- * be found, the first <code>Receiver</code> from that provider
- * will be returned, regardless of name.
- * If there is none, the first <code>Receiver</code> with name
- * <code>"SunMIDI1"</code> in the list of all devices
- * (as returned by <code>getMidiDeviceInfo</code>) will be returned,
- * or, if not found, the first <code>Receiver</code> that can
- * be found in the list of all devices is returned.
- * If that fails, too, a <code>MidiUnavailableException</code>
- * is thrown.
+ * The property value consists of the provider class name and the device name,
+ * separated by the hash mark ("#"). The provider class name is the
+ * fully-qualified name of a concrete
+ * {@link MidiDeviceProvider MIDI device provider} class. The device name is
+ * matched against the {@code String} returned by the {@code getName} method of
+ * {@code MidiDevice.Info}. Either the class name, or the device name may be
+ * omitted. If only the class name is specified, the trailing hash mark is
+ * optional.
+ * <p>
+ * If the provider class is specified, and it can be successfully retrieved from
+ * the installed providers, the list of {@code MidiDevice.Info} objects is
+ * retrieved from the provider. Otherwise, or when these devices do not provide
+ * a subsequent match, the list is retrieved from {@link #getMidiDeviceInfo} to
+ * contain all available {@code MidiDevice.Info} objects.
+ * <p>
+ * If a device name is specified, the resulting list of {@code MidiDevice.Info}
+ * objects is searched: the first one with a matching name, and whose
+ * {@code MidiDevice} implements the respective interface, will be returned. If
+ * no matching {@code MidiDevice.Info} object is found, or the device name is
+ * not specified, the first suitable device from the resulting list will be
+ * returned. For Sequencer and Synthesizer, a device is suitable if it
+ * implements the respective interface; whereas for Receiver and Transmitter, a
+ * device is suitable if it implements neither Sequencer nor Synthesizer and
+ * provides at least one Receiver or Transmitter, respectively.
+ * <p>
+ * For example, the property {@code javax.sound.midi.Receiver} with a value
+ * {@code "com.sun.media.sound.MidiProvider#SunMIDI1"} will have the following
+ * consequences when {@code getReceiver} is called: if the class
+ * {@code com.sun.media.sound.MidiProvider} exists in the list of installed MIDI
+ * device providers, the first {@code Receiver} device with name
+ * {@code "SunMIDI1"} will be returned. If it cannot be found, the first
+ * {@code Receiver} from that provider will be returned, regardless of name. If
+ * there is none, the first {@code Receiver} with name {@code "SunMIDI1"} in the
+ * list of all devices (as returned by {@code getMidiDeviceInfo}) will be
+ * returned, or, if not found, the first {@code Receiver} that can be found in
+ * the list of all devices is returned. If that fails, too, a
+ * {@code MidiUnavailableException} is thrown.
*
* @author Kara Kytle
* @author Florian Bomers
@@ -174,17 +151,15 @@
private MidiSystem() {
}
-
/**
- * Obtains an array of information objects representing
- * the set of all MIDI devices available on the system.
- * A returned information object can then be used to obtain the
- * corresponding device object, by invoking
+ * Obtains an array of information objects representing the set of all MIDI
+ * devices available on the system. A returned information object can then
+ * be used to obtain the corresponding device object, by invoking
* {@link #getMidiDevice(MidiDevice.Info) getMidiDevice}.
*
- * @return an array of <code>MidiDevice.Info</code> objects, one
- * for each installed MIDI device. If no such devices are installed,
- * an array of length 0 is returned.
+ * @return an array of {@code MidiDevice.Info} objects, one for each
+ * installed MIDI device. If no such devices are installed, an array
+ * of length 0 is returned.
*/
public static MidiDevice.Info[] getMidiDeviceInfo() {
List<MidiDevice.Info> allInfos = new ArrayList<>();
@@ -201,16 +176,15 @@
return infosArray;
}
-
/**
* Obtains the requested MIDI device.
*
- * @param info a device information object representing the desired device.
+ * @param info a device information object representing the desired device
* @return the requested device
* @throws MidiUnavailableException if the requested device is not available
- * due to resource restrictions
- * @throws IllegalArgumentException if the info object does not represent
- * a MIDI device installed on the system
+ * due to resource restrictions
+ * @throws IllegalArgumentException if the info object does not represent a
+ * MIDI device installed on the system
* @see #getMidiDeviceInfo
*/
public static MidiDevice getMidiDevice(MidiDevice.Info info) throws MidiUnavailableException {
@@ -226,44 +200,38 @@
throw new IllegalArgumentException("Requested device not installed: " + info);
}
-
/**
- * Obtains a MIDI receiver from an external MIDI port
- * or other default device.
- * The returned receiver always implements
- * the {@code MidiDeviceReceiver} interface.
- *
- * <p>If the system property
- * <code>javax.sound.midi.Receiver</code>
- * is defined or it is defined in the file "sound.properties",
- * it is used to identify the device that provides the default receiver.
- * For details, refer to the {@link MidiSystem class description}.
- *
- * If a suitable MIDI port is not available, the Receiver is
- * retrieved from an installed synthesizer.
- *
- * <p>If a native receiver provided by the default device does not implement
- * the {@code MidiDeviceReceiver} interface, it will be wrapped in a
- * wrapper class that implements the {@code MidiDeviceReceiver} interface.
- * The corresponding {@code Receiver} method calls will be forwarded
- * to the native receiver.
- *
- * <p>If this method returns successfully, the {@link
- * javax.sound.midi.MidiDevice MidiDevice} the
- * <code>Receiver</code> belongs to is opened implicitly, if it is
- * not already open. It is possible to close an implicitly opened
- * device by calling {@link javax.sound.midi.Receiver#close close}
- * on the returned <code>Receiver</code>. All open <code>Receiver</code>
- * instances have to be closed in order to release system resources
- * hold by the <code>MidiDevice</code>. For a
- * detailed description of open/close behaviour see the class
- * description of {@link javax.sound.midi.MidiDevice MidiDevice}.
- *
+ * Obtains a MIDI receiver from an external MIDI port or other default
+ * device. The returned receiver always implements the
+ * {@code MidiDeviceReceiver} interface.
+ * <p>
+ * If the system property {@code javax.sound.midi.Receiver} is defined or it
+ * is defined in the file "sound.properties", it is used to identify the
+ * device that provides the default receiver. For details, refer to the
+ * {@link MidiSystem class description}.
+ * <p>
+ * If a suitable MIDI port is not available, the Receiver is retrieved from
+ * an installed synthesizer.
+ * <p>
+ * If a native receiver provided by the default device does not implement
+ * the {@code MidiDeviceReceiver} interface, it will be wrapped in a wrapper
+ * class that implements the {@code MidiDeviceReceiver} interface. The
+ * corresponding {@code Receiver} method calls will be forwarded to the
+ * native receiver.
+ * <p>
+ * If this method returns successfully, the {@link MidiDevice MidiDevice}
+ * the {@code Receiver} belongs to is opened implicitly, if it is not
+ * already open. It is possible to close an implicitly opened device by
+ * calling {@link Receiver#close close} on the returned {@code Receiver}.
+ * All open {@code Receiver} instances have to be closed in order to release
+ * system resources hold by the {@code MidiDevice}. For a detailed
+ * description of open/close behaviour see the class description of
+ * {@link MidiDevice MidiDevice}.
*
* @return the default MIDI receiver
- * @throws MidiUnavailableException if the default receiver is not
- * available due to resource restrictions,
- * or no device providing receivers is installed in the system
+ * @throws MidiUnavailableException if the default receiver is not available
+ * due to resource restrictions, or no device providing receivers is
+ * installed in the system
*/
public static Receiver getReceiver() throws MidiUnavailableException {
// may throw MidiUnavailableException
@@ -280,41 +248,35 @@
return receiver;
}
-
/**
- * Obtains a MIDI transmitter from an external MIDI port
- * or other default source.
- * The returned transmitter always implements
- * the {@code MidiDeviceTransmitter} interface.
- *
- * <p>If the system property
- * <code>javax.sound.midi.Transmitter</code>
- * is defined or it is defined in the file "sound.properties",
- * it is used to identify the device that provides the default transmitter.
- * For details, refer to the {@link MidiSystem class description}.
- *
- * <p>If a native transmitter provided by the default device does not implement
+ * Obtains a MIDI transmitter from an external MIDI port or other default
+ * source. The returned transmitter always implements the
+ * {@code MidiDeviceTransmitter} interface.
+ * <p>
+ * If the system property {@code javax.sound.midi.Transmitter} is defined or
+ * it is defined in the file "sound.properties", it is used to identify the
+ * device that provides the default transmitter. For details, refer to the
+ * {@link MidiSystem class description}.
+ * <p>
+ * If a native transmitter provided by the default device does not implement
* the {@code MidiDeviceTransmitter} interface, it will be wrapped in a
- * wrapper class that implements the {@code MidiDeviceTransmitter} interface.
- * The corresponding {@code Transmitter} method calls will be forwarded
- * to the native transmitter.
- *
- * <p>If this method returns successfully, the {@link
- * javax.sound.midi.MidiDevice MidiDevice} the
- * <code>Transmitter</code> belongs to is opened implicitly, if it
- * is not already open. It is possible to close an implicitly
- * opened device by calling {@link
- * javax.sound.midi.Transmitter#close close} on the returned
- * <code>Transmitter</code>. All open <code>Transmitter</code>
- * instances have to be closed in order to release system resources
- * hold by the <code>MidiDevice</code>. For a detailed description
- * of open/close behaviour see the class description of {@link
- * javax.sound.midi.MidiDevice MidiDevice}.
+ * wrapper class that implements the {@code MidiDeviceTransmitter}
+ * interface. The corresponding {@code Transmitter} method calls will be
+ * forwarded to the native transmitter.
+ * <p>
+ * If this method returns successfully, the {@link MidiDevice MidiDevice}
+ * the {@code Transmitter} belongs to is opened implicitly, if it is not
+ * already open. It is possible to close an implicitly opened device by
+ * calling {@link Transmitter#close close} on the returned
+ * {@code Transmitter}. All open {@code Transmitter} instances have to be
+ * closed in order to release system resources hold by the
+ * {@code MidiDevice}. For a detailed description of open/close behaviour
+ * see the class description of {@link MidiDevice MidiDevice}.
*
* @return the default MIDI transmitter
* @throws MidiUnavailableException if the default transmitter is not
- * available due to resource restrictions,
- * or no device providing transmitters is installed in the system
+ * available due to resource restrictions, or no device providing
+ * transmitters is installed in the system
*/
public static Transmitter getTransmitter() throws MidiUnavailableException {
// may throw MidiUnavailableException
@@ -331,59 +293,48 @@
return transmitter;
}
-
/**
* Obtains the default synthesizer.
- *
- * <p>If the system property
- * <code>javax.sound.midi.Synthesizer</code>
- * is defined or it is defined in the file "sound.properties",
- * it is used to identify the default synthesizer.
- * For details, refer to the {@link MidiSystem class description}.
+ * <p>
+ * If the system property {@code javax.sound.midi.Synthesizer} is defined or
+ * it is defined in the file "sound.properties", it is used to identify the
+ * default synthesizer. For details, refer to the
+ * {@link MidiSystem class description}.
*
* @return the default synthesizer
- * @throws MidiUnavailableException if the synthesizer is not
- * available due to resource restrictions,
- * or no synthesizer is installed in the system
+ * @throws MidiUnavailableException if the synthesizer is not available due
+ * to resource restrictions, or no synthesizer is installed in the
+ * system
*/
public static Synthesizer getSynthesizer() throws MidiUnavailableException {
// may throw MidiUnavailableException
return (Synthesizer) getDefaultDeviceWrapper(Synthesizer.class);
}
-
/**
- * Obtains the default <code>Sequencer</code>, connected to
- * a default device.
- * The returned <code>Sequencer</code> instance is
- * connected to the default <code>Synthesizer</code>,
- * as returned by {@link #getSynthesizer}.
- * If there is no <code>Synthesizer</code>
- * available, or the default <code>Synthesizer</code>
- * cannot be opened, the <code>sequencer</code> is connected
- * to the default <code>Receiver</code>, as returned
- * by {@link #getReceiver}.
- * The connection is made by retrieving a <code>Transmitter</code>
- * instance from the <code>Sequencer</code> and setting its
- * <code>Receiver</code>.
- * Closing and re-opening the sequencer will restore the
- * connection to the default device.
- *
- * <p>This method is equivalent to calling
- * <code>getSequencer(true)</code>.
- *
- * <p>If the system property
- * <code>javax.sound.midi.Sequencer</code>
- * is defined or it is defined in the file "sound.properties",
- * it is used to identify the default sequencer.
- * For details, refer to the {@link MidiSystem class description}.
+ * Obtains the default {@code Sequencer}, connected to a default device. The
+ * returned {@code Sequencer} instance is connected to the default
+ * {@code Synthesizer}, as returned by {@link #getSynthesizer}. If there is
+ * no {@code Synthesizer} available, or the default {@code Synthesizer}
+ * cannot be opened, the {@code sequencer} is connected to the default
+ * {@code Receiver}, as returned by {@link #getReceiver}. The connection is
+ * made by retrieving a {@code Transmitter} instance from the
+ * {@code Sequencer} and setting its {@code Receiver}. Closing and
+ * re-opening the sequencer will restore the connection to the default
+ * device.
+ * <p>
+ * This method is equivalent to calling {@code getSequencer(true)}.
+ * <p>
+ * If the system property {@code javax.sound.midi.Sequencer} is defined or
+ * it is defined in the file "sound.properties", it is used to identify the
+ * default sequencer. For details, refer to the
+ * {@link MidiSystem class description}.
*
* @return the default sequencer, connected to a default Receiver
- * @throws MidiUnavailableException if the sequencer is not
- * available due to resource restrictions,
- * or there is no <code>Receiver</code> available by any
- * installed <code>MidiDevice</code>,
- * or no sequencer is installed in the system.
+ * @throws MidiUnavailableException if the sequencer is not available due to
+ * resource restrictions, or there is no {@code Receiver} available
+ * by any installed {@code MidiDevice}, or no sequencer is installed
+ * in the system
* @see #getSequencer(boolean)
* @see #getSynthesizer
* @see #getReceiver
@@ -392,49 +343,37 @@
return getSequencer(true);
}
-
-
/**
- * Obtains the default <code>Sequencer</code>, optionally
- * connected to a default device.
- *
- * <p>If <code>connected</code> is true, the returned
- * <code>Sequencer</code> instance is
- * connected to the default <code>Synthesizer</code>,
- * as returned by {@link #getSynthesizer}.
- * If there is no <code>Synthesizer</code>
- * available, or the default <code>Synthesizer</code>
- * cannot be opened, the <code>sequencer</code> is connected
- * to the default <code>Receiver</code>, as returned
- * by {@link #getReceiver}.
- * The connection is made by retrieving a <code>Transmitter</code>
- * instance from the <code>Sequencer</code> and setting its
- * <code>Receiver</code>.
- * Closing and re-opening the sequencer will restore the
+ * Obtains the default {@code Sequencer}, optionally connected to a default
+ * device.
+ * <p>
+ * If {@code connected} is true, the returned {@code Sequencer} instance is
+ * connected to the default {@code Synthesizer}, as returned by
+ * {@link #getSynthesizer}. If there is no {@code Synthesizer} available, or
+ * the default {@code Synthesizer} cannot be opened, the {@code sequencer}
+ * is connected to the default {@code Receiver}, as returned by
+ * {@link #getReceiver}. The connection is made by retrieving a
+ * {@code Transmitter} instance from the {@code Sequencer} and setting its
+ * {@code Receiver}. Closing and re-opening the sequencer will restore the
* connection to the default device.
+ * <p>
+ * If {@code connected} is false, the returned {@code Sequencer} instance is
+ * not connected, it has no open {@code Transmitters}. In order to play the
+ * sequencer on a MIDI device, or a {@code Synthesizer}, it is necessary to
+ * get a {@code Transmitter} and set its {@code Receiver}.
+ * <p>
+ * If the system property {@code javax.sound.midi.Sequencer} is defined or
+ * it is defined in the file "sound.properties", it is used to identify the
+ * default sequencer. For details, refer to the
+ * {@link MidiSystem class description}.
*
- * <p>If <code>connected</code> is false, the returned
- * <code>Sequencer</code> instance is not connected, it
- * has no open <code>Transmitters</code>. In order to
- * play the sequencer on a MIDI device, or a <code>Synthesizer</code>,
- * it is necessary to get a <code>Transmitter</code> and set its
- * <code>Receiver</code>.
- *
- * <p>If the system property
- * <code>javax.sound.midi.Sequencer</code>
- * is defined or it is defined in the file "sound.properties",
- * it is used to identify the default sequencer.
- * For details, refer to the {@link MidiSystem class description}.
- *
- * @param connected whether or not the returned {@code Sequencer}
- * is connected to the default {@code Synthesizer}
+ * @param connected whether or not the returned {@code Sequencer} is
+ * connected to the default {@code Synthesizer}
* @return the default sequencer
- * @throws MidiUnavailableException if the sequencer is not
- * available due to resource restrictions,
- * or no sequencer is installed in the system,
- * or if <code>connected</code> is true, and there is
- * no <code>Receiver</code> available by any installed
- * <code>MidiDevice</code>
+ * @throws MidiUnavailableException if the sequencer is not available due to
+ * resource restrictions, or no sequencer is installed in the
+ * system, or if {@code connected} is true, and there is no
+ * {@code Receiver} available by any installed {@code MidiDevice}
* @see #getSynthesizer
* @see #getReceiver
* @since 1.5
@@ -501,23 +440,20 @@
return seq;
}
-
-
-
/**
- * Constructs a MIDI sound bank by reading it from the specified stream.
- * The stream must point to
- * a valid MIDI soundbank file. In general, MIDI soundbank providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to
- * its original position. If the input stream does not support this,
- * this method may fail with an IOException.
- * @param stream the source of the sound bank data.
+ * Constructs a MIDI sound bank by reading it from the specified stream. The
+ * stream must point to a valid MIDI soundbank file. In general, MIDI
+ * soundbank providers may need to read some data from the stream before
+ * determining whether they support it. These parsers must be able to mark
+ * the stream, read enough data to determine whether they support the
+ * stream, and, if not, reset the stream's read pointer to its original
+ * position. If the input stream does not support this, this method may fail
+ * with an {@code IOException}.
+ *
+ * @param stream the source of the sound bank data
* @return the sound bank
- * @throws InvalidMidiDataException if the stream does not point to
- * valid MIDI soundbank data recognized by the system
+ * @throws InvalidMidiDataException if the stream does not point to valid
+ * MIDI soundbank data recognized by the system
* @throws IOException if an I/O error occurred when loading the soundbank
* @see InputStream#markSupported
* @see InputStream#mark
@@ -542,15 +478,14 @@
}
-
/**
- * Constructs a <code>Soundbank</code> by reading it from the specified URL.
- * The URL must point to a valid MIDI soundbank file.
+ * Constructs a {@code Soundbank} by reading it from the specified URL. The
+ * URL must point to a valid MIDI soundbank file.
*
- * @param url the source of the sound bank data
+ * @param url the source of the sound bank data
* @return the sound bank
* @throws InvalidMidiDataException if the URL does not point to valid MIDI
- * soundbank data recognized by the system
+ * soundbank data recognized by the system
* @throws IOException if an I/O error occurred when loading the soundbank
*/
public static Soundbank getSoundbank(URL url)
@@ -573,16 +508,14 @@
}
-
/**
- * Constructs a <code>Soundbank</code> by reading it from the specified
- * <code>File</code>.
- * The <code>File</code> must point to a valid MIDI soundbank file.
+ * Constructs a {@code Soundbank} by reading it from the specified
+ * {@code File}. The {@code File} must point to a valid MIDI soundbank file.
*
- * @param file the source of the sound bank data
+ * @param file the source of the sound bank data
* @return the sound bank
- * @throws InvalidMidiDataException if the <code>File</code> does not
- * point to valid MIDI soundbank data recognized by the system
+ * @throws InvalidMidiDataException if the {@code File} does not point to
+ * valid MIDI soundbank data recognized by the system
* @throws IOException if an I/O error occurred when loading the soundbank
*/
public static Soundbank getSoundbank(File file)
@@ -604,35 +537,33 @@
throw new InvalidMidiDataException("cannot get soundbank from stream");
}
-
-
/**
* Obtains the MIDI file format of the data in the specified input stream.
* The stream must point to valid MIDI file data for a file type recognized
* by the system.
* <p>
* This method and/or the code it invokes may need to read some data from
- * the stream to determine whether its data format is supported. The
- * implementation may therefore
- * need to mark the stream, read enough data to determine whether it is in
- * a supported format, and reset the stream's read pointer to its original
- * position. If the input stream does not permit this set of operations,
- * this method may fail with an <code>IOException</code>.
+ * the stream to determine whether its data format is supported. The
+ * implementation may therefore need to mark the stream, read enough data to
+ * determine whether it is in a supported format, and reset the stream's
+ * read pointer to its original position. If the input stream does not
+ * permit this set of operations, this method may fail with an
+ * {@code IOException}.
* <p>
* This operation can only succeed for files of a type which can be parsed
- * by an installed file reader. It may fail with an InvalidMidiDataException
- * even for valid files if no compatible file reader is installed. It
- * will also fail with an InvalidMidiDataException if a compatible file reader
- * is installed, but encounters errors while determining the file format.
+ * by an installed file reader. It may fail with an
+ * {@code InvalidMidiDataException} even for valid files if no compatible
+ * file reader is installed. It will also fail with an
+ * {@code InvalidMidiDataException} if a compatible file reader is
+ * installed, but encounters errors while determining the file format.
*
- * @param stream the input stream from which file format information
- * should be extracted
- * @return an <code>MidiFileFormat</code> object describing the MIDI file
- * format
+ * @param stream the input stream from which file format information should
+ * be extracted
+ * @return an {@code MidiFileFormat} object describing the MIDI file format
* @throws InvalidMidiDataException if the stream does not point to valid
- * MIDI file data recognized by the system
+ * MIDI file data recognized by the system
* @throws IOException if an I/O exception occurs while accessing the
- * stream
+ * stream
* @see #getMidiFileFormat(URL)
* @see #getMidiFileFormat(File)
* @see InputStream#markSupported
@@ -661,26 +592,24 @@
}
}
-
/**
- * Obtains the MIDI file format of the data in the specified URL. The URL
- * must point to valid MIDI file data for a file type recognized
- * by the system.
+ * Obtains the MIDI file format of the data in the specified URL. The URL
+ * must point to valid MIDI file data for a file type recognized by the
+ * system.
* <p>
* This operation can only succeed for files of a type which can be parsed
- * by an installed file reader. It may fail with an InvalidMidiDataException
- * even for valid files if no compatible file reader is installed. It
- * will also fail with an InvalidMidiDataException if a compatible file reader
- * is installed, but encounters errors while determining the file format.
+ * by an installed file reader. It may fail with an
+ * {@code InvalidMidiDataException} even for valid files if no compatible
+ * file reader is installed. It will also fail with an
+ * {@code InvalidMidiDataException} if a compatible file reader is
+ * installed, but encounters errors while determining the file format.
*
- * @param url the URL from which file format information should be
- * extracted
- * @return a <code>MidiFileFormat</code> object describing the MIDI file
- * format
+ * @param url the URL from which file format information should be
+ * extracted
+ * @return a {@code MidiFileFormat} object describing the MIDI file format
* @throws InvalidMidiDataException if the URL does not point to valid MIDI
- * file data recognized by the system
+ * file data recognized by the system
* @throws IOException if an I/O exception occurs while accessing the URL
- *
* @see #getMidiFileFormat(InputStream)
* @see #getMidiFileFormat(File)
*/
@@ -707,26 +636,24 @@
}
}
-
/**
- * Obtains the MIDI file format of the specified <code>File</code>. The
- * <code>File</code> must point to valid MIDI file data for a file type
+ * Obtains the MIDI file format of the specified {@code File}. The
+ * {@code File} must point to valid MIDI file data for a file type
* recognized by the system.
* <p>
* This operation can only succeed for files of a type which can be parsed
- * by an installed file reader. It may fail with an InvalidMidiDataException
- * even for valid files if no compatible file reader is installed. It
- * will also fail with an InvalidMidiDataException if a compatible file reader
- * is installed, but encounters errors while determining the file format.
+ * by an installed file reader. It may fail with an
+ * {@code InvalidMidiDataException} even for valid files if no compatible
+ * file reader is installed. It will also fail with an
+ * {@code InvalidMidiDataException} if a compatible file reader is
+ * installed, but encounters errors while determining the file format.
*
- * @param file the <code>File</code> from which file format information
- * should be extracted
- * @return a <code>MidiFileFormat</code> object describing the MIDI file
- * format
- * @throws InvalidMidiDataException if the <code>File</code> does not point
- * to valid MIDI file data recognized by the system
+ * @param file the {@code File} from which file format information should
+ * be extracted
+ * @return a {@code MidiFileFormat} object describing the MIDI file format
+ * @throws InvalidMidiDataException if the {@code File} does not point to
+ * valid MIDI file data recognized by the system
* @throws IOException if an I/O exception occurs while accessing the file
- *
* @see #getMidiFileFormat(InputStream)
* @see #getMidiFileFormat(URL)
*/
@@ -753,35 +680,33 @@
}
}
-
/**
- * Obtains a MIDI sequence from the specified input stream. The stream must
- * point to valid MIDI file data for a file type recognized
- * by the system.
+ * Obtains a MIDI sequence from the specified input stream. The stream must
+ * point to valid MIDI file data for a file type recognized by the system.
* <p>
- * This method and/or the code it invokes may need to read some data
- * from the stream to determine whether
- * its data format is supported. The implementation may therefore
- * need to mark the stream, read enough data to determine whether it is in
- * a supported format, and reset the stream's read pointer to its original
- * position. If the input stream does not permit this set of operations,
- * this method may fail with an <code>IOException</code>.
+ * This method and/or the code it invokes may need to read some data from
+ * the stream to determine whether its data format is supported. The
+ * implementation may therefore need to mark the stream, read enough data to
+ * determine whether it is in a supported format, and reset the stream's
+ * read pointer to its original position. If the input stream does not
+ * permit this set of operations, this method may fail with an
+ * {@code IOException}.
* <p>
* This operation can only succeed for files of a type which can be parsed
- * by an installed file reader. It may fail with an InvalidMidiDataException
- * even for valid files if no compatible file reader is installed. It
- * will also fail with an InvalidMidiDataException if a compatible file reader
- * is installed, but encounters errors while constructing the <code>Sequence</code>
+ * by an installed file reader. It may fail with an
+ * {@code InvalidMidiDataException} even for valid files if no compatible
+ * file reader is installed. It will also fail with an
+ * {@code InvalidMidiDataException} if a compatible file reader is
+ * installed, but encounters errors while constructing the {@code Sequence}
* object from the file data.
*
- * @param stream the input stream from which the <code>Sequence</code>
- * should be constructed
- * @return a <code>Sequence</code> object based on the MIDI file data
- * contained in the input stream
- * @throws InvalidMidiDataException if the stream does not point to
- * valid MIDI file data recognized by the system
- * @throws IOException if an I/O exception occurs while accessing the
- * stream
+ * @param stream the input stream from which the {@code Sequence} should be
+ * constructed
+ * @return a {@code Sequence} object based on the MIDI file data contained
+ * in the input stream
+ * @throws InvalidMidiDataException if the stream does not point to valid
+ * MIDI file data recognized by the system
+ * @throws IOException if an I/O exception occurs while accessing the stream
* @see InputStream#markSupported
* @see InputStream#mark
*/
@@ -808,25 +733,23 @@
}
}
-
/**
- * Obtains a MIDI sequence from the specified URL. The URL must
- * point to valid MIDI file data for a file type recognized
- * by the system.
+ * Obtains a MIDI sequence from the specified URL. The URL must point to
+ * valid MIDI file data for a file type recognized by the system.
* <p>
* This operation can only succeed for files of a type which can be parsed
- * by an installed file reader. It may fail with an InvalidMidiDataException
- * even for valid files if no compatible file reader is installed. It
- * will also fail with an InvalidMidiDataException if a compatible file reader
- * is installed, but encounters errors while constructing the <code>Sequence</code>
+ * by an installed file reader. It may fail with an
+ * {@code InvalidMidiDataException} even for valid files if no compatible
+ * file reader is installed. It will also fail with an
+ * {@code InvalidMidiDataException} if a compatible file reader is
+ * installed, but encounters errors while constructing the {@code Sequence}
* object from the file data.
*
- * @param url the URL from which the <code>Sequence</code> should be
- * constructed
- * @return a <code>Sequence</code> object based on the MIDI file data
- * pointed to by the URL
+ * @param url the URL from which the {@code Sequence} should be constructed
+ * @return a {@code Sequence} object based on the MIDI file data pointed to
+ * by the URL
* @throws InvalidMidiDataException if the URL does not point to valid MIDI
- * file data recognized by the system
+ * file data recognized by the system
* @throws IOException if an I/O exception occurs while accessing the URL
*/
public static Sequence getSequence(URL url)
@@ -852,25 +775,25 @@
}
}
-
/**
- * Obtains a MIDI sequence from the specified <code>File</code>.
- * The <code>File</code> must point to valid MIDI file data
- * for a file type recognized by the system.
+ * Obtains a MIDI sequence from the specified {@code File}. The {@code File}
+ * must point to valid MIDI file data for a file type recognized by the
+ * system.
* <p>
* This operation can only succeed for files of a type which can be parsed
- * by an installed file reader. It may fail with an InvalidMidiDataException
- * even for valid files if no compatible file reader is installed. It
- * will also fail with an InvalidMidiDataException if a compatible file reader
- * is installed, but encounters errors while constructing the <code>Sequence</code>
+ * by an installed file reader. It may fail with an
+ * {@code InvalidMidiDataException} even for valid files if no compatible
+ * file reader is installed. It will also fail with an
+ * {@code InvalidMidiDataException} if a compatible file reader is
+ * installed, but encounters errors while constructing the {@code Sequence}
* object from the file data.
*
- * @param file the <code>File</code> from which the <code>Sequence</code>
- * should be constructed
- * @return a <code>Sequence</code> object based on the MIDI file data
- * pointed to by the File
+ * @param file the {@code File} from which the {@code Sequence} should be
+ * constructed
+ * @return a {@code Sequence} object based on the MIDI file data pointed to
+ * by the File
* @throws InvalidMidiDataException if the File does not point to valid MIDI
- * file data recognized by the system
+ * file data recognized by the system
* @throws IOException if an I/O exception occurs
*/
public static Sequence getSequence(File file)
@@ -896,12 +819,12 @@
}
}
-
/**
* Obtains the set of MIDI file types for which file writing support is
* provided by the system.
- * @return array of unique file types. If no file types are supported,
- * an array of length 0 is returned.
+ *
+ * @return array of unique file types. If no file types are supported, an
+ * array of length 0 is returned.
*/
public static int[] getMidiFileTypes() {
@@ -927,13 +850,13 @@
return resultTypes;
}
-
/**
* Indicates whether file writing support for the specified MIDI file type
* is provided by the system.
- * @param fileType the file type for which write capabilities are queried
- * @return <code>true</code> if the file type is supported,
- * otherwise <code>false</code>
+ *
+ * @param fileType the file type for which write capabilities are queried
+ * @return {@code true} if the file type is supported, otherwise
+ * {@code false}
*/
public static boolean isFileTypeSupported(int fileType) {
@@ -948,14 +871,13 @@
return false;
}
-
/**
* Obtains the set of MIDI file types that the system can write from the
* sequence specified.
- * @param sequence the sequence for which MIDI file type support
- * is queried
- * @return the set of unique supported file types. If no file types are supported,
- * returns an array of length 0.
+ *
+ * @param sequence the sequence for which MIDI file type support is queried
+ * @return the set of unique supported file types. If no file types are
+ * supported, returns an array of length 0.
*/
public static int[] getMidiFileTypes(Sequence sequence) {
@@ -981,15 +903,14 @@
return resultTypes;
}
-
/**
* Indicates whether a MIDI file of the file type specified can be written
* from the sequence indicated.
- * @param fileType the file type for which write capabilities
- * are queried
- * @param sequence the sequence for which file writing support is queried
- * @return <code>true</code> if the file type is supported for this
- * sequence, otherwise <code>false</code>
+ *
+ * @param fileType the file type for which write capabilities are queried
+ * @param sequence the sequence for which file writing support is queried
+ * @return {@code true} if the file type is supported for this sequence,
+ * otherwise {@code false}
*/
public static boolean isFileTypeSupported(int fileType, Sequence sequence) {
@@ -1004,19 +925,20 @@
return false;
}
-
/**
* Writes a stream of bytes representing a file of the MIDI file type
* indicated to the output stream provided.
- * @param in sequence containing MIDI data to be written to the file
- * @param fileType the file type of the file to be written to the output stream
- * @param out stream to which the file data should be written
+ *
+ * @param in sequence containing MIDI data to be written to the file
+ * @param fileType the file type of the file to be written to the output
+ * stream
+ * @param out stream to which the file data should be written
* @return the number of bytes written to the output stream
* @throws IOException if an I/O exception occurs
* @throws IllegalArgumentException if the file format is not supported by
- * the system
+ * the system
* @see #isFileTypeSupported(int, Sequence)
- * @see #getMidiFileTypes(Sequence)
+ * @see #getMidiFileTypes(Sequence)
*/
public static int write(Sequence in, int fileType, OutputStream out) throws IOException {
@@ -1038,19 +960,19 @@
return bytesWritten;
}
-
/**
* Writes a stream of bytes representing a file of the MIDI file type
* indicated to the external file provided.
- * @param in sequence containing MIDI data to be written to the file
- * @param type the file type of the file to be written to the output stream
- * @param out external file to which the file data should be written
+ *
+ * @param in sequence containing MIDI data to be written to the file
+ * @param type the file type of the file to be written to the output stream
+ * @param out external file to which the file data should be written
* @return the number of bytes written to the file
* @throws IOException if an I/O exception occurs
- * @throws IllegalArgumentException if the file type is not supported by
- * the system
+ * @throws IllegalArgumentException if the file type is not supported by the
+ * system
* @see #isFileTypeSupported(int, Sequence)
- * @see #getMidiFileTypes(Sequence)
+ * @see #getMidiFileTypes(Sequence)
*/
public static int write(Sequence in, int type, File out) throws IOException {
@@ -1072,8 +994,6 @@
return bytesWritten;
}
-
-
// HELPER METHODS
@SuppressWarnings("unchecked")
private static List<MidiDeviceProvider> getMidiDeviceProviders() {
@@ -1095,19 +1015,16 @@
return (List<MidiFileReader>) getProviders(MidiFileReader.class);
}
-
- /** Attempts to locate and return a default MidiDevice of the specified
- * type.
- *
+ /**
+ * Attempts to locate and return a default MidiDevice of the specified type.
* This method wraps {@link #getDefaultDevice}. It catches the
- * <code>IllegalArgumentException</code> thrown by
- * <code>getDefaultDevice</code> and instead throws a
- * <code>MidiUnavailableException</code>, with the catched
+ * {@code IllegalArgumentException} thrown by {@code getDefaultDevice} and
+ * instead throws a {@code MidiUnavailableException}, with the catched
* exception chained.
*
- * @param deviceClass The requested device type, one of Synthesizer.class,
- * Sequencer.class, Receiver.class or Transmitter.class.
- * @throws MidiUnavalableException on failure.
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @throws MidiUnavailableException on failure
*/
private static MidiDevice getDefaultDeviceWrapper(Class<?> deviceClass)
throws MidiUnavailableException{
@@ -1120,13 +1037,12 @@
}
}
-
- /** Attempts to locate and return a default MidiDevice of the specified
- * type.
+ /**
+ * Attempts to locate and return a default MidiDevice of the specified type.
*
- * @param deviceClass The requested device type, one of Synthesizer.class,
- * Sequencer.class, Receiver.class or Transmitter.class.
- * @throws IllegalArgumentException on failure.
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @throws IllegalArgumentException on failure
*/
private static MidiDevice getDefaultDevice(Class<?> deviceClass) {
List<MidiDeviceProvider> providers = getMidiDeviceProviders();
@@ -1169,16 +1085,15 @@
throw new IllegalArgumentException("Requested device not installed");
}
-
-
- /** Return a MidiDeviceProcider of a given class from the list of
- MidiDeviceProviders.
-
- @param providerClassName The class name of the provider to be returned.
- @param provider The list of MidiDeviceProviders that is searched.
- @return A MidiDeviceProvider of the requested class, or null if none
- is found.
- */
+ /**
+ * Return a MidiDeviceProvider of a given class from the list of
+ * MidiDeviceProviders.
+ *
+ * @param providerClassName The class name of the provider to be returned
+ * @param providers The list of MidiDeviceProviders that is searched
+ * @return A MidiDeviceProvider of the requested class, or null if none is
+ * found
+ */
private static MidiDeviceProvider getNamedProvider(String providerClassName,
List<MidiDeviceProvider> providers) {
for(int i = 0; i < providers.size(); i++) {
@@ -1190,15 +1105,15 @@
return null;
}
-
- /** Return a MidiDevice with a given name from a given MidiDeviceProvider.
- @param deviceName The name of the MidiDevice to be returned.
- @param provider The MidiDeviceProvider to check for MidiDevices.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
-
- @return A MidiDevice matching the requirements, or null if none is found.
- */
+ /**
+ * Return a MidiDevice with a given name from a given MidiDeviceProvider.
+ *
+ * @param deviceName The name of the MidiDevice to be returned
+ * @param provider The MidiDeviceProvider to check for MidiDevices
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A MidiDevice matching the requirements, or null if none is found
+ */
private static MidiDevice getNamedDevice(String deviceName,
MidiDeviceProvider provider,
Class<?> deviceClass) {
@@ -1222,14 +1137,14 @@
return null;
}
-
- /** Return a MidiDevice with a given name from a given MidiDeviceProvider.
- @param deviceName The name of the MidiDevice to be returned.
- @param provider The MidiDeviceProvider to check for MidiDevices.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
-
- @return A MidiDevice matching the requirements, or null if none is found.
+ /**
+ * Return a MidiDevice with a given name from a given MidiDeviceProvider.
+ *
+ * @param deviceName The name of the MidiDevice to be returned
+ * @param provider The MidiDeviceProvider to check for MidiDevices
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A MidiDevice matching the requirements, or null if none is found
*/
private static MidiDevice getNamedDevice(String deviceName,
MidiDeviceProvider provider,
@@ -1249,16 +1164,16 @@
return null;
}
-
- /** Return a MidiDevice with a given name from a list of
- MidiDeviceProviders.
- @param deviceName The name of the MidiDevice to be returned.
- @param providers The List of MidiDeviceProviders to check for
- MidiDevices.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
- @return A Mixer matching the requirements, or null if none is found.
- */
+ /**
+ * Return a MidiDevice with a given name from a list of MidiDeviceProviders.
+ *
+ * @param deviceName The name of the MidiDevice to be returned
+ * @param providers The List of MidiDeviceProviders to check for
+ * MidiDevices
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A Mixer matching the requirements, or null if none is found
+ */
private static MidiDevice getNamedDevice(String deviceName,
List<MidiDeviceProvider> providers,
Class<?> deviceClass) {
@@ -1282,15 +1197,15 @@
return null;
}
-
- /** Return a MidiDevice with a given name from a list of
- MidiDeviceProviders.
- @param deviceName The name of the MidiDevice to be returned.
- @param providers The List of MidiDeviceProviders to check for
- MidiDevices.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
- @return A Mixer matching the requirements, or null if none is found.
+ /**
+ * Return a MidiDevice with a given name from a list of MidiDeviceProviders.
+ *
+ * @param deviceName The name of the MidiDevice to be returned
+ * @param providers The List of MidiDeviceProviders to check for
+ * MidiDevices
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A Mixer matching the requirements, or null if none is found
*/
private static MidiDevice getNamedDevice(String deviceName,
List<MidiDeviceProvider> providers,
@@ -1310,14 +1225,15 @@
return null;
}
-
- /** From a given MidiDeviceProvider, return the first appropriate device.
- @param provider The MidiDeviceProvider to check for MidiDevices.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
- @return A MidiDevice is considered appropriate, or null if no
- appropriate device is found.
- */
+ /**
+ * From a given MidiDeviceProvider, return the first appropriate device.
+ *
+ * @param provider The MidiDeviceProvider to check for MidiDevices
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A MidiDevice is considered appropriate, or null if no appropriate
+ * device is found
+ */
private static MidiDevice getFirstDevice(MidiDeviceProvider provider,
Class<?> deviceClass) {
MidiDevice device;
@@ -1340,13 +1256,14 @@
return null;
}
-
- /** From a given MidiDeviceProvider, return the first appropriate device.
- @param provider The MidiDeviceProvider to check for MidiDevices.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
- @return A MidiDevice is considered appropriate, or null if no
- appropriate device is found.
+ /**
+ * From a given MidiDeviceProvider, return the first appropriate device.
+ *
+ * @param provider The MidiDeviceProvider to check for MidiDevices
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A MidiDevice is considered appropriate, or null if no appropriate
+ * device is found
*/
private static MidiDevice getFirstDevice(MidiDeviceProvider provider,
Class<?> deviceClass,
@@ -1363,15 +1280,16 @@
return null;
}
-
- /** From a List of MidiDeviceProviders, return the first appropriate
- MidiDevice.
- @param providers The List of MidiDeviceProviders to search.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
- @return A MidiDevice that is considered appropriate, or null
- if none is found.
- */
+ /**
+ * From a List of MidiDeviceProviders, return the first appropriate
+ * MidiDevice.
+ *
+ * @param providers The List of MidiDeviceProviders to search
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A MidiDevice that is considered appropriate, or null if none is
+ * found
+ */
private static MidiDevice getFirstDevice(List<MidiDeviceProvider> providers,
Class<?> deviceClass) {
MidiDevice device;
@@ -1394,14 +1312,15 @@
return null;
}
-
- /** From a List of MidiDeviceProviders, return the first appropriate
- MidiDevice.
- @param providers The List of MidiDeviceProviders to search.
- @param deviceClass The requested device type, one of Synthesizer.class,
- Sequencer.class, Receiver.class or Transmitter.class.
- @return A MidiDevice that is considered appropriate, or null
- if none is found.
+ /**
+ * From a List of MidiDeviceProviders, return the first appropriate
+ * MidiDevice.
+ *
+ * @param providers The List of MidiDeviceProviders to search
+ * @param deviceClass The requested device type, one of Synthesizer.class,
+ * Sequencer.class, Receiver.class or Transmitter.class
+ * @return A MidiDevice that is considered appropriate, or null if none is
+ * found
*/
private static MidiDevice getFirstDevice(List<MidiDeviceProvider> providers,
Class<?> deviceClass,
@@ -1419,28 +1338,29 @@
return null;
}
-
- /** Checks if a MidiDevice is appropriate.
- If deviceClass is Synthesizer or Sequencer, a device implementing
- the respective interface is considered appropriate. If deviceClass
- is Receiver or Transmitter, a device is considered appropriate if
- it implements neither Synthesizer nor Transmitter, and if it can
- provide at least one Receiver or Transmitter, respectively.
-
- @param device the MidiDevice to test
- @param allowSynthesizer if true, Synthesizers are considered
- appropriate. Otherwise only pure MidiDevices are considered
- appropriate (unless allowSequencer is true). This flag only has an
- effect for deviceClass Receiver and Transmitter. For other device
- classes (Sequencer and Synthesizer), this flag has no effect.
- @param allowSequencer if true, Sequencers are considered
- appropriate. Otherwise only pure MidiDevices are considered
- appropriate (unless allowSynthesizer is true). This flag only has an
- effect for deviceClass Receiver and Transmitter. For other device
- classes (Sequencer and Synthesizer), this flag has no effect.
- @return true if the device is considered appropriate according to the
- rules given above, false otherwise.
- */
+ /**
+ * Checks if a MidiDevice is appropriate. If deviceClass is Synthesizer or
+ * Sequencer, a device implementing the respective interface is considered
+ * appropriate. If deviceClass is Receiver or Transmitter, a device is
+ * considered appropriate if it implements neither Synthesizer nor
+ * Transmitter, and if it can provide at least one Receiver or Transmitter,
+ * respectively.
+ *
+ * @param device the MidiDevice to test
+ * @param allowSynthesizer if true, Synthesizers are considered
+ * appropriate. Otherwise only pure MidiDevices are considered
+ * appropriate (unless allowSequencer is true). This flag only has
+ * an effect for deviceClass Receiver and Transmitter. For other
+ * device classes (Sequencer and Synthesizer), this flag has no
+ * effect.
+ * @param allowSequencer if true, Sequencers are considered appropriate.
+ * Otherwise only pure MidiDevices are considered appropriate
+ * (unless allowSynthesizer is true). This flag only has an effect
+ * for deviceClass Receiver and Transmitter. For other device
+ * classes (Sequencer and Synthesizer), this flag has no effect.
+ * @return true if the device is considered appropriate according to the
+ * rules given above, false otherwise
+ */
private static boolean isAppropriateDevice(MidiDevice device,
Class<?> deviceClass,
boolean allowSynthesizer,
@@ -1473,12 +1393,12 @@
return false;
}
-
/**
- * Obtains the set of services currently installed on the system
- * using the SPI mechanism in 1.3.
- * @return a List of instances of providers for the requested service.
- * If no providers are available, a List of length 0 will be returned.
+ * Obtains the set of services currently installed on the system using the
+ * SPI mechanism in 1.3.
+ *
+ * @return a List of instances of providers for the requested service. If no
+ * providers are available, a List of length 0 will be returned.
*/
private static List<?> getProviders(Class<?> providerClass) {
return JDK13Services.getProviders(providerClass);
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java
index 85ace34..b52fac8 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MidiUnavailableException.java
@@ -25,39 +25,37 @@
package javax.sound.midi;
-
/**
- * A <code>MidiUnavailableException</code> is thrown when a requested MIDI
- * component cannot be opened or created because it is unavailable. This often
- * occurs when a device is in use by another application. More generally, it
- * can occur when there is a finite number of a certain kind of resource that can
- * be used for some purpose, and all of them are already in use (perhaps all by
- * this application). For an example of the latter case, see the
+ * A {@code MidiUnavailableException} is thrown when a requested MIDI component
+ * cannot be opened or created because it is unavailable. This often occurs when
+ * a device is in use by another application. More generally, it can occur when
+ * there is a finite number of a certain kind of resource that can be used for
+ * some purpose, and all of them are already in use (perhaps all by this
+ * application). For an example of the latter case, see the
* {@link Transmitter#setReceiver(Receiver) setReceiver} method of
- * <code>Transmitter</code>.
+ * {@code Transmitter}.
*
* @author Kara Kytle
*/
public class MidiUnavailableException extends Exception {
+
private static final long serialVersionUID = 6093809578628944323L;
/**
- * Constructs a <code>MidiUnavailableException</code> that has
- * <code>null</code> as its error detail message.
+ * Constructs a {@code MidiUnavailableException} that has {@code null} as
+ * its error detail message.
*/
public MidiUnavailableException() {
-
super();
}
/**
- * Constructs a <code>MidiUnavailableException</code> with the
- * specified detail message.
+ * Constructs a {@code MidiUnavailableException} with the specified detail
+ * message.
*
- * @param message the string to display as an error detail message
+ * @param message the string to display as an error detail message
*/
- public MidiUnavailableException(String message) {
-
+ public MidiUnavailableException(final String message) {
super(message);
}
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java
index d8bc7cf..f1e4382 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Patch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,88 +25,77 @@
package javax.sound.midi;
-
/**
- * A <code>Patch</code> object represents a location, on a MIDI
- * synthesizer, into which a single instrument is stored (loaded).
- * Every <code>Instrument</code> object has its own <code>Patch</code>
- * object that specifies the memory location
- * into which that instrument should be loaded. The
- * location is specified abstractly by a bank index and a program number (not by
- * any scheme that directly refers to a specific address or offset in RAM).
- * This is a hierarchical indexing scheme: MIDI provides for up to 16384 banks,
- * each of which contains up to 128 program locations. For example, a
- * minimal sort of synthesizer might have only one bank of instruments, and
- * only 32 instruments (programs) in that bank.
+ * A {@code Patch} object represents a location, on a MIDI synthesizer, into
+ * which a single instrument is stored (loaded). Every {@code Instrument} object
+ * has its own {@code Patch} object that specifies the memory location into
+ * which that instrument should be loaded. The location is specified abstractly
+ * by a bank index and a program number (not by any scheme that directly refers
+ * to a specific address or offset in RAM). This is a hierarchical indexing
+ * scheme: MIDI provides for up to 16384 banks, each of which contains up to 128
+ * program locations. For example, a minimal sort of synthesizer might have only
+ * one bank of instruments, and only 32 instruments (programs) in that bank.
* <p>
- * To select what instrument should play the notes on a particular MIDI
- * channel, two kinds of MIDI message are used that specify a patch location:
- * a bank-select command, and a program-change channel command. The Java Sound
+ * To select what instrument should play the notes on a particular MIDI channel,
+ * two kinds of MIDI message are used that specify a patch location: a
+ * bank-select command, and a program-change channel command. The Java Sound
* equivalent is the
- * {@link MidiChannel#programChange(int, int) programChange(int, int)}
- * method of <code>MidiChannel</code>.
+ * {@link MidiChannel#programChange(int, int) programChange(int, int)} method of
+ * {@code MidiChannel}.
*
+ * @author Kara Kytle
* @see Instrument
* @see Instrument#getPatch()
* @see MidiChannel#programChange(int, int)
* @see Synthesizer#loadInstruments(Soundbank, Patch[])
* @see Soundbank
* @see Sequence#getPatchList()
- *
- * @author Kara Kytle
*/
-
public class Patch {
-
/**
- * Bank index
+ * Bank index.
*/
private final int bank;
-
/**
- * Program change number
+ * Program change number.
*/
private final int program;
-
/**
* Constructs a new patch object from the specified bank and program
* numbers.
- * @param bank the bank index (in the range from 0 to 16383)
- * @param program the program index (in the range from 0 to 127)
+ *
+ * @param bank the bank index (in the range from 0 to 16383)
+ * @param program the program index (in the range from 0 to 127)
*/
public Patch(int bank, int program) {
-
this.bank = bank;
this.program = program;
}
-
/**
- * Returns the number of the bank that contains the instrument
- * whose location this <code>Patch</code> specifies.
+ * Returns the number of the bank that contains the instrument whose
+ * location this {@code Patch} specifies.
+ *
* @return the bank number, whose range is from 0 to 16383
* @see MidiChannel#programChange(int, int)
*/
public int getBank() {
-
return bank;
}
-
/**
- * Returns the index, within
- * a bank, of the instrument whose location this <code>Patch</code> specifies.
- * @return the instrument's program number, whose range is from 0 to 127
+ * Returns the index, within a bank, of the instrument whose location this
+ * {@code Patch} specifies.
*
+ * @return the instrument's program number, whose range is from 0 to 127
* @see MidiChannel#getProgram
* @see MidiChannel#programChange(int)
* @see MidiChannel#programChange(int, int)
*/
public int getProgram() {
-
return program;
}
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java
index 9df0a5d..55e038c 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Receiver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,50 +25,46 @@
package javax.sound.midi;
-
/**
- * A <code>Receiver</code> receives <code>{@link MidiEvent}</code> objects and
- * typically does something useful in response, such as interpreting them to
- * generate sound or raw MIDI output. Common MIDI receivers include
- * synthesizers and MIDI Out ports.
+ * A {@code Receiver} receives {@link MidiEvent} objects and typically does
+ * something useful in response, such as interpreting them to generate sound or
+ * raw MIDI output. Common MIDI receivers include synthesizers and MIDI Out
+ * ports.
*
+ * @author Kara Kytle
* @see MidiDevice
* @see Synthesizer
* @see Transmitter
- *
- * @author Kara Kytle
*/
public interface Receiver extends AutoCloseable {
-
//$$fb 2002-04-12: fix for 4662090: Contradiction in Receiver specification
+
/**
- * Sends a MIDI message and time-stamp to this receiver.
- * If time-stamping is not supported by this receiver, the time-stamp
- * value should be -1.
- * @param message the MIDI message to send
- * @param timeStamp the time-stamp for the message, in microseconds.
+ * Sends a MIDI message and time-stamp to this receiver. If time-stamping is
+ * not supported by this receiver, the time-stamp value should be -1.
+ *
+ * @param message the MIDI message to send
+ * @param timeStamp the time-stamp for the message, in microseconds
* @throws IllegalStateException if the receiver is closed
*/
- public void send(MidiMessage message, long timeStamp);
+ void send(MidiMessage message, long timeStamp);
/**
- * Indicates that the application has finished using the receiver, and
- * that limited resources it requires may be released or made available.
- *
- * <p>If the creation of this <code>Receiver</code> resulted in
- * implicitly opening the underlying device, the device is
- * implicitly closed by this method. This is true unless the device is
- * kept open by other <code>Receiver</code> or <code>Transmitter</code>
- * instances that opened the device implicitly, and unless the device
- * has been opened explicitly. If the device this
- * <code>Receiver</code> is retrieved from is closed explicitly by
- * calling {@link MidiDevice#close MidiDevice.close}, the
- * <code>Receiver</code> is closed, too. For a detailed
- * description of open/close behaviour see the class description
- * of {@link javax.sound.midi.MidiDevice MidiDevice}.
+ * Indicates that the application has finished using the receiver, and that
+ * limited resources it requires may be released or made available.
+ * <p>
+ * If the creation of this {@code Receiver} resulted in implicitly opening
+ * the underlying device, the device is implicitly closed by this method.
+ * This is true unless the device is kept open by other {@code Receiver} or
+ * {@code Transmitter} instances that opened the device implicitly, and
+ * unless the device has been opened explicitly. If the device this
+ * {@code Receiver} is retrieved from is closed explicitly by calling
+ * {@link MidiDevice#close MidiDevice.close}, the {@code Receiver} is
+ * closed, too. For a detailed description of open/close behaviour see the
+ * class description of {@link MidiDevice MidiDevice}.
*
* @see javax.sound.midi.MidiSystem#getReceiver
*/
- public void close();
+ void close();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java
index 14cb661..3dd0ca5 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java
@@ -26,72 +26,77 @@
package javax.sound.midi;
import java.util.Vector;
-import com.sun.media.sound.MidiUtils;
-
/**
- * A <code>Sequence</code> is a data structure containing musical
- * information (often an entire song or composition) that can be played
- * back by a <code>{@link Sequencer}</code> object. Specifically, the
- * <code>Sequence</code> contains timing
- * information and one or more tracks. Each <code>{@link Track track}</code> consists of a
- * series of MIDI events (such as note-ons, note-offs, program changes, and meta-events).
- * The sequence's timing information specifies the type of unit that is used
- * to time-stamp the events in the sequence.
+ * A {@code Sequence} is a data structure containing musical information (often
+ * an entire song or composition) that can be played back by a {@link Sequencer}
+ * object. Specifically, the {@code Sequence} contains timing information and
+ * one or more tracks. Each {@link Track track} consists of a series of MIDI
+ * events (such as note-ons, note-offs, program changes, and meta-events). The
+ * sequence's timing information specifies the type of unit that is used to
+ * time-stamp the events in the sequence.
* <p>
- * A <code>Sequence</code> can be created from a MIDI file by reading the file
- * into an input stream and invoking one of the <code>getSequence</code> methods of
- * {@link MidiSystem}. A sequence can also be built from scratch by adding new
- * <code>Tracks</code> to an empty <code>Sequence</code>, and adding
- * <code>{@link MidiEvent}</code> objects to these <code>Tracks</code>.
+ * A {@code Sequence} can be created from a MIDI file by reading the file into
+ * an input stream and invoking one of the {@code getSequence} methods of
+ * {@link MidiSystem}. A sequence can also be built from scratch by adding new
+ * {@code Tracks} to an empty {@code Sequence}, and adding {@link MidiEvent}
+ * objects to these {@code Tracks}.
*
+ * @author Kara Kytle
* @see Sequencer#setSequence(java.io.InputStream stream)
* @see Sequencer#setSequence(Sequence sequence)
* @see Track#add(MidiEvent)
* @see MidiFileFormat
- *
- * @author Kara Kytle
*/
public class Sequence {
-
// Timing types
/**
- * The tempo-based timing type, for which the resolution is expressed in pulses (ticks) per quarter note.
+ * The tempo-based timing type, for which the resolution is expressed in
+ * pulses (ticks) per quarter note.
+ *
* @see #Sequence(float, int)
*/
public static final float PPQ = 0.0f;
/**
- * The SMPTE-based timing type with 24 frames per second (resolution is expressed in ticks per frame).
+ * The SMPTE-based timing type with 24 frames per second (resolution is
+ * expressed in ticks per frame).
+ *
* @see #Sequence(float, int)
*/
public static final float SMPTE_24 = 24.0f;
/**
- * The SMPTE-based timing type with 25 frames per second (resolution is expressed in ticks per frame).
+ * The SMPTE-based timing type with 25 frames per second (resolution is
+ * expressed in ticks per frame).
+ *
* @see #Sequence(float, int)
*/
public static final float SMPTE_25 = 25.0f;
/**
- * The SMPTE-based timing type with 29.97 frames per second (resolution is expressed in ticks per frame).
+ * The SMPTE-based timing type with 29.97 frames per second (resolution is
+ * expressed in ticks per frame).
+ *
* @see #Sequence(float, int)
*/
public static final float SMPTE_30DROP = 29.97f;
/**
- * The SMPTE-based timing type with 30 frames per second (resolution is expressed in ticks per frame).
+ * The SMPTE-based timing type with 30 frames per second (resolution is
+ * expressed in ticks per frame).
+ *
* @see #Sequence(float, int)
*/
public static final float SMPTE_30 = 30.0f;
-
// Variables
/**
* The timing division type of the sequence.
+ *
* @see #PPQ
* @see #SMPTE_24
* @see #SMPTE_25
@@ -103,33 +108,33 @@
/**
* The timing resolution of the sequence.
+ *
* @see #getResolution
*/
protected int resolution;
/**
* The MIDI tracks in this sequence.
+ *
* @see #getTracks
*/
protected Vector<Track> tracks = new Vector<Track>();
-
/**
- * Constructs a new MIDI sequence with the specified timing division
- * type and timing resolution. The division type must be one of the
- * recognized MIDI timing types. For tempo-based timing,
- * <code>divisionType</code> is PPQ (pulses per quarter note) and
- * the resolution is specified in ticks per beat. For SMTPE timing,
- * <code>divisionType</code> specifies the number of frames per
- * second and the resolution is specified in ticks per frame.
- * The sequence will contain no initial tracks. Tracks may be
- * added to or removed from the sequence using <code>{@link #createTrack}</code>
- * and <code>{@link #deleteTrack}</code>.
+ * Constructs a new MIDI sequence with the specified timing division type
+ * and timing resolution. The division type must be one of the recognized
+ * MIDI timing types. For tempo-based timing, {@code divisionType} is PPQ
+ * (pulses per quarter note) and the resolution is specified in ticks per
+ * beat. For SMTPE timing, {@code divisionType} specifies the number of
+ * frames per second and the resolution is specified in ticks per frame. The
+ * sequence will contain no initial tracks. Tracks may be added to or
+ * removed from the sequence using {@link #createTrack} and
+ * {@link #deleteTrack}.
*
- * @param divisionType the timing division type (PPQ or one of the SMPTE types)
- * @param resolution the timing resolution
- * @throws InvalidMidiDataException if <code>divisionType</code> is not valid
- *
+ * @param divisionType the timing division type (PPQ or one of the SMPTE
+ * types)
+ * @param resolution the timing resolution
+ * @throws InvalidMidiDataException if {@code divisionType} is not valid
* @see #PPQ
* @see #SMPTE_24
* @see #SMPTE_25
@@ -156,27 +161,25 @@
this.resolution = resolution;
}
-
/**
- * Constructs a new MIDI sequence with the specified timing division
- * type, timing resolution, and number of tracks. The division type must be one of the
- * recognized MIDI timing types. For tempo-based timing,
- * <code>divisionType</code> is PPQ (pulses per quarter note) and
- * the resolution is specified in ticks per beat. For SMTPE timing,
- * <code>divisionType</code> specifies the number of frames per
- * second and the resolution is specified in ticks per frame.
- * The sequence will be initialized with the number of tracks specified by
- * <code>numTracks</code>. These tracks are initially empty (i.e.
- * they contain only the meta-event End of Track).
- * The tracks may be retrieved for editing using the <code>{@link #getTracks}</code>
- * method. Additional tracks may be added, or existing tracks removed,
- * using <code>{@link #createTrack}</code> and <code>{@link #deleteTrack}</code>.
+ * Constructs a new MIDI sequence with the specified timing division type,
+ * timing resolution, and number of tracks. The division type must be one of
+ * the recognized MIDI timing types. For tempo-based timing,
+ * {@code divisionType} is PPQ (pulses per quarter note) and the resolution
+ * is specified in ticks per beat. For SMTPE timing, {@code divisionType}
+ * specifies the number of frames per second and the resolution is specified
+ * in ticks per frame. The sequence will be initialized with the number of
+ * tracks specified by {@code numTracks}. These tracks are initially empty
+ * (i.e. they contain only the meta-event End of Track). The tracks may be
+ * retrieved for editing using the {@link #getTracks} method. Additional
+ * tracks may be added, or existing tracks removed, using
+ * {@link #createTrack} and {@link #deleteTrack}.
*
- * @param divisionType the timing division type (PPQ or one of the SMPTE types)
- * @param resolution the timing resolution
- * @param numTracks the initial number of tracks in the sequence.
- * @throws InvalidMidiDataException if <code>divisionType</code> is not valid
- *
+ * @param divisionType the timing division type (PPQ or one of the SMPTE
+ * types)
+ * @param resolution the timing resolution
+ * @param numTracks the initial number of tracks in the sequence
+ * @throws InvalidMidiDataException if {@code divisionType} is not valid
* @see #PPQ
* @see #SMPTE_24
* @see #SMPTE_25
@@ -206,11 +209,10 @@
}
}
-
/**
* Obtains the timing division type for this sequence.
- * @return the division type (PPQ or one of the SMPTE types)
*
+ * @return the division type (PPQ or one of the SMPTE types)
* @see #PPQ
* @see #SMPTE_24
* @see #SMPTE_25
@@ -223,11 +225,10 @@
return divisionType;
}
-
/**
- * Obtains the timing resolution for this sequence.
- * If the sequence's division type is PPQ, the resolution is specified in ticks per beat.
- * For SMTPE timing, the resolution is specified in ticks per frame.
+ * Obtains the timing resolution for this sequence. If the sequence's
+ * division type is PPQ, the resolution is specified in ticks per beat. For
+ * SMTPE timing, the resolution is specified in ticks per frame.
*
* @return the number of ticks per beat (PPQ) or per frame (SMPTE)
* @see #getDivisionType
@@ -238,13 +239,13 @@
return resolution;
}
-
/**
- * Creates a new, initially empty track as part of this sequence.
- * The track initially contains the meta-event End of Track.
- * The newly created track is returned. All tracks in the sequence
- * may be retrieved using <code>{@link #getTracks}</code>. Tracks may be
- * removed from the sequence using <code>{@link #deleteTrack}</code>.
+ * Creates a new, initially empty track as part of this sequence. The track
+ * initially contains the meta-event End of Track. The newly created track
+ * is returned. All tracks in the sequence may be retrieved using
+ * {@link #getTracks}. Tracks may be removed from the sequence using
+ * {@link #deleteTrack}.
+ *
* @return the newly created track
*/
public Track createTrack() {
@@ -255,13 +256,12 @@
return track;
}
-
/**
* Removes the specified track from the sequence.
- * @param track the track to remove
- * @return <code>true</code> if the track existed in the track and was removed,
- * otherwise <code>false</code>.
*
+ * @param track the track to remove
+ * @return {@code true} if the track existed in the track and was removed,
+ * otherwise {@code false}
* @see #createTrack
* @see #getTracks
*/
@@ -273,12 +273,11 @@
}
}
-
/**
- * Obtains an array containing all the tracks in this sequence.
- * If the sequence contains no tracks, an array of length 0 is returned.
- * @return the array of tracks
+ * Obtains an array containing all the tracks in this sequence. If the
+ * sequence contains no tracks, an array of length 0 is returned.
*
+ * @return the array of tracks
* @see #createTrack
* @see #deleteTrack
*/
@@ -287,22 +286,20 @@
return tracks.toArray(new Track[tracks.size()]);
}
-
/**
* Obtains the duration of this sequence, expressed in microseconds.
- * @return this sequence's duration in microseconds.
+ *
+ * @return this sequence's duration in microseconds
*/
public long getMicrosecondLength() {
return com.sun.media.sound.MidiUtils.tick2microsecond(this, getTickLength(), null);
}
-
/**
* Obtains the duration of this sequence, expressed in MIDI ticks.
*
* @return this sequence's length in ticks
- *
* @see #getMicrosecondLength
*/
public long getTickLength() {
@@ -321,15 +318,12 @@
}
}
-
/**
- * Obtains a list of patches referenced in this sequence.
- * This patch list may be used to load the required
- * <code>{@link Instrument}</code> objects
- * into a <code>{@link Synthesizer}</code>.
+ * Obtains a list of patches referenced in this sequence. This patch list
+ * may be used to load the required {@link Instrument} objects into a
+ * {@link Synthesizer}.
*
- * @return an array of <code>{@link Patch}</code> objects used in this sequence
- *
+ * @return an array of {@link Patch} objects used in this sequence
* @see Synthesizer#loadInstruments(Soundbank, Patch[])
*/
public Patch[] getPatchList() {
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java
index b587d29..17d6a9d 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,18 @@
package javax.sound.midi;
-import java.io.InputStream;
import java.io.IOException;
-
+import java.io.InputStream;
/**
* A hardware or software device that plays back a MIDI
- * <code>{@link Sequence sequence}</code> is known as a <em>sequencer</em>.
- * A MIDI sequence contains lists of time-stamped MIDI data, such as
- * might be read from a standard MIDI file. Most
- * sequencers also provide functions for creating and editing sequences.
+ * {@link Sequence sequence} is known as a <em>sequencer</em>. A MIDI sequence
+ * contains lists of time-stamped MIDI data, such as might be read from a
+ * standard MIDI file. Most sequencers also provide functions for creating and
+ * editing sequences.
* <p>
- * The <code>Sequencer</code> interface includes methods for the following
- * basic MIDI sequencer operations:
+ * The {@code Sequencer} interface includes methods for the following basic MIDI
+ * sequencer operations:
* <ul>
* <li>obtaining a sequence from MIDI file data</li>
* <li>starting and stopping playback</li>
@@ -48,729 +47,635 @@
* <li>controlling the timing of another device</li>
* </ul>
* In addition, the following operations are supported, either directly, or
- * indirectly through objects that the <code>Sequencer</code> has access to:
+ * indirectly through objects that the {@code Sequencer} has access to:
* <ul>
* <li>editing the data by adding or deleting individual MIDI events or entire
* tracks</li>
* <li>muting or soloing individual tracks in the sequence</li>
- * <li>notifying listener objects about any meta-events or
- * control-change events encountered while playing back the sequence.</li>
+ * <li>notifying listener objects about any meta-events or control-change events
+ * encountered while playing back the sequence.</li>
* </ul>
*
- * @see Sequencer.SyncMode
+ * @author Kara Kytle
+ * @author Florian Bomers
+ * @see SyncMode
* @see #addMetaEventListener
* @see ControllerEventListener
* @see Receiver
* @see Transmitter
* @see MidiDevice
- *
- * @author Kara Kytle
- * @author Florian Bomers
*/
public interface Sequencer extends MidiDevice {
-
/**
- * A value indicating that looping should continue
- * indefinitely rather than complete after a specific
- * number of loops.
+ * A value indicating that looping should continue indefinitely rather than
+ * complete after a specific number of loops.
*
* @see #setLoopCount
* @since 1.5
*/
- public static final int LOOP_CONTINUOUSLY = -1;
-
-
+ int LOOP_CONTINUOUSLY = -1;
/**
* Sets the current sequence on which the sequencer operates.
+ * <p>
+ * This method can be called even if the {@code Sequencer} is closed.
*
- * <p>This method can be called even if the
- * <code>Sequencer</code> is closed.
- *
- * @param sequence the sequence to be loaded.
- * @throws InvalidMidiDataException if the sequence contains invalid
- * MIDI data, or is not supported.
+ * @param sequence the sequence to be loaded
+ * @throws InvalidMidiDataException if the sequence contains invalid MIDI
+ * data, or is not supported
*/
- public void setSequence(Sequence sequence) throws InvalidMidiDataException;
-
+ void setSequence(Sequence sequence) throws InvalidMidiDataException;
/**
- * Sets the current sequence on which the sequencer operates.
- * The stream must point to MIDI file data.
+ * Sets the current sequence on which the sequencer operates. The stream
+ * must point to MIDI file data.
+ * <p>
+ * This method can be called even if the {@code Sequencer} is closed.
*
- * <p>This method can be called even if the
- * <code>Sequencer</code> is closed.
- *
- * @param stream stream containing MIDI file data.
- * @throws IOException if an I/O exception occurs during reading of the stream.
- * @throws InvalidMidiDataException if invalid data is encountered
- * in the stream, or the stream is not supported.
+ * @param stream stream containing MIDI file data
+ * @throws IOException if an I/O exception occurs during reading of the
+ * stream
+ * @throws InvalidMidiDataException if invalid data is encountered in the
+ * stream, or the stream is not supported
*/
- public void setSequence(InputStream stream) throws IOException, InvalidMidiDataException;
-
+ void setSequence(InputStream stream)
+ throws IOException, InvalidMidiDataException;
/**
* Obtains the sequence on which the Sequencer is currently operating.
+ * <p>
+ * This method can be called even if the {@code Sequencer} is closed.
*
- * <p>This method can be called even if the
- * <code>Sequencer</code> is closed.
- *
- * @return the current sequence, or <code>null</code> if no sequence is currently set.
+ * @return the current sequence, or {@code null} if no sequence is currently
+ * set
*/
- public Sequence getSequence();
-
+ Sequence getSequence();
/**
- * Starts playback of the MIDI data in the currently
- * loaded sequence.
- * Playback will begin from the current position.
- * If the playback position reaches the loop end point,
- * and the loop count is greater than 0, playback will
- * resume at the loop start point for the number of
- * repetitions set with <code>setLoopCount</code>.
- * After that, or if the loop count is 0, playback will
- * continue to play to the end of the sequence.
+ * Starts playback of the MIDI data in the currently loaded sequence.
+ * Playback will begin from the current position. If the playback position
+ * reaches the loop end point, and the loop count is greater than 0,
+ * playback will resume at the loop start point for the number of
+ * repetitions set with {@code setLoopCount}. After that, or if the loop
+ * count is 0, playback will continue to play to the end of the sequence.
+ * <p>
+ * The implementation ensures that the synthesizer is brought to a
+ * consistent state when jumping to the loop start point by sending
+ * appropriate controllers, pitch bend, and program change events.
*
- * <p>The implementation ensures that the synthesizer
- * is brought to a consistent state when jumping
- * to the loop start point by sending appropriate
- * controllers, pitch bend, and program change events.
- *
- * @throws IllegalStateException if the <code>Sequencer</code> is
- * closed.
- *
+ * @throws IllegalStateException if the {@code Sequencer} is closed
* @see #setLoopStartPoint
* @see #setLoopEndPoint
* @see #setLoopCount
* @see #stop
*/
- public void start();
-
+ void start();
/**
- * Stops recording, if active, and playback of the currently loaded sequence,
- * if any.
+ * Stops recording, if active, and playback of the currently loaded
+ * sequence, if any.
*
- * @throws IllegalStateException if the <code>Sequencer</code> is
- * closed.
- *
+ * @throws IllegalStateException if the {@code Sequencer} is closed
* @see #start
* @see #isRunning
*/
- public void stop();
-
+ void stop();
/**
- * Indicates whether the Sequencer is currently running. The default is <code>false</code>.
- * The Sequencer starts running when either <code>{@link #start}</code> or <code>{@link #startRecording}</code>
- * is called. <code>isRunning</code> then returns <code>true</code> until playback of the
- * sequence completes or <code>{@link #stop}</code> is called.
- * @return <code>true</code> if the Sequencer is running, otherwise <code>false</code>
+ * Indicates whether the Sequencer is currently running. The default is
+ * {@code false}. The Sequencer starts running when either{@link #start} or
+ * {@link #startRecording} is called. {@code isRunning} then returns
+ * {@code true} until playback of the sequence completes or {@link #stop} is
+ * called.
+ *
+ * @return {@code true} if the Sequencer is running, otherwise {@code false}
*/
- public boolean isRunning();
-
+ boolean isRunning();
/**
- * Starts recording and playback of MIDI data. Data is recorded to all enabled tracks,
- * on the channel(s) for which they were enabled. Recording begins at the current position
- * of the sequencer. Any events already in the track are overwritten for the duration
- * of the recording session. Events from the currently loaded sequence,
- * if any, are delivered to the sequencer's transmitter(s) along with messages
- * received during recording.
+ * Starts recording and playback of MIDI data. Data is recorded to all
+ * enabled tracks, on the channel(s) for which they were enabled. Recording
+ * begins at the current position of the sequencer. Any events already in
+ * the track are overwritten for the duration of the recording session.
+ * Events from the currently loaded sequence, if any, are delivered to the
+ * sequencer's transmitter(s) along with messages received during recording.
* <p>
- * Note that tracks are not by default enabled for recording. In order to record MIDI data,
- * at least one track must be specifically enabled for recording.
+ * Note that tracks are not by default enabled for recording. In order to
+ * record MIDI data, at least one track must be specifically enabled for
+ * recording.
*
- * @throws IllegalStateException if the <code>Sequencer</code> is
- * closed.
- *
- * @see #startRecording
+ * @throws IllegalStateException if the {@code Sequencer} is closed
* @see #recordEnable
* @see #recordDisable
*/
- public void startRecording();
-
+ void startRecording();
/**
- * Stops recording, if active. Playback of the current sequence continues.
+ * Stops recording, if active. Playback of the current sequence continues.
*
- * @throws IllegalStateException if the <code>Sequencer</code> is
- * closed.
- *
+ * @throws IllegalStateException if the {@code Sequencer} is closed
* @see #startRecording
* @see #isRecording
*/
- public void stopRecording();
-
+ void stopRecording();
/**
- * Indicates whether the Sequencer is currently recording. The default is <code>false</code>.
- * The Sequencer begins recording when <code>{@link #startRecording}</code> is called,
- * and then returns <code>true</code> until <code>{@link #stop}</code> or <code>{@link #stopRecording}</code>
- * is called.
- * @return <code>true</code> if the Sequencer is recording, otherwise <code>false</code>
+ * Indicates whether the Sequencer is currently recording. The default is
+ * {@code false}. The Sequencer begins recording when
+ * {@link #startRecording} is called, and then returns {@code true} until
+ * {@link #stop} or {@link #stopRecording} is called.
+ *
+ * @return {@code true} if the Sequencer is recording, otherwise
+ * {@code false}
*/
- public boolean isRecording();
-
+ boolean isRecording();
/**
- * Prepares the specified track for recording events received on a particular channel.
- * Once enabled, a track will receive events when recording is active.
- * @param track the track to which events will be recorded
- * @param channel the channel on which events will be received. If -1 is specified
- * for the channel value, the track will receive data from all channels.
- * @throws IllegalArgumentException thrown if the track is not part of the current
- * sequence.
+ * Prepares the specified track for recording events received on a
+ * particular channel. Once enabled, a track will receive events when
+ * recording is active.
+ *
+ * @param track the track to which events will be recorded
+ * @param channel the channel on which events will be received. If -1 is
+ * specified for the channel value, the track will receive data from
+ * all channels.
+ * @throws IllegalArgumentException thrown if the track is not part of the
+ * current sequence
*/
- public void recordEnable(Track track, int channel);
-
+ void recordEnable(Track track, int channel);
/**
- * Disables recording to the specified track. Events will no longer be recorded
- * into this track.
- * @param track the track to disable for recording, or <code>null</code> to disable
- * recording for all tracks.
+ * Disables recording to the specified track. Events will no longer be
+ * recorded into this track.
+ *
+ * @param track the track to disable for recording, or {@code null} to
+ * disable recording for all tracks
*/
- public void recordDisable(Track track);
-
+ void recordDisable(Track track);
/**
- * Obtains the current tempo, expressed in beats per minute. The
- * actual tempo of playback is the product of the returned value
- * and the tempo factor.
+ * Obtains the current tempo, expressed in beats per minute. The actual
+ * tempo of playback is the product of the returned value and the tempo
+ * factor.
*
* @return the current tempo in beats per minute
- *
* @see #getTempoFactor
* @see #setTempoInBPM(float)
* @see #getTempoInMPQ
*/
- public float getTempoInBPM();
-
+ float getTempoInBPM();
/**
- * Sets the tempo in beats per minute. The actual tempo of playback
- * is the product of the specified value and the tempo factor.
+ * Sets the tempo in beats per minute. The actual tempo of playback is the
+ * product of the specified value and the tempo factor.
*
- * @param bpm desired new tempo in beats per minute
+ * @param bpm desired new tempo in beats per minute
* @see #getTempoFactor
* @see #setTempoInMPQ(float)
* @see #getTempoInBPM
*/
- public void setTempoInBPM(float bpm);
-
+ void setTempoInBPM(float bpm);
/**
- * Obtains the current tempo, expressed in microseconds per quarter
- * note. The actual tempo of playback is the product of the returned
- * value and the tempo factor.
+ * Obtains the current tempo, expressed in microseconds per quarter note.
+ * The actual tempo of playback is the product of the returned value and the
+ * tempo factor.
*
* @return the current tempo in microseconds per quarter note
* @see #getTempoFactor
* @see #setTempoInMPQ(float)
* @see #getTempoInBPM
*/
- public float getTempoInMPQ();
-
+ float getTempoInMPQ();
/**
- * Sets the tempo in microseconds per quarter note. The actual tempo
- * of playback is the product of the specified value and the tempo
- * factor.
+ * Sets the tempo in microseconds per quarter note. The actual tempo of
+ * playback is the product of the specified value and the tempo factor.
*
- * @param mpq desired new tempo in microseconds per quarter note.
+ * @param mpq desired new tempo in microseconds per quarter note
* @see #getTempoFactor
* @see #setTempoInBPM(float)
* @see #getTempoInMPQ
*/
- public void setTempoInMPQ(float mpq);
-
+ void setTempoInMPQ(float mpq);
/**
- * Scales the sequencer's actual playback tempo by the factor provided.
- * The default is 1.0. A value of 1.0 represents the natural rate (the
- * tempo specified in the sequence), 2.0 means twice as fast, etc.
- * The tempo factor does not affect the values returned by
- * <code>{@link #getTempoInMPQ}</code> and <code>{@link #getTempoInBPM}</code>.
- * Those values indicate the tempo prior to scaling.
+ * Scales the sequencer's actual playback tempo by the factor provided. The
+ * default is 1.0. A value of 1.0 represents the natural rate (the tempo
+ * specified in the sequence), 2.0 means twice as fast, etc. The tempo
+ * factor does not affect the values returned by {@link #getTempoInMPQ} and
+ * {@link #getTempoInBPM}. Those values indicate the tempo prior to scaling.
* <p>
* Note that the tempo factor cannot be adjusted when external
- * synchronization is used. In that situation,
- * <code>setTempoFactor</code> always sets the tempo factor to 1.0.
+ * synchronization is used. In that situation, {@code setTempoFactor} always
+ * sets the tempo factor to 1.0.
*
- * @param factor the requested tempo scalar
+ * @param factor the requested tempo scalar
* @see #getTempoFactor
*/
- public void setTempoFactor(float factor);
-
+ void setTempoFactor(float factor);
/**
- * Returns the current tempo factor for the sequencer. The default is
- * 1.0.
+ * Returns the current tempo factor for the sequencer. The default is 1.0.
*
- * @return tempo factor.
+ * @return tempo factor
* @see #setTempoFactor(float)
*/
- public float getTempoFactor();
-
+ float getTempoFactor();
/**
- * Obtains the length of the current sequence, expressed in MIDI ticks,
- * or 0 if no sequence is set.
+ * Obtains the length of the current sequence, expressed in MIDI ticks, or 0
+ * if no sequence is set.
+ *
* @return length of the sequence in ticks
*/
- public long getTickLength();
-
+ long getTickLength();
/**
- * Obtains the current position in the sequence, expressed in MIDI
- * ticks. (The duration of a tick in seconds is determined both by
- * the tempo and by the timing resolution stored in the
- * <code>{@link Sequence}</code>.)
+ * Obtains the current position in the sequence, expressed in MIDI ticks.
+ * (The duration of a tick in seconds is determined both by the tempo and by
+ * the timing resolution stored in the {@link Sequence}.)
*
* @return current tick
* @see #setTickPosition
*/
- public long getTickPosition();
-
+ long getTickPosition();
/**
- * Sets the current sequencer position in MIDI ticks
- * @param tick the desired tick position
+ * Sets the current sequencer position in MIDI ticks.
+ *
+ * @param tick the desired tick position
* @see #getTickPosition
*/
- public void setTickPosition(long tick);
-
+ void setTickPosition(long tick);
/**
- * Obtains the length of the current sequence, expressed in microseconds,
- * or 0 if no sequence is set.
- * @return length of the sequence in microseconds.
+ * Obtains the length of the current sequence, expressed in microseconds, or
+ * 0 if no sequence is set.
+ *
+ * @return length of the sequence in microseconds
*/
- public long getMicrosecondLength();
-
+ long getMicrosecondLength();
/**
- * Obtains the current position in the sequence, expressed in
- * microseconds.
+ * Obtains the current position in the sequence, expressed in microseconds.
+ *
* @return the current position in microseconds
* @see #setMicrosecondPosition
*/
- public long getMicrosecondPosition();
-
+ long getMicrosecondPosition();
/**
- * Sets the current position in the sequence, expressed in microseconds
- * @param microseconds desired position in microseconds
+ * Sets the current position in the sequence, expressed in microseconds.
+ *
+ * @param microseconds desired position in microseconds
* @see #getMicrosecondPosition
*/
- public void setMicrosecondPosition(long microseconds);
-
+ void setMicrosecondPosition(long microseconds);
/**
- * Sets the source of timing information used by this sequencer.
- * The sequencer synchronizes to the master, which is the internal clock,
- * MIDI clock, or MIDI time code, depending on the value of
- * <code>sync</code>. The <code>sync</code> argument must be one
- * of the supported modes, as returned by
- * <code>{@link #getMasterSyncModes}</code>.
+ * Sets the source of timing information used by this sequencer. The
+ * sequencer synchronizes to the master, which is the internal clock, MIDI
+ * clock, or MIDI time code, depending on the value of {@code sync}. The
+ * {@code sync} argument must be one of the supported modes, as returned by
+ * {@link #getMasterSyncModes}.
*
- * @param sync the desired master synchronization mode
- *
+ * @param sync the desired master synchronization mode
* @see SyncMode#INTERNAL_CLOCK
* @see SyncMode#MIDI_SYNC
* @see SyncMode#MIDI_TIME_CODE
* @see #getMasterSyncMode
*/
- public void setMasterSyncMode(SyncMode sync);
-
+ void setMasterSyncMode(SyncMode sync);
/**
* Obtains the current master synchronization mode for this sequencer.
*
* @return the current master synchronization mode
- *
- * @see #setMasterSyncMode(Sequencer.SyncMode)
+ * @see #setMasterSyncMode(SyncMode)
* @see #getMasterSyncModes
*/
- public SyncMode getMasterSyncMode();
-
+ SyncMode getMasterSyncMode();
/**
* Obtains the set of master synchronization modes supported by this
* sequencer.
*
* @return the available master synchronization modes
- *
* @see SyncMode#INTERNAL_CLOCK
* @see SyncMode#MIDI_SYNC
* @see SyncMode#MIDI_TIME_CODE
* @see #getMasterSyncMode
- * @see #setMasterSyncMode(Sequencer.SyncMode)
+ * @see #setMasterSyncMode(SyncMode)
*/
- public SyncMode[] getMasterSyncModes();
-
+ SyncMode[] getMasterSyncModes();
/**
- * Sets the slave synchronization mode for the sequencer.
- * This indicates the type of timing information sent by the sequencer
- * to its receiver. The <code>sync</code> argument must be one
- * of the supported modes, as returned by
- * <code>{@link #getSlaveSyncModes}</code>.
+ * Sets the slave synchronization mode for the sequencer. This indicates the
+ * type of timing information sent by the sequencer to its receiver. The
+ * {@code sync} argument must be one of the supported modes, as returned by
+ * {@link #getSlaveSyncModes}.
*
- * @param sync the desired slave synchronization mode
- *
+ * @param sync the desired slave synchronization mode
* @see SyncMode#MIDI_SYNC
* @see SyncMode#MIDI_TIME_CODE
* @see SyncMode#NO_SYNC
* @see #getSlaveSyncModes
*/
- public void setSlaveSyncMode(SyncMode sync);
-
+ void setSlaveSyncMode(SyncMode sync);
/**
* Obtains the current slave synchronization mode for this sequencer.
*
* @return the current slave synchronization mode
- *
- * @see #setSlaveSyncMode(Sequencer.SyncMode)
+ * @see #setSlaveSyncMode(SyncMode)
* @see #getSlaveSyncModes
*/
- public SyncMode getSlaveSyncMode();
-
+ SyncMode getSlaveSyncMode();
/**
- * Obtains the set of slave synchronization modes supported by the sequencer.
+ * Obtains the set of slave synchronization modes supported by the
+ * sequencer.
*
* @return the available slave synchronization modes
- *
* @see SyncMode#MIDI_SYNC
* @see SyncMode#MIDI_TIME_CODE
* @see SyncMode#NO_SYNC
*/
- public SyncMode[] getSlaveSyncModes();
-
+ SyncMode[] getSlaveSyncModes();
/**
- * Sets the mute state for a track. This method may fail for a number
- * of reasons. For example, the track number specified may not be valid
- * for the current sequence, or the sequencer may not support this functionality.
- * An application which needs to verify whether this operation succeeded should
- * follow this call with a call to <code>{@link #getTrackMute}</code>.
+ * Sets the mute state for a track. This method may fail for a number of
+ * reasons. For example, the track number specified may not be valid for the
+ * current sequence, or the sequencer may not support this functionality. An
+ * application which needs to verify whether this operation succeeded should
+ * follow this call with a call to {@link #getTrackMute}.
*
- * @param track the track number. Tracks in the current sequence are numbered
- * from 0 to the number of tracks in the sequence minus 1.
- * @param mute the new mute state for the track. <code>true</code> implies the
- * track should be muted, <code>false</code> implies the track should be unmuted.
+ * @param track the track number. Tracks in the current sequence are
+ * numbered from 0 to the number of tracks in the sequence minus 1.
+ * @param mute the new mute state for the track. {@code true} implies the
+ * track should be muted, {@code false} implies the track should be
+ * unmuted.
* @see #getSequence
*/
- public void setTrackMute(int track, boolean mute);
-
+ void setTrackMute(int track, boolean mute);
/**
- * Obtains the current mute state for a track. The default mute
- * state for all tracks which have not been muted is false. In any
- * case where the specified track has not been muted, this method should
- * return false. This applies if the sequencer does not support muting
- * of tracks, and if the specified track index is not valid.
+ * Obtains the current mute state for a track. The default mute state for
+ * all tracks which have not been muted is false. In any case where the
+ * specified track has not been muted, this method should return false. This
+ * applies if the sequencer does not support muting of tracks, and if the
+ * specified track index is not valid.
*
- * @param track the track number. Tracks in the current sequence are numbered
- * from 0 to the number of tracks in the sequence minus 1.
- * @return <code>true</code> if muted, <code>false</code> if not.
+ * @param track the track number. Tracks in the current sequence are
+ * numbered from 0 to the number of tracks in the sequence minus 1.
+ * @return {@code true} if muted, {@code false} if not
*/
- public boolean getTrackMute(int track);
+ boolean getTrackMute(int track);
/**
- * Sets the solo state for a track. If <code>solo</code> is <code>true</code>
- * only this track and other solo'd tracks will sound. If <code>solo</code>
- * is <code>false</code> then only other solo'd tracks will sound, unless no
- * tracks are solo'd in which case all un-muted tracks will sound.
+ * Sets the solo state for a track. If {@code solo} is {@code true} only
+ * this track and other solo'd tracks will sound. If {@code solo} is
+ * {@code false} then only other solo'd tracks will sound, unless no tracks
+ * are solo'd in which case all un-muted tracks will sound.
* <p>
- * This method may fail for a number
- * of reasons. For example, the track number specified may not be valid
- * for the current sequence, or the sequencer may not support this functionality.
- * An application which needs to verify whether this operation succeeded should
- * follow this call with a call to <code>{@link #getTrackSolo}</code>.
+ * This method may fail for a number of reasons. For example, the track
+ * number specified may not be valid for the current sequence, or the
+ * sequencer may not support this functionality. An application which needs
+ * to verify whether this operation succeeded should follow this call with a
+ * call to {@link #getTrackSolo}.
*
- * @param track the track number. Tracks in the current sequence are numbered
- * from 0 to the number of tracks in the sequence minus 1.
- * @param solo the new solo state for the track. <code>true</code> implies the
- * track should be solo'd, <code>false</code> implies the track should not be solo'd.
+ * @param track the track number. Tracks in the current sequence are
+ * numbered from 0 to the number of tracks in the sequence minus 1.
+ * @param solo the new solo state for the track. {@code true} implies the
+ * track should be solo'd, {@code false} implies the track should
+ * not be solo'd.
* @see #getSequence
*/
- public void setTrackSolo(int track, boolean solo);
-
+ void setTrackSolo(int track, boolean solo);
/**
- * Obtains the current solo state for a track. The default mute
- * state for all tracks which have not been solo'd is false. In any
- * case where the specified track has not been solo'd, this method should
- * return false. This applies if the sequencer does not support soloing
- * of tracks, and if the specified track index is not valid.
+ * Obtains the current solo state for a track. The default mute state for
+ * all tracks which have not been solo'd is false. In any case where the
+ * specified track has not been solo'd, this method should return false.
+ * This applies if the sequencer does not support soloing of tracks, and if
+ * the specified track index is not valid.
*
- * @param track the track number. Tracks in the current sequence are numbered
- * from 0 to the number of tracks in the sequence minus 1.
- * @return <code>true</code> if solo'd, <code>false</code> if not.
+ * @param track the track number. Tracks in the current sequence are
+ * numbered from 0 to the number of tracks in the sequence minus 1.
+ * @return {@code true} if solo'd, {@code false} if not
*/
- public boolean getTrackSolo(int track);
-
+ boolean getTrackSolo(int track);
/**
- * Registers a meta-event listener to receive
- * notification whenever a meta-event is encountered in the sequence
- * and processed by the sequencer. This method can fail if, for
- * instance,this class of sequencer does not support meta-event
- * notification.
+ * Registers a meta-event listener to receive notification whenever a
+ * meta-event is encountered in the sequence and processed by the sequencer.
+ * This method can fail if, for instance,this class of sequencer does not
+ * support meta-event notification.
*
- * @param listener listener to add
- * @return <code>true</code> if the listener was successfully added,
- * otherwise <code>false</code>
- *
+ * @param listener listener to add
+ * @return {@code true} if the listener was successfully added, otherwise
+ * {@code false}
* @see #removeMetaEventListener
* @see MetaEventListener
* @see MetaMessage
*/
- public boolean addMetaEventListener(MetaEventListener listener);
-
+ boolean addMetaEventListener(MetaEventListener listener);
/**
- * Removes the specified meta-event listener from this sequencer's
- * list of registered listeners, if in fact the listener is registered.
+ * Removes the specified meta-event listener from this sequencer's list of
+ * registered listeners, if in fact the listener is registered.
*
- * @param listener the meta-event listener to remove
+ * @param listener the meta-event listener to remove
* @see #addMetaEventListener
*/
- public void removeMetaEventListener(MetaEventListener listener);
-
+ void removeMetaEventListener(MetaEventListener listener);
/**
- * Registers a controller event listener to receive notification
- * whenever the sequencer processes a control-change event of the
- * requested type or types. The types are specified by the
- * <code>controllers</code> argument, which should contain an array of
- * MIDI controller numbers. (Each number should be between 0 and 127,
- * inclusive. See the MIDI 1.0 Specification for the numbers that
- * correspond to various types of controllers.)
+ * Registers a controller event listener to receive notification whenever
+ * the sequencer processes a control-change event of the requested type or
+ * types. The types are specified by the {@code controllers} argument, which
+ * should contain an array of MIDI controller numbers. (Each number should
+ * be between 0 and 127, inclusive. See the MIDI 1.0 Specification for the
+ * numbers that correspond to various types of controllers.)
* <p>
- * The returned array contains the MIDI controller
- * numbers for which the listener will now receive events.
- * Some sequencers might not support controller event notification, in
- * which case the array has a length of 0. Other sequencers might
- * support notification for some controllers but not all.
- * This method may be invoked repeatedly.
- * Each time, the returned array indicates all the controllers
- * that the listener will be notified about, not only the controllers
- * requested in that particular invocation.
+ * The returned array contains the MIDI controller numbers for which the
+ * listener will now receive events. Some sequencers might not support
+ * controller event notification, in which case the array has a length of 0.
+ * Other sequencers might support notification for some controllers but not
+ * all. This method may be invoked repeatedly. Each time, the returned array
+ * indicates all the controllers that the listener will be notified about,
+ * not only the controllers requested in that particular invocation.
*
- * @param listener the controller event listener to add to the list of
- * registered listeners
- * @param controllers the MIDI controller numbers for which change
- * notification is requested
- * @return the numbers of all the MIDI controllers whose changes will
- * now be reported to the specified listener
- *
+ * @param listener the controller event listener to add to the list of
+ * registered listeners
+ * @param controllers the MIDI controller numbers for which change
+ * notification is requested
+ * @return the numbers of all the MIDI controllers whose changes will now be
+ * reported to the specified listener
* @see #removeControllerEventListener
* @see ControllerEventListener
*/
- public int[] addControllerEventListener(ControllerEventListener listener, int[] controllers);
-
+ int[] addControllerEventListener(ControllerEventListener listener,
+ int[] controllers);
/**
- * Removes a controller event listener's interest in one or more
- * types of controller event. The <code>controllers</code> argument
- * is an array of MIDI numbers corresponding to the controllers for
- * which the listener should no longer receive change notifications.
- * To completely remove this listener from the list of registered
- * listeners, pass in <code>null</code> for <code>controllers</code>.
- * The returned array contains the MIDI controller
- * numbers for which the listener will now receive events. The
- * array has a length of 0 if the listener will not receive
- * change notifications for any controllers.
+ * Removes a controller event listener's interest in one or more types of
+ * controller event. The {@code controllers} argument is an array of MIDI
+ * numbers corresponding to the controllers for which the listener should no
+ * longer receive change notifications. To completely remove this listener
+ * from the list of registered listeners, pass in {@code null} for
+ * {@code controllers}. The returned array contains the MIDI controller
+ * numbers for which the listener will now receive events. The array has a
+ * length of 0 if the listener will not receive change notifications for any
+ * controllers.
*
- * @param listener old listener
- * @param controllers the MIDI controller numbers for which change
- * notification should be cancelled, or <code>null</code> to cancel
- * for all controllers
- * @return the numbers of all the MIDI controllers whose changes will
- * now be reported to the specified listener
- *
+ * @param listener old listener
+ * @param controllers the MIDI controller numbers for which change
+ * notification should be cancelled, or {@code null} to cancel for
+ * all controllers
+ * @return the numbers of all the MIDI controllers whose changes will now be
+ * reported to the specified listener
* @see #addControllerEventListener
*/
- public int[] removeControllerEventListener(ControllerEventListener listener, int[] controllers);
-
+ int[] removeControllerEventListener(ControllerEventListener listener,
+ int[] controllers);
/**
- * Sets the first MIDI tick that will be
- * played in the loop. If the loop count is
- * greater than 0, playback will jump to this
- * point when reaching the loop end point.
+ * Sets the first MIDI tick that will be played in the loop. If the loop
+ * count is greater than 0, playback will jump to this point when reaching
+ * the loop end point.
+ * <p>
+ * A value of 0 for the starting point means the beginning of the loaded
+ * sequence. The starting point must be lower than or equal to the ending
+ * point, and it must fall within the size of the loaded sequence.
+ * <p>
+ * A sequencer's loop start point defaults to start of the sequence.
*
- * <p>A value of 0 for the starting point means the
- * beginning of the loaded sequence. The starting
- * point must be lower than or equal to the ending
- * point, and it must fall within the size of the
- * loaded sequence.
- *
- * <p>A sequencer's loop start point defaults to
- * start of the sequence.
- *
- * @param tick the loop's starting position,
- * in MIDI ticks (zero-based)
- * @throws IllegalArgumentException if the requested
- * loop start point cannot be set, usually because
- * it falls outside the sequence's
- * duration or because the start point is
- * after the end point
- *
+ * @param tick the loop's starting position, in MIDI ticks (zero-based)
+ * @throws IllegalArgumentException if the requested loop start point cannot
+ * be set, usually because it falls outside the sequence's duration
+ * or because the start point is after the end point
* @see #setLoopEndPoint
* @see #setLoopCount
* @see #getLoopStartPoint
* @see #start
* @since 1.5
*/
- public void setLoopStartPoint(long tick);
-
+ void setLoopStartPoint(long tick);
/**
- * Obtains the start position of the loop,
- * in MIDI ticks.
+ * Obtains the start position of the loop, in MIDI ticks.
*
- * @return the start position of the loop,
- in MIDI ticks (zero-based)
+ * @return the start position of the loop, in MIDI ticks (zero-based)
* @see #setLoopStartPoint
* @since 1.5
*/
- public long getLoopStartPoint();
-
+ long getLoopStartPoint();
/**
- * Sets the last MIDI tick that will be played in
- * the loop. If the loop count is 0, the loop end
- * point has no effect and playback continues to
+ * Sets the last MIDI tick that will be played in the loop. If the loop
+ * count is 0, the loop end point has no effect and playback continues to
* play when reaching the loop end point.
+ * <p>
+ * A value of -1 for the ending point indicates the last tick of the
+ * sequence. Otherwise, the ending point must be greater than or equal to
+ * the starting point, and it must fall within the size of the loaded
+ * sequence.
+ * <p>
+ * A sequencer's loop end point defaults to -1, meaning the end of the
+ * sequence.
*
- * <p>A value of -1 for the ending point
- * indicates the last tick of the sequence.
- * Otherwise, the ending point must be greater
- * than or equal to the starting point, and it must
- * fall within the size of the loaded sequence.
- *
- * <p>A sequencer's loop end point defaults to -1,
- * meaning the end of the sequence.
- *
- * @param tick the loop's ending position,
- * in MIDI ticks (zero-based), or
- * -1 to indicate the final tick
- * @throws IllegalArgumentException if the requested
- * loop point cannot be set, usually because
- * it falls outside the sequence's
- * duration or because the ending point is
- * before the starting point
- *
+ * @param tick the loop's ending position, in MIDI ticks (zero-based), or
+ * -1 to indicate the final tick
+ * @throws IllegalArgumentException if the requested loop point cannot be
+ * set, usually because it falls outside the sequence's duration or
+ * because the ending point is before the starting point
* @see #setLoopStartPoint
* @see #setLoopCount
* @see #getLoopEndPoint
* @see #start
* @since 1.5
*/
- public void setLoopEndPoint(long tick);
-
+ void setLoopEndPoint(long tick);
/**
- * Obtains the end position of the loop,
- * in MIDI ticks.
+ * Obtains the end position of the loop, in MIDI ticks.
*
- * @return the end position of the loop, in MIDI
- * ticks (zero-based), or -1 to indicate
- * the end of the sequence
+ * @return the end position of the loop, in MIDI ticks (zero-based), or -1
+ * to indicate the end of the sequence
* @see #setLoopEndPoint
* @since 1.5
*/
- public long getLoopEndPoint();
-
+ long getLoopEndPoint();
/**
- * Sets the number of repetitions of the loop for
- * playback.
- * When the playback position reaches the loop end point,
- * it will loop back to the loop start point
- * <code>count</code> times, after which playback will
- * continue to play to the end of the sequence.
+ * Sets the number of repetitions of the loop for playback. When the
+ * playback position reaches the loop end point, it will loop back to the
+ * loop start point {@code count} times, after which playback will continue
+ * to play to the end of the sequence.
* <p>
- * If the current position when this method is invoked
- * is greater than the loop end point, playback
- * continues to the end of the sequence without looping,
- * unless the loop end point is changed subsequently.
+ * If the current position when this method is invoked is greater than the
+ * loop end point, playback continues to the end of the sequence without
+ * looping, unless the loop end point is changed subsequently.
* <p>
- * A <code>count</code> value of 0 disables looping:
- * playback will continue at the loop end point, and it
- * will not loop back to the loop start point.
+ * A {@code count} value of 0 disables looping: playback will continue at
+ * the loop end point, and it will not loop back to the loop start point.
* This is a sequencer's default.
+ * <p>
+ * If playback is stopped during looping, the current loop status is
+ * cleared; subsequent start requests are not affected by an interrupted
+ * loop operation.
*
- * <p>If playback is stopped during looping, the
- * current loop status is cleared; subsequent start
- * requests are not affected by an interrupted loop
- * operation.
- *
- * @param count the number of times playback should
- * loop back from the loop's end position
- * to the loop's start position, or
- * <code>{@link #LOOP_CONTINUOUSLY}</code>
- * to indicate that looping should
- * continue until interrupted
- *
- * @throws IllegalArgumentException if <code>count</code> is
- * negative and not equal to {@link #LOOP_CONTINUOUSLY}
- *
+ * @param count the number of times playback should loop back from the
+ * loop's end position to the loop's start position, or
+ * {@link #LOOP_CONTINUOUSLY} to indicate that looping should
+ * continue until interrupted
+ * @throws IllegalArgumentException if {@code count} is negative and not
+ * equal to {@link #LOOP_CONTINUOUSLY}
* @see #setLoopStartPoint
* @see #setLoopEndPoint
* @see #getLoopCount
* @see #start
* @since 1.5
*/
- public void setLoopCount(int count);
-
+ void setLoopCount(int count);
/**
- * Obtains the number of repetitions for
- * playback.
+ * Obtains the number of repetitions for playback.
*
- * @return the number of loops after which
- * playback plays to the end of the
+ * @return the number of loops after which playback plays to the end of the
* sequence
* @see #setLoopCount
* @see #start
* @since 1.5
*/
- public int getLoopCount();
+ int getLoopCount();
/**
- * A <code>SyncMode</code> object represents one of the ways in which
- * a MIDI sequencer's notion of time can be synchronized with a master
- * or slave device.
- * If the sequencer is being synchronized to a master, the
- * sequencer revises its current time in response to messages from
- * the master. If the sequencer has a slave, the sequencer
- * similarly sends messages to control the slave's timing.
+ * A {@code SyncMode} object represents one of the ways in which a MIDI
+ * sequencer's notion of time can be synchronized with a master or slave
+ * device. If the sequencer is being synchronized to a master, the sequencer
+ * revises its current time in response to messages from the master. If the
+ * sequencer has a slave, the sequencer similarly sends messages to control
+ * the slave's timing.
* <p>
- * There are three predefined modes that specify possible masters
- * for a sequencer: <code>INTERNAL_CLOCK</code>,
- * <code>MIDI_SYNC</code>, and <code>MIDI_TIME_CODE</code>. The
- * latter two work if the sequencer receives MIDI messages from
- * another device. In these two modes, the sequencer's time gets reset
- * based on system real-time timing clock messages or MIDI time code
- * (MTC) messages, respectively. These two modes can also be used
- * as slave modes, in which case the sequencer sends the corresponding
- * types of MIDI messages to its receiver (whether or not the sequencer
- * is also receiving them from a master). A fourth mode,
- * <code>NO_SYNC</code>, is used to indicate that the sequencer should
- * not control its receiver's timing.
+ * There are three predefined modes that specify possible masters for a
+ * sequencer: {@code INTERNAL_CLOCK}, {@code MIDI_SYNC}, and
+ * {@code MIDI_TIME_CODE}. The latter two work if the sequencer receives
+ * MIDI messages from another device. In these two modes, the sequencer's
+ * time gets reset based on system real-time timing clock messages or MIDI
+ * time code (MTC) messages, respectively. These two modes can also be used
+ * as slave modes, in which case the sequencer sends the corresponding types
+ * of MIDI messages to its receiver (whether or not the sequencer is also
+ * receiving them from a master). A fourth mode, {@code NO_SYNC}, is used to
+ * indicate that the sequencer should not control its receiver's timing.
*
- * @see Sequencer#setMasterSyncMode(Sequencer.SyncMode)
- * @see Sequencer#setSlaveSyncMode(Sequencer.SyncMode)
+ * @see Sequencer#setMasterSyncMode(SyncMode)
+ * @see Sequencer#setSlaveSyncMode(SyncMode)
*/
- public static class SyncMode {
+ class SyncMode {
/**
* Synchronization mode name.
@@ -779,27 +684,27 @@
/**
* Constructs a synchronization mode.
- * @param name name of the synchronization mode
+ *
+ * @param name name of the synchronization mode
*/
protected SyncMode(String name) {
this.name = name;
}
-
/**
- * Determines whether two objects are equal.
- * Returns <code>true</code> if the objects are identical
- * @param obj the reference object with which to compare
- * @return <code>true</code> if this object is the same as the
- * <code>obj</code> argument, <code>false</code> otherwise
+ * Determines whether two objects are equal. Returns {@code true} if the
+ * objects are identical.
+ *
+ * @param obj the reference object with which to compare
+ * @return {@code true} if this object is the same as the {@code obj}
+ * argument, {@code false} otherwise
*/
public final boolean equals(Object obj) {
return super.equals(obj);
}
-
/**
* Finalizes the hashcode method.
*/
@@ -808,10 +713,10 @@
return super.hashCode();
}
-
/**
* Provides this synchronization mode's name as the string
* representation of the mode.
+ *
* @return the name of this synchronization mode
*/
public final String toString() {
@@ -819,50 +724,41 @@
return name;
}
-
/**
- * A master synchronization mode that makes the sequencer get
- * its timing information from its internal clock. This is not
- * a legal slave sync mode.
+ * A master synchronization mode that makes the sequencer get its timing
+ * information from its internal clock. This is not a legal slave sync
+ * mode.
*/
public static final SyncMode INTERNAL_CLOCK = new SyncMode("Internal Clock");
-
/**
- * A master or slave synchronization mode that specifies the
- * use of MIDI clock
- * messages. If this mode is used as the master sync mode,
- * the sequencer gets its timing information from system real-time
- * MIDI clock messages. This mode only applies as the master sync
- * mode for sequencers that are also MIDI receivers. If this is the
- * slave sync mode, the sequencer sends system real-time MIDI clock
- * messages to its receiver. MIDI clock messages are sent at a rate
- * of 24 per quarter note.
+ * A master or slave synchronization mode that specifies the use of MIDI
+ * clock messages. If this mode is used as the master sync mode, the
+ * sequencer gets its timing information from system real-time MIDI
+ * clock messages. This mode only applies as the master sync mode for
+ * sequencers that are also MIDI receivers. If this is the slave sync
+ * mode, the sequencer sends system real-time MIDI clock messages to its
+ * receiver. MIDI clock messages are sent at a rate of 24 per quarter
+ * note.
*/
public static final SyncMode MIDI_SYNC = new SyncMode("MIDI Sync");
-
/**
- * A master or slave synchronization mode that specifies the
- * use of MIDI Time Code.
- * If this mode is used as the master sync mode,
- * the sequencer gets its timing information from MIDI Time Code
- * messages. This mode only applies as the master sync
- * mode to sequencers that are also MIDI receivers. If this
- * mode is used as the
- * slave sync mode, the sequencer sends MIDI Time Code
- * messages to its receiver. (See the MIDI 1.0 Detailed
- * Specification for a description of MIDI Time Code.)
+ * A master or slave synchronization mode that specifies the use of MIDI
+ * Time Code. If this mode is used as the master sync mode, the
+ * sequencer gets its timing information from MIDI Time Code messages.
+ * This mode only applies as the master sync mode to sequencers that are
+ * also MIDI receivers. If this mode is used as the slave sync mode, the
+ * sequencer sends MIDI Time Code messages to its receiver. (See the
+ * MIDI 1.0 Detailed Specification for a description of MIDI Time Code.)
*/
public static final SyncMode MIDI_TIME_CODE = new SyncMode("MIDI Time Code");
-
/**
* A slave synchronization mode indicating that no timing information
- * should be sent to the receiver. This is not a legal master sync
- * mode.
+ * should be sent to the receiver. This is not a legal master sync mode.
*/
public static final SyncMode NO_SYNC = new SyncMode("No Timing");
- } // class SyncMode
+ }
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java
index 02301ca..8dcf92f 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,156 +26,158 @@
package javax.sound.midi;
/**
- * A <code>ShortMessage</code> contains a MIDI message that has at most
- * two data bytes following its status byte. The types of MIDI message
- * that satisfy this criterion are channel voice, channel mode, system common,
- * and system real-time--in other words, everything except system exclusive
- * and meta-events. The <code>ShortMessage</code> class provides methods
- * for getting and setting the contents of the MIDI message.
+ * A {@code ShortMessage} contains a MIDI message that has at most two data
+ * bytes following its status byte. The types of MIDI message that satisfy this
+ * criterion are channel voice, channel mode, system common, and system
+ * real-time--in other words, everything except system exclusive and
+ * meta-events. The {@code ShortMessage} class provides methods for getting and
+ * setting the contents of the MIDI message.
* <p>
- * A number of <code>ShortMessage</code> methods have integer parameters by which
- * you specify a MIDI status or data byte. If you know the numeric value, you
- * can express it directly. For system common and system real-time messages,
- * you can often use the corresponding fields of <code>ShortMessage</code>, such as
- * {@link #SYSTEM_RESET SYSTEM_RESET}. For channel messages,
- * the upper four bits of the status byte are specified by a command value and
- * the lower four bits are specified by a MIDI channel number. To
- * convert incoming MIDI data bytes that are in the form of Java's signed bytes,
- * you can use the <A HREF="MidiMessage.html#integersVsBytes">conversion code</A>
- * given in the <code>{@link MidiMessage}</code> class description.
- *
- * @see SysexMessage
- * @see MetaMessage
+ * A number of {@code ShortMessage} methods have integer parameters by which you
+ * specify a MIDI status or data byte. If you know the numeric value, you can
+ * express it directly. For system common and system real-time messages, you can
+ * often use the corresponding fields of {@code ShortMessage}, such as
+ * {@link #SYSTEM_RESET SYSTEM_RESET}. For channel messages, the upper four bits
+ * of the status byte are specified by a command value and the lower four bits
+ * are specified by a MIDI channel number. To convert incoming MIDI data bytes
+ * that are in the form of Java's signed bytes, you can use the
+ * <a href="MidiMessage.html#integersVsBytes">conversion code</a> given in the
+ * {@link MidiMessage} class description.
*
* @author David Rivas
* @author Kara Kytle
* @author Florian Bomers
+ * @see SysexMessage
+ * @see MetaMessage
*/
-
public class ShortMessage extends MidiMessage {
-
// Status byte defines
-
// System common messages
/**
* Status byte for MIDI Time Code Quarter Frame message (0xF1, or 241).
+ *
* @see MidiMessage#getStatus
*/
public static final int MIDI_TIME_CODE = 0xF1; // 241
/**
* Status byte for Song Position Pointer message (0xF2, or 242).
+ *
* @see MidiMessage#getStatus
*/
public static final int SONG_POSITION_POINTER = 0xF2; // 242
/**
* Status byte for MIDI Song Select message (0xF3, or 243).
+ *
* @see MidiMessage#getStatus
*/
public static final int SONG_SELECT = 0xF3; // 243
/**
* Status byte for Tune Request message (0xF6, or 246).
+ *
* @see MidiMessage#getStatus
*/
public static final int TUNE_REQUEST = 0xF6; // 246
/**
* Status byte for End of System Exclusive message (0xF7, or 247).
+ *
* @see MidiMessage#getStatus
*/
public static final int END_OF_EXCLUSIVE = 0xF7; // 247
-
// System real-time messages
/**
* Status byte for Timing Clock message (0xF8, or 248).
+ *
* @see MidiMessage#getStatus
*/
public static final int TIMING_CLOCK = 0xF8; // 248
/**
* Status byte for Start message (0xFA, or 250).
+ *
* @see MidiMessage#getStatus
*/
public static final int START = 0xFA; // 250
/**
* Status byte for Continue message (0xFB, or 251).
+ *
* @see MidiMessage#getStatus
*/
public static final int CONTINUE = 0xFB; // 251
/**
* Status byte for Stop message (0xFC, or 252).
+ *
* @see MidiMessage#getStatus
*/
public static final int STOP = 0xFC; //252
/**
* Status byte for Active Sensing message (0xFE, or 254).
+ *
* @see MidiMessage#getStatus
*/
public static final int ACTIVE_SENSING = 0xFE; // 254
/**
* Status byte for System Reset message (0xFF, or 255).
+ *
* @see MidiMessage#getStatus
*/
public static final int SYSTEM_RESET = 0xFF; // 255
-
// Channel voice message upper nibble defines
/**
- * Command value for Note Off message (0x80, or 128)
+ * Command value for Note Off message (0x80, or 128).
*/
public static final int NOTE_OFF = 0x80; // 128
/**
- * Command value for Note On message (0x90, or 144)
+ * Command value for Note On message (0x90, or 144).
*/
public static final int NOTE_ON = 0x90; // 144
/**
- * Command value for Polyphonic Key Pressure (Aftertouch) message (0xA0, or 160)
+ * Command value for Polyphonic Key Pressure (Aftertouch) message (0xA0, or
+ * 160).
*/
public static final int POLY_PRESSURE = 0xA0; // 160
/**
- * Command value for Control Change message (0xB0, or 176)
+ * Command value for Control Change message (0xB0, or 176).
*/
public static final int CONTROL_CHANGE = 0xB0; // 176
/**
- * Command value for Program Change message (0xC0, or 192)
+ * Command value for Program Change message (0xC0, or 192).
*/
public static final int PROGRAM_CHANGE = 0xC0; // 192
/**
- * Command value for Channel Pressure (Aftertouch) message (0xD0, or 208)
+ * Command value for Channel Pressure (Aftertouch) message (0xD0, or 208).
*/
public static final int CHANNEL_PRESSURE = 0xD0; // 208
/**
- * Command value for Pitch Bend message (0xE0, or 224)
+ * Command value for Pitch Bend message (0xE0, or 224).
*/
public static final int PITCH_BEND = 0xE0; // 224
-
- // Instance variables
-
/**
- * Constructs a new <code>ShortMessage</code>. The
- * contents of the new message are guaranteed to specify
- * a valid MIDI message. Subsequently, you may set the
- * contents of the message using one of the <code>setMessage</code>
- * methods.
+ * Constructs a new {@code ShortMessage}. The contents of the new message
+ * are guaranteed to specify a valid MIDI message. Subsequently, you may set
+ * the contents of the message using one of the {@code setMessage} methods.
+ *
* @see #setMessage
*/
public ShortMessage() {
@@ -188,14 +190,13 @@
}
/**
- * Constructs a new {@code ShortMessage} which represents a MIDI
- * message that takes no data bytes.
- * The contents of the message can be changed by using one of
- * the {@code setMessage} methods.
+ * Constructs a new {@code ShortMessage} which represents a MIDI message
+ * that takes no data bytes. The contents of the message can be changed by
+ * using one of the {@code setMessage} methods.
*
- * @param status the MIDI status byte
- * @throws InvalidMidiDataException if {@code status} does not specify
- * a valid MIDI status byte for a message that requires no data bytes
+ * @param status the MIDI status byte
+ * @throws InvalidMidiDataException if {@code status} does not specify a
+ * valid MIDI status byte for a message that requires no data bytes
* @see #setMessage(int)
* @see #setMessage(int, int, int)
* @see #setMessage(int, int, int, int)
@@ -210,16 +211,15 @@
/**
* Constructs a new {@code ShortMessage} which represents a MIDI message
* that takes up to two data bytes. If the message only takes one data byte,
- * the second data byte is ignored. If the message does not take
- * any data bytes, both data bytes are ignored.
- * The contents of the message can be changed by using one of
- * the {@code setMessage} methods.
+ * the second data byte is ignored. If the message does not take any data
+ * bytes, both data bytes are ignored. The contents of the message can be
+ * changed by using one of the {@code setMessage} methods.
*
- * @param status the MIDI status byte
- * @param data1 the first data byte
- * @param data2 the second data byte
+ * @param status the MIDI status byte
+ * @param data1 the first data byte
+ * @param data2 the second data byte
* @throws InvalidMidiDataException if the status byte or all data bytes
- * belonging to the message do not specify a valid MIDI message
+ * belonging to the message do not specify a valid MIDI message
* @see #setMessage(int)
* @see #setMessage(int, int, int)
* @see #setMessage(int, int, int, int)
@@ -235,20 +235,19 @@
}
/**
- * Constructs a new {@code ShortMessage} which represents a channel
- * MIDI message that takes up to two data bytes. If the message only takes
- * one data byte, the second data byte is ignored. If the message does not
- * take any data bytes, both data bytes are ignored.
- * The contents of the message can be changed by using one of
- * the {@code setMessage} methods.
+ * Constructs a new {@code ShortMessage} which represents a channel MIDI
+ * message that takes up to two data bytes. If the message only takes one
+ * data byte, the second data byte is ignored. If the message does not take
+ * any data bytes, both data bytes are ignored. The contents of the message
+ * can be changed by using one of the {@code setMessage} methods.
*
- * @param command the MIDI command represented by this message
- * @param channel the channel associated with the message
- * @param data1 the first data byte
- * @param data2 the second data byte
- * @throws InvalidMidiDataException if the command value, channel value
- * or all data bytes belonging to the message do not specify
- * a valid MIDI message
+ * @param command the MIDI command represented by this message
+ * @param channel the channel associated with the message
+ * @param data1 the first data byte
+ * @param data2 the second data byte
+ * @throws InvalidMidiDataException if the command value, channel value or
+ * all data bytes belonging to the message do not specify a valid
+ * MIDI message
* @see #setMessage(int)
* @see #setMessage(int, int, int)
* @see #setMessage(int, int, int, int)
@@ -264,12 +263,11 @@
setMessage(command, channel, data1, data2);
}
-
/**
- * Constructs a new <code>ShortMessage</code>.
- * @param data an array of bytes containing the complete message.
- * The message data may be changed using the <code>setMessage</code>
- * method.
+ * Constructs a new {@code ShortMessage}.
+ *
+ * @param data an array of bytes containing the complete message. The
+ * message data may be changed using the {@code setMessage} method.
* @see #setMessage
*/
// $$fb this should throw an Exception in case of an illegal message!
@@ -279,12 +277,12 @@
super(data);
}
-
/**
* Sets the parameters for a MIDI message that takes no data bytes.
- * @param status the MIDI status byte
- * @throws InvalidMidiDataException if <code>status</code> does not
- * specify a valid MIDI status byte for a message that requires no data bytes.
+ *
+ * @param status the MIDI status byte
+ * @throws InvalidMidiDataException if {@code status} does not specify a
+ * valid MIDI status byte for a message that requires no data bytes
* @see #setMessage(int, int, int)
* @see #setMessage(int, int, int, int)
*/
@@ -297,19 +295,17 @@
setMessage(status, 0, 0);
}
-
/**
- * Sets the parameters for a MIDI message that takes one or two data
- * bytes. If the message takes only one data byte, the second data
- * byte is ignored; if the message does not take any data bytes, both
- * data bytes are ignored.
+ * Sets the parameters for a MIDI message that takes one or two data bytes.
+ * If the message takes only one data byte, the second data byte is ignored;
+ * if the message does not take any data bytes, both data bytes are ignored.
*
- * @param status the MIDI status byte
- * @param data1 the first data byte
- * @param data2 the second data byte
- * @throws InvalidMidiDataException if the
- * the status byte, or all data bytes belonging to the message, do
- * not specify a valid MIDI message.
+ * @param status the MIDI status byte
+ * @param data1 the first data byte
+ * @param data2 the second data byte
+ * @throws InvalidMidiDataException if the the status byte, or all data
+ * bytes belonging to the message, do not specify a valid MIDI
+ * message
* @see #setMessage(int, int, int, int)
* @see #setMessage(int)
*/
@@ -345,22 +341,18 @@
}
}
-
/**
- * Sets the short message parameters for a channel message
- * which takes up to two data bytes. If the message only
- * takes one data byte, the second data byte is ignored; if
- * the message does not take any data bytes, both data bytes
- * are ignored.
+ * Sets the short message parameters for a channel message which takes up to
+ * two data bytes. If the message only takes one data byte, the second data
+ * byte is ignored; if the message does not take any data bytes, both data
+ * bytes are ignored.
*
- * @param command the MIDI command represented by this message
- * @param channel the channel associated with the message
- * @param data1 the first data byte
- * @param data2 the second data byte
- * @throws InvalidMidiDataException if the
- * status byte or all data bytes belonging to the message, do
- * not specify a valid MIDI message
- *
+ * @param command the MIDI command represented by this message
+ * @param channel the channel associated with the message
+ * @param data1 the first data byte
+ * @param data2 the second data byte
+ * @throws InvalidMidiDataException if the status byte or all data bytes
+ * belonging to the message, do not specify a valid MIDI message
* @see #setMessage(int, int, int)
* @see #setMessage(int)
* @see #getCommand
@@ -379,12 +371,12 @@
setMessage((command & 0xF0) | (channel & 0x0F), data1, data2);
}
-
/**
- * Obtains the MIDI channel associated with this event. This method
- * assumes that the event is a MIDI channel message; if not, the return
- * value will not be meaningful.
- * @return MIDI channel associated with the message.
+ * Obtains the MIDI channel associated with this event. This method assumes
+ * that the event is a MIDI channel message; if not, the return value will
+ * not be meaningful.
+ *
+ * @return MIDI channel associated with the message
* @see #setMessage(int, int, int, int)
*/
public int getChannel() {
@@ -392,11 +384,11 @@
return (getStatus() & 0x0F);
}
-
/**
- * Obtains the MIDI command associated with this event. This method
- * assumes that the event is a MIDI channel message; if not, the return
- * value will not be meaningful.
+ * Obtains the MIDI command associated with this event. This method assumes
+ * that the event is a MIDI channel message; if not, the return value will
+ * not be meaningful.
+ *
* @return the MIDI command associated with this event
* @see #setMessage(int, int, int, int)
*/
@@ -405,10 +397,10 @@
return (getStatus() & 0xF0);
}
-
/**
* Obtains the first data byte in the message.
- * @return the value of the <code>data1</code> field
+ *
+ * @return the value of the {@code data1} field
* @see #setMessage(int, int, int)
*/
public int getData1() {
@@ -418,10 +410,10 @@
return 0;
}
-
/**
* Obtains the second data byte in the message.
- * @return the value of the <code>data2</code> field
+ *
+ * @return the value of the {@code data2} field
* @see #setMessage(int, int, int)
*/
public int getData2() {
@@ -431,11 +423,11 @@
return 0;
}
-
/**
- * Creates a new object of the same class and with the same contents
- * as this object.
- * @return a clone of this instance.
+ * Creates a new object of the same class and with the same contents as this
+ * object.
+ *
+ * @return a clone of this instance
*/
public Object clone() {
byte[] newData = new byte[length];
@@ -445,15 +437,15 @@
return msg;
}
-
/**
- * Retrieves the number of data bytes associated with a particular
- * status byte value.
- * @param status status byte value, which must represent a short MIDI message
+ * Retrieves the number of data bytes associated with a particular status
+ * byte value.
+ *
+ * @param status status byte value, which must represent a short MIDI
+ * message
* @return data length in bytes (0, 1, or 2)
- * @throws InvalidMidiDataException if the
- * <code>status</code> argument does not represent the status byte for any
- * short message
+ * @throws InvalidMidiDataException if the {@code status} argument does not
+ * represent the status byte for any short message
*/
protected final int getDataLength(int status) throws InvalidMidiDataException {
// system common and system real-time messages
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java
index 7aba057..727365e 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Soundbank.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,109 +25,101 @@
package javax.sound.midi;
-import java.net.URL;
-
-
/**
- * A <code>Soundbank</code> contains a set of <code>Instruments</code>
- * that can be loaded into a <code>Synthesizer</code>.
- * Note that a Java Sound <code>Soundbank</code> is different from a MIDI bank.
- * MIDI permits up to 16383 banks, each containing up to 128 instruments
- * (also sometimes called programs, patches, or timbres).
- * However, a <code>Soundbank</code> can contain 16383 times 128 instruments,
- * because the instruments within a <code>Soundbank</code> are indexed by both
- * a MIDI program number and a MIDI bank number (via a <code>Patch</code>
- * object). Thus, a <code>Soundbank</code> can be thought of as a collection
- * of MIDI banks.
+ * A {@code Soundbank} contains a set of {@code Instruments} that can be loaded
+ * into a {@code Synthesizer}. Note that a Java Sound {@code Soundbank} is
+ * different from a MIDI bank. MIDI permits up to 16383 banks, each containing
+ * up to 128 instruments (also sometimes called programs, patches, or timbres).
+ * However, a {@code Soundbank} can contain 16383 times 128 instruments, because
+ * the instruments within a {@code Soundbank} are indexed by both a MIDI program
+ * number and a MIDI bank number (via a {@code Patch} object). Thus, a
+ * {@code Soundbank} can be thought of as a collection of MIDI banks.
* <p>
- * <code>Soundbank</code> includes methods that return <code>String</code>
- * objects containing the sound bank's name, manufacturer, version number, and
- * description. The precise content and format of these strings is left
- * to the implementor.
+ * {@code Soundbank} includes methods that return {@code String} objects
+ * containing the sound bank's name, manufacturer, version number, and
+ * description. The precise content and format of these strings is left to the
+ * implementor.
* <p>
- * Different synthesizers use a variety of synthesis techniques. A common
- * one is wavetable synthesis, in which a segment of recorded sound is
- * played back, often with looping and pitch change. The Downloadable Sound
- * (DLS) format uses segments of recorded sound, as does the Headspace Engine.
- * <code>Soundbanks</code> and <code>Instruments</code> that are based on
- * wavetable synthesis (or other uses of stored sound recordings) should
- * typically implement the <code>getResources()</code>
- * method to provide access to these recorded segments. This is optional,
- * however; the method can return an zero-length array if the synthesis technique
- * doesn't use sampled sound (FM synthesis and physical modeling are examples
- * of such techniques), or if it does but the implementor chooses not to make the
- * samples accessible.
+ * Different synthesizers use a variety of synthesis techniques. A common one is
+ * wavetable synthesis, in which a segment of recorded sound is played back,
+ * often with looping and pitch change. The Downloadable Sound (DLS) format uses
+ * segments of recorded sound, as does the Headspace Engine. {@code Soundbanks}
+ * and {@code Instruments} that are based on wavetable synthesis (or other uses
+ * of stored sound recordings) should typically implement the
+ * {@code getResources()} method to provide access to these recorded segments.
+ * This is optional, however; the method can return an zero-length array if the
+ * synthesis technique doesn't use sampled sound (FM synthesis and physical
+ * modeling are examples of such techniques), or if it does but the implementor
+ * chooses not to make the samples accessible.
*
+ * @author David Rivas
+ * @author Kara Kytle
* @see Synthesizer#getDefaultSoundbank
* @see Synthesizer#isSoundbankSupported
* @see Synthesizer#loadInstruments(Soundbank, Patch[])
* @see Patch
* @see Instrument
* @see SoundbankResource
- *
- * @author David Rivas
- * @author Kara Kytle
*/
-
public interface Soundbank {
-
/**
* Obtains the name of the sound bank.
- * @return a <code>String</code> naming the sound bank
+ *
+ * @return a {@code String} naming the sound bank
*/
- public String getName();
+ String getName();
/**
* Obtains the version string for the sound bank.
- * @return a <code>String</code> that indicates the sound bank's version
+ *
+ * @return a {@code String} that indicates the sound bank's version
*/
- public String getVersion();
+ String getVersion();
/**
- * Obtains a <code>string</code> naming the company that provides the
- * sound bank
+ * Obtains a {@code string} naming the company that provides the sound bank.
+ *
* @return the vendor string
*/
- public String getVendor();
+ String getVendor();
/**
* Obtains a textual description of the sound bank, suitable for display.
- * @return a <code>String</code> that describes the sound bank
+ *
+ * @return a {@code String} that describes the sound bank
*/
- public String getDescription();
-
+ String getDescription();
/**
* Extracts a list of non-Instrument resources contained in the sound bank.
- * @return an array of resources, excluding instruments. If the sound bank contains
- * no resources (other than instruments), returns an array of length 0.
+ *
+ * @return an array of resources, excluding instruments. If the sound bank
+ * contains no resources (other than instruments), returns an array
+ * of length 0.
*/
- public SoundbankResource[] getResources();
-
+ SoundbankResource[] getResources();
/**
* Obtains a list of instruments contained in this sound bank.
- * @return an array of the <code>Instruments</code> in this
- * <code>SoundBank</code>
- * If the sound bank contains no instruments, returns an array of length 0.
*
+ * @return an array of the {@code Instruments} in this {@code SoundBank}. If
+ * the sound bank contains no instruments, returns an array of
+ * length 0.
* @see Synthesizer#getLoadedInstruments
* @see #getInstrument(Patch)
*/
- public Instrument[] getInstruments();
+ Instrument[] getInstruments();
/**
- * Obtains an <code>Instrument</code> from the given <code>Patch</code>.
- * @param patch a <code>Patch</code> object specifying the bank index
- * and program change number
- * @return the requested instrument, or <code>null</code> if the
- * sound bank doesn't contain that instrument
+ * Obtains an {@code Instrument} from the given {@code Patch}.
*
+ * @param patch a {@code Patch} object specifying the bank index and
+ * program change number
+ * @return the requested instrument, or {@code null} if the sound bank
+ * doesn't contain that instrument
* @see #getInstruments
* @see Synthesizer#loadInstruments(Soundbank, Patch[])
*/
- public Instrument getInstrument(Patch patch);
-
-
+ Instrument getInstrument(Patch patch);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java
index 52ba8f7..8ac5301 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/SoundbankResource.java
@@ -25,81 +25,72 @@
package javax.sound.midi;
+import javax.sound.sampled.AudioInputStream;
+
/**
- * A <code>SoundbankResource</code> represents any audio resource stored
- * in a <code>{@link Soundbank}</code>. Common soundbank resources include:
+ * A {@code SoundbankResource} represents any audio resource stored in a
+ * {@link Soundbank}. Common soundbank resources include:
* <ul>
- * <li>Instruments. An instrument may be specified in a variety of
- * ways. However, all soundbanks have some mechanism for defining
- * instruments. In doing so, they may reference other resources
- * stored in the soundbank. Each instrument has a <code>Patch</code>
- * which specifies the MIDI program and bank by which it may be
- * referenced in MIDI messages. Instrument information may be
- * stored in <code>{@link Instrument}</code> objects.
- * <li>Audio samples. A sample typically is a sampled audio waveform
- * which contains a short sound recording whose duration is a fraction of
- * a second, or at most a few seconds. These audio samples may be
- * used by a <code>{@link Synthesizer}</code> to synthesize sound in response to MIDI
- * commands, or extracted for use by an application.
- * (The terminology reflects musicians' use of the word "sample" to refer
- * collectively to a series of contiguous audio samples or frames, rather than
- * to a single, instantaneous sample.)
- * The data class for an audio sample will be an object
- * that encapsulates the audio sample data itself and information
- * about how to interpret it (the format of the audio data), such
- * as an <code>{@link javax.sound.sampled.AudioInputStream}</code>. </li>
- * <li>Embedded sequences. A sound bank may contain built-in
- * song data stored in a data object such as a <code>{@link Sequence}</code>.
+ * <li>Instruments. An instrument may be specified in a variety of ways.
+ * However, all soundbanks have some mechanism for defining instruments. In
+ * doing so, they may reference other resources stored in the soundbank. Each
+ * instrument has a {@code Patch} which specifies the MIDI program and bank by
+ * which it may be referenced in MIDI messages. Instrument information may be
+ * stored in {@link Instrument} objects.</li>
+ * <li>Audio samples. A sample typically is a sampled audio waveform which
+ * contains a short sound recording whose duration is a fraction of a second, or
+ * at most a few seconds. These audio samples may be used by a
+ * {@link Synthesizer} to synthesize sound in response to MIDI commands, or
+ * extracted for use by an application. (The terminology reflects musicians' use
+ * of the word "sample" to refer collectively to a series of contiguous audio
+ * samples or frames, rather than to a single, instantaneous sample.) The data
+ * class for an audio sample will be an object that encapsulates the audio
+ * sample data itself and information about how to interpret it (the format of
+ * the audio data), such as an {@link AudioInputStream}.</li>
+ * <li>Embedded sequences. A sound bank may contain built-in song data stored in
+ * a data object such as a {@link Sequence}.</li>
* </ul>
- * <p>
- * Synthesizers that use wavetable synthesis or related
- * techniques play back the audio in a sample when
- * synthesizing notes, often when emulating the real-world instrument that
- * was originally recorded. However, there is not necessarily a one-to-one
- * correspondence between the <code>Instruments</code> and samples
- * in a <code>Soundbank</code>. A single <code>Instrument</code> can use
- * multiple SoundbankResources (typically for notes of dissimilar pitch or
- * brightness). Also, more than one <code>Instrument</code> can use the same
- * sample.
+ * Synthesizers that use wavetable synthesis or related techniques play back the
+ * audio in a sample when synthesizing notes, often when emulating the
+ * real-world instrument that was originally recorded. However, there is not
+ * necessarily a one-to-one correspondence between the {@code Instruments} and
+ * samples in a {@code Soundbank}. A single {@code Instrument} can use multiple
+ * SoundbankResources (typically for notes of dissimilar pitch or brightness).
+ * Also, more than one {@code Instrument} can use the same sample.
*
* @author Kara Kytle
*/
-
public abstract class SoundbankResource {
-
/**
- * The sound bank that contains the <code>SoundbankResources</code>
+ * The sound bank that contains the {@code SoundbankResources}.
*/
private final Soundbank soundBank;
-
/**
- * The name of the <code>SoundbankResource</code>
+ * The name of the {@code SoundbankResource}.
*/
private final String name;
-
/**
* The class used to represent the sample's data.
*/
private final Class<?> dataClass;
-
/**
* The wavetable index.
*/
//private final int index;
-
/**
- * Constructs a new <code>SoundbankResource</code> from the given sound bank
- * and wavetable index. (Setting the <code>SoundbankResource's</code> name,
- * sampled audio data, and instruments is a subclass responsibility.)
- * @param soundBank the sound bank containing this <code>SoundbankResource</code>
- * @param name the name of the sample
- * @param dataClass the class used to represent the sample's data
+ * Constructs a new {@code SoundbankResource} from the given sound bank and
+ * wavetable index. (Setting the {@code SoundbankResource's} name, sampled
+ * audio data, and instruments is a subclass responsibility.)
*
+ * @param soundBank the sound bank containing this
+ * {@code SoundbankResource}
+ * @param name the name of the sample
+ * @param dataClass the class used to represent the sample's data
* @see #getSoundbank
* @see #getName
* @see #getDataClass
@@ -112,65 +103,65 @@
this.dataClass = dataClass;
}
-
/**
- * Obtains the sound bank that contains this <code>SoundbankResource</code>.
- * @return the sound bank in which this <code>SoundbankResource</code> is stored
+ * Obtains the sound bank that contains this {@code SoundbankResource}.
+ *
+ * @return the sound bank in which this {@code SoundbankResource} is stored
*/
public Soundbank getSoundbank() {
return soundBank;
}
-
/**
- * Obtains the name of the resource. This should generally be a string
+ * Obtains the name of the resource. This should generally be a string
* descriptive of the resource.
+ *
* @return the instrument's name
*/
public String getName() {
return name;
}
-
/**
- * Obtains the class used by this sample to represent its data.
- * The object returned by <code>getData</code> will be of this
- * class. If this <code>SoundbankResource</code> object does not support
- * direct access to its data, returns <code>null</code>.
- * @return the class used to represent the sample's data, or
- * null if the data is not accessible
+ * Obtains the class used by this sample to represent its data. The object
+ * returned by {@code getData} will be of this class. If this
+ * {@code SoundbankResource} object does not support direct access to its
+ * data, returns {@code null}.
+ *
+ * @return the class used to represent the sample's data, or null if the
+ * data is not accessible
*/
public Class<?> getDataClass() {
return dataClass;
}
-
/**
- * Obtains the sampled audio that is stored in this <code>SoundbankResource</code>.
- * The type of object returned depends on the implementation of the
- * concrete class, and may be queried using <code>getDataClass</code>.
+ * Obtains the sampled audio that is stored in this
+ * {@code SoundbankResource}. The type of object returned depends on the
+ * implementation of the concrete class, and may be queried using
+ * {@code getDataClass}.
+ *
* @return an object containing the sampled audio data
* @see #getDataClass
*/
public abstract Object getData();
-
/**
- * Obtains the index of this <code>SoundbankResource</code> into the
- * <code>Soundbank's</code> set of <code>SoundbankResources</code>.
+ * Obtains the index of this {@code SoundbankResource} into the
+ * {@code Soundbank's} set of {@code SoundbankResources}.
+ *
* @return the wavetable index
*/
//public int getIndex() {
// return index;
//}
-
/**
* Obtains a list of the instruments in the sound bank that use the
- * <code>SoundbankResource</code> for sound synthesis.
- * @return an array of <code>Instruments</code> that reference this
- * <code>SoundbankResource</code>
+ * {@code SoundbankResource} for sound synthesis.
*
+ * @return an array of {@code Instruments} that reference this
+ * {@code SoundbankResource}
* @see Instrument#getSamples
*/
//public abstract Instrument[] getInstruments();
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
index 6763a96..3d8c7a6 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Synthesizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,46 +25,43 @@
package javax.sound.midi;
-import javax.sound.sampled.Control;
-
-
/**
- * A <code>Synthesizer</code> generates sound. This usually happens when one of
- * the <code>Synthesizer</code>'s {@link MidiChannel} objects receives a
- * {@link MidiChannel#noteOn(int, int) noteOn} message, either
- * directly or via the <code>Synthesizer</code> object.
- * Many <code>Synthesizer</code>s support <code>Receivers</code>, through which
- * MIDI events can be delivered to the <code>Synthesizer</code>.
- * In such cases, the <code>Synthesizer</code> typically responds by sending
- * a corresponding message to the appropriate <code>MidiChannel</code>, or by
- * processing the event itself if the event isn't one of the MIDI channel
- * messages.
+ * A {@code Synthesizer} generates sound. This usually happens when one of the
+ * {@code Synthesizer}'s {@link MidiChannel} objects receives a
+ * {@link MidiChannel#noteOn(int, int) noteOn} message, either directly or via
+ * the {@code Synthesizer} object. Many {@code Synthesizer}s support
+ * {@code Receivers}, through which MIDI events can be delivered to the
+ * {@code Synthesizer}. In such cases, the {@code Synthesizer} typically
+ * responds by sending a corresponding message to the appropriate
+ * {@code MidiChannel}, or by processing the event itself if the event isn't one
+ * of the MIDI channel messages.
* <p>
- * The <code>Synthesizer</code> interface includes methods for loading and
- * unloading instruments from soundbanks. An instrument is a specification for synthesizing a
- * certain type of sound, whether that sound emulates a traditional instrument or is
- * some kind of sound effect or other imaginary sound. A soundbank is a collection of instruments, organized
- * by bank and program number (via the instrument's <code>Patch</code> object).
- * Different <code>Synthesizer</code> classes might implement different sound-synthesis
- * techniques, meaning that some instruments and not others might be compatible with a
- * given synthesizer.
- * Also, synthesizers may have a limited amount of memory for instruments, meaning
- * that not every soundbank and instrument can be used by every synthesizer, even if
- * the synthesis technique is compatible.
- * To see whether the instruments from
- * a certain soundbank can be played by a given synthesizer, invoke the
- * {@link #isSoundbankSupported(Soundbank) isSoundbankSupported} method of
- * <code>Synthesizer</code>.
+ * The {@code Synthesizer} interface includes methods for loading and unloading
+ * instruments from soundbanks. An instrument is a specification for
+ * synthesizing a certain type of sound, whether that sound emulates a
+ * traditional instrument or is some kind of sound effect or other imaginary
+ * sound. A soundbank is a collection of instruments, organized by bank and
+ * program number (via the instrument's {@code Patch} object). Different
+ * {@code Synthesizer} classes might implement different sound-synthesis
+ * techniques, meaning that some instruments and not others might be compatible
+ * with a given synthesizer. Also, synthesizers may have a limited amount of
+ * memory for instruments, meaning that not every soundbank and instrument can
+ * be used by every synthesizer, even if the synthesis technique is compatible.
+ * To see whether the instruments from a certain soundbank can be played by a
+ * given synthesizer, invoke the
+ * {@link #isSoundbankSupported(Soundbank) isSoundbankSupported}
+ * method of {@code Synthesizer}.
* <p>
* "Loading" an instrument means that that instrument becomes available for
- * synthesizing notes. The instrument is loaded into the bank and
- * program location specified by its <code>Patch</code> object. Loading does
- * not necessarily mean that subsequently played notes will immediately have
- * the sound of this newly loaded instrument. For the instrument to play notes,
- * one of the synthesizer's <code>MidiChannel</code> objects must receive (or have received)
- * a program-change message that causes that particular instrument's
- * bank and program number to be selected.
+ * synthesizing notes. The instrument is loaded into the bank and program
+ * location specified by its {@code Patch} object. Loading does not necessarily
+ * mean that subsequently played notes will immediately have the sound of this
+ * newly loaded instrument. For the instrument to play notes, one of the
+ * synthesizer's {@code MidiChannel} objects must receive (or have received) a
+ * program-change message that causes that particular instrument's bank and
+ * program number to be selected.
*
+ * @author Kara Kytle
* @see MidiSystem#getSynthesizer
* @see Soundbank
* @see Instrument
@@ -72,107 +69,103 @@
* @see Receiver
* @see Transmitter
* @see MidiDevice
- *
- * @author Kara Kytle
*/
public interface Synthesizer extends MidiDevice {
-
// SYNTHESIZER METHODS
-
/**
- * Obtains the maximum number of notes that this synthesizer can sound simultaneously.
+ * Obtains the maximum number of notes that this synthesizer can sound
+ * simultaneously.
+ *
* @return the maximum number of simultaneous notes
* @see #getVoiceStatus
*/
- public int getMaxPolyphony();
-
+ int getMaxPolyphony();
/**
* Obtains the processing latency incurred by this synthesizer, expressed in
- * microseconds. This latency measures the worst-case delay between the
- * time a MIDI message is delivered to the synthesizer and the time that the
+ * microseconds. This latency measures the worst-case delay between the time
+ * a MIDI message is delivered to the synthesizer and the time that the
* synthesizer actually produces the corresponding result.
* <p>
- * Although the latency is expressed in microseconds, a synthesizer's actual measured
- * delay may vary over a wider range than this resolution suggests. For example,
- * a synthesizer might have a worst-case delay of a few milliseconds or more.
+ * Although the latency is expressed in microseconds, a synthesizer's actual
+ * measured delay may vary over a wider range than this resolution suggests.
+ * For example, a synthesizer might have a worst-case delay of a few
+ * milliseconds or more.
*
* @return the worst-case delay, in microseconds
*/
- public long getLatency();
-
+ long getLatency();
/**
- * Obtains the set of MIDI channels controlled by this synthesizer. Each
- * non-null element in the returned array is a <code>MidiChannel</code> that
+ * Obtains the set of MIDI channels controlled by this synthesizer. Each
+ * non-null element in the returned array is a {@code MidiChannel} that
* receives the MIDI messages sent on that channel number.
* <p>
- * The MIDI 1.0 specification provides for 16 channels, so this
- * method returns an array of at least 16 elements. However, if this synthesizer
+ * The MIDI 1.0 specification provides for 16 channels, so this method
+ * returns an array of at least 16 elements. However, if this synthesizer
* doesn't make use of all 16 channels, some of the elements of the array
- * might be <code>null</code>, so you should check each element
- * before using it.
- * @return an array of the <code>MidiChannel</code> objects managed by this
- * <code>Synthesizer</code>. Some of the array elements may be <code>null</code>.
+ * might be {@code null}, so you should check each element before using it.
+ *
+ * @return an array of the {@code MidiChannel} objects managed by this
+ * {@code Synthesizer}. Some of the array elements may be
+ * {@code null}.
*/
- public MidiChannel[] getChannels();
-
+ MidiChannel[] getChannels();
/**
- * Obtains the current status of the voices produced by this synthesizer.
- * If this class of <code>Synthesizer</code> does not provide voice
- * information, the returned array will always be of length 0. Otherwise,
- * its length is always equal to the total number of voices, as returned by
- * <code>getMaxPolyphony()</code>. (See the <code>VoiceStatus</code> class
- * description for an explanation of synthesizer voices.)
+ * Obtains the current status of the voices produced by this synthesizer. If
+ * this class of {@code Synthesizer} does not provide voice information, the
+ * returned array will always be of length 0. Otherwise, its length is
+ * always equal to the total number of voices, as returned by
+ * {@code getMaxPolyphony()}. (See the {@code VoiceStatus} class description
+ * for an explanation of synthesizer voices.)
*
- * @return an array of <code>VoiceStatus</code> objects that supply
- * information about the corresponding synthesizer voices
+ * @return an array of {@code VoiceStatus} objects that supply information
+ * about the corresponding synthesizer voices
* @see #getMaxPolyphony
* @see VoiceStatus
*/
- public VoiceStatus[] getVoiceStatus();
-
+ VoiceStatus[] getVoiceStatus();
/**
* Informs the caller whether this synthesizer is capable of loading
- * instruments from the specified soundbank.
- * If the soundbank is unsupported, any attempts to load instruments from
- * it will result in an <code>IllegalArgumentException</code>.
- * @param soundbank soundbank for which support is queried
- * @return <code>true</code> if the soundbank is supported, otherwise <code>false</code>
+ * instruments from the specified soundbank. If the soundbank is
+ * unsupported, any attempts to load instruments from it will result in an
+ * {@code IllegalArgumentException}.
+ *
+ * @param soundbank soundbank for which support is queried
+ * @return {@code true} if the soundbank is supported, otherwise
+ * {@code false}
* @see #loadInstruments
* @see #loadAllInstruments
* @see #unloadInstruments
* @see #unloadAllInstruments
* @see #getDefaultSoundbank
*/
- public boolean isSoundbankSupported(Soundbank soundbank);
-
+ boolean isSoundbankSupported(Soundbank soundbank);
/**
- * Makes a particular instrument available for synthesis. This instrument
- * is loaded into the patch location specified by its <code>Patch</code>
- * object, so that if a program-change message is
- * received (or has been received) that causes that patch to be selected,
- * subsequent notes will be played using the sound of
- * <code>instrument</code>. If the specified instrument is already loaded,
- * this method does nothing and returns <code>true</code>.
+ * Makes a particular instrument available for synthesis. This instrument is
+ * loaded into the patch location specified by its {@code Patch} object, so
+ * that if a program-change message is received (or has been received) that
+ * causes that patch to be selected, subsequent notes will be played using
+ * the sound of {@code instrument}. If the specified instrument is already
+ * loaded, this method does nothing and returns {@code true}.
* <p>
- * The instrument must be part of a soundbank
- * that this <code>Synthesizer</code> supports. (To make sure, you can use
- * the <code>getSoundbank</code> method of <code>Instrument</code> and the
- * <code>isSoundbankSupported</code> method of <code>Synthesizer</code>.)
- * @param instrument instrument to load
- * @return <code>true</code> if the instrument is successfully loaded (or
- * already had been), <code>false</code> if the instrument could not be
- * loaded (for example, if the synthesizer has insufficient
- * memory to load it)
- * @throws IllegalArgumentException if this
- * <code>Synthesizer</code> doesn't support the specified instrument's
- * soundbank
+ * The instrument must be part of a soundbank that this {@code Synthesizer}
+ * supports. (To make sure, you can use the {@code getSoundbank} method of
+ * {@code Instrument} and the {@code isSoundbankSupported} method of
+ * {@code Synthesizer}.)
+ *
+ * @param instrument instrument to load
+ * @return {@code true} if the instrument is successfully loaded (or already
+ * had been), {@code false} if the instrument could not be loaded
+ * (for example, if the synthesizer has insufficient memory to load
+ * it)
+ * @throws IllegalArgumentException if this {@code Synthesizer} doesn't
+ * support the specified instrument's soundbank
* @see #unloadInstrument
* @see #loadInstruments
* @see #loadAllInstruments
@@ -180,138 +173,139 @@
* @see SoundbankResource#getSoundbank
* @see MidiChannel#programChange(int, int)
*/
- public boolean loadInstrument(Instrument instrument);
-
+ boolean loadInstrument(Instrument instrument);
/**
* Unloads a particular instrument.
- * @param instrument instrument to unload
- * @throws IllegalArgumentException if this
- * <code>Synthesizer</code> doesn't support the specified instrument's
- * soundbank
+ *
+ * @param instrument instrument to unload
+ * @throws IllegalArgumentException if this {@code Synthesizer} doesn't
+ * support the specified instrument's soundbank
* @see #loadInstrument
* @see #unloadInstruments
* @see #unloadAllInstruments
* @see #getLoadedInstruments
* @see #remapInstrument
*/
- public void unloadInstrument(Instrument instrument);
-
+ void unloadInstrument(Instrument instrument);
/**
- * Remaps an instrument. Instrument <code>to</code> takes the
- * place of instrument <code>from</code>.<br>
- * For example, if <code>from</code> was located at bank number 2,
- * program number 11, remapping causes that bank and program location
- * to be occupied instead by <code>to</code>.<br>
- * If the function succeeds, instrument <code>from</code> is unloaded.
- * <p>To cancel the remapping reload instrument <code>from</code> by
- * invoking one of {@link #loadInstrument}, {@link #loadInstruments}
- * or {@link #loadAllInstruments}.
+ * Remaps an instrument. Instrument {@code to} takes the place of instrument
+ * {@code from}.
+ * <br>
+ * For example, if {@code from} was located at bank number 2, program number
+ * 11, remapping causes that bank and program location to be occupied
+ * instead by {@code to}.
+ * <br>
+ * If the function succeeds, instrument {@code from} is unloaded.
+ * <p>
+ * To cancel the remapping reload instrument {@code from} by invoking one of
+ * {@link #loadInstrument}, {@link #loadInstruments} or
+ * {@link #loadAllInstruments}.
*
- * @param from the <code>Instrument</code> object to be replaced
- * @param to the <code>Instrument</code> object to be used in place
- * of the old instrument, it should be loaded into the synthesizer
- * @return <code>true</code> if the instrument successfully remapped,
- * <code>false</code> if feature is not implemented by synthesizer
- * @throws IllegalArgumentException if instrument
- * <code>from</code> or instrument <code>to</code> aren't supported by
- * synthesizer or if instrument <code>to</code> is not loaded
- * @throws NullPointerException if <code>from</code> or
- * <code>to</code> parameters have null value
+ * @param from the {@code Instrument} object to be replaced
+ * @param to the {@code Instrument} object to be used in place of the old
+ * instrument, it should be loaded into the synthesizer
+ * @return {@code true} if the instrument successfully remapped,
+ * {@code false} if feature is not implemented by synthesizer
+ * @throws IllegalArgumentException if instrument {@code from} or instrument
+ * {@code to} aren't supported by synthesizer or if instrument
+ * {@code to} is not loaded
+ * @throws NullPointerException if {@code from} or {@code to} parameters
+ * have null value
* @see #loadInstrument
* @see #loadInstruments
* @see #loadAllInstruments
*/
- public boolean remapInstrument(Instrument from, Instrument to);
-
+ boolean remapInstrument(Instrument from, Instrument to);
/**
- * Obtains the default soundbank for the synthesizer, if one exists.
- * (Some synthesizers provide a default or built-in soundbank.)
- * If a synthesizer doesn't have a default soundbank, instruments must
- * be loaded explicitly from an external soundbank.
- * @return default soundbank, or <code>null</code> if one does not exist.
+ * Obtains the default soundbank for the synthesizer, if one exists. (Some
+ * synthesizers provide a default or built-in soundbank.) If a synthesizer
+ * doesn't have a default soundbank, instruments must be loaded explicitly
+ * from an external soundbank.
+ *
+ * @return default soundbank, or {@code null} if one does not exist
* @see #isSoundbankSupported
*/
- public Soundbank getDefaultSoundbank();
-
+ Soundbank getDefaultSoundbank();
/**
- * Obtains a list of instruments that come with the synthesizer. These
- * instruments might be built into the synthesizer, or they might be
- * part of a default soundbank provided with the synthesizer, etc.
+ * Obtains a list of instruments that come with the synthesizer. These
+ * instruments might be built into the synthesizer, or they might be part of
+ * a default soundbank provided with the synthesizer, etc.
* <p>
- * Note that you don't use this method to find out which instruments are
+ * Note that you don't use this method to find out which instruments are
* currently loaded onto the synthesizer; for that purpose, you use
- * <code>getLoadedInstruments()</code>.
- * Nor does the method indicate all the instruments that can be loaded onto
- * the synthesizer; it only indicates the subset that come with the synthesizer.
- * To learn whether another instrument can be loaded, you can invoke
- * <code>isSoundbankSupported()</code>, and if the instrument's
- * <code>Soundbank</code> is supported, you can try loading the instrument.
+ * {@code getLoadedInstruments()}. Nor does the method indicate all the
+ * instruments that can be loaded onto the synthesizer; it only indicates
+ * the subset that come with the synthesizer. To learn whether another
+ * instrument can be loaded, you can invoke {@code isSoundbankSupported()},
+ * and if the instrument's {@code Soundbank} is supported, you can try
+ * loading the instrument.
*
- * @return list of available instruments. If the synthesizer
- * has no instruments coming with it, an array of length 0 is returned.
+ * @return list of available instruments. If the synthesizer has no
+ * instruments coming with it, an array of length 0 is returned.
* @see #getLoadedInstruments
* @see #isSoundbankSupported(Soundbank)
* @see #loadInstrument
*/
- public Instrument[] getAvailableInstruments();
-
+ Instrument[] getAvailableInstruments();
/**
* Obtains a list of the instruments that are currently loaded onto this
- * <code>Synthesizer</code>.
+ * {@code Synthesizer}.
+ *
* @return a list of currently loaded instruments
* @see #loadInstrument
* @see #getAvailableInstruments
* @see Soundbank#getInstruments
*/
- public Instrument[] getLoadedInstruments();
-
+ Instrument[] getLoadedInstruments();
/**
- * Loads onto the <code>Synthesizer</code> all instruments contained
- * in the specified <code>Soundbank</code>.
- * @param soundbank the <code>Soundbank</code> whose are instruments are
- * to be loaded
- * @return <code>true</code> if the instruments are all successfully loaded (or
- * already had been), <code>false</code> if any instrument could not be
- * loaded (for example, if the <code>Synthesizer</code> had insufficient memory)
+ * Loads onto the {@code Synthesizer} all instruments contained in the
+ * specified {@code Soundbank}.
+ *
+ * @param soundbank the {@code Soundbank} whose are instruments are to be
+ * loaded
+ * @return {@code true} if the instruments are all successfully loaded (or
+ * already had been), {@code false} if any instrument could not be
+ * loaded (for example, if the {@code Synthesizer} had insufficient
+ * memory)
* @throws IllegalArgumentException if the requested soundbank is
- * incompatible with this synthesizer.
+ * incompatible with this synthesizer
* @see #isSoundbankSupported
* @see #loadInstrument
* @see #loadInstruments
*/
- public boolean loadAllInstruments(Soundbank soundbank);
-
-
+ boolean loadAllInstruments(Soundbank soundbank);
/**
- * Unloads all instruments contained in the specified <code>Soundbank</code>.
- * @param soundbank soundbank containing instruments to unload
- * @throws IllegalArgumentException thrown if the soundbank is not supported.
+ * Unloads all instruments contained in the specified {@code Soundbank}.
+ *
+ * @param soundbank soundbank containing instruments to unload
+ * @throws IllegalArgumentException thrown if the soundbank is not supported
* @see #isSoundbankSupported
* @see #unloadInstrument
* @see #unloadInstruments
*/
- public void unloadAllInstruments(Soundbank soundbank);
-
+ void unloadAllInstruments(Soundbank soundbank);
/**
* Loads the instruments referenced by the specified patches, from the
- * specified <code>Soundbank</code>. Each of the <code>Patch</code> objects
- * indicates a bank and program number; the <code>Instrument</code> that
- * has the matching <code>Patch</code> is loaded into that bank and program
- * location.
- * @param soundbank the <code>Soundbank</code> containing the instruments to load
- * @param patchList list of patches for which instruments should be loaded
- * @return <code>true</code> if the instruments are all successfully loaded (or
- * already had been), <code>false</code> if any instrument could not be
- * loaded (for example, if the <code>Synthesizer</code> had insufficient memory)
- * @throws IllegalArgumentException thrown if the soundbank is not supported.
+ * specified {@code Soundbank}. Each of the {@code Patch} objects indicates
+ * a bank and program number; the {@code Instrument} that has the matching
+ * {@code Patch} is loaded into that bank and program location.
+ *
+ * @param soundbank the {@code Soundbank} containing the instruments to
+ * load
+ * @param patchList list of patches for which instruments should be loaded
+ * @return {@code true} if the instruments are all successfully loaded (or
+ * already had been), {@code false} if any instrument could not be
+ * loaded (for example, if the {@code Synthesizer} had insufficient
+ * memory)
+ * @throws IllegalArgumentException thrown if the soundbank is not supported
* @see #isSoundbankSupported
* @see Instrument#getPatch
* @see #loadAllInstruments
@@ -319,76 +313,76 @@
* @see Soundbank#getInstrument(Patch)
* @see Sequence#getPatchList()
*/
- public boolean loadInstruments(Soundbank soundbank, Patch[] patchList);
+ boolean loadInstruments(Soundbank soundbank, Patch[] patchList);
/**
- * Unloads the instruments referenced by the specified patches, from the MIDI sound bank specified.
- * @param soundbank soundbank containing instruments to unload
- * @param patchList list of patches for which instruments should be unloaded
- * @throws IllegalArgumentException thrown if the soundbank is not supported.
+ * Unloads the instruments referenced by the specified patches, from the
+ * MIDI sound bank specified.
*
+ * @param soundbank soundbank containing instruments to unload
+ * @param patchList list of patches for which instruments should be
+ * unloaded
+ * @throws IllegalArgumentException thrown if the soundbank is not supported
* @see #unloadInstrument
* @see #unloadAllInstruments
* @see #isSoundbankSupported
* @see Instrument#getPatch
* @see #loadInstruments
*/
- public void unloadInstruments(Soundbank soundbank, Patch[] patchList);
-
+ void unloadInstruments(Soundbank soundbank, Patch[] patchList);
// RECEIVER METHODS
/**
* Obtains the name of the receiver.
+ *
* @return receiver name
*/
- // public abstract String getName();
-
+ // abstract String getName();
/**
* Opens the receiver.
+ *
* @throws MidiUnavailableException if the receiver is cannot be opened,
- * usually because the MIDI device is in use by another application.
- * @throws SecurityException if the receiver cannot be opened due to security
- * restrictions.
+ * usually because the MIDI device is in use by another application.
+ * @throws SecurityException if the receiver cannot be opened due to
+ * security restrictions
*/
- // public abstract void open() throws MidiUnavailableException, SecurityException;
-
+ // abstract void open() throws MidiUnavailableException, SecurityException;
/**
* Closes the receiver.
*/
- // public abstract void close();
-
+ // abstract void close();
/**
* Sends a MIDI event to the receiver.
- * @param event event to send.
- * @throws IllegalStateException if the receiver is not open.
+ *
+ * @param event event to send
+ * @throws IllegalStateException if the receiver is not open
*/
- // public void send(MidiEvent event) throws IllegalStateException {
+ // void send(MidiEvent event) throws IllegalStateException {
//
// }
-
/**
- * Obtains the set of controls supported by the
- * element. If no controls are supported, returns an
- * array of length 0.
+ * Obtains the set of controls supported by the element. If no controls are
+ * supported, returns an array of length 0.
+ *
* @return set of controls
*/
// $$kk: 03.04.99: josh bloch recommends getting rid of this:
// what can you really do with a set of untyped controls??
- // $$kk: 03.05.99: i am putting this back in. for one thing,
+ // $$kk: 03.05.99: i am putting this back in. for one thing,
// you can check the length and know whether you should keep
// looking....
- // public Control[] getControls();
+ // Control[] getControls();
/**
* Obtains the specified control.
- * @param controlClass class of the requested control
- * @return requested control object, or null if the
- * control is not supported.
+ *
+ * @param controlClass class of the requested control
+ * @return requested control object, or null if the control is not supported
*/
- // public Control getControl(Class controlClass);
+ // Control getControl(Class controlClass);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java
index ae4e418..8bcd00a 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,47 +26,47 @@
package javax.sound.midi;
/**
- * A <code>SysexMessage</code> object represents a MIDI system exclusive message.
+ * A {@code SysexMessage} object represents a MIDI system exclusive message.
* <p>
- * When a system exclusive message is read from a MIDI file, it always has
- * a defined length. Data from a system exclusive message from a MIDI file
- * should be stored in the data array of a <code>SysexMessage</code> as
- * follows: the system exclusive message status byte (0xF0 or 0xF7), all
- * message data bytes, and finally the end-of-exclusive flag (0xF7).
- * The length reported by the <code>SysexMessage</code> object is therefore
- * the length of the system exclusive data plus two: one byte for the status
- * byte and one for the end-of-exclusive flag.
+ * When a system exclusive message is read from a MIDI file, it always has a
+ * defined length. Data from a system exclusive message from a MIDI file should
+ * be stored in the data array of a {@code SysexMessage} as follows: the system
+ * exclusive message status byte (0xF0 or 0xF7), all message data bytes, and
+ * finally the end-of-exclusive flag (0xF7). The length reported by the
+ * {@code SysexMessage} object is therefore the length of the system exclusive
+ * data plus two: one byte for the status byte and one for the end-of-exclusive
+ * flag.
* <p>
- * As dictated by the Standard MIDI Files specification, two status byte values are legal
- * for a <code>SysexMessage</code> read from a MIDI file:
+ * As dictated by the Standard MIDI Files specification, two status byte values
+ * are legal for a {@code SysexMessage} read from a MIDI file:
* <ul>
* <li>0xF0: System Exclusive message (same as in MIDI wire protocol)</li>
* <li>0xF7: Special System Exclusive message</li>
* </ul>
- * <p>
- * When Java Sound is used to handle system exclusive data that is being received
- * using MIDI wire protocol, it should place the data in one or more
- * <code>SysexMessages</code>. In this case, the length of the system exclusive data
+ * When Java Sound is used to handle system exclusive data that is being
+ * received using MIDI wire protocol, it should place the data in one or more
+ * {@code SysexMessages}. In this case, the length of the system exclusive data
* is not known in advance; the end of the system exclusive data is marked by an
* end-of-exclusive flag (0xF7) in the MIDI wire byte stream.
* <ul>
* <li>0xF0: System Exclusive message (same as in MIDI wire protocol)</li>
* <li>0xF7: End of Exclusive (EOX)</li>
* </ul>
- * The first <code>SysexMessage</code> object containing data for a particular system
- * exclusive message should have the status value 0xF0. If this message contains all
- * the system exclusive data
- * for the message, it should end with the status byte 0xF7 (EOX).
- * Otherwise, additional system exclusive data should be sent in one or more
- * <code>SysexMessages</code> with a status value of 0xF7. The <code>SysexMessage</code>
- * containing the last of the data for the system exclusive message should end with the
- * value 0xF7 (EOX) to mark the end of the system exclusive message.
+ * The first {@code SysexMessage} object containing data for a particular system
+ * exclusive message should have the status value 0xF0. If this message contains
+ * all the system exclusive data for the message, it should end with the status
+ * byte 0xF7 (EOX). Otherwise, additional system exclusive data should be sent
+ * in one or more {@code SysexMessages} with a status value of 0xF7. The
+ * {@code SysexMessage} containing the last of the data for the system exclusive
+ * message should end with the value 0xF7 (EOX) to mark the end of the system
+ * exclusive message.
* <p>
- * If system exclusive data from <code>SysexMessages</code> objects is being transmitted
- * using MIDI wire protocol, only the initial 0xF0 status byte, the system exclusive
- * data itself, and the final 0xF7 (EOX) byte should be propagated; any 0xF7 status
- * bytes used to indicate that a <code>SysexMessage</code> contains continuing system
- * exclusive data should not be propagated via MIDI wire protocol.
+ * If system exclusive data from {@code SysexMessages} objects is being
+ * transmitted using MIDI wire protocol, only the initial 0xF0 status byte, the
+ * system exclusive data itself, and the final 0xF7 (EOX) byte should be
+ * propagated; any 0xF7 status bytes used to indicate that a
+ * {@code SysexMessage} contains continuing system exclusive data should not be
+ * propagated via MIDI wire protocol.
*
* @author David Rivas
* @author Kara Kytle
@@ -74,43 +74,36 @@
*/
public class SysexMessage extends MidiMessage {
-
// Status byte defines
-
/**
* Status byte for System Exclusive message (0xF0, or 240).
+ *
* @see MidiMessage#getStatus
*/
public static final int SYSTEM_EXCLUSIVE = 0xF0; // 240
-
/**
- * Status byte for Special System Exclusive message (0xF7, or 247), which is used
- * in MIDI files. It has the same value as END_OF_EXCLUSIVE, which
- * is used in the real-time "MIDI wire" protocol.
+ * Status byte for Special System Exclusive message (0xF7, or 247), which is
+ * used in MIDI files. It has the same value as END_OF_EXCLUSIVE, which is
+ * used in the real-time "MIDI wire" protocol.
+ *
* @see MidiMessage#getStatus
*/
public static final int SPECIAL_SYSTEM_EXCLUSIVE = 0xF7; // 247
-
- // Instance variables
-
-
- /*
- * The data bytes for this system exclusive message. These are
- * initialized to <code>null</code> and are set explicitly
- * by {@link #setMessage(int, byte[], int, long) setMessage}.
+ /**
+ * The data bytes for this system exclusive message. These are initialized
+ * to {@code null} and are set explicitly by
+ * {@link #setMessage(int, byte[], int, long) setMessage}.
*/
//protected byte[] data = null;
-
/**
- * Constructs a new <code>SysexMessage</code>. The
- * contents of the new message are guaranteed to specify
- * a valid MIDI message. Subsequently, you may set the
- * contents of the message using one of the <code>setMessage</code>
- * methods.
+ * Constructs a new {@code SysexMessage}. The contents of the new message
+ * are guaranteed to specify a valid MIDI message. Subsequently, you may set
+ * the contents of the message using one of the {@code setMessage} methods.
+ *
* @see #setMessage
*/
public SysexMessage() {
@@ -121,18 +114,17 @@
}
/**
- * Constructs a new {@code SysexMessage} and sets the data for
- * the message. The first byte of the data array must be a valid system
- * exclusive status byte (0xF0 or 0xF7).
- * The contents of the message can be changed by using one of
- * the {@code setMessage} methods.
+ * Constructs a new {@code SysexMessage} and sets the data for the message.
+ * The first byte of the data array must be a valid system exclusive status
+ * byte (0xF0 or 0xF7). The contents of the message can be changed by using
+ * one of the {@code setMessage} methods.
*
- * @param data the system exclusive message data including the status byte
- * @param length the length of the valid message data in the array,
- * including the status byte; it should be non-negative and less than
- * or equal to {@code data.length}
- * @throws InvalidMidiDataException if the parameter values
- * do not specify a valid MIDI meta message.
+ * @param data the system exclusive message data including the status byte
+ * @param length the length of the valid message data in the array,
+ * including the status byte; it should be non-negative and less
+ * than or equal to {@code data.length}
+ * @throws InvalidMidiDataException if the parameter values do not specify a
+ * valid MIDI meta message.
* @see #setMessage(byte[], int)
* @see #setMessage(int, byte[], int)
* @see #getData()
@@ -146,17 +138,17 @@
/**
* Constructs a new {@code SysexMessage} and sets the data for the message.
- * The contents of the message can be changed by using one of
- * the {@code setMessage} methods.
+ * The contents of the message can be changed by using one of the
+ * {@code setMessage} methods.
*
- * @param status the status byte for the message; it must be a valid system
- * exclusive status byte (0xF0 or 0xF7)
- * @param data the system exclusive message data (without the status byte)
- * @param length the length of the valid message data in the array;
- * it should be non-negative and less than or equal to
- * {@code data.length}
- * @throws InvalidMidiDataException if the parameter values
- * do not specify a valid MIDI meta message.
+ * @param status the status byte for the message; it must be a valid system
+ * exclusive status byte (0xF0 or 0xF7)
+ * @param data the system exclusive message data (without the status byte)
+ * @param length the length of the valid message data in the array; it
+ * should be non-negative and less than or equal to
+ * {@code data.length}
+ * @throws InvalidMidiDataException if the parameter values do not specify a
+ * valid MIDI meta message
* @see #setMessage(byte[], int)
* @see #setMessage(int, byte[], int)
* @see #getData()
@@ -168,26 +160,24 @@
setMessage(status, data, length);
}
-
/**
- * Constructs a new <code>SysexMessage</code>.
- * @param data an array of bytes containing the complete message.
- * The message data may be changed using the <code>setMessage</code>
- * method.
+ * Constructs a new {@code SysexMessage}.
+ *
+ * @param data an array of bytes containing the complete message. The
+ * message data may be changed using the {@code setMessage} method.
* @see #setMessage
*/
protected SysexMessage(byte[] data) {
super(data);
}
-
/**
- * Sets the data for the system exclusive message. The
- * first byte of the data array must be a valid system
- * exclusive status byte (0xF0 or 0xF7).
- * @param data the system exclusive message data
- * @param length the length of the valid message data in
- * the array, including the status byte.
+ * Sets the data for the system exclusive message. The first byte of the
+ * data array must be a valid system exclusive status byte (0xF0 or 0xF7).
+ *
+ * @param data the system exclusive message data
+ * @param length the length of the valid message data in the array,
+ * including the status byte
*/
public void setMessage(byte[] data, int length) throws InvalidMidiDataException {
int status = (data[0] & 0xFF);
@@ -197,14 +187,14 @@
super.setMessage(data, length);
}
-
/**
* Sets the data for the system exclusive message.
- * @param status the status byte for the message (0xF0 or 0xF7)
- * @param data the system exclusive message data
- * @param length the length of the valid message data in
- * the array
- * @throws InvalidMidiDataException if the status byte is invalid for a sysex message
+ *
+ * @param status the status byte for the message (0xF0 or 0xF7)
+ * @param data the system exclusive message data
+ * @param length the length of the valid message data in the array
+ * @throws InvalidMidiDataException if the status byte is invalid for a
+ * sysex message
*/
public void setMessage(int status, byte[] data, int length) throws InvalidMidiDataException {
if ( (status != 0xF0) && (status != 0xF7) ) {
@@ -225,11 +215,11 @@
}
}
-
/**
- * Obtains a copy of the data for the system exclusive message.
- * The returned array of bytes does not include the status byte.
- * @return array containing the system exclusive message data.
+ * Obtains a copy of the data for the system exclusive message. The returned
+ * array of bytes does not include the status byte.
+ *
+ * @return array containing the system exclusive message data
*/
public byte[] getData() {
byte[] returnedArray = new byte[length - 1];
@@ -237,10 +227,10 @@
return returnedArray;
}
-
/**
- * Creates a new object of the same class and with the same contents
- * as this object.
+ * Creates a new object of the same class and with the same contents as this
+ * object.
+ *
* @return a clone of this instance
*/
public Object clone() {
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java
index d9e0f43..95a42c7 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Track.java
@@ -25,41 +25,40 @@
package javax.sound.midi;
-import java.util.Vector;
import java.util.ArrayList;
import java.util.HashSet;
+
import com.sun.media.sound.MidiUtils;
/**
- * A MIDI track is an independent stream of MIDI events (time-stamped MIDI
- * data) that can be stored along with other tracks in a standard MIDI file.
- * The MIDI specification allows only 16 channels of MIDI data, but tracks
- * are a way to get around this limitation. A MIDI file can contain any number
- * of tracks, each containing its own stream of up to 16 channels of MIDI data.
+ * A MIDI track is an independent stream of MIDI events (time-stamped MIDI data)
+ * that can be stored along with other tracks in a standard MIDI file. The MIDI
+ * specification allows only 16 channels of MIDI data, but tracks are a way to
+ * get around this limitation. A MIDI file can contain any number of tracks,
+ * each containing its own stream of up to 16 channels of MIDI data.
* <p>
- * A <code>Track</code> occupies a middle level in the hierarchy of data played
- * by a <code>{@link Sequencer}</code>: sequencers play sequences, which contain tracks,
- * which contain MIDI events. A sequencer may provide controls that mute
- * or solo individual tracks.
+ * A {@code Track} occupies a middle level in the hierarchy of data played by a
+ * {@link Sequencer}: sequencers play sequences, which contain tracks, which
+ * contain MIDI events. A sequencer may provide controls that mute or solo
+ * individual tracks.
* <p>
* The timing information and resolution for a track is controlled by and stored
- * in the sequence containing the track. A given <code>Track</code>
- * is considered to belong to the particular <code>{@link Sequence}</code> that
- * maintains its timing. For this reason, a new (empty) track is created by calling the
- * <code>{@link Sequence#createTrack}</code> method, rather than by directly invoking a
- * <code>Track</code> constructor.
+ * in the sequence containing the track. A given {@code Track} is considered to
+ * belong to the particular {@link Sequence} that maintains its timing. For this
+ * reason, a new (empty) track is created by calling the
+ * {@link Sequence#createTrack} method, rather than by directly invoking a
+ * {@code Track} constructor.
* <p>
- * The <code>Track</code> class provides methods to edit the track by adding
- * or removing <code>MidiEvent</code> objects from it. These operations keep
- * the event list in the correct time order. Methods are also
- * included to obtain the track's size, in terms of either the number of events
- * it contains or its duration in ticks.
- *
- * @see Sequencer#setTrackMute
- * @see Sequencer#setTrackSolo
+ * The {@code Track} class provides methods to edit the track by adding or
+ * removing {@code MidiEvent} objects from it. These operations keep the event
+ * list in the correct time order. Methods are also included to obtain the
+ * track's size, in terms of either the number of events it contains or its
+ * duration in ticks.
*
* @author Kara Kytle
* @author Florian Bomers
+ * @see Sequencer#setTrackMute
+ * @see Sequencer#setTrackSolo
*/
public class Track {
@@ -73,10 +72,9 @@
private MidiEvent eotEvent;
-
/**
- * Package-private constructor. Constructs a new, empty Track object,
- * which initially contains one event, the meta-event End of Track.
+ * Package-private constructor. Constructs a new, empty Track object, which
+ * initially contains one event, the meta-event End of Track.
*/
Track() {
// start with the end of track event
@@ -87,14 +85,14 @@
}
/**
- * Adds a new event to the track. However, if the event is already
- * contained in the track, it is not added again. The list of events
- * is kept in time order, meaning that this event inserted at the
- * appropriate place in the list, not necessarily at the end.
+ * Adds a new event to the track. However, if the event is already contained
+ * in the track, it is not added again. The list of events is kept in time
+ * order, meaning that this event inserted at the appropriate place in the
+ * list, not necessarily at the end.
*
- * @param event the event to add
- * @return <code>true</code> if the event did not already exist in the
- * track and was added, otherwise <code>false</code>
+ * @param event the event to add
+ * @return {@code true} if the event did not already exist in the track and
+ * was added, otherwise {@code false}
*/
public boolean add(MidiEvent event) {
if (event == null) {
@@ -176,12 +174,12 @@
return false;
}
-
/**
* Removes the specified event from the track.
- * @param event the event to remove
- * @return <code>true</code> if the event existed in the track and was removed,
- * otherwise <code>false</code>
+ *
+ * @param event the event to remove
+ * @return {@code true} if the event existed in the track and was removed,
+ * otherwise {@code false}
*/
public boolean remove(MidiEvent event) {
@@ -207,15 +205,14 @@
return false;
}
-
/**
* Obtains the event at the specified index.
- * @param index the location of the desired event in the event vector
- * @throws ArrayIndexOutOfBoundsException if the
- * specified index is negative or not less than the current size of
- * this track.
- * @see #size
+ *
+ * @param index the location of the desired event in the event vector
* @return the event at the specified index
+ * @throws ArrayIndexOutOfBoundsException if the specified index is negative
+ * or not less than the current size of this track
+ * @see #size
*/
public MidiEvent get(int index) throws ArrayIndexOutOfBoundsException {
try {
@@ -227,9 +224,9 @@
}
}
-
/**
* Obtains the number of events in this track.
+ *
* @return the size of the track's event vector
*/
public int size() {
@@ -238,12 +235,12 @@
}
}
-
/**
- * Obtains the length of the track, expressed in MIDI ticks. (The
- * duration of a tick in seconds is determined by the timing resolution
- * of the <code>Sequence</code> containing this track, and also by
- * the tempo of the music as set by the sequencer.)
+ * Obtains the length of the track, expressed in MIDI ticks. (The duration
+ * of a tick in seconds is determined by the timing resolution of the
+ * {@code Sequence} containing this track, and also by the tempo of the
+ * music as set by the sequencer.)
+ *
* @return the duration, in ticks
* @see Sequence#Sequence(float, int)
* @see Sequencer#setTempoInBPM(float)
@@ -271,5 +268,4 @@
throw new InvalidMidiDataException("cannot modify end of track message");
}
}
-
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java
index e78b800..639aa2c 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Transmitter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,52 +25,49 @@
package javax.sound.midi;
-
/**
- * A <code>Transmitter</code> sends <code>{@link MidiEvent}</code> objects to one or more
- * <code>{@link Receiver Receivers}</code>. Common MIDI transmitters include sequencers
- * and MIDI input ports.
- *
- * @see Receiver
+ * A {@code Transmitter} sends {@link MidiEvent} objects to one or more
+ * {@link Receiver Receivers}. Common MIDI transmitters include sequencers and
+ * MIDI input ports.
*
* @author Kara Kytle
+ * @see Receiver
*/
public interface Transmitter extends AutoCloseable {
-
/**
* Sets the receiver to which this transmitter will deliver MIDI messages.
* If a receiver is currently set, it is replaced with this one.
- * @param receiver the desired receiver.
+ *
+ * @param receiver the desired receiver
*/
- public void setReceiver(Receiver receiver);
-
+ void setReceiver(Receiver receiver);
/**
- * Obtains the current receiver to which this transmitter will deliver MIDI messages.
- * @return the current receiver. If no receiver is currently set,
- * returns <code>null</code>
+ * Obtains the current receiver to which this transmitter will deliver MIDI
+ * messages.
+ *
+ * @return the current receiver. If no receiver is currently set, returns
+ * {@code null}.
*/
- public Receiver getReceiver();
-
+ Receiver getReceiver();
/**
* Indicates that the application has finished using the transmitter, and
* that limited resources it requires may be released or made available.
- *
- * <p>If the creation of this <code>Transmitter</code> resulted in
- * implicitly opening the underlying device, the device is
- * implicitly closed by this method. This is true unless the device is
- * kept open by other <code>Receiver</code> or <code>Transmitter</code>
- * instances that opened the device implicitly, and unless the device
- * has been opened explicitly. If the device this
- * <code>Transmitter</code> is retrieved from is closed explicitly
- * by calling {@link MidiDevice#close MidiDevice.close}, the
- * <code>Transmitter</code> is closed, too. For a detailed
- * description of open/close behaviour see the class description
- * of {@link javax.sound.midi.MidiDevice MidiDevice}.
+ * <p>
+ * If the creation of this {@code Transmitter} resulted in implicitly
+ * opening the underlying device, the device is implicitly closed by this
+ * method. This is true unless the device is kept open by other
+ * {@code Receiver} or {@code Transmitter} instances that opened the device
+ * implicitly, and unless the device has been opened explicitly. If the
+ * device this {@code Transmitter} is retrieved from is closed explicitly by
+ * calling {@link MidiDevice#close MidiDevice.close}, the
+ * {@code Transmitter} is closed, too. For a detailed description of
+ * open/close behaviour see the class description of
+ * {@link MidiDevice MidiDevice}.
*
* @see javax.sound.midi.MidiSystem#getTransmitter
*/
- public void close();
+ void close();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java
index 45f2e4d..2d67961 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/VoiceStatus.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,93 +25,83 @@
package javax.sound.midi;
-
/**
- * A <code>VoiceStatus</code> object contains information about the current
- * status of one of the voices produced by a {@link Synthesizer}.
+ * A {@code VoiceStatus} object contains information about the current status of
+ * one of the voices produced by a {@link Synthesizer}.
* <p>
* MIDI synthesizers are generally capable of producing some maximum number of
- * simultaneous notes, also referred to as voices. A voice is a stream
- * of successive single notes, and the process of assigning incoming MIDI notes to
- * specific voices is known as voice allocation.
- * However, the voice-allocation algorithm and the contents of each voice are
- * normally internal to a MIDI synthesizer and hidden from outside view. One can, of
- * course, learn from MIDI messages which notes the synthesizer is playing, and
- * one might be able deduce something about the assignment of notes to voices.
- * But MIDI itself does not provide a means to report which notes a
- * synthesizer has assigned to which voice, nor even to report how many voices
- * the synthesizer is capable of synthesizing.
+ * simultaneous notes, also referred to as voices. A voice is a stream of
+ * successive single notes, and the process of assigning incoming MIDI notes to
+ * specific voices is known as voice allocation. However, the voice-allocation
+ * algorithm and the contents of each voice are normally internal to a MIDI
+ * synthesizer and hidden from outside view. One can, of course, learn from MIDI
+ * messages which notes the synthesizer is playing, and one might be able deduce
+ * something about the assignment of notes to voices. But MIDI itself does not
+ * provide a means to report which notes a synthesizer has assigned to which
+ * voice, nor even to report how many voices the synthesizer is capable of
+ * synthesizing.
* <p>
- * In Java Sound, however, a
- * <code>Synthesizer</code> class can expose the contents of its voices through its
- * {@link Synthesizer#getVoiceStatus() getVoiceStatus()} method.
- * This behavior is recommended but optional;
- * synthesizers that don't expose their voice allocation simply return a
- * zero-length array. A <code>Synthesizer</code> that does report its voice status
- * should maintain this information at
- * all times for all of its voices, whether they are currently sounding or
- * not. In other words, a given type of <code>Synthesizer</code> always has a fixed
- * number of voices, equal to the maximum number of simultaneous notes it is
- * capable of sounding.
+ * In Java Sound, however, a {@code Synthesizer} class can expose the contents
+ * of its voices through its
+ * {@link Synthesizer#getVoiceStatus() getVoiceStatus()} method. This behavior
+ * is recommended but optional; synthesizers that don't expose their voice
+ * allocation simply return a zero-length array. A {@code Synthesizer} that does
+ * report its voice status should maintain this information at all times for all
+ * of its voices, whether they are currently sounding or not. In other words, a
+ * given type of {@code Synthesizer} always has a fixed number of voices, equal
+ * to the maximum number of simultaneous notes it is capable of sounding.
* <p>
- * <A NAME="description_of_active"></A>
- * If the voice is not currently processing a MIDI note, it
- * is considered inactive. A voice is inactive when it has
- * been given no note-on commands, or when every note-on command received has
- * been terminated by a corresponding note-off (or by an "all notes off"
- * message). For example, this happens when a synthesizer capable of playing 16
- * simultaneous notes is told to play a four-note chord; only
- * four voices are active in this case (assuming no earlier notes are still playing).
- * Usually, a voice whose status is reported as active is producing audible sound, but this
- * is not always true; it depends on the details of the instrument (that
- * is, the synthesis algorithm) and how long the note has been going on.
- * For example, a voice may be synthesizing the sound of a single hand-clap. Because
- * this sound dies away so quickly, it may become inaudible before a note-off
- * message is received. In such a situation, the voice is still considered active
- * even though no sound is currently being produced.
+ * <a NAME="description_of_active"></a> If the voice is not currently processing
+ * a MIDI note, it is considered inactive. A voice is inactive when it has been
+ * given no note-on commands, or when every note-on command received has been
+ * terminated by a corresponding note-off (or by an "all notes off" message).
+ * For example, this happens when a synthesizer capable of playing 16
+ * simultaneous notes is told to play a four-note chord; only four voices are
+ * active in this case (assuming no earlier notes are still playing). Usually, a
+ * voice whose status is reported as active is producing audible sound, but this
+ * is not always true; it depends on the details of the instrument (that is, the
+ * synthesis algorithm) and how long the note has been going on. For example, a
+ * voice may be synthesizing the sound of a single hand-clap. Because this sound
+ * dies away so quickly, it may become inaudible before a note-off message is
+ * received. In such a situation, the voice is still considered active even
+ * though no sound is currently being produced.
* <p>
- * Besides its active or inactive status, the <code>VoiceStatus</code> class
- * provides fields that reveal the voice's current MIDI channel, bank and
- * program number, MIDI note number, and MIDI volume. All of these can
- * change during the course of a voice. While the voice is inactive, each
- * of these fields has an unspecified value, so you should check the active
- * field first.
- *
- * @see Synthesizer#getMaxPolyphony
- * @see Synthesizer#getVoiceStatus
+ * Besides its active or inactive status, the {@code VoiceStatus} class provides
+ * fields that reveal the voice's current MIDI channel, bank and program number,
+ * MIDI note number, and MIDI volume. All of these can change during the course
+ * of a voice. While the voice is inactive, each of these fields has an
+ * unspecified value, so you should check the active field first.
*
* @author David Rivas
* @author Kara Kytle
+ * @see Synthesizer#getMaxPolyphony
+ * @see Synthesizer#getVoiceStatus
*/
-
public class VoiceStatus {
-
/**
- * Indicates whether the voice is currently processing a MIDI note.
- * See the explanation of
- * <A HREF="#description_of_active">active and inactive voices</A>.
+ * Indicates whether the voice is currently processing a MIDI note. See the
+ * explanation of
+ * <a HREF="#description_of_active">active and inactive voices</a>.
*/
public boolean active = false;
-
/**
- * The MIDI channel on which this voice is playing. The value is a
- * zero-based channel number if the voice is active, or
- * unspecified if the voice is inactive.
+ * The MIDI channel on which this voice is playing. The value is a
+ * zero-based channel number if the voice is active, or unspecified if the
+ * voice is inactive.
*
* @see MidiChannel
* @see #active
*/
public int channel = 0;
-
/**
* The bank number of the instrument that this voice is currently using.
* This is a number dictated by the MIDI bank-select message; it does not
- * refer to a <code>SoundBank</code> object.
- * The value ranges from 0 to 16383 if the voice is active, and is
- * unspecified if the voice is inactive.
+ * refer to a {@code SoundBank} object. The value ranges from 0 to 16383 if
+ * the voice is active, and is unspecified if the voice is inactive.
+ *
* @see Patch
* @see Soundbank
* @see #active
@@ -119,11 +109,10 @@
*/
public int bank = 0;
-
/**
* The program number of the instrument that this voice is currently using.
- * The value ranges from 0 to 127 if the voice is active, and is
- * unspecified if the voice is inactive.
+ * The value ranges from 0 to 127 if the voice is active, and is unspecified
+ * if the voice is inactive.
*
* @see MidiChannel#getProgram
* @see Patch
@@ -131,28 +120,24 @@
*/
public int program = 0;
-
/**
- * The MIDI note that this voice is playing. The range for an active voice
- * is from 0 to 127 in semitones, with 60 referring to Middle C.
- * The value is unspecified if the voice is inactive.
+ * The MIDI note that this voice is playing. The range for an active voice
+ * is from 0 to 127 in semitones, with 60 referring to Middle C. The value
+ * is unspecified if the voice is inactive.
*
* @see MidiChannel#noteOn
* @see #active
*/
public int note = 0;
-
/**
- * The current MIDI volume level for the voice.
- * The value ranges from 0 to 127 if the voice is active, and is
- * unspecified if the voice is inactive.
+ * The current MIDI volume level for the voice. The value ranges from 0 to
+ * 127 if the voice is active, and is unspecified if the voice is inactive.
* <p>
- * Note that this value does not necessarily reflect
- * the instantaneous level of the sound produced by this
- * voice; that level is the result of many contributing
- * factors, including the current instrument and the
- * shape of the amplitude envelope it produces.
+ * Note that this value does not necessarily reflect the instantaneous level
+ * of the sound produced by this voice; that level is the result of many
+ * contributing factors, including the current instrument and the shape of
+ * the amplitude envelope it produces.
*
* @see #active
*/
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
index ecb72b3..bbdca9e 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
@@ -26,13 +26,13 @@
package javax.sound.midi.spi;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
+import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MidiFileFormat;
import javax.sound.midi.Sequence;
-import javax.sound.midi.InvalidMidiDataException;
/**
* A {@code MidiFileReader} supplies MIDI file-reading services. Classes
@@ -106,7 +106,7 @@
* @param stream the input stream from which the {@code Sequence} should
* be constructed
* @return a {@code Sequence} object based on the MIDI file data contained
- * in the input stream.
+ * in the input stream
* @throws InvalidMidiDataException if the stream does not point to valid
* MIDI file data recognized by the system
* @throws IOException if an I/O exception occurs
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
index c7e82d9..501c18b 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
@@ -32,12 +32,12 @@
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.Soundbank;
+import javax.sound.midi.Synthesizer;
/**
* A {@code SoundbankReader} supplies soundbank file-reading services. Concrete
* subclasses of {@code SoundbankReader} parse a given soundbank file, producing
- * a {@link javax.sound.midi.Soundbank} object that can be loaded into a
- * {@link javax.sound.midi.Synthesizer}.
+ * a {@link Soundbank} object that can be loaded into a {@link Synthesizer}.
*
* @since 1.3
* @author Kara Kytle
@@ -47,7 +47,7 @@
/**
* Obtains a soundbank object from the URL provided.
*
- * @param url URL representing the soundbank.
+ * @param url URL representing the soundbank
* @return soundbank object
* @throws InvalidMidiDataException if the URL does not point to valid MIDI
* soundbank data recognized by this soundbank reader
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
index 459ef99..db528ae 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java
@@ -26,19 +26,19 @@
package javax.sound.sampled;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
-
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
import java.util.Vector;
-import java.util.ArrayList;
-import javax.sound.sampled.spi.AudioFileWriter;
import javax.sound.sampled.spi.AudioFileReader;
+import javax.sound.sampled.spi.AudioFileWriter;
import javax.sound.sampled.spi.FormatConversionProvider;
import javax.sound.sampled.spi.MixerProvider;
@@ -60,14 +60,14 @@
* <p>
* Properties can be used to specify the default mixer for specific line types.
* Both system properties and a properties file are considered. The
- * {@code sound.properties} properties file is read from an
- * implementation-specific location (typically it is the {@code lib} directory
- * in the Java installation directory). If a property exists both as a system
- * property and in the properties file, the system property takes precedence.
- * If none is specified, a suitable default is chosen among the available
- * devices. The syntax of the properties file is specified in
- * {@link java.util.Properties#load(InputStream) Properties.load}. The following
- * table lists the available property keys and which methods consider them:
+ * "sound.properties" properties file is read from an implementation-specific
+ * location (typically it is the {@code lib} directory in the Java installation
+ * directory). If a property exists both as a system property and in the
+ * properties file, the system property takes precedence. If none is specified,
+ * a suitable default is chosen among the available devices. The syntax of the
+ * properties file is specified in
+ * {@link Properties#load(InputStream) Properties.load}. The following table
+ * lists the available property keys and which methods consider them:
*
* <table border=0>
* <caption>Audio System Property Keys</caption>
@@ -100,12 +100,11 @@
*
* The property value consists of the provider class name and the mixer name,
* separated by the hash mark ("#"). The provider class name is the
- * fully-qualified name of a concrete
- * {@link javax.sound.sampled.spi.MixerProvider mixer provider} class. The mixer
- * name is matched against the {@code String} returned by the {@code getName}
- * method of {@code Mixer.Info}. Either the class name, or the mixer name may be
- * omitted. If only the class name is specified, the trailing hash mark is
- * optional.
+ * fully-qualified name of a concrete {@link MixerProvider mixer provider}
+ * class. The mixer name is matched against the {@code String} returned by the
+ * {@code getName} method of {@code Mixer.Info}. Either the class name, or the
+ * mixer name may be omitted. If only the class name is specified, the trailing
+ * hash mark is optional.
* <p>
* If the provider class is specified, and it can be successfully retrieved from
* the installed providers, the list of {@code Mixer.Info} objects is retrieved
@@ -1324,10 +1323,9 @@
* Obtains the set of format converters (codecs, transcoders, etc.) that are
* currently installed on the system.
*
- * @return an array of {@link javax.sound.sampled.spi.FormatConversionProvider
- * FormatConversionProvider} objects representing the available
- * format converters. If no format converters readers are available
- * on the system, an array of length 0 is returned.
+ * @return an array of {@link FormatConversionProvider} objects representing
+ * the available format converters. If no format converters readers
+ * are available on the system, an array of length 0 is returned.
*/
@SuppressWarnings("unchecked")
private static List<FormatConversionProvider> getFormatConversionProviders() {
@@ -1338,10 +1336,9 @@
* Obtains the set of audio file readers that are currently installed on the
* system.
*
- * @return a List of {@link javax.sound.sampled.spi.AudioFileReader
- * AudioFileReader} objects representing the installed audio file
- * readers. If no audio file readers are available on the system, an
- * empty List is returned.
+ * @return a List of {@link AudioFileReader} objects representing the
+ * installed audio file readers. If no audio file readers are
+ * available on the system, an empty List is returned.
*/
@SuppressWarnings("unchecked")
private static List<AudioFileReader> getAudioFileReaders() {
@@ -1352,10 +1349,9 @@
* Obtains the set of audio file writers that are currently installed on the
* system.
*
- * @return a List of {@link javax.sound.sampled.spi.AudioFileWriter
- * AudioFileWriter} objects representing the available audio file
- * writers. If no audio file writers are available on the system, an
- * empty List is returned.
+ * @return a List of {@link AudioFileWriter} objects representing the
+ * available audio file writers. If no audio file writers are
+ * available on the system, an empty List is returned.
*/
@SuppressWarnings("unchecked")
private static List<AudioFileWriter> getAudioFileWriters() {
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java
index 9a81a76..6246a40 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java
@@ -355,11 +355,11 @@
* {@code true} for all formats returned by {@code getFormats()}.
* <p>
* Some fields in the AudioFormat instances can be set to
- * {@link javax.sound.sampled.AudioSystem#NOT_SPECIFIED NOT_SPECIFIED}
- * if that field does not apply to the format, or if the format supports
- * a wide range of values for that field. For example, a multi-channel
- * device supporting up to 64 channels, could set the channel field in
- * the {@code AudioFormat} instances returned by this method to
+ * {@link AudioSystem#NOT_SPECIFIED NOT_SPECIFIED} if that field does
+ * not apply to the format, or if the format supports a wide range of
+ * values for that field. For example, a multi-channel device supporting
+ * up to 64 channels, could set the channel field in the
+ * {@code AudioFormat} instances returned by this method to
* {@code NOT_SPECIFIED}.
*
* @return a set of supported audio formats
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
index daa7555..818df43 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
@@ -26,8 +26,8 @@
package javax.sound.sampled.spi;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
index a4cc31b..0cb6dc6 100644
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
@@ -30,6 +30,7 @@
import java.io.OutputStream;
import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
import static javax.sound.sampled.AudioFileFormat.Type;
@@ -110,8 +111,7 @@
* the length be written into the file header, and cannot be written from
* start to finish unless the length is known in advance. An attempt to
* write such a file type will fail with an IOException if the length in the
- * audio file format is {@link javax.sound.sampled.AudioSystem#NOT_SPECIFIED
- * AudioSystem.NOT_SPECIFIED}.
+ * audio file format is {@link AudioSystem#NOT_SPECIFIED}.
*
* @param stream the audio input stream containing audio data to be written
* to the output stream
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java
index f1b625b..bf9a23d 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/CellEditor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
* new component implement the interface. Or the developer can
* choose a wrapper based approach and provide a companion object which
* implements the <code>CellEditor</code> interface (See
- * <code>JCellEditor</code> for example). The wrapper approach
+ * <code>DefaultCellEditor</code> for example). The wrapper approach
* is particularly useful if the user want to use a 3rd party ISV
* editor with <code>JTable</code>, but the ISV didn't implement the
* <code>CellEditor</code> interface. The user can simply create an object
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
index 8f7812e..564e173 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/ImageIcon.java
@@ -490,12 +490,33 @@
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ imageObserver = (ImageObserver) f.get("imageObserver", null);
+ description = (String) f.get("description", null);
+ width = f.get("width", -1);
+ height = f.get("height", -1);
+ accessibleContext = (AccessibleImageIcon) f.get("accessibleContext", null);
int w = s.readInt();
int h = s.readInt();
int[] pixels = (int[])(s.readObject());
+ if (pixels == null && (w != -1 || h != -1)) {
+ throw new IllegalStateException("Inconsistent width and height"
+ + " for null image [" + w + ", " + h + "]");
+ }
+
+ if (pixels != null && (w < 0 || h < 0)) {
+ throw new IllegalStateException("Inconsistent width and height"
+ + " for image [" + w + ", " + h + "]");
+ }
+
+ if (w != getIconWidth() || h != getIconHeight()) {
+ throw new IllegalStateException("Inconsistent width and height"
+ + " for image [" + w + ", " + h + "]");
+ }
+
if (pixels != null) {
Toolkit tk = Toolkit.getDefaultToolkit();
ColorModel cm = ColorModel.getRGBdefault();
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
index 765610e..17cbf60 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -1888,7 +1888,7 @@
* description: The preferred vertical alignment of the component.
*/
public void setAlignmentY(float alignmentY) {
- this.alignmentY = alignmentY > 1.0f ? 1.0f : alignmentY < 0.0f ? 0.0f : alignmentY;
+ this.alignmentY = validateAlignment(alignmentY);
isAlignmentYSet = true;
}
@@ -1917,10 +1917,14 @@
* description: The preferred horizontal alignment of the component.
*/
public void setAlignmentX(float alignmentX) {
- this.alignmentX = alignmentX > 1.0f ? 1.0f : alignmentX < 0.0f ? 0.0f : alignmentX;
+ this.alignmentX = validateAlignment(alignmentX);
isAlignmentXSet = true;
}
+ private float validateAlignment(float alignment) {
+ return alignment > 1.0f ? 1.0f : alignment < 0.0f ? 0.0f : alignment;
+ }
+
/**
* Sets the input verifier for this component.
*
@@ -5514,7 +5518,24 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ isAlignmentXSet = f.get("isAlignmentXSet", false);
+ alignmentX = validateAlignment(f.get("alignmentX", 0f));
+ isAlignmentYSet = f.get("isAlignmentYSet", false);
+ alignmentY = validateAlignment(f.get("alignmentY", 0f));
+ listenerList = (EventListenerList) f.get("listenerList", null);
+ vetoableChangeSupport = (VetoableChangeSupport) f.get("vetoableChangeSupport", null);
+ autoscrolls = f.get("autoscrolls", false);
+ border = (Border) f.get("border", null);
+ flags = f.get("flags", 0);
+ inputVerifier = (InputVerifier) f.get("inputVerifier", null);
+ verifyInputWhenFocusTarget = f.get("verifyInputWhenFocusTarget", false);
+ popupMenu = (JPopupMenu) f.get("popupMenu", null);
+ focusInputMap = (InputMap) f.get("focusInputMap", null);
+ ancestorInputMap = (InputMap) f.get("ancestorInputMap", null);
+ windowInputMap = (ComponentInputMap) f.get("windowInputMap", null);
+ actionMap = (ActionMap) f.get("actionMap", null);
/* If there's no ReadObjectCallback for this stream yet, that is, if
* this is the first call to JComponent.readObject() for this
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index bf690dd..1edf494 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -50,6 +50,8 @@
import java.awt.event.*;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.lang.ref.WeakReference;
/**
@@ -460,10 +462,14 @@
* bound: false
*/
public void setDragEnabled(boolean b) {
+ checkDragEnabled(b);
+ dragEnabled = b;
+ }
+
+ private static void checkDragEnabled(boolean b) {
if (b && GraphicsEnvironment.isHeadless()) {
throw new HeadlessException();
}
- dragEnabled = b;
}
/**
@@ -949,9 +955,7 @@
if(this.dialogType == dialogType) {
return;
}
- if(!(dialogType == OPEN_DIALOG || dialogType == SAVE_DIALOG || dialogType == CUSTOM_DIALOG)) {
- throw new IllegalArgumentException("Incorrect Dialog Type: " + dialogType);
- }
+ checkDialogType(dialogType);
int oldValue = this.dialogType;
this.dialogType = dialogType;
if(dialogType == OPEN_DIALOG || dialogType == SAVE_DIALOG) {
@@ -960,6 +964,14 @@
firePropertyChange(DIALOG_TYPE_CHANGED_PROPERTY, oldValue, dialogType);
}
+ private static void checkDialogType(int dialogType) {
+ if (!(dialogType == OPEN_DIALOG || dialogType == SAVE_DIALOG
+ || dialogType == CUSTOM_DIALOG)) {
+ throw new IllegalArgumentException(
+ "Incorrect Dialog Type: " + dialogType);
+ }
+ }
+
/**
* Sets the string that goes in the <code>JFileChooser</code> window's
* title bar.
@@ -1349,12 +1361,17 @@
return;
}
- if ((mode == FILES_ONLY) || (mode == DIRECTORIES_ONLY) || (mode == FILES_AND_DIRECTORIES)) {
+ checkFileSelectionMode(mode);
int oldValue = fileSelectionMode;
fileSelectionMode = mode;
firePropertyChange(FILE_SELECTION_MODE_CHANGED_PROPERTY, oldValue, fileSelectionMode);
- } else {
- throw new IllegalArgumentException("Incorrect Mode for file selection: " + mode);
+ }
+
+ private static void checkFileSelectionMode(int mode) {
+ if ((mode != FILES_ONLY) && (mode != DIRECTORIES_ONLY)
+ && (mode != FILES_AND_DIRECTORIES)) {
+ throw new IllegalArgumentException(
+ "Incorrect Mode for file selection: " + mode);
}
}
@@ -1901,7 +1918,43 @@
*/
private void readObject(java.io.ObjectInputStream in)
throws IOException, ClassNotFoundException {
- in.defaultReadObject();
+ ObjectInputStream.GetField f = in.readFields();
+
+ dialogTitle = (String) f.get("dialogTitle", null);
+ approveButtonText = (String) f.get("approveButtonText", null);
+ approveButtonToolTipText =
+ (String) f.get("approveButtonToolTipText", null);
+ approveButtonMnemonic = f.get("approveButtonMnemonic", 0);
+ @SuppressWarnings("unchecked")
+ Vector<FileFilter> newFilters = (Vector<FileFilter>) f.get("filters", null);
+ if (newFilters == null) {
+ throw new InvalidObjectException("Null filters");
+ }
+ filters = newFilters;
+ dialog = (JDialog) f.get("dialog", null);
+ int newDialogType = f.get("dialogType", OPEN_DIALOG);
+ checkDialogType(newDialogType);
+ dialogType = newDialogType;
+ returnValue = f.get("returnValue", 0);
+ accessory = (JComponent) f.get("accessory", null);
+ fileView = (FileView) f.get("fileView", null);
+ controlsShown = f.get("controlsShown", false);
+ useFileHiding = f.get("useFileHiding", false);
+ int newFileSelectionMode = f.get("fileSelectionMode", FILES_ONLY);
+ checkFileSelectionMode(newFileSelectionMode);
+ fileSelectionMode = newFileSelectionMode;
+ multiSelectionEnabled = f.get("multiSelectionEnabled", false);
+ useAcceptAllFileFilter = f.get("useAcceptAllFileFilter", false);
+ boolean newDragEnabled = f.get("dragEnabled", false);
+ checkDragEnabled(newDragEnabled);
+ dragEnabled = newDragEnabled;
+ fileFilter = (FileFilter) f.get("fileFilter", null);
+ fileSystemView = (FileSystemView) f.get("fileSystemView", null);
+ currentDirectory = (File) f.get("currentDirectory", null);
+ selectedFile = (File) f.get("selectedFile", null);
+ selectedFiles = (File[]) f.get("selectedFiles", null);
+ accessibleContext = (AccessibleContext) f.get("accessibleContext", null);
+
installShowFilesListener();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java b/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java
index cc3b080..9de3ede 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -24,14 +24,22 @@
*/
package javax.swing;
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.PropertyChangeListener;
-import java.util.Locale;
-import java.util.Vector;
-import java.io.Serializable;
+import java.awt.AWTEvent;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.HeadlessException;
+import java.awt.Image;
+import java.awt.LayoutManager;
+import java.awt.event.WindowEvent;
-import javax.accessibility.*;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
/**
@@ -297,33 +305,28 @@
* @see #setDefaultCloseOperation
* @see java.awt.Window#processWindowEvent
*/
- protected void processWindowEvent(WindowEvent e) {
+ protected void processWindowEvent(final WindowEvent e) {
super.processWindowEvent(e);
if (e.getID() == WindowEvent.WINDOW_CLOSING) {
- switch(defaultCloseOperation) {
- case HIDE_ON_CLOSE:
- setVisible(false);
- break;
- case DISPOSE_ON_CLOSE:
- dispose();
- break;
- case DO_NOTHING_ON_CLOSE:
- default:
- break;
- case EXIT_ON_CLOSE:
- // This needs to match the checkExit call in
- // setDefaultCloseOperation
- System.exit(0);
- break;
+ switch (defaultCloseOperation) {
+ case HIDE_ON_CLOSE:
+ setVisible(false);
+ break;
+ case DISPOSE_ON_CLOSE:
+ dispose();
+ break;
+ case EXIT_ON_CLOSE:
+ // This needs to match the checkExit call in
+ // setDefaultCloseOperation
+ System.exit(0);
+ break;
+ case DO_NOTHING_ON_CLOSE:
+ default:
}
}
}
-// public void setMenuBar(MenuBar menu) {
-// throw new IllegalComponentStateException("Please use setJMenuBar() with JFrame.");
-// }
-
/**
* Sets the operation that will happen by default when
* the user initiates a "close" on this frame.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JLayer.java b/jdk/src/java.desktop/share/classes/javax/swing/JLayer.java
index 57bccae..8c58c91 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JLayer.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JLayer.java
@@ -158,8 +158,9 @@
private LayerUI<? super V> layerUI;
private JPanel glassPane;
private long eventMask;
- private transient boolean isPainting;
- private transient boolean isPaintingImmediately;
+ private transient boolean isPaintCalling;
+ private transient boolean isPaintImmediatelyCalling;
+ private transient boolean isImageUpdateCalling;
private static final LayerEventController eventController =
new LayerEventController();
@@ -405,12 +406,12 @@
* @param h the height of the region to be painted
*/
public void paintImmediately(int x, int y, int w, int h) {
- if (!isPaintingImmediately && getUI() != null) {
- isPaintingImmediately = true;
+ if (!isPaintImmediatelyCalling && getUI() != null) {
+ isPaintImmediatelyCalling = true;
try {
getUI().paintImmediately(x, y, w, h, this);
} finally {
- isPaintingImmediately = false;
+ isPaintImmediatelyCalling = false;
}
} else {
super.paintImmediately(x, y, w, h);
@@ -418,17 +419,44 @@
}
/**
+ * Delegates its functionality to the
+ * {@link javax.swing.plaf.LayerUI#imageUpdate(java.awt.Image, int, int, int, int, int, JLayer)} method,
+ * if the {@code LayerUI} is set.
+ *
+ * @param img the image being observed
+ * @param infoflags see {@code imageUpdate} for more information
+ * @param x the <i>x</i> coordinate
+ * @param y the <i>y</i> coordinate
+ * @param w the width
+ * @param h the height
+ * @return {@code false} if the infoflags indicate that the
+ * image is completely loaded; {@code true} otherwise.
+ */
+ public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h) {
+ if (!isImageUpdateCalling && getUI() != null) {
+ isImageUpdateCalling = true;
+ try {
+ return getUI().imageUpdate(img, infoflags, x, y, w, h, this);
+ } finally {
+ isImageUpdateCalling = false;
+ }
+ } else {
+ return super.imageUpdate(img, infoflags, x, y, w, h);
+ }
+ }
+
+ /**
* Delegates all painting to the {@link javax.swing.plaf.LayerUI} object.
*
* @param g the {@code Graphics} to render to
*/
public void paint(Graphics g) {
- if (!isPainting) {
- isPainting = true;
+ if (!isPaintCalling) {
+ isPaintCalling = true;
try {
super.paintComponent(g);
} finally {
- isPainting = false;
+ isPaintCalling = false;
}
} else {
super.paint(g);
@@ -646,15 +674,21 @@
return 1;
}
+ @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
- s.defaultReadObject();
- if (layerUI != null) {
- setUI(layerUI);
- }
+ ObjectInputStream.GetField f = s.readFields();
+
+ view = (V) f.get("view", null);
+ glassPane = (JPanel) f.get("glassPane", null);
+ eventMask = f.get("eventMask", 0l);
if (eventMask != 0) {
eventController.updateAWTEventListener(0, eventMask);
}
+ LayerUI<V> newLayerUI = (LayerUI<V>) f.get("layerUI", null);
+ if (newLayerUI != null) {
+ setUI(newLayerUI);
+ }
}
/**
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index b3d52fc..413b3cf 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -43,13 +43,10 @@
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.io.IOException;
+import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Vector;
import javax.swing.plaf.OptionPaneUI;
import javax.swing.event.InternalFrameEvent;
@@ -2055,15 +2052,22 @@
* description: The option pane's message type.
*/
public void setMessageType(int newType) {
+ checkMessageType(newType);
+ int oldType = messageType;
+ messageType = newType;
+ firePropertyChange(MESSAGE_TYPE_PROPERTY, oldType, messageType);
+ }
+
+ private static void checkMessageType(int newType){
if(newType != ERROR_MESSAGE && newType != INFORMATION_MESSAGE &&
newType != WARNING_MESSAGE && newType != QUESTION_MESSAGE &&
newType != PLAIN_MESSAGE)
- throw new RuntimeException("JOptionPane: type must be one of JOptionPane.ERROR_MESSAGE, JOptionPane.INFORMATION_MESSAGE, JOptionPane.WARNING_MESSAGE, JOptionPane.QUESTION_MESSAGE or JOptionPane.PLAIN_MESSAGE");
-
- int oldType = messageType;
-
- messageType = newType;
- firePropertyChange(MESSAGE_TYPE_PROPERTY, oldType, messageType);
+ throw new RuntimeException("JOptionPane: type must be one of"
+ + " JOptionPane.ERROR_MESSAGE,"
+ + " JOptionPane.INFORMATION_MESSAGE,"
+ + " JOptionPane.WARNING_MESSAGE,"
+ + " JOptionPane.QUESTION_MESSAGE"
+ + " or JOptionPane.PLAIN_MESSAGE");
}
/**
@@ -2097,16 +2101,23 @@
* description: The option pane's option type.
*/
public void setOptionType(int newType) {
- if(newType != DEFAULT_OPTION && newType != YES_NO_OPTION &&
- newType != YES_NO_CANCEL_OPTION && newType != OK_CANCEL_OPTION)
- throw new RuntimeException("JOptionPane: option type must be one of JOptionPane.DEFAULT_OPTION, JOptionPane.YES_NO_OPTION, JOptionPane.YES_NO_CANCEL_OPTION or JOptionPane.OK_CANCEL_OPTION");
-
+ checkOptionType(newType);
int oldType = optionType;
-
optionType = newType;
firePropertyChange(OPTION_TYPE_PROPERTY, oldType, optionType);
}
+ private static void checkOptionType(int newType) {
+ if (newType != DEFAULT_OPTION && newType != YES_NO_OPTION
+ && newType != YES_NO_CANCEL_OPTION
+ && newType != OK_CANCEL_OPTION) {
+ throw new RuntimeException("JOptionPane: option type must be one of"
+ + " JOptionPane.DEFAULT_OPTION, JOptionPane.YES_NO_OPTION,"
+ + " JOptionPane.YES_NO_CANCEL_OPTION"
+ + " or JOptionPane.OK_CANCEL_OPTION");
+ }
+ }
+
/**
* Returns the type of options that are displayed.
*
@@ -2385,7 +2396,15 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ int newMessageType = f.get("messageType", 0);
+ checkMessageType(newMessageType);
+ messageType = newMessageType;
+ int newOptionType = f.get("optionType", 0);
+ checkOptionType(newOptionType);
+ optionType = newOptionType;
+ wantsInput = f.get("wantsInput", false);
Vector<?> values = (Vector)s.readObject();
int indexCounter = 0;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index ca00144..89311ba 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -1345,7 +1345,20 @@
// implements javax.swing.MenuElement
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ int newDesiredLocationX = f.get("desiredLocationX", 0);
+ int newDesiredLocationY = f.get("desiredLocationY", 0);
+ Point p = adjustPopupLocationToFitScreen(
+ newDesiredLocationX, newDesiredLocationY);
+ desiredLocationX = p.x;
+ desiredLocationY = p.y;
+
+ label = (String) f.get("label", null);
+ paintBorder = f.get("paintBorder", false);
+ margin = (Insets) f.get("margin", null);
+ lightWeightPopup = f.get("lightWeightPopup", false);
+ selectionModel = (SingleSelectionModel) f.get("selectionModel", null);
Vector<?> values = (Vector)s.readObject();
int indexCounter = 0;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
index 96c0505..ffde325 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -495,10 +495,7 @@
*
*/
public void setTabPlacement(int tabPlacement) {
- if (tabPlacement != TOP && tabPlacement != LEFT &&
- tabPlacement != BOTTOM && tabPlacement != RIGHT) {
- throw new IllegalArgumentException("illegal tab placement: must be TOP, BOTTOM, LEFT, or RIGHT");
- }
+ checkTabPlacement(tabPlacement);
if (this.tabPlacement != tabPlacement) {
int oldValue = this.tabPlacement;
this.tabPlacement = tabPlacement;
@@ -508,6 +505,14 @@
}
}
+ private static void checkTabPlacement(int tabPlacement) {
+ if (tabPlacement != TOP && tabPlacement != LEFT &&
+ tabPlacement != BOTTOM && tabPlacement != RIGHT) {
+ throw new IllegalArgumentException("illegal tab placement:"
+ + " must be TOP, BOTTOM, LEFT, or RIGHT");
+ }
+ }
+
/**
* Returns the policy used by the tabbedpane to layout the tabs when all the
* tabs will not fit within a single run.
@@ -551,9 +556,7 @@
*
*/
public void setTabLayoutPolicy(int tabLayoutPolicy) {
- if (tabLayoutPolicy != WRAP_TAB_LAYOUT && tabLayoutPolicy != SCROLL_TAB_LAYOUT) {
- throw new IllegalArgumentException("illegal tab layout policy: must be WRAP_TAB_LAYOUT or SCROLL_TAB_LAYOUT");
- }
+ checkTabLayoutPolicy(tabLayoutPolicy);
if (this.tabLayoutPolicy != tabLayoutPolicy) {
int oldValue = this.tabLayoutPolicy;
this.tabLayoutPolicy = tabLayoutPolicy;
@@ -563,6 +566,14 @@
}
}
+ private static void checkTabLayoutPolicy(int tabLayoutPolicy) {
+ if (tabLayoutPolicy != WRAP_TAB_LAYOUT
+ && tabLayoutPolicy != SCROLL_TAB_LAYOUT) {
+ throw new IllegalArgumentException("illegal tab layout policy:"
+ + " must be WRAP_TAB_LAYOUT or SCROLL_TAB_LAYOUT");
+ }
+ }
+
/**
* Returns the currently selected index for this tabbedpane.
* Returns -1 if there is no currently selected tab.
@@ -1816,7 +1827,19 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ int newTabPlacement = f.get("tabPlacement", TOP);
+ checkTabPlacement(newTabPlacement);
+ tabPlacement = newTabPlacement;
+ int newTabLayoutPolicy = f.get("tabLayoutPolicy", 0);
+ checkTabLayoutPolicy(newTabLayoutPolicy);
+ tabLayoutPolicy = newTabLayoutPolicy;
+ model = (SingleSelectionModel) f.get("model", null);
+ haveRegistered = f.get("haveRegistered", false);
+ changeListener = (ChangeListener) f.get("changeListener", null);
+ visComp = (Component) f.get("visComp", null);
+
if ((ui != null) && (getUIClassID().equals(uiClassID))) {
ui.installUI(this);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTable.java b/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
index a4f30ac..d88dbed 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -37,6 +37,7 @@
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.IOException;
+import java.io.InvalidObjectException;
import javax.accessibility.*;
@@ -1203,11 +1204,7 @@
* AUTO_RESIZE_ALL_COLUMNS JTable.AUTO_RESIZE_ALL_COLUMNS
*/
public void setAutoResizeMode(int mode) {
- if ((mode == AUTO_RESIZE_OFF) ||
- (mode == AUTO_RESIZE_NEXT_COLUMN) ||
- (mode == AUTO_RESIZE_SUBSEQUENT_COLUMNS) ||
- (mode == AUTO_RESIZE_LAST_COLUMN) ||
- (mode == AUTO_RESIZE_ALL_COLUMNS)) {
+ if (isValidAutoResizeMode(mode)) {
int old = autoResizeMode;
autoResizeMode = mode;
resizeAndRepaint();
@@ -1218,6 +1215,14 @@
}
}
+ private static boolean isValidAutoResizeMode(int mode) {
+ return (mode == AUTO_RESIZE_OFF)
+ || (mode == AUTO_RESIZE_NEXT_COLUMN)
+ || (mode == AUTO_RESIZE_SUBSEQUENT_COLUMNS)
+ || (mode == AUTO_RESIZE_LAST_COLUMN)
+ || (mode == AUTO_RESIZE_ALL_COLUMNS);
+ }
+
/**
* Returns the auto resize mode of the table. The default mode
* is AUTO_RESIZE_SUBSEQUENT_COLUMNS.
@@ -1439,10 +1444,14 @@
* bound: false
*/
public void setDragEnabled(boolean b) {
+ checkDragEnabled(b);
+ dragEnabled = b;
+ }
+
+ private void checkDragEnabled(boolean b) {
if (b && GraphicsEnvironment.isHeadless()) {
throw new HeadlessException();
}
- dragEnabled = b;
}
/**
@@ -1489,6 +1498,11 @@
* @since 1.6
*/
public final void setDropMode(DropMode dropMode) {
+ checkDropMode(dropMode);
+ this.dropMode = dropMode;
+ }
+
+ private static void checkDropMode(DropMode dropMode) {
if (dropMode != null) {
switch (dropMode) {
case USE_SELECTION:
@@ -1499,14 +1513,12 @@
case ON_OR_INSERT:
case ON_OR_INSERT_ROWS:
case ON_OR_INSERT_COLS:
- this.dropMode = dropMode;
return;
}
}
-
- throw new IllegalArgumentException(dropMode + ": Unsupported drop mode for table");
+ throw new IllegalArgumentException(dropMode
+ + ": Unsupported drop mode for table");
}
-
/**
* Returns the drop mode for this component.
*
@@ -5865,7 +5877,75 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ TableModel newDataModel = (TableModel) f.get("dataModel", null);
+ if (newDataModel == null) {
+ throw new InvalidObjectException("Null dataModel");
+ }
+ dataModel = newDataModel;
+
+ TableColumnModel newColumnModel = (TableColumnModel) f.get("columnModel", null);
+ if (newColumnModel == null) {
+ throw new InvalidObjectException("Null columnModel");
+ }
+ columnModel = newColumnModel;
+
+ ListSelectionModel newSelectionModel = (ListSelectionModel) f.get("selectionModel", null);
+ if (newSelectionModel == null) {
+ throw new InvalidObjectException("Null selectionModel");
+ }
+ selectionModel = newSelectionModel;
+
+ tableHeader = (JTableHeader) f.get("tableHeader", null);
+ int newRowHeight = f.get("rowHeight", 0);
+ if (newRowHeight <= 0) {
+ throw new InvalidObjectException("Row height less than 1");
+ }
+ rowHeight = newRowHeight;
+
+ rowMargin = f.get("rowMargin", 0);
+ Color newGridColor = (Color) f.get("gridColor", null);
+ if (newGridColor == null) {
+ throw new InvalidObjectException("Null gridColor");
+ }
+ gridColor = newGridColor;
+
+ showHorizontalLines = f.get("showHorizontalLines", false);
+ showVerticalLines = f.get("showVerticalLines", false);
+ int newAutoResizeMode = f.get("autoResizeMode", 0);
+ if (!isValidAutoResizeMode(newAutoResizeMode)) {
+ throw new InvalidObjectException("autoResizeMode is not valid");
+ }
+ autoResizeMode = newAutoResizeMode;
+ autoCreateColumnsFromModel = f.get("autoCreateColumnsFromModel", false);
+ preferredViewportSize = (Dimension) f.get("preferredViewportSize", null);
+ rowSelectionAllowed = f.get("rowSelectionAllowed", false);
+ cellSelectionEnabled = f.get("cellSelectionEnabled", false);
+ selectionForeground = (Color) f.get("selectionForeground", null);
+ selectionBackground = (Color) f.get("selectionBackground", null);
+ rowModel = (SizeSequence) f.get("rowModel", null);
+
+ boolean newDragEnabled = f.get("dragEnabled", false);
+ checkDragEnabled(newDragEnabled);
+ dragEnabled = newDragEnabled;
+
+ surrendersFocusOnKeystroke = f.get("surrendersFocusOnKeystroke", false);
+ editorRemover = (PropertyChangeListener) f.get("editorRemover", null);
+ columnSelectionAdjusting = f.get("columnSelectionAdjusting", false);
+ rowSelectionAdjusting = f.get("rowSelectionAdjusting", false);
+ printError = (Throwable) f.get("printError", null);
+ isRowHeightSet = f.get("isRowHeightSet", false);
+ updateSelectionOnSort = f.get("updateSelectionOnSort", false);
+ ignoreSortChange = f.get("ignoreSortChange", false);
+ sorterChanged = f.get("sorterChanged", false);
+ autoCreateRowSorter = f.get("autoCreateRowSorter", false);
+ fillsViewportHeight = f.get("fillsViewportHeight", false);
+ DropMode newDropMode = (DropMode) f.get("dropMode",
+ DropMode.USE_SELECTION);
+ checkDropMode(newDropMode);
+ dropMode = newDropMode;
+
if ((ui != null) && (getUIClassID().equals(uiClassID))) {
ui.installUI(this);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JTree.java b/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
index 3188156..6d50f6f 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -1216,10 +1216,14 @@
* bound: false
*/
public void setDragEnabled(boolean b) {
+ checkDragEnabled(b);
+ dragEnabled = b;
+ }
+
+ private static void checkDragEnabled(boolean b) {
if (b && GraphicsEnvironment.isHeadless()) {
throw new HeadlessException();
}
- dragEnabled = b;
}
/**
@@ -1262,18 +1266,23 @@
* @since 1.6
*/
public final void setDropMode(DropMode dropMode) {
+ checkDropMode(dropMode);
+ this.dropMode = dropMode;
+ }
+
+ private static void checkDropMode(DropMode dropMode) {
if (dropMode != null) {
switch (dropMode) {
case USE_SELECTION:
case ON:
case INSERT:
case ON_OR_INSERT:
- this.dropMode = dropMode;
return;
}
}
- throw new IllegalArgumentException(dropMode + ": Unsupported drop mode for tree");
+ throw new IllegalArgumentException(dropMode +
+ ": Unsupported drop mode for tree");
}
/**
@@ -3089,7 +3098,34 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ rootVisible = f.get("rootVisible", false);
+ rowHeight = f.get("rowHeight", 0);
+ rowHeightSet = f.get("rowHeightSet", false);
+ showsRootHandles = f.get("showsRootHandles", false);
+ showsRootHandlesSet = f.get("showsRootHandlesSet", false);
+ editable = f.get("editable", false);
+ largeModel = f.get("largeModel", false);
+ visibleRowCount = f.get("visibleRowCount", 0);
+ invokesStopCellEditing = f.get("invokesStopCellEditing", false);
+ scrollsOnExpand = f.get("scrollsOnExpand", false);
+ scrollsOnExpandSet = f.get("scrollsOnExpandSet", false);
+ toggleClickCount = f.get("toggleClickCount", 0);
+ leadPath = (TreePath) f.get("leadPath", null);
+ anchorPath = (TreePath) f.get("anchorPath", null);
+ expandsSelectedPaths = f.get("expandsSelectedPaths", false);
+ settingUI = f.get("settingUI", false);
+ boolean newDragEnabled = f.get("dragEnabled", false);
+ checkDragEnabled(newDragEnabled);
+ dragEnabled = newDragEnabled;
+ DropMode newDropMode = (DropMode) f.get("dropMode",
+ DropMode.USE_SELECTION);
+ checkDropMode(newDropMode);
+ dropMode = newDropMode;
+
+ expandRow = f.get("expandRow", -1);
+ dropTimer = (TreeTimer) f.get("dropTimer", null);
// Create an instance of expanded state.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java b/jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
index de33d4c..ac366ca 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
@@ -194,7 +194,23 @@
private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException
{
- in.defaultReadObject();
+ ObjectInputStream.GetField f = in.readFields();
+
+ @SuppressWarnings("unchecked")
+ HashMap<Component, Component> newForwardMap =
+ (HashMap<Component, Component> ) f.get("forwardMap", null);
+ if (newForwardMap == null) {
+ throw new InvalidObjectException("Null forwardMap");
+ }
+ forwardMap = newForwardMap;
+ @SuppressWarnings("unchecked")
+ HashMap<Component, Component> newBackwardMap =
+ (HashMap<Component, Component>) f.get("backwardMap", null);
+ if (newBackwardMap == null) {
+ throw new InvalidObjectException("Null backwardMap");
+ }
+ backwardMap = newBackwardMap;
+
delegatePolicy = (FocusTraversalPolicy)in.readObject();
delegateManager = (DefaultFocusManager)in.readObject();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
index fb7b282..07705f4 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -374,7 +374,8 @@
sourceWheelEvent.isPopupTrigger(),
sourceWheelEvent.getScrollType(),
sourceWheelEvent.getScrollAmount(),
- sourceWheelEvent.getWheelRotation());
+ sourceWheelEvent.getWheelRotation(),
+ sourceWheelEvent.getPreciseWheelRotation());
}
else if (sourceEvent instanceof MenuDragMouseEvent) {
MenuDragMouseEvent sourceMenuDragEvent = (MenuDragMouseEvent)sourceEvent;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/Timer.java b/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
index 6caced7..ffaa9d5 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -401,14 +401,15 @@
* @see #setInitialDelay
*/
public void setDelay(int delay) {
- if (delay < 0) {
- throw new IllegalArgumentException("Invalid delay: " + delay);
- }
- else {
+ checkDelay(delay, "Invalid delay: ");
this.delay = delay;
}
- }
+ private static void checkDelay(int delay, String message) {
+ if (delay < 0) {
+ throw new IllegalArgumentException(message + delay);
+ }
+ }
/**
* Returns the delay, in milliseconds,
@@ -435,14 +436,9 @@
* @see #setDelay
*/
public void setInitialDelay(int initialDelay) {
- if (initialDelay < 0) {
- throw new IllegalArgumentException("Invalid initial delay: " +
- initialDelay);
- }
- else {
+ checkDelay(initialDelay, "Invalid initial delay: ");
this.initialDelay = initialDelay;
}
- }
/**
@@ -638,7 +634,26 @@
throws ClassNotFoundException, IOException
{
this.acc = AccessController.getContext();
- in.defaultReadObject();
+ ObjectInputStream.GetField f = in.readFields();
+
+ EventListenerList newListenerList = (EventListenerList)
+ f.get("listenerList", null);
+ if (newListenerList == null) {
+ throw new InvalidObjectException("Null listenerList");
+ }
+ listenerList = newListenerList;
+
+ int newInitialDelay = f.get("initialDelay", 0);
+ checkDelay(newInitialDelay, "Invalid initial delay: ");
+ initialDelay = newInitialDelay;
+
+ int newDelay = f.get("delay", 0);
+ checkDelay(newDelay, "Invalid delay: ");
+ delay = newDelay;
+
+ repeats = f.get("repeats", false);
+ coalesce = f.get("coalesce", false);
+ actionCommand = (String) f.get("actionCommand", null);
}
/*
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java b/jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
index 817a2f7..3543e1c 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
@@ -107,7 +107,7 @@
* @see #SwingPropertyChangeSupport(Object sourceBean, boolean notifyOnEDT)
* @since 1.6
*/
- public final boolean isNotifyOnEDT() {
+ public boolean isNotifyOnEDT() {
return notifyOnEDT;
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java
index e0d9f1f..2ba9741 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComboBoxUI.java
@@ -37,16 +37,25 @@
/**
* Set the visibility of the popup
+ *
+ * @param c a {@code JComboBox}
+ * @param v a {@code boolean} determining the visibilty of the popup
*/
public abstract void setPopupVisible( JComboBox<?> c, boolean v );
/**
* Determine the visibility of the popup
+ *
+ * @param c a {@code JComboBox}
+ * @return true if popup of the {@code JComboBox} is visible
*/
public abstract boolean isPopupVisible( JComboBox<?> c );
/**
* Determine whether or not the combo box itself is traversable
+ *
+ * @param c a {@code JComboBox}
+ * @return true if the given {@code JComboBox} is traversable
*/
public abstract boolean isFocusTraversable( JComboBox<?> c );
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java
index 190d450..15a05cd 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/ComponentUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -173,7 +173,8 @@
* this argument is often ignored,
* but might be used if the UI object is stateless
* and shared by multiple components
- *
+ * @return a {@code Dimension} object containing given component's preferred
+ * size appropriate for the look and feel
* @see javax.swing.JComponent#getPreferredSize
* @see java.awt.LayoutManager#preferredLayoutSize
*/
@@ -240,7 +241,8 @@
* and shared by multiple components
* @param x the <i>x</i> coordinate of the point
* @param y the <i>y</i> coordinate of the point
- *
+ * @return {@code true} if the specified {@code x,y} location is contained
+ * within the look and feel's defined shape for the given component
* @see javax.swing.JComponent#contains
* @see java.awt.Component#contains
*/
@@ -258,6 +260,9 @@
* stateful, then it should return a new instance per component.
* The default implementation of this method throws an error, as it
* should never be invoked.
+ *
+ * @param c a {@code JComponent} for which to create a UI delegate
+ * @return a {@code ComponentUI} object for {@code c}
*/
public static ComponentUI createUI(JComponent c) {
throw new Error("ComponentUI.createUI not implemented.");
@@ -332,8 +337,9 @@
* <code>Component.AccessibleAWTComponent.getAccessibleChildrenCount()</code> instead
* of this method.
*
- * @see #getAccessibleChild
+ * @param c {@code JComponent} for which to get count of accessible children
* @return the number of accessible children in the object
+ * @see #getAccessibleChild
*/
public int getAccessibleChildrenCount(JComponent c) {
return SwingUtilities.getAccessibleChildrenCount(c);
@@ -351,9 +357,10 @@
* <code>Component.AccessibleAWTComponent.getAccessibleChild()</code> instead of
* this method.
*
- * @see #getAccessibleChildrenCount
+ * @param c a {@code JComponent} for which to get a child object
* @param i zero-based index of child
* @return the <code>i</code>th <code>Accessible</code> child of the object
+ * @see #getAccessibleChildrenCount
*/
public Accessible getAccessibleChild(JComponent c, int i) {
return SwingUtilities.getAccessibleChild(c, i);
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java
index d9b4361..e3f2373b 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/FileChooserUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,8 @@
* <code>JFileChooser</code> will use this button as default button
* for dialog windows.
*
+ * @param fc the {@code JFileChooser} whose default button is requested
+ * @return the default JButton for current look and feel
* @since 1.7
*/
public JButton getDefaultButton(JFileChooser fc) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java
index a8584fd..a60da23 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/LayerUI.java
@@ -716,10 +716,22 @@
* @param y the y value of the region to be painted
* @param width the width of the region to be painted
* @param height the height of the region to be painted
- *
+ * @param l a {@code JLayer} component
* @see JComponent#paintImmediately(int, int, int, int)
*/
public void paintImmediately(int x, int y, int width, int height, JLayer<? extends V> l) {
l.paintImmediately(x, y, width, height);
}
+
+ /**
+ * Delegates its functionality to the default implementation of the {@code JLayer.imageUpdate} method
+ * which is inherited from {@code JLayer}'s base classes.
+ * <p>
+ * This method is to be overridden instead of {@code JLayer.imageUpdate}.
+ * <p>
+ * <b>Note:</b> This method is usually called <b>not</b> on the Event Dispatching Thread.
+ */
+ public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h, JLayer<? extends V> l) {
+ return l.imageUpdate(img, infoflags, x, y, w, h);
+ }
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java
index 49137e7..fc967b8 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/OptionPaneUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,18 @@
/**
* Requests the component representing the default value to have
* focus.
+ *
+ * @param op a {@code JOptionPane}
*/
public abstract void selectInitialValue(JOptionPane op);
/**
* Returns true if the user has supplied instances of Component for
* either the options or message.
+ *
+ * @param op a {@code JOptionPane}
+ * @return {@code true} if the given {@code JOptionPane} contains user
+ * created {@code Component}s
*/
public abstract boolean containsCustomComponents(JOptionPane op);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java
index 5f57c65..ab485a2 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/PopupMenuUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,11 @@
public abstract class PopupMenuUI extends ComponentUI {
/**
+ * Returns whether or not the given {@code MouseEvent} is the popup menu
+ * trigger event for the platform
+ *
+ * @param e a {@code MouseEvent}
+ * @return true if the {@code MouseEvent e} is the popup menu trigger
* @since 1.3
*/
public boolean isPopupTrigger(MouseEvent e) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java
index ed62e39..15afcee 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/SplitPaneUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,32 +38,49 @@
/**
* Messaged to relayout the JSplitPane based on the preferred size
* of the children components.
+ *
+ * @param jc a {@code JSplitPane}
*/
public abstract void resetToPreferredSizes(JSplitPane jc);
/**
* Sets the location of the divider to location.
+ *
+ * @param jc a {@code JSplitPane}
+ * @param location an integer specifying the location of the divider
*/
public abstract void setDividerLocation(JSplitPane jc, int location);
/**
* Returns the location of the divider.
+ *
+ * @param jc a {@code JSplitPane}
+ * @return an integer specifying the location of the divider
*/
public abstract int getDividerLocation(JSplitPane jc);
/**
* Returns the minimum possible location of the divider.
+ *
+ * @param jc a {@code JSplitPane}
+ * @return and integer specifying the minimum location of the divider
*/
public abstract int getMinimumDividerLocation(JSplitPane jc);
/**
* Returns the maximum possible location of the divider.
+ *
+ * @param jc a {@code JSplitPane}
+ * @return an integer specifying the maximum location of the divider
*/
public abstract int getMaximumDividerLocation(JSplitPane jc);
/**
* Messaged after the JSplitPane the receiver is providing the look
* and feel for paints its children.
+ *
+ * @param jc a {@code JSplitPane}
+ * @param g the {@code Graphics} context
*/
public abstract void finishedPaintingChildren(JSplitPane jc, Graphics g);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
index 0ce25c1..6332d1d 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,9 @@
* Converts the given location in the model to a place in
* the view coordinate system.
*
+ * @param t the text component for which this UI is installed
* @param pos the local location in the model to translate >= 0
- * @return the coordinates as a rectangle
+ * @return the coordinates as a {@code Rectangle}
* @exception BadLocationException if the given position does not
* represent a valid location in the associated document
*/
@@ -53,8 +54,10 @@
* Converts the given location in the model to a place in
* the view coordinate system.
*
+ * @param t the text component for which this UI is installed
* @param pos the local location in the model to translate >= 0
- * @return the coordinates as a rectangle
+ * @param bias the bias for the position
+ * @return the coordinates as a {@code Rectangle}
* @exception BadLocationException if the given position does not
* represent a valid location in the associated document
*/
@@ -64,6 +67,7 @@
* Converts the given place in the view coordinate system
* to the nearest representative location in the model.
*
+ * @param t the text component for which this UI is installed
* @param pt the location in the view to translate. This
* should be in the same coordinate system as the mouse
* events.
@@ -75,6 +79,7 @@
* Provides a mapping from the view coordinate space to the logical
* coordinate space of the model.
*
+ * @param t the text component for which this UI is installed
* @param pt the location in the view to translate.
* This should be in the same coordinate system
* as the mouse events.
@@ -117,6 +122,7 @@
* Causes the portion of the view responsible for the
* given part of the model to be repainted.
*
+ * @param t the text component for which this UI is installed
* @param p0 the beginning of the range >= 0
* @param p1 the end of the range >= p0
*/
@@ -126,8 +132,13 @@
* Causes the portion of the view responsible for the
* given part of the model to be repainted.
*
+ * @param t the text component for which this UI is installed
* @param p0 the beginning of the range >= 0
* @param p1 the end of the range >= p0
+ * @param firstBias the bias of the first character position, toward the
+ * previous character or the next character
+ * @param secondBias the bias of the second character position, toward the
+ * previous character or the next character
*/
public abstract void damageRange(JTextComponent t, int p0, int p1,
Position.Bias firstBias,
@@ -139,6 +150,7 @@
* things like the commands available, stream readers and
* writers, etc.
*
+ * @param t the text component for which this UI is installed
* @return the editor kit binding
*/
public abstract EditorKit getEditorKit(JTextComponent t);
@@ -149,13 +161,18 @@
* can be traversed to determine how the model is being
* represented spatially.
*
- * @return the view
+ * @param t the text component for which this UI is installed
+ * @return a {@code View} with the allocation of the associated
+ * text component
*/
public abstract View getRootView(JTextComponent t);
/**
* Returns the string to be used as the tooltip at the passed in location.
*
+ * @param t the text component for which this UI is installed
+ * @param pt a {@code Point} specifying location for which to get a tooltip
+ * @return a {@code String} containing the tooltip
* @see javax.swing.text.JTextComponent#getToolTipText
* @since 1.4
*/
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java
index d1ded67..5968b33 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/TreeUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,68 +38,109 @@
public abstract class TreeUI extends ComponentUI
{
/**
- * Returns the Rectangle enclosing the label portion that the
- * last item in path will be drawn into. Will return null if
- * any component in path is currently valid.
- */
+ * Returns the Rectangle enclosing the label portion that the
+ * last item in path will be drawn into. Will return null if
+ * any component in path is currently valid.
+ *
+ * @param tree the {@code JTree} for {@code path}
+ * @param path the {@code TreePath} identifying the node
+ * @return the {@code Rectangle} enclosing the label portion that the
+ * last item in path will be drawn into, {@code null} if any
+ * component in path is currently valid.
+ */
public abstract Rectangle getPathBounds(JTree tree, TreePath path);
/**
- * Returns the path for passed in row. If row is not visible
- * null is returned.
- */
+ * Returns the path for passed in row. If row is not visible
+ * null is returned.
+ *
+ * @param tree a {@code JTree} object
+ * @param row an integer specifying a row
+ * @return the {@code path} for {@code row} or {@code null} if {@code row}
+ * is not visible
+ */
public abstract TreePath getPathForRow(JTree tree, int row);
/**
- * Returns the row that the last item identified in path is visible
- * at. Will return -1 if any of the elements in path are not
- * currently visible.
- */
+ * Returns the row that the last item identified in path is visible
+ * at. Will return -1 if any of the elements in path are not
+ * currently visible.
+ *
+ * @param tree the {@code JTree} for {@code path}
+ * @param path the {@code TreePath} object to look in
+ * @return an integer specifying the row at which the last item
+ * identified is visible, -1 if any of the elements in
+ * {@code path} are not currently visible
+ */
public abstract int getRowForPath(JTree tree, TreePath path);
/**
- * Returns the number of rows that are being displayed.
- */
+ * Returns the number of rows that are being displayed.
+ *
+ * @param tree the {@code JTree} for which to count rows
+ * @return an integer specifying the number of row being displayed
+ */
public abstract int getRowCount(JTree tree);
/**
- * Returns the path to the node that is closest to x,y. If
- * there is nothing currently visible this will return null, otherwise
- * it'll always return a valid path. If you need to test if the
- * returned object is exactly at x, y you should get the bounds for
- * the returned path and test x, y against that.
- */
+ * Returns the path to the node that is closest to x,y. If
+ * there is nothing currently visible this will return null, otherwise
+ * it'll always return a valid path. If you need to test if the
+ * returned object is exactly at x, y you should get the bounds for
+ * the returned path and test x, y against that.
+ *
+ * @param tree a {@code JTree} object
+ * @param x an integer giving the number of pixels horizontally from the
+ * left edge of the display area
+ * @param y an integer giving the number of pixels vertically from the top
+ * of the display area, minus any top margin
+ * @return the {@code TreePath} node closest to {@code x,y} or {@code null}
+ * if there is nothing currently visible
+ */
public abstract TreePath getClosestPathForLocation(JTree tree, int x,
int y);
/**
- * Returns true if the tree is being edited. The item that is being
- * edited can be returned by getEditingPath().
- */
+ * Returns true if the tree is being edited. The item that is being
+ * edited can be returned by getEditingPath().
+ *
+ * @param tree a {@code JTree} object
+ * @return true if {@code tree} is being edited
+ */
public abstract boolean isEditing(JTree tree);
/**
- * Stops the current editing session. This has no effect if the
- * tree isn't being edited. Returns true if the editor allows the
- * editing session to stop.
- */
+ * Stops the current editing session. This has no effect if the
+ * tree isn't being edited. Returns true if the editor allows the
+ * editing session to stop.
+ *
+ * @param tree a {@code JTree} object
+ * @return true if the editor allows the editing session to stop
+ */
public abstract boolean stopEditing(JTree tree);
/**
- * Cancels the current editing session. This has no effect if the
- * tree isn't being edited. Returns true if the editor allows the
- * editing session to stop.
- */
+ * Cancels the current editing session. This has no effect if the
+ * tree isn't being edited.
+ *
+ * @param tree a {@code JTree} object
+ */
public abstract void cancelEditing(JTree tree);
/**
- * Selects the last item in path and tries to edit it. Editing will
- * fail if the CellEditor won't allow it for the selected item.
- */
+ * Selects the last item in path and tries to edit it. Editing will
+ * fail if the CellEditor won't allow it for the selected item.
+ *
+ * @param tree the {@code JTree} being edited
+ * @param path the {@code TreePath} to be edited
+ */
public abstract void startEditingAtPath(JTree tree, TreePath path);
/**
* Returns the path to the element that is being edited.
+ *
+ * @param tree the {@code JTree} for which to return a path
+ * @return a {@code TreePath} containing the path to {@code tree}
*/
public abstract TreePath getEditingPath(JTree tree);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
index ffbd5ea..c7c5ad0 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -351,10 +351,15 @@
/**
- * Installs necessary mouse handlers on <code>newPane</code>
- * and adds it to the frame.
- * Reverse process for the <code>currentPane</code>.
- */
+ * Installs necessary mouse handlers on <code>newPane</code>
+ * and adds it to the frame.
+ * Reverse process for the <code>currentPane</code>.
+ *
+ * @param currentPane this {@code Jcomponent} is the current pane being
+ * viewed that has mouse handlers installed
+ * @param newPane this {@code Jcomponent} is the pane which will be added
+ * and have mouse handlers installed
+ */
protected void replacePane(JComponent currentPane, JComponent newPane) {
if(currentPane != null) {
deinstallMouseHandlers(currentPane);
@@ -517,11 +522,12 @@
}
/// DesktopManager methods
- /** Returns the proper DesktopManager. Calls getDesktopPane() to
- * find the JDesktop component and returns the desktopManager from
- * it. If this fails, it will return a default DesktopManager that
- * should work in arbitrary parents.
- */
+ /**
+ * Returns the proper DesktopManager. Calls getDesktopPane() to
+ * find the JDesktop component and returns the desktopManager from
+ * it. If this fails, it will return a default DesktopManager that
+ * should work in arbitrary parents.
+ */
protected DesktopManager getDesktopManager() {
if(frame.getDesktopPane() != null
&& frame.getDesktopPane().getDesktopManager() != null)
@@ -539,6 +545,8 @@
* This method is called when the user wants to close the frame.
* The <code>playCloseSound</code> Action is fired.
* This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
*/
protected void closeFrame(JInternalFrame f) {
// Internal Frame Auditory Cue Activation
@@ -551,6 +559,8 @@
* This method is called when the user wants to maximize the frame.
* The <code>playMaximizeSound</code> Action is fired.
* This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
*/
protected void maximizeFrame(JInternalFrame f) {
// Internal Frame Auditory Cue Activation
@@ -563,6 +573,8 @@
* This method is called when the user wants to minimize the frame.
* The <code>playRestoreDownSound</code> Action is fired.
* This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
*/
protected void minimizeFrame(JInternalFrame f) {
// Internal Frame Auditory Cue Activation
@@ -579,6 +591,8 @@
* This method is called when the user wants to iconify the frame.
* The <code>playMinimizeSound</code> Action is fired.
* This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
*/
protected void iconifyFrame(JInternalFrame f) {
// Internal Frame Auditory Cue Activation
@@ -591,6 +605,8 @@
* This method is called when the user wants to deiconify the frame.
* The <code>playRestoreUpSound</code> Action is fired.
* This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
*/
protected void deiconifyFrame(JInternalFrame f) {
// Internal Frame Auditory Cue Activation
@@ -603,15 +619,21 @@
getDesktopManager().deiconifyFrame(f);
}
- /** This method is called when the frame becomes selected.
+ /**
+ * This method is called when the frame becomes selected.
* This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
*/
protected void activateFrame(JInternalFrame f) {
getDesktopManager().activateFrame(f);
}
- /** This method is called when the frame is no longer selected.
- * This action is delegated to the desktopManager.
- */
+ /**
+ * This method is called when the frame is no longer selected.
+ * This action is delegated to the desktopManager.
+ *
+ * @param f the {@code JInternalFrame} being viewed
+ */
protected void deactivateFrame(JInternalFrame f) {
getDesktopManager().deactivateFrame(f);
}
@@ -769,7 +791,7 @@
resizeDir = SOUTH;
}
} else {
- /* the mouse press happened inside the frame, not in the
+ /* the mouse press happened inside the frame, not in the
border */
discardRelease = true;
return;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
index c7642f4..ebb0862 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -93,8 +93,10 @@
private final static int scrollSpeedThrottle = 60; // delay in milli seconds
- /** True indicates a middle click will absolutely position the
- * scrollbar. */
+ /**
+ * True indicates a middle click will absolutely position the
+ * scrollbar.
+ */
private boolean supportsAbsolutePositioning;
/**
@@ -877,6 +879,10 @@
* Set the bounds of the thumb and force a repaint that includes
* the old thumbBounds and the new one.
*
+ * @param x set the x location of the thumb
+ * @param y set the y location of the thumb
+ * @param width set the width of the thumb
+ * @param height set the height of the thumb
* @see #getThumbBounds
*/
protected void setThumbBounds(int x, int y, int width, int height)
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
index b6ca67d..bfd4e76 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
@@ -656,10 +656,15 @@
}
/**
- * Gets the height of the tick area for horizontal sliders and the width of the
- * tick area for vertical sliders. BasicSliderUI uses the returned value to
- * determine the tick area rectangle. If you want to give your ticks some room,
- * make this larger than you need and paint your ticks away from the sides in paintTicks().
+ * Gets the height of the tick area for horizontal sliders and the width of
+ * the tick area for vertical sliders. BasicSliderUI uses the returned value
+ * to determine the tick area rectangle. If you want to give your ticks some
+ * room, make this larger than you need and paint your ticks away from the
+ * sides in paintTicks().
+ *
+ * @return an integer representing the height of the tick area for
+ * horizontal sliders, and the width of the tick area for the vertical
+ * sliders
*/
protected int getTickLength() {
return 8;
@@ -867,7 +872,7 @@
* Returns the smallest value that has an entry in the label table.
*
* @return smallest value that has an entry in the label table, or
- * null.
+ * null.
* @since 1.6
*/
protected Integer getLowestValue() {
@@ -894,7 +899,11 @@
/**
- * Returns the label that corresponds to the highest slider value in the label table.
+ * Returns the label that corresponds to the highest slider value in the
+ * label table.
+ *
+ * @return the label that corresponds to the highest slider value in the
+ * label table
* @see JSlider#setLabelTable
*/
protected Component getLowestValueLabel() {
@@ -906,7 +915,11 @@
}
/**
- * Returns the label that corresponds to the lowest slider value in the label table.
+ * Returns the label that corresponds to the lowest slider value in the
+ * label table.
+ *
+ * @return the label that corresponds to the lowest slider value in the
+ * label table
* @see JSlider#setLabelTable
*/
protected Component getHighestValueLabel() {
@@ -1166,8 +1179,14 @@
}
/**
- * Called for every label in the label table. Used to draw the labels for horizontal sliders.
- * The graphics have been translated to labelRect.y already.
+ * Called for every label in the label table. Used to draw the labels for
+ * horizontal sliders. The graphics have been translated to labelRect.y
+ * already.
+ *
+ * @param g the graphics context in which to paint
+ * @param value the value of the slider
+ * @param label the component label in the label table that needs to be
+ * painted
* @see JSlider#setLabelTable
*/
protected void paintHorizontalLabel( Graphics g, int value, Component label ) {
@@ -1179,8 +1198,14 @@
}
/**
- * Called for every label in the label table. Used to draw the labels for vertical sliders.
- * The graphics have been translated to labelRect.x already.
+ * Called for every label in the label table. Used to draw the labels for
+ * vertical sliders. The graphics have been translated to labelRect.x
+ * already.
+ *
+ * @param g the graphics context in which to paint
+ * @param value the value of the slider
+ * @param label the component label in the label table that needs to be
+ * painted
* @see JSlider#setLabelTable
*/
protected void paintVerticalLabel( Graphics g, int value, Component label ) {
@@ -1342,9 +1367,12 @@
}
/**
- * This function is called when a mousePressed was detected in the track, not
- * in the thumb. The default behavior is to scroll by block. You can
- * override this method to stop it from scrolling or to add additional behavior.
+ * This function is called when a mousePressed was detected in the track,
+ * not in the thumb. The default behavior is to scroll by block. You can
+ * override this method to stop it from scrolling or to add additional
+ * behavior.
+ *
+ * @param dir the direction and number of blocks to scroll
*/
protected void scrollDueToClickInTrack( int dir ) {
scrollByBlock( dir );
@@ -1387,6 +1415,7 @@
* @param value the slider value to get the location for
* @param trackY y-origin of the track
* @param trackHeight the height of the track
+ * @return the y location for the specified value of the slider
* @since 1.6
*/
protected int yPositionForValue(int value, int trackY, int trackHeight) {
@@ -1417,6 +1446,9 @@
* track at the the bottom or the top, this method sets the value to either
* the minimum or maximum value of the slider, depending on if the slider
* is inverted or not.
+ *
+ * @param yPos the location of the slider along the y axis
+ * @return the value at the y position
*/
public int valueForYPosition( int yPos ) {
int value;
@@ -1449,6 +1481,9 @@
* track at the left or the right, this method sets the value to either the
* minimum or maximum value of the slider, depending on if the slider is
* inverted or not.
+ *
+ * @param xPos the location of the slider along the x axis
+ * @return the value of the x position
*/
public int valueForXPosition( int xPos ) {
int value;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index bf27557..7490b8e 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -1174,6 +1174,16 @@
* this function draws the border around each tab
* note that this function does now draw the background of the tab.
* that is done elsewhere
+ *
+ * @param g the graphics context in which to paint
+ * @param tabPlacement the placement (left, right, bottom, top) of the tab
+ * @param tabIndex the index of the tab with respect to other tabs
+ * @param x the x coordinate of tab
+ * @param y the y coordinate of tab
+ * @param w the width of the tab
+ * @param h the height of the tab
+ * @param isSelected a {@code boolean} which determines whether or not
+ * the tab is selected
*/
protected void paintTabBorder(Graphics g, int tabPlacement,
int tabIndex,
@@ -3530,12 +3540,7 @@
else if (name =="indexForTitle") {
calculatedBaseline = false;
Integer index = (Integer) e.getNewValue();
- // remove the current index
- // to let updateHtmlViews() insert the correct one
- if (htmlViews != null) {
- htmlViews.removeElementAt(index);
- }
- updateHtmlViews(index);
+ updateHtmlViews(index, false);
} else if (name == "tabLayoutPolicy") {
BasicTabbedPaneUI.this.uninstallUI(pane);
BasicTabbedPaneUI.this.installUI(pane);
@@ -3574,13 +3579,13 @@
calculatedBaseline = false;
} else if (name == "indexForNullComponent") {
isRunsDirty = true;
- updateHtmlViews((Integer)e.getNewValue());
+ updateHtmlViews((Integer)e.getNewValue(), true);
} else if (name == "font") {
calculatedBaseline = false;
}
}
- private void updateHtmlViews(int index) {
+ private void updateHtmlViews(int index, boolean inserted) {
String title = tabPane.getTitleAt(index);
boolean isHTML = BasicHTML.isHTMLString(title);
if (isHTML) {
@@ -3588,16 +3593,24 @@
htmlViews = createHTMLVector();
} else { // Vector already exists
View v = BasicHTML.createHTMLView(tabPane, title);
- htmlViews.insertElementAt(v, index);
+ setHtmlView(v, inserted, index);
}
} else { // Not HTML
if (htmlViews!=null) { // Add placeholder
- htmlViews.insertElementAt(null, index);
+ setHtmlView(null, inserted, index);
} // else nada!
}
updateMnemonics();
}
+ private void setHtmlView(View v, boolean inserted, int index) {
+ if (inserted || index >= htmlViews.size()) {
+ htmlViews.insertElementAt(v, index);
+ } else {
+ htmlViews.setElementAt(v, index);
+ }
+ }
+
//
// ChangeListener
//
@@ -3716,7 +3729,7 @@
return;
}
isRunsDirty = true;
- updateHtmlViews(tp.indexOfComponent(child));
+ updateHtmlViews(tp.indexOfComponent(child), true);
}
public void componentRemoved(ContainerEvent e) {
JTabbedPane tp = (JTabbedPane)e.getContainer();
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
index 111ab92..6b1bf61 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -1426,11 +1426,18 @@
// --- serialization ---------------------------------------------
+ @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ documentProperties =
+ (Dictionary<Object, Object>) f.get("documentProperties", null);
listenerList = new EventListenerList();
+ data = (Content) f.get("data", null);
+ context = (AttributeContext) f.get("context", null);
+ documentFilter = (DocumentFilter) f.get("documentFilter", null);
// Restore bidi structure
//REMIND(bcb) This creates an initial bidi element to account for
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
index 5eb0b2b..cd17fed 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -1516,7 +1516,30 @@
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ EventListenerList newListenerList = (EventListenerList) f.get("listenerList", null);
+ if (newListenerList == null) {
+ throw new InvalidObjectException("Null listenerList");
+ }
+ listenerList = newListenerList;
+ component = (JTextComponent) f.get("component", null);
+ updatePolicy = f.get("updatePolicy", 0);
+ visible = f.get("visible", false);
+ active = f.get("active", false);
+ dot = f.get("dot", 0);
+ mark = f.get("mark", 0);
+ selectionTag = f.get("selectionTag", null);
+ selectionVisible = f.get("selectionVisible", false);
+ flasher = (Timer) f.get("flasher", null);
+ magicCaretPosition = (Point) f.get("magicCaretPosition", null);
+ dotLTR = f.get("dotLTR", false);
+ markLTR = f.get("markLTR", false);
+ ownsSelection = f.get("ownsSelection", false);
+ forceCaretPositionChange = f.get("forceCaretPositionChange", false);
+ caretWidth = f.get("caretWidth", 0);
+ aspectRatio = f.get("aspectRatio", 0.0f);
+
handler = new Handler();
if (!s.readBoolean()) {
dotBias = Position.Bias.Forward;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
index 78788cb..09faa56 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
@@ -1082,8 +1082,9 @@
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException {
- listeningStyles = new Vector<Style>();
- s.defaultReadObject();
+ listeningStyles = new Vector<>();
+ ObjectInputStream.GetField f = s.readFields();
+ buffer = (ElementBuffer) f.get("buffer", null);
// Reinstall style listeners.
if (styleContextChangeListener == null &&
listenerList.getListenerCount(DocumentListener.class) > 0) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
index 24a503e..2baa067 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GapContent.java
@@ -280,7 +280,7 @@
* is held by the mark, so it is adjusted according
* to it's relationship to the gap.
*/
- public final int getOffset() {
+ public int getOffset() {
int g0 = getGapStart();
int g1 = getGapEnd();
int offs = (index < g0) ? index : index - (g1 - g0);
@@ -302,7 +302,7 @@
this.mark = mark;
}
- public final int getOffset() {
+ public int getOffset() {
return mark.getOffset();
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index ab4da54..63c27ce 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -683,10 +683,14 @@
* bound: false
*/
public void setDragEnabled(boolean b) {
+ checkDragEnabled(b);
+ dragEnabled = b;
+ }
+
+ private static void checkDragEnabled(boolean b) {
if (b && GraphicsEnvironment.isHeadless()) {
throw new HeadlessException();
}
- dragEnabled = b;
}
/**
@@ -727,11 +731,15 @@
* @since 1.6
*/
public final void setDropMode(DropMode dropMode) {
+ checkDropMode(dropMode);
+ this.dropMode = dropMode;
+ }
+
+ private static void checkDropMode(DropMode dropMode) {
if (dropMode != null) {
switch (dropMode) {
case USE_SELECTION:
case INSERT:
- this.dropMode = dropMode;
return;
}
}
@@ -3747,7 +3755,34 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ model = (Document) f.get("model", null);
+ navigationFilter = (NavigationFilter) f.get("navigationFilter", null);
+ caretColor = (Color) f.get("caretColor", null);
+ selectionColor = (Color) f.get("selectionColor", null);
+ selectedTextColor = (Color) f.get("selectedTextColor", null);
+ disabledTextColor = (Color) f.get("disabledTextColor", null);
+ editable = f.get("editable", false);
+ margin = (Insets) f.get("margin", null);
+ focusAccelerator = f.get("focusAccelerator", '\0');
+ boolean newDragEnabled = f.get("dragEnabled", false);
+ checkDragEnabled(newDragEnabled);
+ dragEnabled = newDragEnabled;
+ DropMode newDropMode = (DropMode) f.get("dropMode",
+ DropMode.USE_SELECTION);
+ checkDropMode(newDropMode);
+ dropMode = newDropMode;
+ composedTextAttribute = (SimpleAttributeSet) f.get("composedTextAttribute", null);
+ composedTextContent = (String) f.get("composedTextContent", null);
+ composedTextStart = (Position) f.get("composedTextStart", null);
+ composedTextEnd = (Position) f.get("composedTextEnd", null);
+ latestCommittedTextStart = (Position) f.get("latestCommittedTextStart", null);
+ latestCommittedTextEnd = (Position) f.get("latestCommittedTextEnd", null);
+ composedTextCaret = (ComposedTextCaret) f.get("composedTextCaret", null);
+ checkedInputOverride = f.get("checkedInputOverride", false);
+ needToSendKeyTypedEvent = f.get("needToSendKeyTypedEvent", false);
+
caretEvent = new MutableCaretEvent(this);
addMouseListener(caretEvent);
addFocusListener(caretEvent);
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java b/jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
index 1c37ed9..9c78ff8 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
@@ -649,7 +649,15 @@
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+
+ validCharacters = (String) f.get("validCharacters", null);
+ invalidCharacters = (String) f.get("invalidCharacters", null);
+ placeholderString = (String) f.get("placeholderString", null);
+ placeholder = f.get("placeholder", '\0');
+ containsLiteralChars = f.get("containsLiteralChars", false);
+ mask = (String) f.get("mask", null);
+
try {
updateInternalMask();
} catch (ParseException pe) {
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java b/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
index 5780d1d..802a9cd 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
@@ -714,11 +714,19 @@
throws ClassNotFoundException, IOException
{
fontSearch = new FontKey(null, 0, 0);
- fontTable = new Hashtable<FontKey, Font>();
+ fontTable = new Hashtable<>();
search = new SimpleAttributeSet();
attributesPool = Collections.
- synchronizedMap(new WeakHashMap<SmallAttributeSet, WeakReference<SmallAttributeSet>>());
- s.defaultReadObject();
+ synchronizedMap(new WeakHashMap<SmallAttributeSet,
+ WeakReference<SmallAttributeSet>>());
+
+ ObjectInputStream.GetField f = s.readFields();
+ Style newStyles = (Style) f.get("styles", null);
+ if (newStyles == null) {
+ throw new InvalidObjectException("Null styles");
+ }
+ styles = newStyles;
+ unusedSets = f.get("unusedSets", 0);
}
// --- variables ---------------------------------------------------
@@ -734,7 +742,7 @@
private Style styles;
private transient FontKey fontSearch = new FontKey(null, 0, 0);
- private transient Hashtable<FontKey, Font> fontTable = new Hashtable<FontKey, Font>();
+ private transient Hashtable<FontKey, Font> fontTable = new Hashtable<>();
private transient Map<SmallAttributeSet, WeakReference<SmallAttributeSet>> attributesPool = Collections.
synchronizedMap(new WeakHashMap<SmallAttributeSet, WeakReference<SmallAttributeSet>>());
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
index 344e819..d4d44d6c 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
@@ -3555,10 +3555,13 @@
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+ int newBaseFontSize = f.get("baseFontSize", 0);
+ setBaseFontSize(newBaseFontSize);
+
// Reconstruct the hashtable.
int numValues = s.readInt();
- valueConvertor = new Hashtable<Object, Object>(Math.max(1, numValues));
+ valueConvertor = new Hashtable<>(Math.max(1, numValues));
while (numValues-- > 0) {
Object key = s.readObject();
Object value = s.readObject();
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
index 4c8c898..54f8992 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
@@ -1297,10 +1297,19 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
+
+ ObjectInputStream.GetField f = s.readFields();
+ parent = (MutableTreeNode) f.get("parent", null);
+ @SuppressWarnings("unchecked")
+ Vector<TreeNode> newChildren = (Vector<TreeNode>) f.get("children", null);
+ boolean newAllowsChildren = f.get("allowsChildren", false);
+ if (!newAllowsChildren && newChildren != null && newChildren.size() > 0) {
+ throw new IllegalStateException("node does not allow children");
+ }
+ children = newChildren;
+ allowsChildren = newAllowsChildren;
+
Object[] tValues;
-
- s.defaultReadObject();
-
tValues = (Object[])s.readObject();
if(tValues.length > 0 && tValues[0].equals("userObject"))
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
index cac878b..7f40177 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,7 @@
import javax.swing.plaf.FontUIResource;
import java.awt.*;
import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
import java.util.EventObject;
-import java.util.Vector;
/**
* A <code>TreeCellEditor</code>. You need to supply an
@@ -60,7 +57,6 @@
*
* @author Scott Violet
*/
-@SuppressWarnings("serial") // Same-version serialization only
public class DefaultTreeCellEditor implements ActionListener, TreeCellEditor,
TreeSelectionListener {
/** Editor handling the editing. */
@@ -532,6 +528,7 @@
*/
protected TreeCellEditor createTreeCellEditor() {
Border aBorder = UIManager.getBorder("Tree.editorBorder");
+ @SuppressWarnings("serial") // Safe: outer class is non-serializable
DefaultCellEditor editor = new DefaultCellEditor
(new DefaultTextField(aBorder)) {
public boolean shouldSelectCell(EventObject event) {
@@ -556,35 +553,6 @@
editingComponent = null;
}
- // Serialization support.
- private void writeObject(ObjectOutputStream s) throws IOException {
- Vector<Object> values = new Vector<Object>();
-
- s.defaultWriteObject();
- // Save the realEditor, if its Serializable.
- if(realEditor != null && realEditor instanceof Serializable) {
- values.addElement("realEditor");
- values.addElement(realEditor);
- }
- s.writeObject(values);
- }
-
- private void readObject(ObjectInputStream s)
- throws IOException, ClassNotFoundException {
- s.defaultReadObject();
-
- Vector<?> values = (Vector)s.readObject();
- int indexCounter = 0;
- int maxCounter = values.size();
-
- if(indexCounter < maxCounter && values.elementAt(indexCounter).
- equals("realEditor")) {
- realEditor = (TreeCellEditor)values.elementAt(++indexCounter);
- indexCounter++;
- }
- }
-
-
/**
* <code>TextField</code> used when no editor is supplied.
* This textfield locks into the border it is constructed with.
@@ -592,6 +560,7 @@
* renderer is not <code>null</code> and no font
* has been specified the preferred height is that of the renderer.
*/
+ @SuppressWarnings("serial") // Safe: outer class is non-serializable
public class DefaultTextField extends JTextField {
/** Border to use. */
protected Border border;
@@ -673,6 +642,7 @@
/**
* Container responsible for placing the <code>editingComponent</code>.
*/
+ @SuppressWarnings("serial") // Safe: outer class is non-serializable
public class EditorContainer extends Container {
/**
* Constructs an <code>EditorContainer</code> object.
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
index 06b712f..d3f9a2e 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -691,7 +691,13 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
- s.defaultReadObject();
+ ObjectInputStream.GetField f = s.readFields();
+ EventListenerList newListenerList = (EventListenerList) f.get("listenerList", null);
+ if (newListenerList == null) {
+ throw new InvalidObjectException("Null listenerList");
+ }
+ listenerList = newListenerList;
+ asksAllowsChildren = f.get("asksAllowsChildren", false);
Vector<?> values = (Vector)s.readObject();
int indexCounter = 0;
@@ -699,7 +705,11 @@
if(indexCounter < maxCounter && values.elementAt(indexCounter).
equals("root")) {
- root = (TreeNode)values.elementAt(++indexCounter);
+ TreeNode newRoot = (TreeNode)values.elementAt(++indexCounter);
+ if (newRoot == null) {
+ throw new InvalidObjectException("Null root");
+ }
+ root = newRoot;
indexCounter++;
}
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
index ac5953d..b46bb1e 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -151,17 +151,20 @@
public void setSelectionMode(int mode) {
int oldMode = selectionMode;
- selectionMode = mode;
- if(selectionMode != TreeSelectionModel.SINGLE_TREE_SELECTION &&
- selectionMode != TreeSelectionModel.CONTIGUOUS_TREE_SELECTION &&
- selectionMode != TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION)
- selectionMode = TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION;
+ selectionMode = validateSelectionMode(mode);
if(oldMode != selectionMode && changeSupport != null)
changeSupport.firePropertyChange(SELECTION_MODE_PROPERTY,
Integer.valueOf(oldMode),
Integer.valueOf(selectionMode));
}
+ private static int validateSelectionMode(int mode) {
+ return (mode != TreeSelectionModel.SINGLE_TREE_SELECTION
+ && mode != TreeSelectionModel.CONTIGUOUS_TREE_SELECTION
+ && mode != TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION)
+ ? TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION : mode;
+ }
+
/**
* Returns the selection mode, one of <code>SINGLE_TREE_SELECTION</code>,
* <code>DISCONTIGUOUS_TREE_SELECTION</code> or
@@ -1219,14 +1222,40 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField f = s.readFields();
+
+ changeSupport = (SwingPropertyChangeSupport) f.get("changeSupport", null);
+ selection = (TreePath[]) f.get("selection", null);
+ EventListenerList newListenerList = (EventListenerList) f.get("listenerList", null);
+ if (newListenerList == null) {
+ throw new InvalidObjectException("Null listenerList");
+ }
+ listenerList = newListenerList;
+ listSelectionModel = (DefaultListSelectionModel) f.get("listSelectionModel", null);
+ selectionMode = validateSelectionMode(f.get("selectionMode", 0));
+ leadPath = (TreePath) f.get("leadPath", null);
+ leadIndex = f.get("leadIndex", 0);
+ leadRow = f.get("leadRow", 0);
+ @SuppressWarnings("unchecked")
+ Hashtable<TreePath, Boolean> newUniquePaths =
+ (Hashtable<TreePath, Boolean>) f.get("uniquePaths", null);
+ uniquePaths = newUniquePaths;
+ @SuppressWarnings("unchecked")
+ Hashtable<TreePath, Boolean> newLastPaths =
+ (Hashtable<TreePath, Boolean>) f.get("lastPaths", null);
+ lastPaths = newLastPaths;
+ tempPaths = (TreePath[]) f.get("tempPaths", null);
+
Object[] tValues;
-
- s.defaultReadObject();
-
tValues = (Object[])s.readObject();
- if(tValues.length > 0 && tValues[0].equals("rowMapper"))
- rowMapper = (RowMapper)tValues[1];
+ if (tValues.length > 0 && tValues[0].equals("rowMapper")) {
+ RowMapper newRowMapper = (RowMapper) tValues[1];
+ if (newRowMapper == null) {
+ throw new InvalidObjectException("Null newRowMapper");
+ }
+ rowMapper = newRowMapper;
+ }
}
}
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java
index d5b7633..de3df3a 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/AWTAutoShutdown.java
@@ -354,7 +354,7 @@
}
}
- final void registerPeer(final Object target, final Object peer) {
+ void registerPeer(final Object target, final Object peer) {
synchronized (activationLock) {
synchronized (mainLock) {
peerMap.put(target, peer);
@@ -363,7 +363,7 @@
}
}
- final void unregisterPeer(final Object target, final Object peer) {
+ void unregisterPeer(final Object target, final Object peer) {
synchronized (activationLock) {
synchronized (mainLock) {
if (peerMap.get(target) == peer) {
@@ -374,7 +374,7 @@
}
}
- final Object getPeer(final Object target) {
+ Object getPeer(final Object target) {
synchronized (activationLock) {
synchronized (mainLock) {
return peerMap.get(target);
@@ -382,7 +382,7 @@
}
}
- final void dumpPeers(final PlatformLogger aLog) {
+ void dumpPeers(final PlatformLogger aLog) {
if (aLog.isLoggable(PlatformLogger.Level.FINE)) {
synchronized (activationLock) {
synchronized (mainLock) {
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
index 070e0bd..9ff1b2a 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java
@@ -259,7 +259,7 @@
private static final ThreadLocal<AppContext> threadAppContext =
new ThreadLocal<AppContext>();
- private final static void initMainAppContext() {
+ private static void initMainAppContext() {
// On the main Thread, we get the ThreadGroup, make a corresponding
// AppContext, and instantiate the Java EventQueue. This way, legacy
// code is unaffected by the move to multiple AppContext ability.
@@ -291,7 +291,7 @@
* @see java.lang.ThreadGroup
* @since 1.2
*/
- public final static AppContext getAppContext() {
+ public static AppContext getAppContext() {
// we are standalone app, return the main app context
if (numAppContexts.get() == 1 && mainAppContext != null) {
return mainAppContext;
@@ -375,11 +375,11 @@
* @return true if the specified AppContext is the main AppContext.
* @since 1.8
*/
- public final static boolean isMainContext(AppContext ctx) {
+ public static boolean isMainContext(AppContext ctx) {
return (ctx != null && ctx == mainAppContext);
}
- private final static AppContext getExecutionAppContext() {
+ private static AppContext getExecutionAppContext() {
SecurityManager securityManager = System.getSecurityManager();
if ((securityManager != null) &&
(securityManager instanceof AWTSecurityManager))
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java b/jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java
index e1d616f..4d16780 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/ComponentFactory.java
@@ -25,6 +25,8 @@
package sun.awt;
+import sun.awt.datatransfer.DataTransferer;
+
import java.awt.*;
import java.awt.dnd.*;
import java.awt.dnd.peer.DragSourceContextPeer;
@@ -93,4 +95,6 @@
RobotPeer createRobot(Robot target, GraphicsDevice screen)
throws AWTException, HeadlessException;
+ DataTransferer getDataTransferer();
+
}
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java
index 0889048..8f2fbb7 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/HeadlessToolkit.java
@@ -25,6 +25,8 @@
package sun.awt;
+import sun.awt.datatransfer.DataTransferer;
+
import java.awt.*;
import java.awt.dnd.*;
import java.awt.dnd.peer.DragSourceContextPeer;
@@ -402,6 +404,11 @@
return null;
}
+ @Override
+ public DataTransferer getDataTransferer() {
+ return null;
+ }
+
@SuppressWarnings("deprecation")
public FontMetrics getFontMetrics(Font font) {
return tk.getFontMetrics(font);
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 77a34d6..d98cbf8 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -203,8 +203,6 @@
public abstract boolean isTraySupported();
- public abstract DataTransferer getDataTransferer();
-
@SuppressWarnings("deprecation")
public abstract FontPeer getFontPeer(String name, int style);
@@ -386,7 +384,7 @@
* null or the target can't be found, a null with be returned.
*/
public static AppContext targetToAppContext(Object target) {
- if (target == null || GraphicsEnvironment.isHeadless()) {
+ if (target == null) {
return null;
}
AppContext context = getAppContext(target);
@@ -460,12 +458,10 @@
* via targetToAppContext() above.
*/
public static void insertTargetMapping(Object target, AppContext appContext) {
- if (!GraphicsEnvironment.isHeadless()) {
- if (!setAppContext(target, appContext)) {
- // Target is not a Component/MenuComponent, use the private Map
- // instead.
- appContextMap.put(target, appContext);
- }
+ if (!setAppContext(target, appContext)) {
+ // Target is not a Component/MenuComponent, use the private Map
+ // instead.
+ appContextMap.put(target, appContext);
}
}
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
index 367d90e..963ca5c 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -61,8 +61,6 @@
import java.nio.charset.UnsupportedCharsetException;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.security.AccessController;
@@ -73,9 +71,10 @@
import java.util.*;
-import sun.util.logging.PlatformLogger;
+import sun.datatransfer.DataFlavorUtil;
import sun.awt.AppContext;
+import sun.awt.ComponentFactory;
import sun.awt.SunToolkit;
import java.awt.image.BufferedImage;
@@ -135,35 +134,6 @@
public static final DataFlavor javaTextEncodingFlavor;
/**
- * Lazy initialization of Standard Encodings.
- */
- private static class StandardEncodingsHolder {
- private static final SortedSet<String> standardEncodings = load();
-
- private static SortedSet<String> load() {
- final Comparator<String> comparator =
- new CharsetComparator(IndexedComparator.SELECT_WORST);
- final SortedSet<String> tempSet = new TreeSet<>(comparator);
- tempSet.add("US-ASCII");
- tempSet.add("ISO-8859-1");
- tempSet.add("UTF-8");
- tempSet.add("UTF-16BE");
- tempSet.add("UTF-16LE");
- tempSet.add("UTF-16");
- tempSet.add(Charset.defaultCharset().name());
- return Collections.unmodifiableSortedSet(tempSet);
- }
- }
-
- /**
- * Tracks whether a particular text/* MIME type supports the charset
- * parameter. The Map is initialized with all of the standard MIME types
- * listed in the DataFlavor.selectBestTextFlavor method comment. Additional
- * entries may be added during the life of the JRE for text/<other> types.
- */
- private static final Map<String, Boolean> textMIMESubtypeCharsetSupport;
-
- /**
* A collection of all natives listed in flavormap.properties with
* a primary MIME type of "text".
*/
@@ -193,8 +163,6 @@
*/
private static final String DATA_CONVERTER_KEY = "DATA_CONVERTER_KEY";
- private static final PlatformLogger dtLog = PlatformLogger.getLogger("sun.awt.datatransfer.DataTransfer");
-
static {
DataFlavor tJavaTextEncodingFlavor = null;
try {
@@ -202,24 +170,6 @@
} catch (ClassNotFoundException cannotHappen) {
}
javaTextEncodingFlavor = tJavaTextEncodingFlavor;
-
- Map<String, Boolean> tempMap = new HashMap<>(17);
- tempMap.put("sgml", Boolean.TRUE);
- tempMap.put("xml", Boolean.TRUE);
- tempMap.put("html", Boolean.TRUE);
- tempMap.put("enriched", Boolean.TRUE);
- tempMap.put("richtext", Boolean.TRUE);
- tempMap.put("uri-list", Boolean.TRUE);
- tempMap.put("directory", Boolean.TRUE);
- tempMap.put("css", Boolean.TRUE);
- tempMap.put("calendar", Boolean.TRUE);
- tempMap.put("plain", Boolean.TRUE);
- tempMap.put("rtf", Boolean.FALSE);
- tempMap.put("tab-separated-values", Boolean.FALSE);
- tempMap.put("t140", Boolean.FALSE);
- tempMap.put("rfc822-headers", Boolean.FALSE);
- tempMap.put("parityfec", Boolean.FALSE);
- textMIMESubtypeCharsetSupport = Collections.synchronizedMap(tempMap);
}
/**
@@ -228,172 +178,7 @@
* instead, null will be returned.
*/
public static synchronized DataTransferer getInstance() {
- return ((SunToolkit) Toolkit.getDefaultToolkit()).getDataTransferer();
- }
-
- /**
- * Converts an arbitrary text encoding to its canonical name.
- */
- public static String canonicalName(String encoding) {
- if (encoding == null) {
- return null;
- }
- try {
- return Charset.forName(encoding).name();
- } catch (IllegalCharsetNameException icne) {
- return encoding;
- } catch (UnsupportedCharsetException uce) {
- return encoding;
- }
- }
-
- /**
- * If the specified flavor is a text flavor which supports the "charset"
- * parameter, then this method returns that parameter, or the default
- * charset if no such parameter was specified at construction. For non-
- * text DataFlavors, and for non-charset text flavors, this method returns
- * null.
- */
- public static String getTextCharset(DataFlavor flavor) {
- if (!isFlavorCharsetTextType(flavor)) {
- return null;
- }
-
- String encoding = flavor.getParameter("charset");
-
- return (encoding != null) ? encoding : Charset.defaultCharset().name();
- }
-
- /**
- * Tests only whether the flavor's MIME type supports the charset
- * parameter. Must only be called for flavors with a primary type of
- * "text".
- */
- public static boolean doesSubtypeSupportCharset(DataFlavor flavor) {
- if (dtLog.isLoggable(PlatformLogger.Level.FINE)) {
- if (!"text".equals(flavor.getPrimaryType())) {
- dtLog.fine("Assertion (\"text\".equals(flavor.getPrimaryType())) failed");
- }
- }
-
- String subType = flavor.getSubType();
- if (subType == null) {
- return false;
- }
-
- Boolean support = textMIMESubtypeCharsetSupport.get(subType);
-
- if (support != null) {
- return support;
- }
-
- boolean ret_val = (flavor.getParameter("charset") != null);
- textMIMESubtypeCharsetSupport.put(subType, ret_val);
- return ret_val;
- }
- public static boolean doesSubtypeSupportCharset(String subType,
- String charset)
- {
- Boolean support = textMIMESubtypeCharsetSupport.get(subType);
-
- if (support != null) {
- return support;
- }
-
- boolean ret_val = (charset != null);
- textMIMESubtypeCharsetSupport.put(subType, ret_val);
- return ret_val;
- }
-
- /**
- * Returns whether this flavor is a text type which supports the
- * 'charset' parameter.
- */
- public static boolean isFlavorCharsetTextType(DataFlavor flavor) {
- // Although stringFlavor doesn't actually support the charset
- // parameter (because its primary MIME type is not "text"), it should
- // be treated as though it does. stringFlavor is semantically
- // equivalent to "text/plain" data.
- if (DataFlavor.stringFlavor.equals(flavor)) {
- return true;
- }
-
- if (!"text".equals(flavor.getPrimaryType()) ||
- !doesSubtypeSupportCharset(flavor))
- {
- return false;
- }
-
- Class<?> rep_class = flavor.getRepresentationClass();
-
- if (flavor.isRepresentationClassReader() ||
- String.class.equals(rep_class) ||
- flavor.isRepresentationClassCharBuffer() ||
- char[].class.equals(rep_class))
- {
- return true;
- }
-
- if (!(flavor.isRepresentationClassInputStream() ||
- flavor.isRepresentationClassByteBuffer() ||
- byte[].class.equals(rep_class))) {
- return false;
- }
-
- String charset = flavor.getParameter("charset");
-
- return (charset != null)
- ? DataTransferer.isEncodingSupported(charset)
- : true; // null equals default encoding which is always supported
- }
-
- /**
- * Returns whether this flavor is a text type which does not support the
- * 'charset' parameter.
- */
- public static boolean isFlavorNoncharsetTextType(DataFlavor flavor) {
- if (!"text".equals(flavor.getPrimaryType()) ||
- doesSubtypeSupportCharset(flavor))
- {
- return false;
- }
-
- return (flavor.isRepresentationClassInputStream() ||
- flavor.isRepresentationClassByteBuffer() ||
- byte[].class.equals(flavor.getRepresentationClass()));
- }
-
- /**
- * Determines whether this JRE can both encode and decode text in the
- * specified encoding.
- */
- private static boolean isEncodingSupported(String encoding) {
- if (encoding == null) {
- return false;
- }
- try {
- return Charset.isSupported(encoding);
- } catch (IllegalCharsetNameException icne) {
- return false;
- }
- }
-
- /**
- * Returns {@code true} if the given type is a java.rmi.Remote.
- */
- public static boolean isRemote(Class<?> type) {
- return RMI.isRemote(type);
- }
-
- /**
- * Returns an Iterator which traverses a SortedSet of Strings which are
- * a total order of the standard character sets supported by the JRE. The
- * ordering follows the same principles as DataFlavor.selectBestTextFlavor.
- * So as to avoid loading all available character converters, optional,
- * non-standard, character sets are not included.
- */
- public static Set <String> standardEncodings() {
- return StandardEncodingsHolder.standardEncodings;
+ return ((ComponentFactory) Toolkit.getDefaultToolkit()).getDataTransferer();
}
/**
@@ -600,8 +385,7 @@
indexMap.putAll(textPlainIndexMap);
// Sort the map keys according to the formats preference order.
- Comparator<Long> comparator =
- new IndexOrderComparator(indexMap, IndexedComparator.SELECT_WORST);
+ Comparator<Long> comparator = DataFlavorUtil.getIndexOrderComparator(indexMap).reversed();
SortedMap<Long, DataFlavor> sortedMap = new TreeMap<>(comparator);
sortedMap.putAll(formatMap);
@@ -972,7 +756,7 @@
// target format. Append terminating NUL bytes.
if (stringSelectionHack ||
(String.class.equals(flavor.getRepresentationClass()) &&
- isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
String str = removeSuspectedData(flavor, contents, (String)obj);
@@ -983,7 +767,7 @@
// Source data is a Reader. Convert to a String and recur. In the
// future, we may want to rewrite this so that we encode on demand.
} else if (flavor.isRepresentationClassReader()) {
- if (!(isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ if (!(DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
throw new IOException
("cannot transfer non-text data as Reader");
}
@@ -1002,7 +786,7 @@
// Source data is a CharBuffer. Convert to a String and recur.
} else if (flavor.isRepresentationClassCharBuffer()) {
- if (!(isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ if (!(DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
throw new IOException
("cannot transfer non-text data as CharBuffer");
}
@@ -1018,7 +802,7 @@
// Source data is a char array. Convert to a String and recur.
} else if (char[].class.equals(flavor.getRepresentationClass())) {
- if (!(isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ if (!(DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
throw new IOException
("cannot transfer non-text data as char array");
}
@@ -1036,8 +820,8 @@
byte[] bytes = new byte[size];
buffer.get(bytes, 0, size);
- if (isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
- String sourceEncoding = DataTransferer.getTextCharset(flavor);
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ String sourceEncoding = DataFlavorUtil.getTextCharset(flavor);
return translateTransferableString(
new String(bytes, sourceEncoding),
format);
@@ -1051,8 +835,8 @@
} else if (byte[].class.equals(flavor.getRepresentationClass())) {
byte[] bytes = (byte[])obj;
- if (isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
- String sourceEncoding = DataTransferer.getTextCharset(flavor);
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ String sourceEncoding = DataFlavorUtil.getTextCharset(flavor);
return translateTransferableString(
new String(bytes, sourceEncoding),
format);
@@ -1155,9 +939,9 @@
} while (!eof);
}
- if (isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
byte[] bytes = bos.toByteArray();
- String sourceEncoding = DataTransferer.getTextCharset(flavor);
+ String sourceEncoding = DataFlavorUtil.getTextCharset(flavor);
return translateTransferableString(
new String(bytes, sourceEncoding),
format);
@@ -1166,14 +950,11 @@
}
-
// Source data is an RMI object
} else if (flavor.isRepresentationClassRemote()) {
+ theByteArray = convertObjectToBytes(DataFlavorUtil.RMI.newMarshalledObject(obj));
- Object mo = RMI.newMarshalledObject(obj);
- theByteArray = convertObjectToBytes(mo);
-
- // Source data is Serializable
+ // Source data is Serializable
} else if (flavor.isRepresentationClassSerializable()) {
theByteArray = convertObjectToBytes(obj);
@@ -1387,7 +1168,7 @@
// Target data is a String. Strip terminating NUL bytes. Decode bytes
// into characters. Search-and-replace EOLN.
} else if (String.class.equals(flavor.getRepresentationClass()) &&
- isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
theObject = translateBytesToString(bytes, format, localeTransferable);
@@ -1401,9 +1182,8 @@
}
// Target data is a CharBuffer. Recur to obtain String and wrap.
} else if (flavor.isRepresentationClassCharBuffer()) {
- if (!(isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
- throw new IOException
- ("cannot transfer non-text data as CharBuffer");
+ if (!(DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ throw new IOException("cannot transfer non-text data as CharBuffer");
}
CharBuffer buffer = CharBuffer.wrap(
@@ -1414,7 +1194,7 @@
// Target data is a char array. Recur to obtain String and convert to
// char array.
} else if (char[].class.equals(flavor.getRepresentationClass())) {
- if (!(isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ if (!(DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
throw new IOException
("cannot transfer non-text data as char array");
}
@@ -1427,10 +1207,10 @@
// terminators and search-and-replace EOLN, then reencode according to
// the requested flavor.
} else if (flavor.isRepresentationClassByteBuffer()) {
- if (isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
bytes = translateBytesToString(
bytes, format, localeTransferable).getBytes(
- DataTransferer.getTextCharset(flavor)
+ DataFlavorUtil.getTextCharset(flavor)
);
}
@@ -1442,10 +1222,10 @@
// terminators and search-and-replace EOLN, then reencode according to
// the requested flavor.
} else if (byte[].class.equals(flavor.getRepresentationClass())) {
- if (isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
theObject = translateBytesToString(
bytes, format, localeTransferable
- ).getBytes(DataTransferer.getTextCharset(flavor));
+ ).getBytes(DataFlavorUtil.getTextCharset(flavor));
} else {
theObject = bytes;
}
@@ -1462,9 +1242,9 @@
} else if (flavor.isRepresentationClassRemote()) {
try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ObjectInputStream ois = new ObjectInputStream(bais))
- {
- theObject = RMI.getMarshalledObject(ois.readObject());
+ ObjectInputStream ois = new ObjectInputStream(bais)) {
+
+ theObject = DataFlavorUtil.RMI.getMarshalledObject(ois.readObject());
} catch (Exception e) {
throw new IOException(e.getMessage());
}
@@ -1529,7 +1309,7 @@
// Target data is a String. Strip terminating NUL bytes. Decode bytes
// into characters. Search-and-replace EOLN.
} else if (String.class.equals(flavor.getRepresentationClass()) &&
- isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
return translateBytesToString(inputStreamToByteArray(str),
format, localeTransferable);
@@ -1554,7 +1334,7 @@
// as "Unicode" (utf-16be). Then use an InputStreamReader to decode
// back to chars on demand.
} else if (flavor.isRepresentationClassReader()) {
- if (!(isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
+ if (!(DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format))) {
throw new IOException
("cannot transfer non-text data as Reader");
}
@@ -1563,27 +1343,24 @@
str, DataFlavor.plainTextFlavor,
format, localeTransferable);
- String unicode = DataTransferer.getTextCharset(DataFlavor.plainTextFlavor);
+ String unicode = DataFlavorUtil.getTextCharset(DataFlavor.plainTextFlavor);
Reader reader = new InputStreamReader(is, unicode);
theObject = constructFlavoredObject(reader, flavor, Reader.class);
// Target data is a byte array
} else if (byte[].class.equals(flavor.getRepresentationClass())) {
- if(isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
theObject = translateBytesToString(inputStreamToByteArray(str), format, localeTransferable)
- .getBytes(DataTransferer.getTextCharset(flavor));
+ .getBytes(DataFlavorUtil.getTextCharset(flavor));
} else {
theObject = inputStreamToByteArray(str);
}
// Target data is an RMI object
} else if (flavor.isRepresentationClassRemote()) {
-
- try (ObjectInputStream ois =
- new ObjectInputStream(str))
- {
- theObject = RMI.getMarshalledObject(ois.readObject());
- }catch (Exception e) {
+ try (ObjectInputStream ois = new ObjectInputStream(str)) {
+ theObject = DataFlavorUtil.RMI.getMarshalledObject(ois.readObject());
+ } catch (Exception e) {
throw new IOException(e.getMessage());
}
@@ -1621,9 +1398,9 @@
(InputStream str, DataFlavor flavor, long format,
Transferable localeTransferable) throws IOException
{
- if (isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
+ if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
str = new ReencodingInputStream
- (str, format, DataTransferer.getTextCharset(flavor),
+ (str, format, DataFlavorUtil.getTextCharset(flavor),
localeTransferable);
}
@@ -1865,8 +1642,7 @@
byte[] bytes, String mimeType) throws IOException
{
- Iterator<ImageReader> readerIterator =
- ImageIO.getImageReadersByMIMEType(mimeType);
+ Iterator<ImageReader> readerIterator = ImageIO.getImageReadersByMIMEType(mimeType);
if (!readerIterator.hasNext()) {
throw new IOException("No registered service provider can decode " +
@@ -1919,8 +1695,7 @@
throws IOException {
IOException originalIOE = null;
- Iterator<ImageWriter> writerIterator =
- ImageIO.getImageWritersByMIMEType(mimeType);
+ Iterator<ImageWriter> writerIterator = ImageIO.getImageWritersByMIMEType(mimeType);
if (!writerIterator.hasNext()) {
throw new IOException("No registered service provider can encode " +
@@ -1979,8 +1754,7 @@
String mimeType)
throws IOException {
- Iterator<ImageWriter> writerIterator =
- ImageIO.getImageWritersByMIMEType(mimeType);
+ Iterator<ImageWriter> writerIterator = ImageIO.getImageWritersByMIMEType(mimeType);
ImageTypeSpecifier typeSpecifier =
new ImageTypeSpecifier(renderedImage);
@@ -2163,8 +1937,7 @@
}
}
- public abstract ToolkitThreadBlockedHandler
- getToolkitThreadBlockedHandler();
+ public abstract ToolkitThreadBlockedHandler getToolkitThreadBlockedHandler();
/**
* Helper function to reduce a Map with Long keys to a long array.
@@ -2189,8 +1962,7 @@
public static DataFlavor[] setToSortedDataFlavorArray(Set<DataFlavor> flavorsSet) {
DataFlavor[] flavors = new DataFlavor[flavorsSet.size()];
flavorsSet.toArray(flavors);
- final Comparator<DataFlavor> comparator =
- new DataFlavorComparator(IndexedComparator.SELECT_WORST);
+ final Comparator<DataFlavor> comparator = DataFlavorUtil.getDataFlavorComparator().reversed();
Arrays.sort(flavors, comparator);
return flavors;
}
@@ -2230,519 +2002,4 @@
public LinkedHashSet<String> getPlatformMappingsForFlavor(DataFlavor df) {
return new LinkedHashSet<>();
}
-
- /**
- * A Comparator which includes a helper function for comparing two Objects
- * which are likely to be keys in the specified Map.
- */
- public abstract static class IndexedComparator<T> implements Comparator<T> {
-
- /**
- * The best Object (e.g., DataFlavor) will be the last in sequence.
- */
- public static final boolean SELECT_BEST = true;
-
- /**
- * The best Object (e.g., DataFlavor) will be the first in sequence.
- */
- public static final boolean SELECT_WORST = false;
-
- final boolean order;
-
- public IndexedComparator(boolean order) {
- this.order = order;
- }
-
- /**
- * Helper method to compare two objects by their Integer indices in the
- * given map. If the map doesn't contain an entry for either of the
- * objects, the fallback index will be used for the object instead.
- *
- * @param indexMap the map which maps objects into Integer indexes.
- * @param obj1 the first object to be compared.
- * @param obj2 the second object to be compared.
- * @param fallbackIndex the Integer to be used as a fallback index.
- * @return a negative integer, zero, or a positive integer as the
- * first object is mapped to a less, equal to, or greater
- * index than the second.
- */
- static <T> int compareIndices(Map<T, Integer> indexMap,
- T obj1, T obj2,
- Integer fallbackIndex) {
- Integer index1 = indexMap.getOrDefault(obj1, fallbackIndex);
- Integer index2 = indexMap.getOrDefault(obj2, fallbackIndex);
- return index1.compareTo(index2);
- }
- }
-
- /**
- * An IndexedComparator which compares two String charsets. The comparison
- * follows the rules outlined in DataFlavor.selectBestTextFlavor. In order
- * to ensure that non-Unicode, non-ASCII, non-default charsets are sorted
- * in alphabetical order, charsets are not automatically converted to their
- * canonical forms.
- */
- public static class CharsetComparator extends IndexedComparator<String> {
- private static final Map<String, Integer> charsets;
-
- private static final Integer DEFAULT_CHARSET_INDEX = 2;
- private static final Integer OTHER_CHARSET_INDEX = 1;
- private static final Integer WORST_CHARSET_INDEX = 0;
- private static final Integer UNSUPPORTED_CHARSET_INDEX = Integer.MIN_VALUE;
-
- private static final String UNSUPPORTED_CHARSET = "UNSUPPORTED";
-
- static {
- Map<String, Integer> charsetsMap = new HashMap<>(8, 1.0f);
-
- // we prefer Unicode charsets
- charsetsMap.put(canonicalName("UTF-16LE"), 4);
- charsetsMap.put(canonicalName("UTF-16BE"), 5);
- charsetsMap.put(canonicalName("UTF-8"), 6);
- charsetsMap.put(canonicalName("UTF-16"), 7);
-
- // US-ASCII is the worst charset supported
- charsetsMap.put(canonicalName("US-ASCII"), WORST_CHARSET_INDEX);
-
- charsetsMap.putIfAbsent(Charset.defaultCharset().name(), DEFAULT_CHARSET_INDEX);
-
- charsetsMap.put(UNSUPPORTED_CHARSET, UNSUPPORTED_CHARSET_INDEX);
-
- charsets = Collections.unmodifiableMap(charsetsMap);
- }
-
- public CharsetComparator(boolean order) {
- super(order);
- }
-
- /**
- * Compares two String objects. Returns a negative integer, zero,
- * or a positive integer as the first charset is worse than, equal to,
- * or better than the second.
- *
- * @param obj1 the first charset to be compared
- * @param obj2 the second charset to be compared
- * @return a negative integer, zero, or a positive integer as the
- * first argument is worse, equal to, or better than the
- * second.
- * @throws ClassCastException if either of the arguments is not
- * instance of String
- * @throws NullPointerException if either of the arguments is
- * <code>null</code>.
- */
- public int compare(String obj1, String obj2) {
- if (order == SELECT_BEST) {
- return compareCharsets(obj1, obj2);
- } else {
- return compareCharsets(obj2, obj1);
- }
- }
-
- /**
- * Compares charsets. Returns a negative integer, zero, or a positive
- * integer as the first charset is worse than, equal to, or better than
- * the second.
- * <p>
- * Charsets are ordered according to the following rules:
- * <ul>
- * <li>All unsupported charsets are equal.
- * <li>Any unsupported charset is worse than any supported charset.
- * <li>Unicode charsets, such as "UTF-16", "UTF-8", "UTF-16BE" and
- * "UTF-16LE", are considered best.
- * <li>After them, platform default charset is selected.
- * <li>"US-ASCII" is the worst of supported charsets.
- * <li>For all other supported charsets, the lexicographically less
- * one is considered the better.
- * </ul>
- *
- * @param charset1 the first charset to be compared
- * @param charset2 the second charset to be compared.
- * @return a negative integer, zero, or a positive integer as the
- * first argument is worse, equal to, or better than the
- * second.
- */
- int compareCharsets(String charset1, String charset2) {
- charset1 = getEncoding(charset1);
- charset2 = getEncoding(charset2);
-
- int comp = compareIndices(charsets, charset1, charset2,
- OTHER_CHARSET_INDEX);
-
- if (comp == 0) {
- return charset2.compareTo(charset1);
- }
-
- return comp;
- }
-
- /**
- * Returns encoding for the specified charset according to the
- * following rules:
- * <ul>
- * <li>If the charset is <code>null</code>, then <code>null</code> will
- * be returned.
- * <li>Iff the charset specifies an encoding unsupported by this JRE,
- * <code>UNSUPPORTED_CHARSET</code> will be returned.
- * <li>If the charset specifies an alias name, the corresponding
- * canonical name will be returned iff the charset is a known
- * Unicode, ASCII, or default charset.
- * </ul>
- *
- * @param charset the charset.
- * @return an encoding for this charset.
- */
- static String getEncoding(String charset) {
- if (charset == null) {
- return null;
- } else if (!DataTransferer.isEncodingSupported(charset)) {
- return UNSUPPORTED_CHARSET;
- } else {
- // Only convert to canonical form if the charset is one
- // of the charsets explicitly listed in the known charsets
- // map. This will happen only for Unicode, ASCII, or default
- // charsets.
- String canonicalName = DataTransferer.canonicalName(charset);
- return (charsets.containsKey(canonicalName))
- ? canonicalName
- : charset;
- }
- }
- }
-
- /**
- * An IndexedComparator which compares two DataFlavors. For text flavors,
- * the comparison follows the rules outlined in
- * DataFlavor.selectBestTextFlavor. For non-text flavors, unknown
- * application MIME types are preferred, followed by known
- * application/x-java-* MIME types. Unknown application types are preferred
- * because if the user provides his own data flavor, it will likely be the
- * most descriptive one. For flavors which are otherwise equal, the
- * flavors' string representation are compared in the alphabetical order.
- */
- public static class DataFlavorComparator extends IndexedComparator<DataFlavor> {
-
- private final CharsetComparator charsetComparator;
-
- private static final Map<String, Integer> exactTypes;
- private static final Map<String, Integer> primaryTypes;
- private static final Map<Class<?>, Integer> nonTextRepresentations;
- private static final Map<String, Integer> textTypes;
- private static final Map<Class<?>, Integer> decodedTextRepresentations;
- private static final Map<Class<?>, Integer> encodedTextRepresentations;
-
- private static final Integer UNKNOWN_OBJECT_LOSES = Integer.MIN_VALUE;
- private static final Integer UNKNOWN_OBJECT_WINS = Integer.MAX_VALUE;
-
- static {
- {
- Map<String, Integer> exactTypesMap = new HashMap<>(4, 1.0f);
-
- // application/x-java-* MIME types
- exactTypesMap.put("application/x-java-file-list", 0);
- exactTypesMap.put("application/x-java-serialized-object", 1);
- exactTypesMap.put("application/x-java-jvm-local-objectref", 2);
- exactTypesMap.put("application/x-java-remote-object", 3);
-
- exactTypes = Collections.unmodifiableMap(exactTypesMap);
- }
-
- {
- Map<String, Integer> primaryTypesMap = new HashMap<>(1, 1.0f);
-
- primaryTypesMap.put("application", 0);
-
- primaryTypes = Collections.unmodifiableMap(primaryTypesMap);
- }
-
- {
- Map<Class<?>, Integer> nonTextRepresentationsMap = new HashMap<>(3, 1.0f);
-
- nonTextRepresentationsMap.put(java.io.InputStream.class, 0);
- nonTextRepresentationsMap.put(java.io.Serializable.class, 1);
-
- Class<?> remoteClass = RMI.remoteClass();
- if (remoteClass != null) {
- nonTextRepresentationsMap.put(remoteClass, 2);
- }
-
- nonTextRepresentations = Collections.unmodifiableMap(nonTextRepresentationsMap);
- }
-
- {
- Map<String, Integer> textTypesMap = new HashMap<>(16, 1.0f);
-
- // plain text
- textTypesMap.put("text/plain", 0);
-
- // stringFlavor
- textTypesMap.put("application/x-java-serialized-object", 1);
-
- // misc
- textTypesMap.put("text/calendar", 2);
- textTypesMap.put("text/css", 3);
- textTypesMap.put("text/directory", 4);
- textTypesMap.put("text/parityfec", 5);
- textTypesMap.put("text/rfc822-headers", 6);
- textTypesMap.put("text/t140", 7);
- textTypesMap.put("text/tab-separated-values", 8);
- textTypesMap.put("text/uri-list", 9);
-
- // enriched
- textTypesMap.put("text/richtext", 10);
- textTypesMap.put("text/enriched", 11);
- textTypesMap.put("text/rtf", 12);
-
- // markup
- textTypesMap.put("text/html", 13);
- textTypesMap.put("text/xml", 14);
- textTypesMap.put("text/sgml", 15);
-
- textTypes = Collections.unmodifiableMap(textTypesMap);
- }
-
- {
- Map<Class<?>, Integer> decodedTextRepresentationsMap = new HashMap<>(4, 1.0f);
-
- decodedTextRepresentationsMap.put(char[].class, 0);
- decodedTextRepresentationsMap.put(CharBuffer.class, 1);
- decodedTextRepresentationsMap.put(String.class, 2);
- decodedTextRepresentationsMap.put(Reader.class, 3);
-
- decodedTextRepresentations =
- Collections.unmodifiableMap(decodedTextRepresentationsMap);
- }
-
- {
- Map<Class<?>, Integer> encodedTextRepresentationsMap = new HashMap<>(3, 1.0f);
-
- encodedTextRepresentationsMap.put(byte[].class, 0);
- encodedTextRepresentationsMap.put(ByteBuffer.class, 1);
- encodedTextRepresentationsMap.put(InputStream.class, 2);
-
- encodedTextRepresentations =
- Collections.unmodifiableMap(encodedTextRepresentationsMap);
- }
- }
-
- public DataFlavorComparator() {
- this(SELECT_BEST);
- }
-
- public DataFlavorComparator(boolean order) {
- super(order);
-
- charsetComparator = new CharsetComparator(order);
- }
-
- public int compare(DataFlavor obj1, DataFlavor obj2) {
- DataFlavor flavor1 = order == SELECT_BEST ? obj1 : obj2;
- DataFlavor flavor2 = order == SELECT_BEST ? obj2 : obj1;
-
- if (flavor1.equals(flavor2)) {
- return 0;
- }
-
- int comp = 0;
-
- String primaryType1 = flavor1.getPrimaryType();
- String subType1 = flavor1.getSubType();
- String mimeType1 = primaryType1 + "/" + subType1;
- Class<?> class1 = flavor1.getRepresentationClass();
-
- String primaryType2 = flavor2.getPrimaryType();
- String subType2 = flavor2.getSubType();
- String mimeType2 = primaryType2 + "/" + subType2;
- Class<?> class2 = flavor2.getRepresentationClass();
-
- if (flavor1.isFlavorTextType() && flavor2.isFlavorTextType()) {
- // First, compare MIME types
- comp = compareIndices(textTypes, mimeType1, mimeType2,
- UNKNOWN_OBJECT_LOSES);
- if (comp != 0) {
- return comp;
- }
-
- // Only need to test one flavor because they both have the
- // same MIME type. Also don't need to worry about accidentally
- // passing stringFlavor because either
- // 1. Both flavors are stringFlavor, in which case the
- // equality test at the top of the function succeeded.
- // 2. Only one flavor is stringFlavor, in which case the MIME
- // type comparison returned a non-zero value.
- if (doesSubtypeSupportCharset(flavor1)) {
- // Next, prefer the decoded text representations of Reader,
- // String, CharBuffer, and [C, in that order.
- comp = compareIndices(decodedTextRepresentations, class1,
- class2, UNKNOWN_OBJECT_LOSES);
- if (comp != 0) {
- return comp;
- }
-
- // Next, compare charsets
- comp = charsetComparator.compareCharsets
- (DataTransferer.getTextCharset(flavor1),
- DataTransferer.getTextCharset(flavor2));
- if (comp != 0) {
- return comp;
- }
- }
-
- // Finally, prefer the encoded text representations of
- // InputStream, ByteBuffer, and [B, in that order.
- comp = compareIndices(encodedTextRepresentations, class1,
- class2, UNKNOWN_OBJECT_LOSES);
- if (comp != 0) {
- return comp;
- }
- } else {
- // First, prefer application types.
- comp = compareIndices(primaryTypes, primaryType1, primaryType2,
- UNKNOWN_OBJECT_LOSES);
- if (comp != 0) {
- return comp;
- }
-
- // Next, look for application/x-java-* types. Prefer unknown
- // MIME types because if the user provides his own data flavor,
- // it will likely be the most descriptive one.
- comp = compareIndices(exactTypes, mimeType1, mimeType2,
- UNKNOWN_OBJECT_WINS);
- if (comp != 0) {
- return comp;
- }
-
- // Finally, prefer the representation classes of Remote,
- // Serializable, and InputStream, in that order.
- comp = compareIndices(nonTextRepresentations, class1, class2,
- UNKNOWN_OBJECT_LOSES);
- if (comp != 0) {
- return comp;
- }
- }
-
- // The flavours are not equal but still not distinguishable.
- // Compare String representations in alphabetical order
- return flavor1.getMimeType().compareTo(flavor2.getMimeType());
- }
- }
-
- /*
- * Given the Map that maps objects to Integer indices and a boolean value,
- * this Comparator imposes a direct or reverse order on set of objects.
- * <p>
- * If the specified boolean value is SELECT_BEST, the Comparator imposes the
- * direct index-based order: an object A is greater than an object B if and
- * only if the index of A is greater than the index of B. An object that
- * doesn't have an associated index is less or equal than any other object.
- * <p>
- * If the specified boolean value is SELECT_WORST, the Comparator imposes the
- * reverse index-based order: an object A is greater than an object B if and
- * only if A is less than B with the direct index-based order.
- */
- public static class IndexOrderComparator extends IndexedComparator<Long> {
- private final Map<Long, Integer> indexMap;
- private static final Integer FALLBACK_INDEX = Integer.MIN_VALUE;
-
- public IndexOrderComparator(Map<Long, Integer> indexMap, boolean order) {
- super(order);
- this.indexMap = indexMap;
- }
-
- public int compare(Long obj1, Long obj2) {
- if (order == SELECT_WORST) {
- return -compareIndices(indexMap, obj1, obj2, FALLBACK_INDEX);
- } else {
- return compareIndices(indexMap, obj1, obj2, FALLBACK_INDEX);
- }
- }
- }
-
- /**
- * A class that provides access to java.rmi.Remote and java.rmi.MarshalledObject
- * without creating a static dependency.
- */
- private static class RMI {
- private static final Class<?> remoteClass = getClass("java.rmi.Remote");
- private static final Class<?> marshallObjectClass =
- getClass("java.rmi.MarshalledObject");
- private static final Constructor<?> marshallCtor =
- getConstructor(marshallObjectClass, Object.class);
- private static final Method marshallGet =
- getMethod(marshallObjectClass, "get");
-
- private static Class<?> getClass(String name) {
- try {
- return Class.forName(name, true, null);
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-
- private static Constructor<?> getConstructor(Class<?> c, Class<?>... types) {
- try {
- return (c == null) ? null : c.getDeclaredConstructor(types);
- } catch (NoSuchMethodException x) {
- throw new AssertionError(x);
- }
- }
-
- private static Method getMethod(Class<?> c, String name, Class<?>... types) {
- try {
- return (c == null) ? null : c.getMethod(name, types);
- } catch (NoSuchMethodException e) {
- throw new AssertionError(e);
- }
- }
-
- /**
- * Returns {@code true} if the given class is java.rmi.Remote.
- */
- static boolean isRemote(Class<?> c) {
- return (remoteClass == null) ? false : remoteClass.isAssignableFrom(c);
- }
-
- /**
- * Returns java.rmi.Remote.class if RMI is present; otherwise {@code null}.
- */
- static Class<?> remoteClass() {
- return remoteClass;
- }
-
- /**
- * Returns a new MarshalledObject containing the serialized representation
- * of the given object.
- */
- static Object newMarshalledObject(Object obj) throws IOException {
- try {
- return marshallCtor.newInstance(obj);
- } catch (InstantiationException | IllegalAccessException x) {
- throw new AssertionError(x);
- } catch (InvocationTargetException x) {
- Throwable cause = x.getCause();
- if (cause instanceof IOException)
- throw (IOException)cause;
- throw new AssertionError(x);
- }
- }
-
- /**
- * Returns a new copy of the contained marshalled object.
- */
- static Object getMarshalledObject(Object obj)
- throws IOException, ClassNotFoundException
- {
- try {
- return marshallGet.invoke(obj);
- } catch (IllegalAccessException x) {
- throw new AssertionError(x);
- } catch (InvocationTargetException x) {
- Throwable cause = x.getCause();
- if (cause instanceof IOException)
- throw (IOException)cause;
- if (cause instanceof ClassNotFoundException)
- throw (ClassNotFoundException)cause;
- throw new AssertionError(x);
- }
- }
- }
}
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java
new file mode 100644
index 0000000..f0727ec
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DesktopDatatransferServiceImpl.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt.datatransfer;
+
+import sun.awt.AppContext;
+import sun.datatransfer.DesktopDatatransferService;
+
+import java.awt.EventQueue;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.FlavorMap;
+import java.util.LinkedHashSet;
+import java.util.function.Supplier;
+
+/**
+ * Provides desktop services to the datatransfer module according to
+ * {@code DesktopDatatransferService} interface.
+ *
+ * @author Petr Pchelko
+ * @since 1.9
+ */
+public class DesktopDatatransferServiceImpl implements DesktopDatatransferService {
+
+ private static final Object FLAVOR_MAP_KEY = new Object();
+
+ @Override
+ public void invokeOnEventThread(Runnable r) {
+ EventQueue.invokeLater(r);
+ }
+
+ @Override
+ public String getDefaultUnicodeEncoding() {
+ DataTransferer dataTransferer = DataTransferer.getInstance();
+ if (dataTransferer != null) {
+ return dataTransferer.getDefaultUnicodeEncoding();
+ }
+ return null;
+ }
+
+ @Override
+ public FlavorMap getFlavorMap(Supplier<FlavorMap> supplier) {
+ AppContext context = AppContext.getAppContext();
+ FlavorMap fm = (FlavorMap) context.get(FLAVOR_MAP_KEY);
+ if (fm == null) {
+ fm = supplier.get();
+ context.put(FLAVOR_MAP_KEY, fm);
+ }
+ return fm;
+ }
+
+ @Override
+ public boolean isDesktopPresent() {
+ return true;
+ }
+
+ @Override
+ public LinkedHashSet<DataFlavor> getPlatformMappingsForNative(String nat) {
+ DataTransferer instance = DataTransferer.getInstance();
+ return instance != null ? instance.getPlatformMappingsForNative(nat) : new LinkedHashSet<>();
+ }
+
+ @Override
+ public LinkedHashSet<String> getPlatformMappingsForFlavor(DataFlavor df) {
+ DataTransferer instance = DataTransferer.getInstance();
+ return instance != null ? instance.getPlatformMappingsForFlavor(df) : new LinkedHashSet<>();
+ }
+
+ @Override
+ public void registerTextFlavorProperties(String nat, String charset, String eoln, String terminators) {
+ DataTransferer instance = DataTransferer.getInstance();
+ if (instance != null) {
+ instance.registerTextFlavorProperties(nat, charset, eoln, terminators);
+ }
+ }
+}
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService
new file mode 100644
index 0000000..7d763de
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService
@@ -0,0 +1 @@
+sun.awt.datatransfer.DesktopDatatransferServiceImpl
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java b/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
index 76a29a1..0b4b8d8 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/geom/Crossings.java
@@ -312,7 +312,7 @@
super(xlo, ylo, xhi, yhi);
}
- public final boolean covers(double ystart, double yend) {
+ public boolean covers(double ystart, double yend) {
return (limit == 2 && yranges[0] <= ystart && yranges[1] >= yend);
}
@@ -398,7 +398,7 @@
crosscounts = new int[yranges.length / 2];
}
- public final boolean covers(double ystart, double yend) {
+ public boolean covers(double ystart, double yend) {
int i = 0;
while (i < limit) {
double ylo = yranges[i++];
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
index 376827c..b1c6dae 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
@@ -53,7 +53,7 @@
Dimension2D[] sizes, BiFunction<Integer, Integer, Image> mapper) {
this.baseImageWidth = baseImageWidth;
this.baseImageHeight = baseImageHeight;
- this.sizes = sizes;
+ this.sizes = (sizes == null) ? null : Arrays.copyOf(sizes, sizes.length);
this.mapper = mapper;
}
diff --git a/jdk/src/java.desktop/share/classes/sun/datatransfer/DataFlavorUtil.java b/jdk/src/java.desktop/share/classes/sun/datatransfer/DataFlavorUtil.java
new file mode 100644
index 0000000..a5198dd
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/sun/datatransfer/DataFlavorUtil.java
@@ -0,0 +1,832 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.datatransfer;
+
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.FlavorMap;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Supplier;
+
+
+/**
+ * Utility class with different datatransfer helper functions
+ *
+ * @see 1.9
+ */
+public class DataFlavorUtil {
+
+ private DataFlavorUtil() {
+ // Avoid instantiation
+ }
+
+ private static Comparator<String> getCharsetComparator() {
+ return CharsetComparator.INSTANCE;
+ }
+
+ public static Comparator<DataFlavor> getDataFlavorComparator() {
+ return DataFlavorComparator.INSTANCE;
+ }
+
+ public static Comparator<Long> getIndexOrderComparator(Map<Long, Integer> indexMap) {
+ return new IndexOrderComparator(indexMap);
+ }
+
+ public static Comparator<DataFlavor> getTextFlavorComparator() {
+ return TextFlavorComparator.INSTANCE;
+ }
+
+ /**
+ * Tracks whether a particular text/* MIME type supports the charset
+ * parameter. The Map is initialized with all of the standard MIME types
+ * listed in the DataFlavor.selectBestTextFlavor method comment. Additional
+ * entries may be added during the life of the JRE for text/<other> types.
+ */
+ private static final Map<String, Boolean> textMIMESubtypeCharsetSupport;
+
+ static {
+ Map<String, Boolean> tempMap = new HashMap<>(17);
+ tempMap.put("sgml", Boolean.TRUE);
+ tempMap.put("xml", Boolean.TRUE);
+ tempMap.put("html", Boolean.TRUE);
+ tempMap.put("enriched", Boolean.TRUE);
+ tempMap.put("richtext", Boolean.TRUE);
+ tempMap.put("uri-list", Boolean.TRUE);
+ tempMap.put("directory", Boolean.TRUE);
+ tempMap.put("css", Boolean.TRUE);
+ tempMap.put("calendar", Boolean.TRUE);
+ tempMap.put("plain", Boolean.TRUE);
+ tempMap.put("rtf", Boolean.FALSE);
+ tempMap.put("tab-separated-values", Boolean.FALSE);
+ tempMap.put("t140", Boolean.FALSE);
+ tempMap.put("rfc822-headers", Boolean.FALSE);
+ tempMap.put("parityfec", Boolean.FALSE);
+ textMIMESubtypeCharsetSupport = Collections.synchronizedMap(tempMap);
+ }
+
+ /**
+ * Lazy initialization of Standard Encodings.
+ */
+ private static class StandardEncodingsHolder {
+ private static final SortedSet<String> standardEncodings = load();
+
+ private static SortedSet<String> load() {
+ final SortedSet<String> tempSet = new TreeSet<>(getCharsetComparator().reversed());
+ tempSet.add("US-ASCII");
+ tempSet.add("ISO-8859-1");
+ tempSet.add("UTF-8");
+ tempSet.add("UTF-16BE");
+ tempSet.add("UTF-16LE");
+ tempSet.add("UTF-16");
+ tempSet.add(Charset.defaultCharset().name());
+ return Collections.unmodifiableSortedSet(tempSet);
+ }
+ }
+
+ /**
+ * Returns a {@code SortedSet} of Strings which are a total order of the standard
+ * character sets supported by the JRE. The ordering follows the same principles as
+ * {@link java.awt.datatransfer.DataFlavor#selectBestTextFlavor(java.awt.datatransfer.DataFlavor[])}.
+ * So as to avoid loading all available character converters, optional, non-standard,
+ * character sets are not included.
+ */
+ public static Set<String> standardEncodings() {
+ return StandardEncodingsHolder.standardEncodings;
+ }
+
+ /**
+ * Converts an arbitrary text encoding to its canonical name.
+ */
+ public static String canonicalName(String encoding) {
+ if (encoding == null) {
+ return null;
+ }
+ try {
+ return Charset.forName(encoding).name();
+ } catch (IllegalCharsetNameException icne) {
+ return encoding;
+ } catch (UnsupportedCharsetException uce) {
+ return encoding;
+ }
+ }
+
+ /**
+ * Tests only whether the flavor's MIME type supports the charset
+ * parameter. Must only be called for flavors with a primary type of
+ * "text".
+ */
+ public static boolean doesSubtypeSupportCharset(DataFlavor flavor) {
+ String subType = flavor.getSubType();
+ if (subType == null) {
+ return false;
+ }
+
+ Boolean support = textMIMESubtypeCharsetSupport.get(subType);
+
+ if (support != null) {
+ return support;
+ }
+
+ boolean ret_val = (flavor.getParameter("charset") != null);
+ textMIMESubtypeCharsetSupport.put(subType, ret_val);
+ return ret_val;
+ }
+ public static boolean doesSubtypeSupportCharset(String subType,
+ String charset)
+ {
+ Boolean support = textMIMESubtypeCharsetSupport.get(subType);
+
+ if (support != null) {
+ return support;
+ }
+
+ boolean ret_val = (charset != null);
+ textMIMESubtypeCharsetSupport.put(subType, ret_val);
+ return ret_val;
+ }
+
+
+ /**
+ * Returns whether this flavor is a text type which supports the
+ * 'charset' parameter.
+ */
+ public static boolean isFlavorCharsetTextType(DataFlavor flavor) {
+ // Although stringFlavor doesn't actually support the charset
+ // parameter (because its primary MIME type is not "text"), it should
+ // be treated as though it does. stringFlavor is semantically
+ // equivalent to "text/plain" data.
+ if (DataFlavor.stringFlavor.equals(flavor)) {
+ return true;
+ }
+
+ if (!"text".equals(flavor.getPrimaryType()) ||
+ !doesSubtypeSupportCharset(flavor))
+ {
+ return false;
+ }
+
+ Class<?> rep_class = flavor.getRepresentationClass();
+
+ if (flavor.isRepresentationClassReader() ||
+ String.class.equals(rep_class) ||
+ flavor.isRepresentationClassCharBuffer() ||
+ char[].class.equals(rep_class))
+ {
+ return true;
+ }
+
+ if (!(flavor.isRepresentationClassInputStream() ||
+ flavor.isRepresentationClassByteBuffer() ||
+ byte[].class.equals(rep_class))) {
+ return false;
+ }
+
+ String charset = flavor.getParameter("charset");
+
+ // null equals default encoding which is always supported
+ return (charset == null) || isEncodingSupported(charset);
+ }
+
+ /**
+ * Returns whether this flavor is a text type which does not support the
+ * 'charset' parameter.
+ */
+ public static boolean isFlavorNoncharsetTextType(DataFlavor flavor) {
+ if (!"text".equals(flavor.getPrimaryType()) || doesSubtypeSupportCharset(flavor)) {
+ return false;
+ }
+
+ return (flavor.isRepresentationClassInputStream() ||
+ flavor.isRepresentationClassByteBuffer() ||
+ byte[].class.equals(flavor.getRepresentationClass()));
+ }
+
+ /**
+ * If the specified flavor is a text flavor which supports the "charset"
+ * parameter, then this method returns that parameter, or the default
+ * charset if no such parameter was specified at construction. For non-
+ * text DataFlavors, and for non-charset text flavors, this method returns
+ * null.
+ */
+ public static String getTextCharset(DataFlavor flavor) {
+ if (!isFlavorCharsetTextType(flavor)) {
+ return null;
+ }
+
+ String encoding = flavor.getParameter("charset");
+
+ return (encoding != null) ? encoding : Charset.defaultCharset().name();
+ }
+
+ /**
+ * Determines whether this JRE can both encode and decode text in the
+ * specified encoding.
+ */
+ private static boolean isEncodingSupported(String encoding) {
+ if (encoding == null) {
+ return false;
+ }
+ try {
+ return Charset.isSupported(encoding);
+ } catch (IllegalCharsetNameException icne) {
+ return false;
+ }
+ }
+
+ /**
+ * Helper method to compare two objects by their Integer indices in the
+ * given map. If the map doesn't contain an entry for either of the
+ * objects, the fallback index will be used for the object instead.
+ *
+ * @param indexMap the map which maps objects into Integer indexes.
+ * @param obj1 the first object to be compared.
+ * @param obj2 the second object to be compared.
+ * @param fallbackIndex the Integer to be used as a fallback index.
+ * @return a negative integer, zero, or a positive integer as the
+ * first object is mapped to a less, equal to, or greater
+ * index than the second.
+ */
+ static <T> int compareIndices(Map<T, Integer> indexMap,
+ T obj1, T obj2,
+ Integer fallbackIndex) {
+ Integer index1 = indexMap.getOrDefault(obj1, fallbackIndex);
+ Integer index2 = indexMap.getOrDefault(obj2, fallbackIndex);
+ return index1.compareTo(index2);
+ }
+
+ /**
+ * An IndexedComparator which compares two String charsets. The comparison
+ * follows the rules outlined in DataFlavor.selectBestTextFlavor. In order
+ * to ensure that non-Unicode, non-ASCII, non-default charsets are sorted
+ * in alphabetical order, charsets are not automatically converted to their
+ * canonical forms.
+ */
+ private static class CharsetComparator implements Comparator<String> {
+ static final CharsetComparator INSTANCE = new CharsetComparator();
+
+ private static final Map<String, Integer> charsets;
+
+ private static final Integer DEFAULT_CHARSET_INDEX = 2;
+ private static final Integer OTHER_CHARSET_INDEX = 1;
+ private static final Integer WORST_CHARSET_INDEX = 0;
+ private static final Integer UNSUPPORTED_CHARSET_INDEX = Integer.MIN_VALUE;
+
+ private static final String UNSUPPORTED_CHARSET = "UNSUPPORTED";
+
+ static {
+ Map<String, Integer> charsetsMap = new HashMap<>(8, 1.0f);
+
+ // we prefer Unicode charsets
+ charsetsMap.put(canonicalName("UTF-16LE"), 4);
+ charsetsMap.put(canonicalName("UTF-16BE"), 5);
+ charsetsMap.put(canonicalName("UTF-8"), 6);
+ charsetsMap.put(canonicalName("UTF-16"), 7);
+
+ // US-ASCII is the worst charset supported
+ charsetsMap.put(canonicalName("US-ASCII"), WORST_CHARSET_INDEX);
+
+ charsetsMap.putIfAbsent(Charset.defaultCharset().name(), DEFAULT_CHARSET_INDEX);
+
+ charsetsMap.put(UNSUPPORTED_CHARSET, UNSUPPORTED_CHARSET_INDEX);
+
+ charsets = Collections.unmodifiableMap(charsetsMap);
+ }
+
+ /**
+ * Compares charsets. Returns a negative integer, zero, or a positive
+ * integer as the first charset is worse than, equal to, or better than
+ * the second.
+ * <p>
+ * Charsets are ordered according to the following rules:
+ * <ul>
+ * <li>All unsupported charsets are equal.
+ * <li>Any unsupported charset is worse than any supported charset.
+ * <li>Unicode charsets, such as "UTF-16", "UTF-8", "UTF-16BE" and
+ * "UTF-16LE", are considered best.
+ * <li>After them, platform default charset is selected.
+ * <li>"US-ASCII" is the worst of supported charsets.
+ * <li>For all other supported charsets, the lexicographically less
+ * one is considered the better.
+ * </ul>
+ *
+ * @param charset1 the first charset to be compared
+ * @param charset2 the second charset to be compared.
+ * @return a negative integer, zero, or a positive integer as the
+ * first argument is worse, equal to, or better than the
+ * second.
+ */
+ public int compare(String charset1, String charset2) {
+ charset1 = getEncoding(charset1);
+ charset2 = getEncoding(charset2);
+
+ int comp = compareIndices(charsets, charset1, charset2, OTHER_CHARSET_INDEX);
+
+ if (comp == 0) {
+ return charset2.compareTo(charset1);
+ }
+
+ return comp;
+ }
+
+ /**
+ * Returns encoding for the specified charset according to the
+ * following rules:
+ * <ul>
+ * <li>If the charset is <code>null</code>, then <code>null</code> will
+ * be returned.
+ * <li>Iff the charset specifies an encoding unsupported by this JRE,
+ * <code>UNSUPPORTED_CHARSET</code> will be returned.
+ * <li>If the charset specifies an alias name, the corresponding
+ * canonical name will be returned iff the charset is a known
+ * Unicode, ASCII, or default charset.
+ * </ul>
+ *
+ * @param charset the charset.
+ * @return an encoding for this charset.
+ */
+ static String getEncoding(String charset) {
+ if (charset == null) {
+ return null;
+ } else if (!isEncodingSupported(charset)) {
+ return UNSUPPORTED_CHARSET;
+ } else {
+ // Only convert to canonical form if the charset is one
+ // of the charsets explicitly listed in the known charsets
+ // map. This will happen only for Unicode, ASCII, or default
+ // charsets.
+ String canonicalName = canonicalName(charset);
+ return (charsets.containsKey(canonicalName))
+ ? canonicalName
+ : charset;
+ }
+ }
+ }
+
+ /**
+ * An IndexedComparator which compares two DataFlavors. For text flavors,
+ * the comparison follows the rules outlined in
+ * DataFlavor.selectBestTextFlavor. For non-text flavors, unknown
+ * application MIME types are preferred, followed by known
+ * application/x-java-* MIME types. Unknown application types are preferred
+ * because if the user provides his own data flavor, it will likely be the
+ * most descriptive one. For flavors which are otherwise equal, the
+ * flavors' string representation are compared in the alphabetical order.
+ */
+ private static class DataFlavorComparator implements Comparator<DataFlavor> {
+
+ static final DataFlavorComparator INSTANCE = new DataFlavorComparator();
+
+ private static final Map<String, Integer> exactTypes;
+ private static final Map<String, Integer> primaryTypes;
+ private static final Map<Class<?>, Integer> nonTextRepresentations;
+ private static final Map<String, Integer> textTypes;
+ private static final Map<Class<?>, Integer> decodedTextRepresentations;
+ private static final Map<Class<?>, Integer> encodedTextRepresentations;
+
+ private static final Integer UNKNOWN_OBJECT_LOSES = Integer.MIN_VALUE;
+ private static final Integer UNKNOWN_OBJECT_WINS = Integer.MAX_VALUE;
+
+ static {
+ {
+ Map<String, Integer> exactTypesMap = new HashMap<>(4, 1.0f);
+
+ // application/x-java-* MIME types
+ exactTypesMap.put("application/x-java-file-list", 0);
+ exactTypesMap.put("application/x-java-serialized-object", 1);
+ exactTypesMap.put("application/x-java-jvm-local-objectref", 2);
+ exactTypesMap.put("application/x-java-remote-object", 3);
+
+ exactTypes = Collections.unmodifiableMap(exactTypesMap);
+ }
+
+ {
+ Map<String, Integer> primaryTypesMap = new HashMap<>(1, 1.0f);
+
+ primaryTypesMap.put("application", 0);
+
+ primaryTypes = Collections.unmodifiableMap(primaryTypesMap);
+ }
+
+ {
+ Map<Class<?>, Integer> nonTextRepresentationsMap = new HashMap<>(3, 1.0f);
+
+ nonTextRepresentationsMap.put(java.io.InputStream.class, 0);
+ nonTextRepresentationsMap.put(java.io.Serializable.class, 1);
+
+ nonTextRepresentationsMap.put(RMI.remoteClass(), 2);
+
+ nonTextRepresentations = Collections.unmodifiableMap(nonTextRepresentationsMap);
+ }
+
+ {
+ Map<String, Integer> textTypesMap = new HashMap<>(16, 1.0f);
+
+ // plain text
+ textTypesMap.put("text/plain", 0);
+
+ // stringFlavor
+ textTypesMap.put("application/x-java-serialized-object", 1);
+
+ // misc
+ textTypesMap.put("text/calendar", 2);
+ textTypesMap.put("text/css", 3);
+ textTypesMap.put("text/directory", 4);
+ textTypesMap.put("text/parityfec", 5);
+ textTypesMap.put("text/rfc822-headers", 6);
+ textTypesMap.put("text/t140", 7);
+ textTypesMap.put("text/tab-separated-values", 8);
+ textTypesMap.put("text/uri-list", 9);
+
+ // enriched
+ textTypesMap.put("text/richtext", 10);
+ textTypesMap.put("text/enriched", 11);
+ textTypesMap.put("text/rtf", 12);
+
+ // markup
+ textTypesMap.put("text/html", 13);
+ textTypesMap.put("text/xml", 14);
+ textTypesMap.put("text/sgml", 15);
+
+ textTypes = Collections.unmodifiableMap(textTypesMap);
+ }
+
+ {
+ Map<Class<?>, Integer> decodedTextRepresentationsMap = new HashMap<>(4, 1.0f);
+
+ decodedTextRepresentationsMap.put(char[].class, 0);
+ decodedTextRepresentationsMap.put(CharBuffer.class, 1);
+ decodedTextRepresentationsMap.put(String.class, 2);
+ decodedTextRepresentationsMap.put(Reader.class, 3);
+
+ decodedTextRepresentations =
+ Collections.unmodifiableMap(decodedTextRepresentationsMap);
+ }
+
+ {
+ Map<Class<?>, Integer> encodedTextRepresentationsMap = new HashMap<>(3, 1.0f);
+
+ encodedTextRepresentationsMap.put(byte[].class, 0);
+ encodedTextRepresentationsMap.put(ByteBuffer.class, 1);
+ encodedTextRepresentationsMap.put(InputStream.class, 2);
+
+ encodedTextRepresentations =
+ Collections.unmodifiableMap(encodedTextRepresentationsMap);
+ }
+ }
+
+
+ public int compare(DataFlavor flavor1, DataFlavor flavor2) {
+ if (flavor1.equals(flavor2)) {
+ return 0;
+ }
+
+ int comp;
+
+ String primaryType1 = flavor1.getPrimaryType();
+ String subType1 = flavor1.getSubType();
+ String mimeType1 = primaryType1 + "/" + subType1;
+ Class<?> class1 = flavor1.getRepresentationClass();
+
+ String primaryType2 = flavor2.getPrimaryType();
+ String subType2 = flavor2.getSubType();
+ String mimeType2 = primaryType2 + "/" + subType2;
+ Class<?> class2 = flavor2.getRepresentationClass();
+
+ if (flavor1.isFlavorTextType() && flavor2.isFlavorTextType()) {
+ // First, compare MIME types
+ comp = compareIndices(textTypes, mimeType1, mimeType2, UNKNOWN_OBJECT_LOSES);
+ if (comp != 0) {
+ return comp;
+ }
+
+ // Only need to test one flavor because they both have the
+ // same MIME type. Also don't need to worry about accidentally
+ // passing stringFlavor because either
+ // 1. Both flavors are stringFlavor, in which case the
+ // equality test at the top of the function succeeded.
+ // 2. Only one flavor is stringFlavor, in which case the MIME
+ // type comparison returned a non-zero value.
+ if (doesSubtypeSupportCharset(flavor1)) {
+ // Next, prefer the decoded text representations of Reader,
+ // String, CharBuffer, and [C, in that order.
+ comp = compareIndices(decodedTextRepresentations, class1,
+ class2, UNKNOWN_OBJECT_LOSES);
+ if (comp != 0) {
+ return comp;
+ }
+
+ // Next, compare charsets
+ comp = CharsetComparator.INSTANCE.compare(getTextCharset(flavor1),
+ getTextCharset(flavor2));
+ if (comp != 0) {
+ return comp;
+ }
+ }
+
+ // Finally, prefer the encoded text representations of
+ // InputStream, ByteBuffer, and [B, in that order.
+ comp = compareIndices(encodedTextRepresentations, class1,
+ class2, UNKNOWN_OBJECT_LOSES);
+ if (comp != 0) {
+ return comp;
+ }
+ } else {
+ // First, prefer application types.
+ comp = compareIndices(primaryTypes, primaryType1, primaryType2,
+ UNKNOWN_OBJECT_LOSES);
+ if (comp != 0) {
+ return comp;
+ }
+
+ // Next, look for application/x-java-* types. Prefer unknown
+ // MIME types because if the user provides his own data flavor,
+ // it will likely be the most descriptive one.
+ comp = compareIndices(exactTypes, mimeType1, mimeType2,
+ UNKNOWN_OBJECT_WINS);
+ if (comp != 0) {
+ return comp;
+ }
+
+ // Finally, prefer the representation classes of Remote,
+ // Serializable, and InputStream, in that order.
+ comp = compareIndices(nonTextRepresentations, class1, class2,
+ UNKNOWN_OBJECT_LOSES);
+ if (comp != 0) {
+ return comp;
+ }
+ }
+
+ // The flavours are not equal but still not distinguishable.
+ // Compare String representations in alphabetical order
+ return flavor1.getMimeType().compareTo(flavor2.getMimeType());
+ }
+ }
+
+ /*
+ * Given the Map that maps objects to Integer indices and a boolean value,
+ * this Comparator imposes a direct or reverse order on set of objects.
+ * <p>
+ * If the specified boolean value is SELECT_BEST, the Comparator imposes the
+ * direct index-based order: an object A is greater than an object B if and
+ * only if the index of A is greater than the index of B. An object that
+ * doesn't have an associated index is less or equal than any other object.
+ * <p>
+ * If the specified boolean value is SELECT_WORST, the Comparator imposes the
+ * reverse index-based order: an object A is greater than an object B if and
+ * only if A is less than B with the direct index-based order.
+ */
+ private static class IndexOrderComparator implements Comparator<Long> {
+ private final Map<Long, Integer> indexMap;
+ private static final Integer FALLBACK_INDEX = Integer.MIN_VALUE;
+
+ public IndexOrderComparator(Map<Long, Integer> indexMap) {
+ this.indexMap = indexMap;
+ }
+
+ public int compare(Long obj1, Long obj2) {
+ return compareIndices(indexMap, obj1, obj2, FALLBACK_INDEX);
+ }
+ }
+
+ private static class TextFlavorComparator extends DataFlavorComparator {
+
+ static final TextFlavorComparator INSTANCE = new TextFlavorComparator();
+ /**
+ * Compares two <code>DataFlavor</code> objects. Returns a negative
+ * integer, zero, or a positive integer as the first
+ * <code>DataFlavor</code> is worse than, equal to, or better than the
+ * second.
+ * <p>
+ * <code>DataFlavor</code>s are ordered according to the rules outlined
+ * for <code>selectBestTextFlavor</code>.
+ *
+ * @param flavor1 the first <code>DataFlavor</code> to be compared
+ * @param flavor2 the second <code>DataFlavor</code> to be compared
+ * @return a negative integer, zero, or a positive integer as the first
+ * argument is worse, equal to, or better than the second
+ * @throws ClassCastException if either of the arguments is not an
+ * instance of <code>DataFlavor</code>
+ * @throws NullPointerException if either of the arguments is
+ * <code>null</code>
+ *
+ * @see java.awt.datatransfer.DataFlavor#selectBestTextFlavor
+ */
+ public int compare(DataFlavor flavor1, DataFlavor flavor2) {
+ if (flavor1.isFlavorTextType()) {
+ if (flavor2.isFlavorTextType()) {
+ return super.compare(flavor1, flavor2);
+ } else {
+ return 1;
+ }
+ } else if (flavor2.isFlavorTextType()) {
+ return -1;
+ } else {
+ return 0;
+ }
+ }
+ }
+
+ /**
+ * A fallback implementation of {@link sun.datatransfer.DesktopDatatransferService}
+ * used if there is no desktop.
+ */
+ private static final class DefaultDesktopDatatransferService implements DesktopDatatransferService {
+ static final DesktopDatatransferService INSTANCE = getDesktopService();
+
+ private static DesktopDatatransferService getDesktopService() {
+ ServiceLoader<DesktopDatatransferService> loader =
+ ServiceLoader.load(DesktopDatatransferService.class, null);
+ Iterator<DesktopDatatransferService> iterator = loader.iterator();
+ if (iterator.hasNext()) {
+ return iterator.next();
+ } else {
+ return new DefaultDesktopDatatransferService();
+ }
+ }
+
+ /**
+ * System singleton FlavorTable.
+ * Only used if there is no desktop
+ * to provide an appropriate FlavorMap.
+ */
+ private volatile FlavorMap flavorMap;
+
+ @Override
+ public void invokeOnEventThread(Runnable r) {
+ r.run();
+ }
+
+ @Override
+ public String getDefaultUnicodeEncoding() {
+ return StandardCharsets.UTF_8.name();
+ }
+
+ @Override
+ public FlavorMap getFlavorMap(Supplier<FlavorMap> supplier) {
+ FlavorMap map = flavorMap;
+ if (map == null) {
+ synchronized (this) {
+ map = flavorMap;
+ if (map == null) {
+ flavorMap = map = supplier.get();
+ }
+ }
+ }
+ return map;
+ }
+
+ @Override
+ public boolean isDesktopPresent() {
+ return false;
+ }
+
+ @Override
+ public LinkedHashSet<DataFlavor> getPlatformMappingsForNative(String nat) {
+ return new LinkedHashSet<>();
+ }
+
+ @Override
+ public LinkedHashSet<String> getPlatformMappingsForFlavor(DataFlavor df) {
+ return new LinkedHashSet<>();
+ }
+
+ @Override
+ public void registerTextFlavorProperties(String nat, String charset,
+ String eoln, String terminators) {
+ // Not needed if desktop module is absent
+ }
+ }
+
+ public static DesktopDatatransferService getDesktopService() {
+ return DefaultDesktopDatatransferService.INSTANCE;
+ }
+
+ /**
+ * A class that provides access to java.rmi.Remote and java.rmi.MarshalledObject
+ * without creating a static dependency.
+ */
+ public static class RMI {
+ private static final Class<?> remoteClass = getClass("java.rmi.Remote");
+ private static final Class<?> marshallObjectClass = getClass("java.rmi.MarshalledObject");
+ private static final Constructor<?> marshallCtor = getConstructor(marshallObjectClass, Object.class);
+ private static final Method marshallGet = getMethod(marshallObjectClass, "get");
+
+ private static Class<?> getClass(String name) {
+ try {
+ return Class.forName(name, true, null);
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+ private static Constructor<?> getConstructor(Class<?> c, Class<?>... types) {
+ try {
+ return (c == null) ? null : c.getDeclaredConstructor(types);
+ } catch (NoSuchMethodException x) {
+ throw new AssertionError(x);
+ }
+ }
+
+ private static Method getMethod(Class<?> c, String name, Class<?>... types) {
+ try {
+ return (c == null) ? null : c.getMethod(name, types);
+ } catch (NoSuchMethodException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ /**
+ * Returns java.rmi.Remote.class if RMI is present; otherwise {@code null}.
+ */
+ static Class<?> remoteClass() {
+ return remoteClass;
+ }
+
+ /**
+ * Returns {@code true} if the given class is java.rmi.Remote.
+ */
+ public static boolean isRemote(Class<?> c) {
+ return (remoteClass != null) && remoteClass.isAssignableFrom(c);
+ }
+
+ /**
+ * Returns a new MarshalledObject containing the serialized representation
+ * of the given object.
+ */
+ public static Object newMarshalledObject(Object obj) throws IOException {
+ try {
+ return marshallCtor == null ? null : marshallCtor.newInstance(obj);
+ } catch (InstantiationException | IllegalAccessException x) {
+ throw new AssertionError(x);
+ } catch (InvocationTargetException x) {
+ Throwable cause = x.getCause();
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ throw new AssertionError(x);
+ }
+ }
+
+ /**
+ * Returns a new copy of the contained marshalled object.
+ */
+ public static Object getMarshalledObject(Object obj)
+ throws IOException, ClassNotFoundException {
+ try {
+ return marshallGet == null ? null : marshallGet.invoke(obj);
+ } catch (IllegalAccessException x) {
+ throw new AssertionError(x);
+ } catch (InvocationTargetException x) {
+ Throwable cause = x.getCause();
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ if (cause instanceof ClassNotFoundException)
+ throw (ClassNotFoundException) cause;
+ throw new AssertionError(x);
+ }
+ }
+
+ }
+}
diff --git a/jdk/src/java.desktop/share/classes/sun/datatransfer/DesktopDatatransferService.java b/jdk/src/java.desktop/share/classes/sun/datatransfer/DesktopDatatransferService.java
new file mode 100644
index 0000000..c077548
--- /dev/null
+++ b/jdk/src/java.desktop/share/classes/sun/datatransfer/DesktopDatatransferService.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.datatransfer;
+
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.FlavorMap;
+import java.util.LinkedHashSet;
+import java.util.function.Supplier;
+
+/**
+ * Contains services which desktop provides to the datatransfer system
+ * to enrich it's functionality
+ *
+ * @author Petr Pchelko
+ * @since 1.9
+ */
+public interface DesktopDatatransferService {
+
+ /**
+ * If desktop is present - invokes a {@code Runnable} on
+ * the event dispatch thread. Otherwise invokes a {@code run()}
+ * method directly.
+ *
+ * @param r a {@code Runnable} to invoke
+ */
+ void invokeOnEventThread(Runnable r);
+
+ /**
+ * Get a platform-dependent default unicode encoding to use in
+ * datatransfer system.
+ *
+ * @return default unicode encoding
+ */
+ String getDefaultUnicodeEncoding();
+
+ /**
+ * Takes an appropriate {@code FlavorMap} from the desktop.
+ * If no appropriate table is found - uses a provided supplier to
+ * instantiate a table. If the desktop is absent - creates and returns
+ * a system singleton.
+ *
+ * @param supplier a constructor that should be used to create a new instance of
+ * the {@code FlavorMap}
+ * @return a {@code FlavorMap}
+ */
+ FlavorMap getFlavorMap(Supplier<FlavorMap> supplier);
+
+ /**
+ * Checks if desktop is present
+ *
+ * @return {@code true} is the desktop is present
+ */
+ boolean isDesktopPresent();
+
+ /**
+ * Returns platform-specific mappings for the specified native format.
+ * If there are no platform-specific mappings for this native, the method
+ * returns an empty {@code Set}
+ *
+ * @param nat a native format to return flavors for
+ * @return set of platform-specific mappings for a native format
+ */
+ LinkedHashSet<DataFlavor> getPlatformMappingsForNative(String nat);
+
+ /**
+ * Returns platform-specific mappings for the specified flavor.
+ * If there are no platform-specific mappings for this flavor, the method
+ * returns an empty {@code Set}
+ *
+ * @param df {@code DataFlavor} to return mappings for
+ * @return set of platform-specific mappings for a {@code DataFlavor}
+ */
+ LinkedHashSet<String> getPlatformMappingsForFlavor(DataFlavor df);
+
+ /**
+ * This method is called for text flavor mappings established while parsing
+ * the default flavor mappings file. It stores the "eoln" and "terminators"
+ * parameters which are not officially part of the MIME type. They are
+ * MIME parameters specific to the flavormap.properties file format.
+ */
+ void registerTextFlavorProperties(String nat, String charset,
+ String eoln, String terminators);
+}
diff --git a/jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
index b8d2b78..d875da3 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
@@ -67,11 +67,11 @@
compFont.maxIndices != null;
}
- public final int compositeGlyphCode(int slot, int glyphCode) {
+ public int compositeGlyphCode(int slot, int glyphCode) {
return (slot << 24 | (glyphCode & GLYPHMASK));
}
- private final void initMapper() {
+ private void initMapper() {
if (missingGlyph == CharToGlyphMapper.UNINITIALIZED_GLYPH) {
if (glyphMaps == null) {
glyphMaps = new int[NBLOCKS][];
@@ -108,7 +108,7 @@
glyphMaps[index0][unicode & 0xff] = glyphCode;
}
- private final CharToGlyphMapper getSlotMapper(int slot) {
+ private CharToGlyphMapper getSlotMapper(int slot) {
CharToGlyphMapper mapper = slotMappers[slot];
if (mapper == null) {
mapper = font.getSlotFont(slot).getMapper();
@@ -117,7 +117,7 @@
return mapper;
}
- private final int convertToGlyph(int unicode) {
+ private int convertToGlyph(int unicode) {
for (int slot = 0; slot < font.numSlots; slot++) {
if (!hasExcludes || !font.isExcludedChar(slot, unicode)) {
diff --git a/jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java b/jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java
index a27ded2..e6219dc 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/CoreMetrics.java
@@ -66,11 +66,11 @@
return ((FontLineMetrics)lm).cm;
}
- public final int hashCode() {
+ public int hashCode() {
return Float.floatToIntBits(ascent + ssOffset);
}
- public final boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
try {
return equals((CoreMetrics)rhs);
}
@@ -79,7 +79,7 @@
}
}
- public final boolean equals(CoreMetrics rhs) {
+ public boolean equals(CoreMetrics rhs) {
if (rhs != null) {
if (this == rhs) {
return true;
@@ -105,7 +105,7 @@
// fullOffsets is an array of 5 baseline offsets,
// roman, center, hanging, bottom, and top in that order
// this does NOT add the ssOffset
- public final float effectiveBaselineOffset(float[] fullOffsets) {
+ public float effectiveBaselineOffset(float[] fullOffsets) {
switch (baselineIndex) {
case GraphicAttribute.TOP_ALIGNMENT:
return fullOffsets[4] + ascent;
diff --git a/jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index deae80c..06654b3 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -454,6 +454,17 @@
/* Only look in the cache */
long getCachedGlyphPtr(int glyphCode) {
+ try {
+ return getCachedGlyphPtrInternal(glyphCode);
+ } catch (Exception e) {
+ NullFontScaler nullScaler =
+ (NullFontScaler)FontScaler.getNullScaler();
+ long nullSC = NullFontScaler.getNullScalerContext();
+ return nullScaler.getGlyphImage(nullSC, glyphCode);
+ }
+ }
+
+ private long getCachedGlyphPtrInternal(int glyphCode) {
switch (glyphCacheFormat) {
case INTARRAY:
return intGlyphImages[glyphCode] & INTMASK;
@@ -481,6 +492,27 @@
}
private synchronized long setCachedGlyphPtr(int glyphCode, long glyphPtr) {
+ try {
+ return setCachedGlyphPtrInternal(glyphCode, glyphPtr);
+ } catch (Exception e) {
+ switch (glyphCacheFormat) {
+ case INTARRAY:
+ case SEGINTARRAY:
+ StrikeCache.freeIntPointer((int)glyphPtr);
+ break;
+ case LONGARRAY:
+ case SEGLONGARRAY:
+ StrikeCache.freeLongPointer(glyphPtr);
+ break;
+ }
+ NullFontScaler nullScaler =
+ (NullFontScaler)FontScaler.getNullScaler();
+ long nullSC = NullFontScaler.getNullScalerContext();
+ return nullScaler.getGlyphImage(nullSC, glyphCode);
+ }
+ }
+
+ private long setCachedGlyphPtrInternal(int glyphCode, long glyphPtr) {
switch (glyphCacheFormat) {
case INTARRAY:
if (intGlyphImages[glyphCode] == 0) {
diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java b/jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java
index 9053ff0..031f5cf 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/FontLineMetrics.java
@@ -50,55 +50,55 @@
this.frc = frc;
}
- public final int getNumChars() {
+ public int getNumChars() {
return numchars;
}
- public final float getAscent() {
+ public float getAscent() {
return cm.ascent;
}
- public final float getDescent() {
+ public float getDescent() {
return cm.descent;
}
- public final float getLeading() {
+ public float getLeading() {
return cm.leading;
}
- public final float getHeight() {
+ public float getHeight() {
return cm.height;
}
- public final int getBaselineIndex() {
+ public int getBaselineIndex() {
return cm.baselineIndex;
}
- public final float[] getBaselineOffsets() {
+ public float[] getBaselineOffsets() {
return cm.baselineOffsets.clone();
}
- public final float getStrikethroughOffset() {
+ public float getStrikethroughOffset() {
return cm.strikethroughOffset;
}
- public final float getStrikethroughThickness() {
+ public float getStrikethroughThickness() {
return cm.strikethroughThickness;
}
- public final float getUnderlineOffset() {
+ public float getUnderlineOffset() {
return cm.underlineOffset;
}
- public final float getUnderlineThickness() {
+ public float getUnderlineThickness() {
return cm.underlineThickness;
}
- public final int hashCode() {
+ public int hashCode() {
return cm.hashCode();
}
- public final boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
try {
return cm.equals(((FontLineMetrics)rhs).cm);
}
@@ -107,7 +107,7 @@
}
}
- public final Object clone() {
+ public Object clone() {
// frc, cm do not need deep clone
try {
return super.clone();
diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java b/jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java
index e0a5666..d20b100 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/FontRunIterator.java
@@ -140,11 +140,11 @@
static final int DONE = -1;
- final int nextCodePoint() {
+ int nextCodePoint() {
return nextCodePoint(limit);
}
- final int nextCodePoint(int lim) {
+ int nextCodePoint(int lim) {
if (pos >= lim) {
return DONE;
}
@@ -159,7 +159,7 @@
return ch;
}
- final void pushback(int ch) {
+ void pushback(int ch) {
if (ch >= 0) {
if (ch >= 0x10000) {
pos -= 2;
diff --git a/jdk/src/java.desktop/share/classes/sun/font/GlyphList.java b/jdk/src/java.desktop/share/classes/sun/font/GlyphList.java
index 328e3e4..2540b11 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/GlyphList.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/GlyphList.java
@@ -262,7 +262,7 @@
return mapChars(info, len);
}
- private final boolean mapChars(FontInfo info, int len) {
+ private boolean mapChars(FontInfo info, int len) {
/* REMIND.Is it worthwhile for the iteration to convert
* chars to glyph ids to directly map to images?
*/
diff --git a/jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java b/jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java
index e719fc3..d023a51 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/ScriptRun.java
@@ -121,7 +121,7 @@
*
* @return the index of the first character in the current script run.
*/
- public final int getScriptStart() {
+ public int getScriptStart() {
return scriptStart;
}
@@ -130,7 +130,7 @@
*
* @return the index of the first character after the current script run.
*/
- public final int getScriptLimit() {
+ public int getScriptLimit() {
return scriptLimit;
}
@@ -140,7 +140,7 @@
* @return the script code for the script of the current script run.
* @see #Script
*/
- public final int getScriptCode() {
+ public int getScriptCode() {
return scriptCode;
}
@@ -150,7 +150,7 @@
*
* @return <code>false</code> if there isn't another run, <code>true</code> if there is.
*/
- public final boolean next() {
+ public boolean next() {
int startSP = parenSP; // used to find the first new open character
// if we've fallen off the end of the text, we're done
@@ -242,7 +242,7 @@
static final int DONE = -1;
- private final int nextCodePoint() {
+ private int nextCodePoint() {
if (scriptLimit >= textLimit) {
return DONE;
}
@@ -257,7 +257,7 @@
return ch;
}
- private final void pushback(int ch) {
+ private void pushback(int ch) {
if (ch >= 0) {
if (ch >= 0x10000) {
scriptLimit -= 2;
@@ -287,7 +287,7 @@
* @param n the word in which to find the highest bit that's set.
* @return the bit number (counting from the low order bit) of the highest bit.
*/
- private static final byte highBit(int n)
+ private static byte highBit(int n)
{
if (n <= 0) {
return -32;
diff --git a/jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java b/jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java
index d894014..14ae9f4 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/ScriptRunData.java
@@ -39,7 +39,7 @@
private static final int CHAR_LIMIT = 0x110000;
private static int cache = 0;
- public static final int getScript(int cp) {
+ public static int getScript(int cp) {
// optimize for runs of characters in the same script
if (cp >= data[cache] && cp < data[cache+2]) {
return data[cache+1];
diff --git a/jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java b/jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java
index 49b31ac..99319c7 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/StrikeCache.java
@@ -202,7 +202,7 @@
recentStrikeIndex = index;
}
- private static final void doDispose(FontStrikeDisposer disposer) {
+ private static void doDispose(FontStrikeDisposer disposer) {
if (disposer.intGlyphImages != null) {
freeCachedIntMemory(disposer.intGlyphImages,
disposer.pScalerContext);
diff --git a/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java b/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java
index 3266268..f92eba8 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/SunFontManager.java
@@ -3198,7 +3198,7 @@
* Returns an array of two strings. The first element is the
* name of the font. The second element is the file name.
*/
- public abstract String[] getDefaultPlatformFont();
+ protected abstract String[] getDefaultPlatformFont();
// Begin: Refactored from SunGraphicsEnviroment.
diff --git a/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
index 4ebee6c..de79dbb 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
@@ -59,7 +59,11 @@
}
missingGlyph = 0; /* standard for TrueType fonts */
ByteBuffer buffer = font.getTableBuffer(TrueTypeFont.maxpTag);
- numGlyphs = buffer.getChar(4); // offset 4 bytes in MAXP table.
+ if (buffer != null && buffer.capacity() >= 6) {
+ numGlyphs = buffer.getChar(4); // offset 4 bytes in MAXP table.
+ } else {
+ handleBadCMAP();
+ }
if (FontUtilities.isSolaris && isJAlocale && font.supportsJA()) {
needsJAremapping = true;
if (FontUtilities.isSolaris8 &&
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java b/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
index 06e3397..692f376 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/StateTrackableDelegate.java
@@ -250,7 +250,7 @@
* {@code IMMUTABLE} delegate is never modified.
* @since 1.7
*/
- public final void markDirty() {
+ public void markDirty() {
theTracker = null;
}
}
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
index a6e28f2..aed79d9 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
@@ -917,7 +917,7 @@
* Return the SurfaceData object assigned to manage the destination
* drawable surface of this Graphics2D.
*/
- public final SurfaceData getSurfaceData() {
+ public SurfaceData getSurfaceData() {
return surfaceData;
}
@@ -1734,7 +1734,7 @@
* compositeState <= COMP_CUSTOM)
* though nothing bad will happen if it is run in other states.
*/
- final void validateColor() {
+ void validateColor() {
int eargb;
if (imageComp == CompositeType.Clear) {
eargb = 0;
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
index 1281081..29d86ad 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
@@ -43,7 +43,7 @@
tagCache = new TagCache(this);
}
- final long getLcmsPtr() {
+ long getLcmsPtr() {
return this.getNativePtr();
}
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
index 8498924..5eeaf85 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java
@@ -242,7 +242,7 @@
this.uniqueID = makeUniqueID(desc);
}
- public synchronized static final int makeUniqueID(String desc) {
+ public synchronized static int makeUniqueID(String desc) {
Integer i = compositeUIDMap.get(desc);
if (i == null) {
diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java b/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java
index 1c2517d..bcbcf9f 100644
--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java
@@ -401,7 +401,7 @@
this.pixelConverter = parent.pixelConverter;
}
- public synchronized static final int makeUniqueID(String desc) {
+ public static synchronized int makeUniqueID(String desc) {
Integer i = surfaceUIDMap.get(desc);
if (i == null) {
diff --git a/jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java b/jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java
index 4704e07..96a67eb 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java
@@ -73,7 +73,7 @@
* @return Printing attribute class (category), an instance of class
* {@link java.lang.Class java.lang.Class}.
*/
- public final Class<? extends Attribute> getCategory() {
+ public Class<? extends Attribute> getCategory() {
return DialogOwner.class;
}
@@ -87,7 +87,7 @@
*
* @return Attribute category name.
*/
- public final String getName() {
+ public String getName() {
return "dialog-owner";
}
diff --git a/jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java b/jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java
index 24feefd..b4a5054 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java
@@ -40,23 +40,19 @@
page_max = max;
}
-
- public final Class<? extends PrintRequestAttribute> getCategory() {
+ public Class<? extends PrintRequestAttribute> getCategory() {
return SunMinMaxPage.class;
}
-
- public final int getMin() {
+ public int getMin() {
return page_min;
}
- public final int getMax() {
+ public int getMax() {
return page_max;
}
-
- public final String getName() {
+ public String getName() {
return "sun-page-minmax";
}
-
}
diff --git a/jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java b/jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java
index 7cfd54d..6d7af26 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java
@@ -44,11 +44,11 @@
pages = value;
}
- public final Class<? extends Attribute> getCategory() {
+ public Class<? extends Attribute> getCategory() {
return SunPageSelection.class;
}
- public final String getName() {
+ public String getName() {
return "sun-page-selection";
}
diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c
index 6dc99ab..e51f53a 100644
--- a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c
+++ b/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c
@@ -291,7 +291,12 @@
= (*env)->GetBooleanField(env, bisdo->icm, allGrayID);
int *pRgb = (int *)
((*env)->GetPrimitiveArrayCritical(env, bisdo->lutarray, NULL));
- CHECK_NULL_RETURN(pRgb, (ColorData*)NULL);
+
+ if (pRgb == NULL) {
+ free(cData);
+ return (ColorData*)NULL;
+ }
+
cData->img_clr_tbl = initCubemap(pRgb, bisdo->lutsize, 32);
if (allGray == JNI_TRUE) {
initInverseGrayLut(pRgb, bisdo->lutsize, cData);
@@ -304,7 +309,13 @@
if (JNU_IsNull(env, colorData)) {
jlong pData = ptr_to_jlong(cData);
colorData = (*env)->NewObjectA(env, clsICMCD, initICMCDmID, (jvalue *)&pData);
- JNU_CHECK_EXCEPTION_RETURN(env, (ColorData*)NULL);
+
+ if ((*env)->ExceptionCheck(env))
+ {
+ free(cData);
+ return (ColorData*)NULL;
+ }
+
(*env)->SetObjectField(env, bisdo->icm, colorDataID, colorData);
}
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java
index caf1c2d..5ed8161 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
* For now, this class manages the list of items and painting thereof, but not
* posting of Item or ActionEvents
*/
-public class ListHelper implements XScrollbarClient {
+final class ListHelper implements XScrollbarClient {
private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.ListHelper");
private final int FOCUS_INSET = 1;
@@ -79,24 +79,16 @@
// Holds the true if mouse is dragging outside of the area of the list
// The flag is used at the moment of the dragging and releasing mouse
// See 6243382 for more information
- boolean mouseDraggedOutVertically = false;
+ private boolean mouseDraggedOutVertically = false;
private volatile boolean vsbVisibilityChanged = false;
/*
* Comment
*/
- public ListHelper(XWindow peer,
- Color[] colors,
- int initialSize,
- boolean multiSelect,
- boolean scrollVert,
- boolean scrollHoriz,
- Font font,
- int maxVisItems,
- int SPACE,
- int MARGIN,
- int BORDER,
- int SCROLLBAR) {
+ ListHelper(XWindow peer, Color[] colors, int initialSize,
+ boolean multiSelect, boolean scrollVert, boolean scrollHoriz,
+ Font font, int maxVisItems, int SPACE, int MARGIN, int BORDER,
+ int SCROLLBAR) {
this.peer = peer;
this.colors = colors;
this.multiSelect = multiSelect;
@@ -121,6 +113,7 @@
SCROLLBAR_WIDTH = SCROLLBAR;
}
+ @Override
public Component getEventSource() {
return peer.getEventSource();
}
@@ -129,36 +122,36 @@
/* List management methods */
/**********************************************************************/
- public void add(String item) {
+ void add(String item) {
items.add(item);
updateScrollbars();
}
- public void add(String item, int index) {
+ void add(String item, int index) {
items.add(index, item);
updateScrollbars();
}
- public void remove(String item) {
+ void remove(String item) {
// FIXME: need to clean up select list, too?
items.remove(item);
updateScrollbars();
// Is vsb visible now?
}
- public void remove(int index) {
+ void remove(int index) {
// FIXME: need to clean up select list, too?
items.remove(index);
updateScrollbars();
// Is vsb visible now?
}
- public void removeAll() {
+ void removeAll() {
items.removeAll(items);
updateScrollbars();
}
- public void setMultiSelect(boolean ms) {
+ void setMultiSelect(boolean ms) {
multiSelect = ms;
}
@@ -167,7 +160,7 @@
* merely keeps internal track of which items are selected for painting
* dealing with target Components happens elsewhere
*/
- public void select(int index) {
+ void select(int index) {
if (index > getItemCount() - 1) {
index = (isEmpty() ? -1 : 0);
}
@@ -182,13 +175,13 @@
}
/* docs */
- public void deselect(int index) {
+ void deselect(int index) {
assert(false);
}
/* docs */
/* if called for multiselect, return -1 */
- public int getSelectedIndex() {
+ int getSelectedIndex() {
if (!multiSelect) {
Integer val = selected.get(0);
return val.intValue();
@@ -202,21 +195,21 @@
* A getter method for XChoicePeer.
* Returns vsbVisiblityChanged value and sets it to false.
*/
- public boolean checkVsbVisibilityChangedAndReset(){
+ boolean checkVsbVisibilityChangedAndReset(){
boolean returnVal = vsbVisibilityChanged;
vsbVisibilityChanged = false;
return returnVal;
}
- public boolean isEmpty() {
+ boolean isEmpty() {
return items.isEmpty();
}
- public int getItemCount() {
+ int getItemCount() {
return items.size();
}
- public String getItem(int index) {
+ String getItem(int index) {
return items.get(index);
}
@@ -224,15 +217,15 @@
/* GUI-related methods */
/**********************************************************************/
- public void setFocusedIndex(int index) {
+ void setFocusedIndex(int index) {
focusedIndex = index;
}
- public boolean isFocusedIndex(int index) {
+ private boolean isFocusedIndex(int index) {
return index == focusedIndex;
}
- public void setFont(Font newFont) {
+ void setFont(Font newFont) {
if (newFont != font) {
font = newFont;
fm = Toolkit.getDefaultToolkit().getFontMetrics(font);
@@ -243,7 +236,7 @@
/*
* Returns width of the text of the longest item
*/
- public int getMaxItemWidth() {
+ int getMaxItemWidth() {
int m = 0;
int end = getItemCount();
for(int i = 0 ; i < end ; i++) {
@@ -260,7 +253,7 @@
return fm.getHeight() + (2*TEXT_SPACE);
}
- public int y2index(int y) {
+ int y2index(int y) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("y=" + y +", firstIdx=" + firstDisplayedIndex() +", itemHeight=" + getItemHeight()
+ ",item_margin=" + ITEM_MARGIN);
@@ -275,14 +268,14 @@
public int numItemsDisplayed() {}
*/
- public int firstDisplayedIndex() {
+ int firstDisplayedIndex() {
if (vsbVis) {
return vsb.getValue();
}
return 0;
}
- public int lastDisplayedIndex() {
+ int lastDisplayedIndex() {
// FIXME: need to account for horiz scroll bar
if (hsbVis) {
assert false : "Implement for horiz scroll bar";
@@ -294,7 +287,7 @@
/*
* If the given index is not visible in the List, scroll so that it is.
*/
- public void makeVisible(int index) {
+ private void makeVisible(int index) {
if (vsbVis) {
if (index < firstDisplayedIndex()) {
vsb.setValue(index);
@@ -306,7 +299,7 @@
}
// FIXME: multi-select needs separate focused index
- public void up() {
+ void up() {
int curIdx = getSelectedIndex();
int numItems = getItemCount();
int newIdx;
@@ -323,12 +316,12 @@
select(newIdx);
}
- public void down() {
+ void down() {
int newIdx = (getSelectedIndex() + 1) % getItemCount();
select(newIdx);
}
- public void pageUp() {
+ void pageUp() {
// FIXME: for multi-select, move the focused item, not the selected item
if (vsbVis && firstDisplayedIndex() > 0) {
if (multiSelect) {
@@ -343,7 +336,7 @@
}
}
}
- public void pageDown() {
+ void pageDown() {
if (vsbVis && lastDisplayedIndex() < getItemCount() - 1) {
if (multiSelect) {
assert false : "Implement pageDown() for multiSelect";
@@ -357,17 +350,17 @@
}
}
}
- public void home() {}
- public void end() {}
+ void home() {}
+ void end() {}
- public boolean isVSBVisible() { return vsbVis; }
- public boolean isHSBVisible() { return hsbVis; }
+ boolean isVSBVisible() { return vsbVis; }
+ boolean isHSBVisible() { return hsbVis; }
- public XVerticalScrollbar getVSB() { return vsb; }
- public XHorizontalScrollbar getHSB() { return hsb; }
+ XVerticalScrollbar getVSB() { return vsb; }
+ XHorizontalScrollbar getHSB() { return hsb; }
- public boolean isInVertSB(Rectangle bounds, int x, int y) {
+ boolean isInVertSB(Rectangle bounds, int x, int y) {
if (vsbVis) {
assert vsb != null : "Vert scrollbar is visible, yet is null?";
int sbHeight = hsbVis ? bounds.height - SCROLLBAR_WIDTH : bounds.height;
@@ -379,7 +372,7 @@
return false;
}
- public boolean isInHorizSB(Rectangle bounds, int x, int y) {
+ boolean isInHorizSB(Rectangle bounds, int x, int y) {
if (hsbVis) {
assert hsb != null : "Horiz scrollbar is visible, yet is null?";
@@ -392,7 +385,7 @@
return false;
}
- public void handleVSBEvent(MouseEvent e, Rectangle bounds, int x, int y) {
+ void handleVSBEvent(MouseEvent e, Rectangle bounds, int x, int y) {
int sbHeight = hsbVis ? bounds.height - SCROLLBAR_WIDTH : bounds.height;
vsb.handleMouseEvent(e.getID(),
@@ -405,7 +398,7 @@
* Called when items are added/removed.
* Update whether the scrollbar is visible or not, scrollbar values
*/
- void updateScrollbars() {
+ private void updateScrollbars() {
boolean oldVsbVis = vsbVis;
vsbVis = vsb != null && items.size() > maxVisItems;
if (vsbVis) {
@@ -420,10 +413,11 @@
// FIXME: check if added item makes a hsb necessary (if supported, that of course)
}
- public int getNumItemsDisplayed() {
+ private int getNumItemsDisplayed() {
return items.size() > maxVisItems ? maxVisItems : items.size();
}
+ @Override
public void repaintScrollbarRequest(XScrollbar sb) {
Graphics g = peer.getGraphics();
Rectangle bounds = peer.getBounds();
@@ -436,6 +430,7 @@
g.dispose();
}
+ @Override
public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) {
if (obj == vsb) {
int oldScrollValue = vsb.getValue();
@@ -467,7 +462,7 @@
}
}
- public void updateColors(Color[] newColors) {
+ void updateColors(Color[] newColors) {
colors = newColors;
}
@@ -481,7 +476,7 @@
XVerticalScrollbar vsb,
XHorizontalScrollbar hsb) {
*/
- public void paintItems(Graphics g,
+ void paintItems(Graphics g,
Color[] colors,
Rectangle bounds) {
// paint border
@@ -490,17 +485,14 @@
// paint focus?
}
- public void paintAllItems(Graphics g,
+ void paintAllItems(Graphics g,
Color[] colors,
Rectangle bounds) {
paintItems(g, colors, bounds,
firstDisplayedIndex(), lastDisplayedIndex());
}
- public void paintItems(Graphics g,
- Color[] colors,
- Rectangle bounds,
- int first,
- int last) {
+ private void paintItems(Graphics g, Color[] colors, Rectangle bounds,
+ int first, int last) {
peer.flush();
int x = BORDER_WIDTH + ITEM_MARGIN;
int width = bounds.width - 2*ITEM_MARGIN - 2*BORDER_WIDTH - (vsbVis ? SCROLLBAR_WIDTH : 0);
@@ -529,12 +521,9 @@
/*
* comment about what is painted (i.e. the focus rect
*/
- public void paintItem(Graphics g,
- Color[] colors,
- String string,
- int x, int y, int width, int height,
- boolean selected,
- boolean focused) {
+ private void paintItem(Graphics g, Color[] colors, String string, int x,
+ int y, int width, int height, boolean selected,
+ boolean focused) {
//System.out.println("LP.pI(): x="+x+" y="+y+" w="+width+" h="+height);
//g.setColor(colors[BACKGROUND_COLOR]);
@@ -575,7 +564,7 @@
//g.clipRect(clip.x, clip.y, clip.width, clip.height);
}
- boolean isItemSelected(int index) {
+ private boolean isItemSelected(int index) {
Iterator<Integer> itr = selected.iterator();
while (itr.hasNext()) {
Integer val = itr.next();
@@ -586,7 +575,7 @@
return false;
}
- public void paintVSB(Graphics g, Color colors[], Rectangle bounds) {
+ private void paintVSB(Graphics g, Color colors[], Rectangle bounds) {
int height = bounds.height - 2*BORDER_WIDTH - (hsbVis ? (SCROLLBAR_WIDTH-2) : 0);
Graphics ng = g.create();
@@ -602,7 +591,7 @@
}
}
- public void paintHSB(Graphics g, Color colors[], Rectangle bounds) {
+ private void paintHSB(Graphics g, Color colors[], Rectangle bounds) {
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
index 4b31c9a..3e14dda 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
@@ -179,7 +179,7 @@
}
return xatom;
}
- public final String getName() {
+ public String getName() {
if (name == null) {
XToolkit.awtLock();
try {
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
index 3620420..c7d0813 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
@@ -29,7 +29,6 @@
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
@@ -46,7 +45,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashSet;
-import java.util.List;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
@@ -54,11 +52,11 @@
import javax.imageio.ImageWriter;
import javax.imageio.spi.ImageWriterSpi;
+import sun.datatransfer.DataFlavorUtil;
import sun.awt.datatransfer.DataTransferer;
import sun.awt.datatransfer.ToolkitThreadBlockedHandler;
import java.io.ByteArrayOutputStream;
-import java.util.stream.Stream;
/**
* Platform-specific support for the data transfer subsystem.
@@ -87,27 +85,30 @@
return transferer;
}
+ @Override
public String getDefaultUnicodeEncoding() {
return "iso-10646-ucs-2";
}
+ @Override
public boolean isLocaleDependentTextFormat(long format) {
return false;
}
+ @Override
public boolean isTextFormat(long format) {
return super.isTextFormat(format)
|| isMimeFormat(format, "text");
}
+ @Override
protected String getCharsetForTextFormat(Long lFormat) {
- long format = lFormat.longValue();
- if (isMimeFormat(format, "text")) {
- String nat = getNativeForFormat(format);
+ if (isMimeFormat(lFormat, "text")) {
+ String nat = getNativeForFormat(lFormat);
DataFlavor df = new DataFlavor(nat, null);
// Ignore the charset parameter of the MIME type if the subtype
// doesn't support charset.
- if (!DataTransferer.doesSubtypeSupportCharset(df)) {
+ if (!DataFlavorUtil.doesSubtypeSupportCharset(df)) {
return null;
}
String charset = df.getParameter("charset");
@@ -118,6 +119,7 @@
return super.getCharsetForTextFormat(lFormat);
}
+ @Override
protected boolean isURIListFormat(long format) {
String nat = getNativeForFormat(format);
if (nat == null) {
@@ -134,24 +136,27 @@
return false;
}
+ @Override
public boolean isFileFormat(long format) {
return format == FILE_NAME_ATOM.getAtom() ||
format == DT_NET_FILE_ATOM.getAtom();
}
+ @Override
public boolean isImageFormat(long format) {
return format == PNG_ATOM.getAtom() ||
format == JFIF_ATOM.getAtom() ||
isMimeFormat(format, "image");
}
+ @Override
protected Long getFormatForNativeAsLong(String str) {
// Just get the atom. If it has already been retrived
// once, we'll get a copy so this should be very fast.
- long atom = XAtom.get(str).getAtom();
- return Long.valueOf(atom);
+ return XAtom.get(str).getAtom();
}
+ @Override
protected String getNativeForFormat(long format) {
return getTargetNameForAtom(format);
}
@@ -167,6 +172,7 @@
return XAtom.get(atom).getName();
}
+ @Override
protected byte[] imageToPlatformBytes(Image image, long format)
throws IOException {
String mimeType = null;
@@ -196,6 +202,7 @@
}
}
+ @Override
protected ByteArrayOutputStream convertFileListToBytes(ArrayList<String> fileList)
throws IOException
{
@@ -213,6 +220,7 @@
* Translates either a byte array or an input stream which contain
* platform-specific image data in the given format into an Image.
*/
+ @Override
protected Image platformImageBytesToImage(
byte[] bytes, long format) throws IOException
{
@@ -317,8 +325,7 @@
return flavors;
}
- DataFlavor df = null;
-
+ DataFlavor df;
try {
df = new DataFlavor(nat);
} catch (Exception e) {
@@ -383,7 +390,7 @@
String baseType = df.getPrimaryType() + "/" + df.getSubType();
String mimeType = baseType;
- if (charset != null && DataTransferer.isFlavorCharsetTextType(df)) {
+ if (charset != null && DataFlavorUtil.isFlavorCharsetTextType(df)) {
mimeType += ";charset=" + charset;
}
@@ -413,14 +420,14 @@
}
}
}
- } else if (DataTransferer.isFlavorCharsetTextType(df)) {
+ } else if (DataFlavorUtil.isFlavorCharsetTextType(df)) {
// stringFlavor is semantically equivalent to the standard
// "text/plain" MIME type.
if (DataFlavor.stringFlavor.equals(df)) {
baseType = "text/plain";
}
- for (String encoding : DataTransferer.standardEncodings()) {
+ for (String encoding : DataFlavorUtil.standardEncodings()) {
if (!encoding.equals(charset)) {
natives.add(baseType + ";charset=" + encoding);
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java
index aa3d2da..1870aac 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetRegistry.java
@@ -86,7 +86,7 @@
return window;
}
- static final long getDnDProxyWindow() {
+ static long getDnDProxyWindow() {
return XWindow.getXAWTRootWindow().getWindow();
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
index 33f792d..2fb0748 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
/**
* A class which interfaces with the X11 selection service.
*/
-public final class XSelection {
+final class XSelection {
/* Maps atoms to XSelection instances. */
private static final Hashtable<XAtom, XSelection> table = new Hashtable<XAtom, XSelection>();
@@ -119,11 +119,10 @@
/**
* Creates a selection object.
*
- * @param atom the selection atom.
- * @param clpbrd the corresponding clipoboard
- * @exception NullPointerException if atom is <code>null</code>.
+ * @param atom the selection atom
+ * @throws NullPointerException if atom is {@code null}
*/
- public XSelection(XAtom atom) {
+ XSelection(XAtom atom) {
if (atom == null) {
throw new NullPointerException("Null atom");
}
@@ -135,10 +134,9 @@
return selectionAtom;
}
- public synchronized boolean setOwner(Transferable contents,
- Map<Long, DataFlavor> formatMap,
- long[] formats, long time)
- {
+ synchronized boolean setOwner(Transferable contents,
+ Map<Long, DataFlavor> formatMap,
+ long[] formats, long time) {
long owner = XWindow.getXAWTRootWindow().getWindow();
long selection = selectionAtom.getAtom();
@@ -435,7 +433,7 @@
return data != null ? data : new byte[0];
}
- void validateDataGetter(WindowPropertyGetter propertyGetter)
+ private void validateDataGetter(WindowPropertyGetter propertyGetter)
throws IOException
{
// The order of checks is important because a property getter
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
index 6ae7516..390a3c6 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
@@ -159,13 +159,13 @@
static native void awt_output_flush();
- static final void awtFUnlock() {
+ static void awtFUnlock() {
awtUnlock();
awt_output_flush();
}
- public native void nativeLoadSystemColors(int[] systemColors);
+ private native void nativeLoadSystemColors(int[] systemColors);
static UIDefaults getUIDefaults() {
if (uidefaults == null) {
@@ -876,7 +876,7 @@
*/
// Need this for XMenuItemPeer.
- protected static final Object targetToPeer(Object target) {
+ protected static Object targetToPeer(Object target) {
Object p=null;
if (target != null && !GraphicsEnvironment.isHeadless()) {
p = specialPeerMap.get(target);
@@ -887,7 +887,7 @@
}
// Need this for XMenuItemPeer.
- protected static final void targetDisposedPeer(Object target, Object peer) {
+ protected static void targetDisposedPeer(Object target, Object peer) {
SunToolkit.targetDisposedPeer(target, peer);
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
index b7d2a74..49384a9 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
@@ -43,7 +43,7 @@
import sun.java2d.SunGraphics2D;
import sun.java2d.SurfaceData;
-public class XWindow extends XBaseWindow implements X11ComponentPeer {
+class XWindow extends XBaseWindow implements X11ComponentPeer {
private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWindow");
private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWindow");
private static PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XWindow");
@@ -858,8 +858,10 @@
// REMIND: need to implement looking for disabled events
- public native boolean x11inputMethodLookupString(long event, long [] keysymArray);
- native boolean haveCurrentX11InputMethodInstance();
+ private native boolean x11inputMethodLookupString(long event,
+ long[] keysymArray);
+
+ private native boolean haveCurrentX11InputMethodInstance();
private boolean mouseAboveMe;
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
index fb30079..01d0640 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
package sun.awt.X11;
import java.security.AccessController;
-import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
-import sun.misc.*;
-final public class XlibWrapper
-{
+import sun.misc.Unsafe;
+import sun.security.action.GetPropertyAction;
+
+final class XlibWrapper {
+
static Unsafe unsafe = Unsafe.getUnsafe();
// strange constants
static final int MAXSIZE = 32767;
@@ -48,7 +48,7 @@
char *display_name;
*/
- public final static String eventToString[]=
+ static final String[] eventToString =
{"<none:0>", "<none:1>", "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease",
"MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn", "FocusOut",
"KeymapNotify", "Expose", "GraphicsExpose", "NoExpose", "VisibilityNotify",
@@ -66,7 +66,7 @@
/**
* Gets byte string from str_ptr and copies it into byte array
- * String should be NULL terminated
+ * String should be NULL terminated.
*/
static native byte[] getStringBytes(long str_ptr);
@@ -529,7 +529,7 @@
display Specifies the connection to the X server.
onoff Specifies a Boolean value that indicates whether to enable or disable synchronization.
*/
- public static native int XSynchronize(long display, boolean onoff);
+ static native int XSynchronize(long display, boolean onoff);
/**
* Extracts an X event that can be processed in a secondary loop.
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
index 987f669..179adeb 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
package sun.awt;
import java.awt.GraphicsEnvironment;
@@ -29,7 +54,7 @@
/**
* The X11 implementation of {@link FontManager}.
*/
-public class X11FontManager extends SunFontManager {
+public final class X11FontManager extends SunFontManager {
// constants identifying XLFD and font ID fields
private static final int FOUNDRY_FIELD = 1;
@@ -129,8 +154,6 @@
*/
private static String[] fontdirs = null;
- private static String[] defaultPlatformFont = null;
-
private FontConfigManager fcManager = null;
public static X11FontManager getInstance() {
@@ -768,11 +791,9 @@
return getFontPathNative(noType1Fonts);
}
- public String[] getDefaultPlatformFont() {
- if (defaultPlatformFont != null) {
- return defaultPlatformFont;
- }
- String[] info = new String[2];
+ @Override
+ protected String[] getDefaultPlatformFont() {
+ final String[] info = new String[2];
getFontConfigManager().initFontConfigFonts(false);
FontConfigManager.FcCompFont[] fontConfigFonts =
getFontConfigManager().getFontConfigFonts();
@@ -798,8 +819,7 @@
info[1] = "/dialog.ttf";
}
}
- defaultPlatformFont = info;
- return defaultPlatformFont;
+ return info;
}
public synchronized FontConfigManager getFontConfigManager() {
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java b/jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
index 68136e9..0be9eb4 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import sun.awt.Win32GraphicsEnvironment;
import sun.awt.windows.WFontConfiguration;
import sun.font.FontManager;
import sun.font.SunFontManager;
@@ -46,9 +45,7 @@
/**
* The X11 implementation of {@link FontManager}.
*/
-public class Win32FontManager extends SunFontManager {
-
- private static String[] defaultPlatformFont = null;
+public final class Win32FontManager extends SunFontManager {
private static TrueTypeFont eudcFont;
@@ -213,12 +210,8 @@
protected synchronized native String getFontPath(boolean noType1Fonts);
- public String[] getDefaultPlatformFont() {
-
- if (defaultPlatformFont != null) {
- return defaultPlatformFont;
- }
-
+ @Override
+ protected String[] getDefaultPlatformFont() {
String[] info = new String[2];
info[0] = "Arial";
info[1] = "c:\\windows\\fonts";
@@ -245,8 +238,7 @@
info[1] = dirs[0];
}
info[1] = info[1] + File.separator + "arial.ttf";
- defaultPlatformFont = info;
- return defaultPlatformFont;
+ return info;
}
/* register only TrueType/OpenType fonts
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
index 1d3c413..cdcd8c0 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
@@ -145,7 +145,7 @@
}
@Override
- public final void dispose() {
+ public void dispose() {
// Due to a memory management problem in Windows 98, we should retain
// the native input context until this object is finalized. So do
// nothing here.
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index 23a71fe..bade04d 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -1573,7 +1573,7 @@
//** BEGIN Functions called by native code for querying/updating attributes
- private final String getPrinterAttrib() {
+ private String getPrinterAttrib() {
// getPrintService will get current print service or default if none
PrintService service = this.getPrintService();
String name = (service != null) ? service.getName() : null;
@@ -1581,7 +1581,7 @@
}
/* SheetCollate */
- private final int getCollateAttrib() {
+ private int getCollateAttrib() {
// -1 means unset, 0 uncollated, 1 collated.
return mAttCollate;
}
@@ -1602,7 +1602,7 @@
/* Orientation */
- private final int getOrientAttrib() {
+ private int getOrientAttrib() {
int orient = PageFormat.PORTRAIT;
OrientationRequested orientReq = (attributes == null) ? null :
(OrientationRequested)attributes.get(OrientationRequested.class);
@@ -1629,7 +1629,7 @@
}
/* Copies and Page Range. */
- private final int getCopiesAttrib() {
+ private int getCopiesAttrib() {
if (defaultCopies) {
return 0;
} else {
@@ -1637,9 +1637,8 @@
}
}
- private final void setRangeCopiesAttribute(int from, int to,
- boolean isRangeSet,
- int copies) {
+ private void setRangeCopiesAttribute(int from, int to, boolean isRangeSet,
+ int copies) {
if (attributes != null) {
if (isRangeSet) {
attributes.add(new PageRanges(from, to));
@@ -1658,12 +1657,12 @@
- private final boolean getDestAttrib() {
+ private boolean getDestAttrib() {
return (mDestination != null);
}
/* Quality */
- private final int getQualityAttrib() {
+ private int getQualityAttrib() {
return mAttQuality;
}
@@ -1684,7 +1683,7 @@
}
/* Color/Chromaticity */
- private final int getColorAttrib() {
+ private int getColorAttrib() {
return mAttChromaticity;
}
@@ -1703,7 +1702,7 @@
}
/* Sides */
- private final int getSidesAttrib() {
+ private int getSidesAttrib() {
return mAttSides;
}
@@ -1724,7 +1723,7 @@
}
/** MediaSizeName / dmPaper */
- private final int[] getWin32MediaAttrib() {
+ private int[] getWin32MediaAttrib() {
int wid_ht[] = {0, 0};
if (attributes != null) {
Media media = (Media)attributes.get(Media.class);
@@ -1810,7 +1809,7 @@
- private final boolean getPrintToFileEnabled() {
+ private boolean getPrintToFileEnabled() {
SecurityManager security = System.getSecurityManager();
if (security != null) {
FilePermission printToFilePermission =
@@ -1824,7 +1823,7 @@
return true;
}
- private final void setNativeAttributes(int flags, int fields, int values) {
+ private void setNativeAttributes(int flags, int fields, int values) {
if (attributes == null) {
return;
}
@@ -2016,7 +2015,7 @@
* The attribute set here is a temporary one installed whilst this
* happens,
*/
- private final void setJobAttributes(PrintRequestAttributeSet attributes,
+ private void setJobAttributes(PrintRequestAttributeSet attributes,
int fields, int values,
short copies,
short dmPaperSize,
@@ -2152,7 +2151,7 @@
}
/* Printer Resolution. See also getXRes() and getYRes() */
- private final void setResolutionDPI(int xres, int yres) {
+ private void setResolutionDPI(int xres, int yres) {
if (attributes != null) {
PrinterResolution res =
new PrinterResolution(xres, yres, PrinterResolution.DPI);
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
index 1213cad..cdccc81 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
@@ -276,7 +276,7 @@
setExtraMouseButtonsEnabledNative(areExtraMouseButtonsEnabled);
}
- private final void registerShutdownHook() {
+ private void registerShutdownHook() {
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
Thread shutdown = new Thread(ThreadGroupUtils.getRootThreadGroup(), this::shutdown);
shutdown.setContextClassLoader(null);
@@ -746,11 +746,11 @@
@Override
protected native void loadSystemColors(int[] systemColors);
- public static final Object targetToPeer(Object target) {
+ public static Object targetToPeer(Object target) {
return SunToolkit.targetToPeer(target);
}
- public static final void targetDisposedPeer(Object target, Object peer) {
+ public static void targetDisposedPeer(Object target, Object peer) {
SunToolkit.targetDisposedPeer(target, peer);
}
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp
index 95f868e..21644a5 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp
@@ -186,7 +186,7 @@
void
AwtButton::NotifyListeners()
{
- DoCallback("handleAction", "(JI)V", TimeHelper::getMessageTimeUTC(),
+ DoCallback("handleAction", "(JI)V", ::JVM_CurrentTimeMillis(NULL, 0),
(jint)AwtComponent::GetJavaModifiers());
}
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp
index 5ab74c7..6988fb9 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp
@@ -467,7 +467,9 @@
jclass win32GCCls = env->FindClass("sun/awt/Win32GraphicsConfig");
DASSERT(win32GCCls != NULL);
DASSERT(env->IsInstanceOf(compGC, win32GCCls));
- CHECK_NULL(win32GCCls);
+ if (win32GCCls == NULL) {
+ throw std::bad_alloc();
+ }
env->SetObjectField(peer, AwtComponent::peerGCID, compGC);
}
}
@@ -2125,37 +2127,6 @@
return mrDoDefault;
}
-namespace TimeHelper {
- // Sometimes the message belongs to another event queue and
- // GetMessageTime() may return wrong non-zero value (the case is
- // the TrayIcon peer). Using TimeHelper::windowsToUTC(::GetTickCount())
- // could help there.
- static DWORD getMessageTimeWindows(){
- DWORD time = ::GetMessageTime();
- // The following 'if' seems to be a unneeded hack.
- // Consider removing it.
- if (time == 0) {
- time = ::GetTickCount();
- }
- return time;
- }
-
- jlong getMessageTimeUTC() {
- return windowsToUTC(getMessageTimeWindows());
- }
-
- // If calling order of GetTickCount and JVM_CurrentTimeMillis
- // is swapped, it would sometimes give different result.
- // Anyway, we would not always have determinism
- // and sortedness of time conversion here (due to Windows's
- // timers peculiarities). Having some euristic algorithm might
- // help here.
- jlong windowsToUTC(DWORD windowsTime) {
- jlong offset = ::GetTickCount() - windowsTime;
- jlong jvm_time = ::JVM_CurrentTimeMillis(NULL, 0);
- return jvm_time - offset;
- }
-} //TimeHelper
MsgRouting AwtComponent::WmPaint(HDC)
{
@@ -2253,7 +2224,7 @@
MsgRouting AwtComponent::WmMouseEnter(UINT flags, int x, int y)
{
SendMouseEvent(java_awt_event_MouseEvent_MOUSE_ENTERED,
- TimeHelper::getMessageTimeUTC(), x, y, GetJavaModifiers(), 0, JNI_FALSE);
+ ::JVM_CurrentTimeMillis(NULL, 0), x, y, GetJavaModifiers(), 0, JNI_FALSE);
if ((flags & ALL_MK_BUTTONS) == 0) {
AwtCursor::UpdateCursor(this);
}
@@ -2288,7 +2259,7 @@
msg->message = message;
msg->wParam = wParam;
msg->lParam = lParam;
- msg->time = TimeHelper::getMessageTimeWindows();
+ msg->time = ::GetMessageTime();
msg->pt.x = x;
msg->pt.y = y;
}
@@ -2327,7 +2298,7 @@
MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)
{
- jlong now = TimeHelper::getMessageTimeUTC();
+ jlong now = ::JVM_CurrentTimeMillis(NULL, 0);
if (lastClickWnd == this &&
lastButton == button &&
@@ -2392,7 +2363,7 @@
MSG msg;
InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, TimeHelper::getMessageTimeUTC(),
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, ::JVM_CurrentTimeMillis(NULL, 0),
x, y, GetJavaModifiers(), clickCount,
(GetButton(button) == java_awt_event_MouseEvent_BUTTON3 ?
TRUE : FALSE), GetButton(button), &msg);
@@ -2403,7 +2374,7 @@
*/
if ((m_mouseButtonClickAllowed & GetButtonMK(button)) != 0) { //CLICK allowed
SendMouseEvent(java_awt_event_MouseEvent_MOUSE_CLICKED,
- TimeHelper::getMessageTimeUTC(), x, y, GetJavaModifiers(),
+ ::JVM_CurrentTimeMillis(NULL, 0), x, y, GetJavaModifiers(),
clickCount, JNI_FALSE, GetButton(button));
}
// Exclude button from allowed to generate CLICK messages
@@ -2452,7 +2423,7 @@
// This is a partial backout of 5039416 fix.
MSG msg;
InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_DRAGGED, TimeHelper::getMessageTimeUTC(), x, y,
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_DRAGGED, ::JVM_CurrentTimeMillis(NULL, 0), x, y,
GetJavaModifiers(), 0, JNI_FALSE,
java_awt_event_MouseEvent_NOBUTTON, &msg);
//dragging means no more CLICKs until next WM_MOUSE_DOWN/WM_MOUSE_UP message sequence
@@ -2460,7 +2431,7 @@
} else {
MSG msg;
InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, TimeHelper::getMessageTimeUTC(), x, y,
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, ::JVM_CurrentTimeMillis(NULL, 0), x, y,
GetJavaModifiers(), 0, JNI_FALSE,
java_awt_event_MouseEvent_NOBUTTON, &msg);
}
@@ -2471,7 +2442,7 @@
MsgRouting AwtComponent::WmMouseExit(UINT flags, int x, int y)
{
- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_EXITED, TimeHelper::getMessageTimeUTC(), x,
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_EXITED, ::JVM_CurrentTimeMillis(NULL, 0), x,
y, GetJavaModifiers(), 0, JNI_FALSE);
sm_cursorOn = NULL;
return mrConsume; /* Don't pass our synthetic event on! */
@@ -2523,7 +2494,7 @@
DTRACE_PRINTLN("calling SendMouseWheelEvent");
- SendMouseWheelEvent(java_awt_event_MouseEvent_MOUSE_WHEEL, TimeHelper::getMessageTimeUTC(),
+ SendMouseWheelEvent(java_awt_event_MouseEvent_MOUSE_WHEEL, ::JVM_CurrentTimeMillis(NULL, 0),
eventPt.x, eventPt.y, GetJavaModifiers(), 0, 0, scrollType,
scrollLines, roundedWheelRotation, preciseWheelRotation, &msg);
@@ -3578,7 +3549,7 @@
SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_PRESSED,
- TimeHelper::windowsToUTC(msg.time), jkey, character,
+ ::JVM_CurrentTimeMillis(NULL, 0), jkey, character,
modifiers, keyLocation, (jlong)wkey, &msg);
// bugid 4724007: Windows does not create a WM_CHAR for the Del key
@@ -3588,7 +3559,7 @@
// for Java - we don't want Windows trying to process it).
if (jkey == java_awt_event_KeyEvent_VK_DELETE) {
SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_TYPED,
- TimeHelper::windowsToUTC(msg.time),
+ ::JVM_CurrentTimeMillis(NULL, 0),
java_awt_event_KeyEvent_VK_UNDEFINED,
character, modifiers,
java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN, (jlong)0);
@@ -3620,7 +3591,7 @@
UpdateDynPrimaryKeymap(wkey, jkey, keyLocation, modifiers);
SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_RELEASED,
- TimeHelper::windowsToUTC(msg.time), jkey, character,
+ ::JVM_CurrentTimeMillis(NULL, 0), jkey, character,
modifiers, keyLocation, (jlong)wkey, &msg);
return mrConsume;
}
@@ -3665,7 +3636,7 @@
jint modifiers = GetJavaModifiers();
SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_TYPED,
- TimeHelper::windowsToUTC(msg.time),
+ ::JVM_CurrentTimeMillis(NULL, 0),
java_awt_event_KeyEvent_VK_UNDEFINED,
unicodeChar, modifiers,
java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN, (jlong)0,
@@ -3734,7 +3705,7 @@
InitMessage(&msg, message, character,
MAKELPARAM(repCnt, flags));
SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_TYPED,
- TimeHelper::windowsToUTC(msg.time),
+ ::JVM_CurrentTimeMillis(NULL, 0),
java_awt_event_KeyEvent_VK_UNDEFINED,
unicodeChar, modifiers,
java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN, (jlong)0,
@@ -4020,7 +3991,7 @@
}
// call m_InputMethod.sendInputMethod()
- env->CallVoidMethod(m_InputMethod, sendIMEventMid, id, TimeHelper::getMessageTimeUTC(),
+ env->CallVoidMethod(m_InputMethod, sendIMEventMid, id, ::JVM_CurrentTimeMillis(NULL, 0),
text, clauseBoundary, clauseReading, attrBoundary,
attrValue, commitedTextLength, caretPos, visiblePos);
if (safe_ExceptionOccurred(env)) env->ExceptionDescribe();
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h
index f3f3409..9fe2754 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h
@@ -908,11 +908,6 @@
void ReleaseDCList(HWND hwnd, DCList &list);
void MoveDCToPassiveList(HDC hDC);
-namespace TimeHelper{
- jlong getMessageTimeUTC();
- jlong windowsToUTC(DWORD event_offset);
-}
-
#include "ObjectList.h"
#endif /* AWT_COMPONENT_H */
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp
index 6c10266..3cdf9d8 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp
@@ -229,9 +229,10 @@
if (cur != NULL) {
::SetCursor(cur);
} else {
- safe_ExceptionOccurred(env);
+ if (safe_ExceptionOccurred(env)) {
+ env->ExceptionClear();
+ }
}
-
if (AwtCursor::updateCursorID == NULL) {
jclass cls =
env->FindClass("sun/awt/windows/WGlobalCursorManager");
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp
index 5188c85..39016b9 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp
@@ -535,7 +535,7 @@
}
else if (notifyCode == LBN_DBLCLK) {
DoCallback("handleAction", "(IJI)V", nCurrentSelection,
- TimeHelper::getMessageTimeUTC(),
+ ::JVM_CurrentTimeMillis(NULL, 0),
(jint)AwtComponent::GetJavaModifiers());
}
}
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp
index cb0f380..c0a0120 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp
@@ -665,7 +665,7 @@
DASSERT(nState != 0xFFFFFFFF);
DoCallback("handleAction", "(Z)V", ((nState & MF_CHECKED) == 0));
} else {
- DoCallback("handleAction", "(JI)V", TimeHelper::getMessageTimeUTC(),
+ DoCallback("handleAction", "(JI)V", ::JVM_CurrentTimeMillis(NULL, 0),
(jint)AwtComponent::GetJavaModifiers());
}
}
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp
index 1b59e71..d904da8 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp
@@ -758,6 +758,7 @@
// through print dialog or start of printing
// None of those may have happened yet, so call initPrinter()
initPrinter(env, self);
+ JNU_CHECK_EXCEPTION(env);
HANDLE hDevNames = AwtPrintControl::getPrintHDName(env, self);
HDC hdc = AwtPrintControl::getPrintDC(env, self);
@@ -1102,6 +1103,7 @@
jboolean err;
initPrinter(env, self);
+ JNU_CHECK_EXCEPTION(env);
// check for collation
HGLOBAL hDevNames = AwtPrintControl::getPrintHDName(env, self);
@@ -1362,6 +1364,13 @@
}
initPrinter(env, self);
+ if (env->ExceptionCheck()) {
+ if (dest != NULL) {
+ JNU_ReleaseStringPlatformChars(env, dest, destination);
+ }
+ return JNI_FALSE;
+ }
+
HDC printDC = AwtPrintControl::getPrintDC(env, self);
SAVE_CONTROLWORD
@@ -3814,6 +3823,7 @@
// pixels per inch in y direction
jint yRes = GetDeviceCaps(printDC, LOGPIXELSY);
err = setIntField(env, self, YRES_STR, yRes);
+ if (err) return;
// x coord of printable area in pixels
jint xOrg = GetDeviceCaps(printDC, PHYSICALOFFSETX);
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp
index d453101..7952f1e 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp
@@ -325,7 +325,7 @@
MsgRouting AwtTrayIcon::WmMouseDown(UINT flags, int x, int y, int button)
{
- jlong now = TimeHelper::windowsToUTC(::GetTickCount());
+ jlong now = ::JVM_CurrentTimeMillis(NULL, 0);
jint javaModif = AwtComponent::GetJavaModifiers();
if (lastClickTrIc == this &&
@@ -361,14 +361,14 @@
MSG msg;
AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, TimeHelper::windowsToUTC(::GetTickCount()),
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, ::JVM_CurrentTimeMillis(NULL, 0),
x, y, AwtComponent::GetJavaModifiers(), clickCount,
(AwtComponent::GetButton(button) == java_awt_event_MouseEvent_BUTTON3 ?
TRUE : FALSE), AwtComponent::GetButton(button), &msg);
if ((m_mouseButtonClickAllowed & AwtComponent::GetButtonMK(button)) != 0) { // No up-button in the drag-state
SendMouseEvent(java_awt_event_MouseEvent_MOUSE_CLICKED,
- TimeHelper::windowsToUTC(::GetTickCount()), x, y, AwtComponent::GetJavaModifiers(),
+ ::JVM_CurrentTimeMillis(NULL, 0), x, y, AwtComponent::GetJavaModifiers(),
clickCount, JNI_FALSE, AwtComponent::GetButton(button));
}
m_mouseButtonClickAllowed &= ~AwtComponent::GetButtonMK(button); // Exclude the up-button from the drag-state
@@ -395,7 +395,7 @@
if ((flags & ALL_MK_BUTTONS) != 0) {
m_mouseButtonClickAllowed = 0;
} else {
- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, TimeHelper::windowsToUTC(::GetTickCount()), x, y,
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, ::JVM_CurrentTimeMillis(NULL, 0), x, y,
AwtComponent::GetJavaModifiers(), 0, JNI_FALSE,
java_awt_event_MouseEvent_NOBUTTON, &msg);
}
@@ -408,7 +408,7 @@
if (AwtComponent::GetJavaModifiers() & java_awt_event_InputEvent_BUTTON1_DOWN_MASK) {
MSG msg;
AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::windowsToUTC(::GetTickCount()),
+ SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, ::JVM_CurrentTimeMillis(NULL, 0),
AwtComponent::GetJavaModifiers(), &msg);
}
return mrConsume;
@@ -417,14 +417,14 @@
MsgRouting AwtTrayIcon::WmKeySelect(UINT flags, int x, int y)
{
static jlong lastKeySelectTime = 0;
- jlong now = TimeHelper::windowsToUTC(::GetTickCount());
+ jlong now = ::JVM_CurrentTimeMillis(NULL, 0);
// If a user selects a notify icon with the ENTER key,
// Shell 5.0 sends double NIN_KEYSELECT notification.
if (lastKeySelectTime != now) {
MSG msg;
AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::windowsToUTC(::GetTickCount()),
+ SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, ::JVM_CurrentTimeMillis(NULL, 0),
AwtComponent::GetJavaModifiers(), &msg);
}
lastKeySelectTime = now;
@@ -441,7 +441,7 @@
if (clickCount == 2) {
MSG msg;
AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::windowsToUTC(::GetTickCount()),
+ SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, ::JVM_CurrentTimeMillis(NULL, 0),
AwtComponent::GetJavaModifiers(), &msg);
}
return mrConsume;
diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp
index 1242bba..4a3bcfc 100644
--- a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp
@@ -1552,7 +1552,7 @@
}
}
jobject event = env->NewObject(wClassEvent, wEventInitMID, target, id,
- jOpposite, oldState, newState, TimeHelper::getMessageTimeUTC());
+ jOpposite, oldState, newState, ::JVM_CurrentTimeMillis(NULL, 0));
DASSERT(!safe_ExceptionOccurred(env));
DASSERT(event != NULL);
if (jOpposite != NULL) {
diff --git a/jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m b/jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
index e2212fc..f25f868 100644
--- a/jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
+++ b/jdk/src/java.prefs/macosx/native/libprefs/MacOSXPreferencesFile.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,8 @@
static jclass exceptionClass = NULL;
jclass c;
+ (*env)->ExceptionClear(env); // If an exception is pending, clear it before
+ // calling FindClass() and/or ThrowNew().
if (exceptionClass) {
c = exceptionClass;
} else {
@@ -534,8 +536,13 @@
(JNIEnv *env, jobject klass, jobject jpath,
jobject jname, jlong juser, jlong jhost)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFDictionaryRef node = NULL;
@@ -579,8 +586,13 @@
(JNIEnv *env, jobject klass, jobject jpath,
jobject jname, jlong juser, jlong jhost)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFStringRef parentName;
@@ -647,9 +659,17 @@
jobject jname, jlong juser, jlong jhost)
{
// like addNode, but can put a three-level-deep dict into the root file
- CFStringRef path = toCF(env, jpath);
- CFStringRef child = toCF(env, jchild);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef child = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ child = toCF(env, jchild);
+ }
+ if (child != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFMutableDictionaryRef parent;
@@ -693,9 +713,17 @@
(JNIEnv *env, jobject klass, jobject jpath, jobject jchild,
jobject jname, jlong juser, jlong jhost)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef child = toCF(env, jchild);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef child = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ child = toCF(env, jchild);
+ }
+ if (child != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFDictionaryRef constParent;
@@ -734,10 +762,21 @@
(JNIEnv *env, jobject klass, jobject jpath, jobject jkey, jobject jvalue,
jobject jname, jlong juser, jlong jhost)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef key = toCF(env, jkey);
- CFStringRef value = toCF(env, jvalue);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef key = NULL;
+ CFStringRef value = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ key = toCF(env, jkey);
+ }
+ if (key != NULL) {
+ value = toCF(env, jvalue);
+ }
+ if (value != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFMutableDictionaryRef node = NULL;
@@ -771,9 +810,17 @@
(JNIEnv *env, jobject klass, jobject jpath, jobject jkey,
jobject jname, jlong juser, jlong jhost)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef key = toCF(env, jkey);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef key = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ key = toCF(env, jkey);
+ }
+ if (key != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFDictionaryRef constNode;
@@ -812,9 +859,17 @@
(JNIEnv *env, jobject klass, jobject jpath, jobject jkey,
jobject jname, jlong juser, jlong jhost)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef key = toCF(env, jkey);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef key = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ key = toCF(env, jkey);
+ }
+ if (key != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFPropertyListRef value;
@@ -914,8 +969,13 @@
jobject jname, jlong juser, jlong jhost,
Boolean allowSlash)
{
- CFStringRef path = toCF(env, jpath);
- CFStringRef name = toCF(env, jname);
+ CFStringRef path = NULL;
+ CFStringRef name = NULL;
+
+ path = toCF(env, jpath);
+ if (path != NULL) {
+ name = toCF(env, jname);
+ }
CFStringRef user = (CFStringRef)jlong_to_ptr(juser);
CFStringRef host = (CFStringRef)jlong_to_ptr(jhost);
CFDictionaryRef node;
diff --git a/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java
index 440a85c..09d407a 100644
--- a/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java
+++ b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java
@@ -43,7 +43,7 @@
* </ul>
* @deprecated as of 1.9, replaced by {@link #KRB5_GET_SESSION_KEY_EX}
* which returns an instance of
- * {@link sun.security.jgss.krb5.Krb5Context.EncryptionKey}
+ * {@link javax.security.auth.kerberos.EncryptionKey}
* that implements the {@link javax.crypto.SecretKey} interface and
* has similar methods with {@link javax.security.auth.kerberos.KerberosKey}.
*/
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
index 3337d9f..2335cc2 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
@@ -43,7 +43,6 @@
import java.io.FileOutputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.lang.reflect.*;
/**
* CredentialsCache stores credentials(tickets, session keys, etc) in a
@@ -388,52 +387,36 @@
/*
* For Unix platforms we use the default cache name to be
- * /tmp/krbcc_uid ; for all other platforms we use
- * {user_home}/krb5_cc{user_name}
- * Please note that for Windows 2K we will use LSA to get
+ * /tmp/krb5cc_uid ; for all other platforms we use
+ * {user_home}/krb5cc_{user_name}
+ * Please note that for Windows we will use LSA to get
* the TGT from the the default cache even before we come here;
* however when we create cache we will create a cache under
- * {user_home}/krb5_cc{user_name} for non-Unix platforms including
- * Windows 2K.
+ * {user_home}/krb5cc_{user_name} for non-Unix platforms including
+ * Windows.
*/
- if (osname != null) {
- String cmd = null;
- String uidStr = null;
- long uid = 0;
-
- if (osname.startsWith("SunOS") ||
- (osname.startsWith("Linux"))) {
- try {
- Class<?> c = Class.forName
- ("com.sun.security.auth.module.UnixSystem");
- Constructor<?> constructor = c.getConstructor();
- Object obj = constructor.newInstance();
- Method method = c.getMethod("getUid");
- uid = ((Long)method.invoke(obj)).longValue();
- name = File.separator + "tmp" +
+ if (osname != null && !osname.startsWith("Windows")) {
+ long uid = sun.misc.VM.getuid();
+ if (uid != -1) {
+ name = File.separator + "tmp" +
File.separator + stdCacheNameComponent + "_" + uid;
- if (DEBUG) {
- System.out.println(">>>KinitOptions cache name is " +
- name);
- }
- return name;
- } catch (Exception e) {
- if (DEBUG) {
- System.out.println("Exception in obtaining uid " +
- "for Unix platforms " +
- "Using user's home directory");
-
-
- e.printStackTrace();
- }
+ if (DEBUG) {
+ System.out.println(">>>KinitOptions cache name is " +
+ name);
+ }
+ return name;
+ } else {
+ if (DEBUG) {
+ System.out.println("Error in obtaining uid " +
+ "for Unix platforms " +
+ "Using user's home directory");
}
}
}
// we did not get the uid;
-
String user_name =
java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("user.name"));
diff --git a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
index 322726f..f3a0151 100644
--- a/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
+++ b/jdk/src/java.smartcardio/share/classes/sun/security/smartcardio/CardImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
package sun.security.smartcardio;
import java.nio.ByteBuffer;
-
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import javax.smartcardio.*;
-
import static sun.security.smartcardio.PCSC.*;
/**
@@ -62,6 +62,15 @@
// thread holding exclusive access to the card, or null
private volatile Thread exclusiveThread;
+ // used for platform specific logic
+ private static final boolean isWindows;
+
+ static {
+ final String osName = AccessController.doPrivileged(
+ (PrivilegedAction<String>) () -> System.getProperty("os.name"));
+ isWindows = osName.startsWith("Windows");
+ }
+
CardImpl(TerminalImpl terminal, String protocol) throws PCSCException {
this.terminal = terminal;
int sharingMode = SCARD_SHARE_SHARED;
@@ -74,7 +83,12 @@
connectProtocol = SCARD_PROTOCOL_T1;
} else if (protocol.equalsIgnoreCase("direct")) {
// testing
- connectProtocol = 0;
+
+ // MSDN states that the preferred protocol can be zero, but doesn't
+ // specify whether other values are allowed.
+ // pcsc-lite implementation expects the preferred protocol to be non zero.
+ connectProtocol = isWindows ? 0 : SCARD_PROTOCOL_RAW;
+
sharingMode = SCARD_SHARE_DIRECT;
} else {
throw new IllegalArgumentException("Unsupported protocol " + protocol);
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
index a7fdf01..2998715 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -368,7 +368,7 @@
* <code>DriverManager.getConnection</code> when the
* <code>DriverManager</code> is used to get a connection.
* <P>
- * The JDBC URL identifies the driver to be used to make the conndection.
+ * The JDBC URL identifies the driver to be used to make the connection.
* This URL can be found in the documentation supplied by the driver
* vendor.
* @serial
@@ -562,7 +562,7 @@
* <code>null</code>, this method silently discards the <code>null</code>
* value and does not add a null reference to the set of listeners.
* <p>
- * <b>Note</b>: if the listener is already set, and the new <code>RowSetListerner</code>
+ * <b>Note</b>: if the listener is already set, and the new <code>RowSetListener</code>
* instance is added to the set of listeners already registered to receive
* event notifications from this <code>RowSet</code>.
*
@@ -767,7 +767,7 @@
* the connection is created using a JDBC technology-enabled driver
* ("JDBC driver") and the <code>DriverManager</code>.
* The correct JDBC URL for the specific driver to be used can be found
- * in the driver documentation. Although there are guidelines for for how
+ * in the driver documentation. Although there are guidelines for how
* a JDBC URL is formed,
* a driver vendor can specify any <code>String</code> object except
* one with a length of <code>0</code> (an empty string).
@@ -1093,7 +1093,7 @@
"Connection.TRANSACTION_NONE or " +
"Connection.TRANSACTION_READ_UNCOMMITTED or " +
"Connection.TRANSACTION_READ_COMMITTED or " +
- "Connection.RRANSACTION_REPEATABLE_READ or " +
+ "Connection.TRANSACTION_REPEATABLE_READ or " +
"Connection.TRANSACTION_SERIALIZABLE");
}
this.isolation = level;
@@ -3193,7 +3193,7 @@
} //end getParams
- /**
+ /**
* Sets the designated parameter to SQL <code>NULL</code>.
*
* <P><B>Note:</B> You must specify the parameter's SQL type.
@@ -3210,8 +3210,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to SQL <code>NULL</code>.
* This version of the method <code>setNull</code> should
* be used for user-defined types and REF type parameters. Examples
@@ -3248,9 +3247,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>boolean</code> value.
* The driver converts this
* to an SQL <code>BIT</code> or <code>BOOLEAN</code> value when it sends it to the database.
@@ -3268,9 +3265,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>byte</code> value.
* The driver converts this
* to an SQL <code>TINYINT</code> value when it sends it to the database.
@@ -3288,9 +3283,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>short</code> value.
* The driver converts this
* to an SQL <code>SMALLINT</code> value when it sends it to the database.
@@ -3308,8 +3301,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>int</code> value.
* The driver converts this
* to an SQL <code>INTEGER</code> value when it sends it to the database.
@@ -3328,7 +3320,7 @@
}
- /**
+ /**
* Sets the designated parameter to the given Java <code>long</code> value.
* The driver converts this
* to an SQL <code>BIGINT</code> value when it sends it to the database.
@@ -3346,8 +3338,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>float</code> value.
* The driver converts this
* to an SQL <code>FLOAT</code> value when it sends it to the database.
@@ -3365,8 +3356,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>double</code> value.
* The driver converts this
* to an SQL <code>DOUBLE</code> value when it sends it to the database.
@@ -3384,9 +3374,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given
* <code>java.math.BigDecimal</code> value.
* The driver converts this to an SQL <code>NUMERIC</code> value when
@@ -3405,9 +3393,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given Java <code>String</code> value.
* The driver converts this
* to an SQL <code>VARCHAR</code> or <code>LONGVARCHAR</code> value
@@ -3428,9 +3414,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given Java array of bytes.
* The driver converts this to an SQL <code>VARBINARY</code> or
* <code>LONGVARBINARY</code> (depending on the argument's size relative
@@ -3450,9 +3434,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Timestamp</code> value.
* The driver
* converts this to an SQL <code>TIMESTAMP</code> value when it sends it to the
@@ -3472,9 +3454,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given input stream, which will have
* the specified number of bytes.
* When a very large ASCII value is input to a <code>LONGVARCHAR</code>
@@ -3501,8 +3481,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given input stream, which will have
* the specified number of bytes.
* When a very large binary value is input to a <code>LONGVARBINARY</code>
@@ -3528,8 +3507,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>Reader</code>
* object, which is the given number of characters long.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
@@ -3558,7 +3536,6 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
/**
* Sets the designated parameter to the given input stream.
* When a very large ASCII value is input to a <code>LONGVARCHAR</code>
@@ -3586,8 +3563,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given input stream.
* When a very large binary value is input to a <code>LONGVARBINARY</code>
* parameter, it may be more practical to send it via a
@@ -3613,9 +3589,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the designated parameter to the given <code>Reader</code>
* object.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
@@ -3644,7 +3618,6 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
/**
* Sets the designated parameter in this <code>RowSet</code> object's command
* to a <code>Reader</code> object. The
@@ -3672,9 +3645,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the value of the designated parameter with the given object. The second
* argument must be an object type; for integral values, the
* <code>java.lang</code> equivalent objects should be used.
@@ -3692,7 +3663,7 @@
* or <code>Array</code>, the driver should pass it to the database as a
* value of the corresponding SQL type.
* <P>
- * Note that this method may be used to pass datatabase-
+ * Note that this method may be used to pass database-
* specific abstract data types.
*
* @param parameterName the name of the parameter
@@ -3720,9 +3691,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
+ /**
* Sets the value of the designated parameter with the given object.
* This method is like the method <code>setObject</code>
* above, except that it assumes a scale of zero.
@@ -3748,8 +3717,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the value of the designated parameter with the given object.
* The second parameter must be of type <code>Object</code>; therefore, the
* <code>java.lang</code> equivalent objects should be used for built-in types.
@@ -3759,7 +3727,7 @@
* will be converted to the corresponding SQL type before being
* sent to the database.
*
- * <p>Note that this method may be used to pass datatabase-
+ * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java
* type.
*
@@ -3789,10 +3757,9 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-
- /**
- * Sets the designated parameter to a <code>InputStream</code> object. The inputstream must contain the number
+ /**
+ * Sets the designated parameter to a <code>InputStream</code> object.
+ * The <code>InputStream</code> must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@@ -3809,8 +3776,8 @@
* this method is called on a closed <code>PreparedStatement</code>,
* if parameterIndex does not correspond
* to a parameter marker in the SQL statement, if the length specified
- * is less than zero or if the number of bytes in the inputstream does not match
- * the specified length.
+ * is less than zero or if the number of bytes in the
+ * <code>InputStream</code> does not match the specified length.
* @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
*
* @since 1.6
@@ -3820,8 +3787,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to a <code>InputStream</code> object.
* This method differs from the <code>setBinaryStream (int, InputStream)</code>
* method because it informs the driver that the parameter value should be
@@ -3848,11 +3814,11 @@
public void setBlob(int parameterIndex, InputStream inputStream)
throws SQLException{
throw new SQLFeatureNotSupportedException("Feature not supported");
- }
+ }
-
- /**
- * Sets the designated parameter to a <code>InputStream</code> object. The <code>inputstream</code> must contain the number
+ /**
+ * Sets the designated parameter to a <code>InputStream</code> object.
+ * The <code>Inputstream</code> must contain the number
* of characters specified by length, otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@@ -3869,7 +3835,7 @@
* @param length the number of bytes in the parameter data.
* @throws SQLException if parameterIndex does not correspond
* to a parameter marker in the SQL statement, or if the length specified
- * is less than zero; if the number of bytes in the inputstream does not match
+ * is less than zero; if the number of bytes in the <code>InputStream</code> does not match
* the specified length; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
@@ -3882,8 +3848,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Blob</code> object.
* The driver converts this to an SQL <code>BLOB</code> value when it
* sends it to the database.
@@ -3900,8 +3865,7 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to a <code>InputStream</code> object.
* This method differs from the <code>setBinaryStream (int, InputStream)</code>
* method because it informs the driver that the parameter value should be
@@ -3925,35 +3889,34 @@
public void setBlob(String parameterName, InputStream inputStream)
throws SQLException{
throw new SQLFeatureNotSupportedException("Feature not supported");
- }
+ }
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number
- * of characters specified by length otherwise a <code>SQLException</code> will be
- * generated when the <code>PreparedStatement</code> is executed.
- *This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
- * because it informs the driver that the parameter value should be sent to
- * the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
- * driver may have to do extra work to determine whether the parameter
- * data should be sent to the server as a <code>LONGVARCHAR</code> or a <code>CLOB</code>
- * @param parameterIndex index of the first parameter is 1, the second is 2, ...
- * @param reader An object that contains the data to set the parameter value to.
- * @param length the number of characters in the parameter data.
- * @throws SQLException if a database access error occurs, this method is called on
- * a closed <code>PreparedStatement</code>, if parameterIndex does not correspond to a parameter
- * marker in the SQL statement, or if the length specified is less than zero.
- *
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.6
- */
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object.
+ * The reader must contain the number
+ * of characters specified by length otherwise a <code>SQLException</code> will be
+ * generated when the <code>PreparedStatement</code> is executed.
+ * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
+ * because it informs the driver that the parameter value should be sent to
+ * the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
+ * driver may have to do extra work to determine whether the parameter
+ * data should be sent to the server as a <code>LONGVARCHAR</code> or a <code>CLOB</code>
+ * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+ * @param reader An object that contains the data to set the parameter value to.
+ * @param length the number of characters in the parameter data.
+ * @throws SQLException if a database access error occurs, this method is called on
+ * a closed <code>PreparedStatement</code>, if parameterIndex does not correspond to a parameter
+ * marker in the SQL statement, or if the length specified is less than zero.
+ *
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
+ * @since 1.6
+ */
public void setClob(int parameterIndex, Reader reader, long length)
throws SQLException{
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
-/**
+ /**
* Sets the designated parameter to a <code>Reader</code> object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to
@@ -3979,35 +3942,34 @@
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain the number
- * of characters specified by length otherwise a <code>SQLException</code> will be
- * generated when the <code>CallableStatement</code> is executed.
- * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
- * because it informs the driver that the parameter value should be sent to
- * the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
- * driver may have to do extra work to determine whether the parameter
- * data should be send to the server as a <code>LONGVARCHAR</code> or a <code>CLOB</code>
- * @param parameterName the name of the parameter to be set
- * @param reader An object that contains the data to set the parameter value to.
- * @param length the number of characters in the parameter data.
- * @throws SQLException if parameterIndex does not correspond to a parameter
- * marker in the SQL statement; if the length specified is less than zero;
- * a database access error occurs or
- * this method is called on a closed <code>CallableStatement</code>
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
- *
- * @since 1.6
- */
- public void setClob(String parameterName, Reader reader, long length)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object.
+ * The <code>reader</code> must contain the number
+ * of characters specified by length otherwise a <code>SQLException</code> will be
+ * generated when the <code>CallableStatement</code> is executed.
+ * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
+ * because it informs the driver that the parameter value should be sent to
+ * the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
+ * driver may have to do extra work to determine whether the parameter
+ * data should be send to the server as a <code>LONGVARCHAR</code> or a <code>CLOB</code>
+ * @param parameterName the name of the parameter to be set
+ * @param reader An object that contains the data to set the parameter value to.
+ * @param length the number of characters in the parameter data.
+ * @throws SQLException if parameterIndex does not correspond to a parameter
+ * marker in the SQL statement; if the length specified is less than zero;
+ * a database access error occurs or
+ * this method is called on a closed <code>CallableStatement</code>
+ * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+ * this method
+ *
+ * @since 1.6
+ */
+ public void setClob(String parameterName, Reader reader, long length)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Clob</code> object.
* The driver converts this to an SQL <code>CLOB</code> value when it
* sends it to the database.
@@ -4020,12 +3982,11 @@
* this method
* @since 1.6
*/
- public void setClob (String parameterName, Clob x) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
+ public void setClob (String parameterName, Clob x) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to a <code>Reader</code> object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to
@@ -4045,13 +4006,11 @@
* @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
* @since 1.6
*/
- public void setClob(String parameterName, Reader reader)
- throws SQLException{
+ public void setClob(String parameterName, Reader reader) throws SQLException {
throw new SQLFeatureNotSupportedException("Feature not supported");
- }
+ }
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Date</code> value
* using the default time zone of the virtual machine that is running
* the application.
@@ -4068,12 +4027,11 @@
* @since 1.4
*/
public void setDate(String parameterName, java.sql.Date x)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Date</code> value,
* using the given <code>Calendar</code> object. The driver uses
* the <code>Calendar</code> object to construct an SQL <code>DATE</code> value,
@@ -4095,12 +4053,11 @@
* @since 1.4
*/
public void setDate(String parameterName, java.sql.Date x, Calendar cal)
- throws SQLException{
+ throws SQLException {
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Time</code> value.
* The driver converts this
* to an SQL <code>TIME</code> value when it sends it to the database.
@@ -4115,12 +4072,11 @@
* @since 1.4
*/
public void setTime(String parameterName, java.sql.Time x)
- throws SQLException{
+ throws SQLException {
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Time</code> value,
* using the given <code>Calendar</code> object. The driver uses
* the <code>Calendar</code> object to construct an SQL <code>TIME</code> value,
@@ -4142,12 +4098,11 @@
* @since 1.4
*/
public void setTime(String parameterName, java.sql.Time x, Calendar cal)
- throws SQLException{
+ throws SQLException {
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
+ /**
* Sets the designated parameter to the given <code>java.sql.Timestamp</code> value,
* using the given <code>Calendar</code> object. The driver uses
* the <code>Calendar</code> object to construct an SQL <code>TIMESTAMP</code> value,
@@ -4169,366 +4124,347 @@
* @since 1.4
*/
public void setTimestamp(String parameterName, java.sql.Timestamp x, Calendar cal)
- throws SQLException{
+ throws SQLException {
throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
- /**
- * Sets the designated parameter to the given <code>java.sql.SQLXML</code> object. The driver converts this to an
- * SQL <code>XML</code> value when it sends it to the database.
- * @param parameterIndex index of the first parameter is 1, the second is 2, ...
- * @param xmlObject a <code>SQLXML</code> object that maps an SQL <code>XML</code> value
- * @throws SQLException if a database access error occurs, this method
- * is called on a closed result set,
- * the <code>java.xml.transform.Result</code>,
- * <code>Writer</code> or <code>OutputStream</code> has not been closed
- * for the <code>SQLXML</code> object or
- * if there is an error processing the XML value. The <code>getCause</code> method
- * of the exception may provide a more detailed exception, for example, if the
- * stream does not contain valid XML.
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to the given <code>java.sql.SQLXML</code> object. The driver converts this to an
- * <code>SQL XML</code> value when it sends it to the database.
- * @param parameterName the name of the parameter
- * @param xmlObject a <code>SQLXML</code> object that maps an <code>SQL XML</code> value
- * @throws SQLException if a database access error occurs, this method
- * is called on a closed result set,
- * the <code>java.xml.transform.Result</code>,
- * <code>Writer</code> or <code>OutputStream</code> has not been closed
- * for the <code>SQLXML</code> object or
- * if there is an error processing the XML value. The <code>getCause</code> method
- * of the exception may provide a more detailed exception, for example, if the
- * stream does not contain valid XML.
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to the given <code>java.sql.RowId</code> object. The
- * driver converts this to a SQL <code>ROWID</code> value when it sends it
- * to the database
- *
- * @param parameterIndex the first parameter is 1, the second is 2, ...
- * @param x the parameter value
- * @throws SQLException if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- *
- * @since 1.6
- */
- public void setRowId(int parameterIndex, RowId x) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to the given <code>java.sql.RowId</code> object. The
- * driver converts this to a SQL <code>ROWID</code> when it sends it to the
- * database.
- *
- * @param parameterName the name of the parameter
- * @param x the parameter value
- * @throws SQLException if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setRowId(String parameterName, RowId x) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
- /**
- * Sets the designated parameter to the given <code>String</code> object.
- * The driver converts this to a SQL <code>NCHAR</code> or
- * <code>NVARCHAR</code> or <code>LONGNVARCHAR</code> value
- * (depending on the argument's
- * size relative to the driver's limits on <code>NVARCHAR</code> values)
- * when it sends it to the database.
- *
- * @param parameterIndex of the first parameter is 1, the second is 2, ...
- * @param value the parameter value
- * @throws SQLException if the driver does not support national
- * character sets; if the driver can detect that a data conversion
- * error could occur ; or if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setNString(int parameterIndex, String value) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to the given <code>String</code> object.
- * The driver converts this to a SQL <code>NCHAR</code> or
- * <code>NVARCHAR</code> or <code>LONGNVARCHAR</code>
- * @param parameterName the name of the column to be set
- * @param value the parameter value
- * @throws SQLException if the driver does not support national
- * character sets; if the driver can detect that a data conversion
- * error could occur; or if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setNString(String parameterName, String value)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
- * driver does the necessary conversion from Java character format to
- * the national character set in the database.
- * @param parameterIndex of the first parameter is 1, the second is 2, ...
- * @param value the parameter value
- * @param length the number of characters in the parameter data.
- * @throws SQLException if the driver does not support national
- * character sets; if the driver can detect that a data conversion
- * error could occur ; or if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
- * driver does the necessary conversion from Java character format to
- * the national character set in the database.
- * @param parameterName the name of the column to be set
- * @param value the parameter value
- * @param length the number of characters in the parameter data.
- * @throws SQLException if the driver does not support national
- * character sets; if the driver can detect that a data conversion
- * error could occur; or if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- * @since 1.6
- */
- public void setNCharacterStream(String parameterName, Reader value, long length)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
- * driver does the necessary conversion from Java character format to
- * the national character set in the database.
-
- * <P><B>Note:</B> This stream object can either be a standard
- * Java stream object or your own subclass that implements the
- * standard interface.
- * <P><B>Note:</B> Consult your JDBC driver documentation to determine if
- * it might be more efficient to use a version of
- * <code>setNCharacterStream</code> which takes a length parameter.
- *
- * @param parameterName the name of the parameter
- * @param value the parameter value
- * @throws SQLException if the driver does not support national
- * character sets; if the driver can detect that a data conversion
- * error could occur ; if a database access error occurs; or
- * this method is called on a closed <code>CallableStatement</code>
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.6
- */
- public void setNCharacterStream(String parameterName, Reader value) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
+ /**
+ * Sets the designated parameter to the given <code>java.sql.SQLXML</code> object. The driver converts this to an
+ * SQL <code>XML</code> value when it sends it to the database.
+ * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+ * @param xmlObject a <code>SQLXML</code> object that maps an SQL <code>XML</code> value
+ * @throws SQLException if a database access error occurs, this method
+ * is called on a closed result set,
+ * the <code>java.xml.transform.Result</code>,
+ * <code>Writer</code> or <code>OutputStream</code> has not been closed
+ * for the <code>SQLXML</code> object or
+ * if there is an error processing the XML value. The <code>getCause</code> method
+ * of the exception may provide a more detailed exception, for example, if the
+ * stream does not contain valid XML.
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
}
+ /**
+ * Sets the designated parameter to the given <code>java.sql.SQLXML</code> object. The driver converts this to an
+ * <code>SQL XML</code> value when it sends it to the database.
+ * @param parameterName the name of the parameter
+ * @param xmlObject a <code>SQLXML</code> object that maps an <code>SQL XML</code> value
+ * @throws SQLException if a database access error occurs, this method
+ * is called on a closed result set,
+ * the <code>java.xml.transform.Result</code>,
+ * <code>Writer</code> or <code>OutputStream</code> has not been closed
+ * for the <code>SQLXML</code> object or
+ * if there is an error processing the XML value. The <code>getCause</code> method
+ * of the exception may provide a more detailed exception, for example, if the
+ * stream does not contain valid XML.
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to the given <code>java.sql.RowId</code> object. The
+ * driver converts this to a SQL <code>ROWID</code> value when it sends it
+ * to the database
+ *
+ * @param parameterIndex the first parameter is 1, the second is 2, ...
+ * @param x the parameter value
+ * @throws SQLException if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ *
+ * @since 1.6
+ */
+ public void setRowId(int parameterIndex, RowId x) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
/**
- * Sets the designated parameter to a <code>java.sql.NClob</code> object. The object
- * implements the <code>java.sql.NClob</code> interface. This <code>NClob</code>
- * object maps to a SQL <code>NCLOB</code>.
+ * Sets the designated parameter to the given <code>java.sql.RowId</code> object. The
+ * driver converts this to a SQL <code>ROWID</code> when it sends it to the
+ * database.
+ *
+ * @param parameterName the name of the parameter
+ * @param x the parameter value
+ * @throws SQLException if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setRowId(String parameterName, RowId x) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to the given <code>String</code> object.
+ * The driver converts this to a SQL <code>NCHAR</code> or
+ * <code>NVARCHAR</code> or <code>LONGNVARCHAR</code> value
+ * (depending on the argument's
+ * size relative to the driver's limits on <code>NVARCHAR</code> values)
+ * when it sends it to the database.
+ *
+ * @param parameterIndex of the first parameter is 1, the second is 2, ...
+ * @param value the parameter value
+ * @throws SQLException if the driver does not support national
+ * character sets; if the driver can detect that a data conversion
+ * error could occur ; or if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setNString(int parameterIndex, String value) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to the given <code>String</code> object.
+ * The driver converts this to a SQL <code>NCHAR</code> or
+ * <code>NVARCHAR</code> or <code>LONGNVARCHAR</code>
* @param parameterName the name of the column to be set
* @param value the parameter value
* @throws SQLException if the driver does not support national
+ * character sets; if the driver can detect that a data conversion
+ * error could occur; or if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setNString(String parameterName, String value) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object. The
+ * <code>Reader</code> reads the data till end-of-file is reached. The
+ * driver does the necessary conversion from Java character format to
+ * the national character set in the database.
+ * @param parameterIndex of the first parameter is 1, the second is 2, ...
+ * @param value the parameter value
+ * @param length the number of characters in the parameter data.
+ * @throws SQLException if the driver does not support national
+ * character sets; if the driver can detect that a data conversion
+ * error could occur ; or if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setNCharacterStream(int parameterIndex, Reader value, long length)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object. The
+ * <code>Reader</code> reads the data till end-of-file is reached. The
+ * driver does the necessary conversion from Java character format to
+ * the national character set in the database.
+ * @param parameterName the name of the column to be set
+ * @param value the parameter value
+ * @param length the number of characters in the parameter data.
+ * @throws SQLException if the driver does not support national
* character sets; if the driver can detect that a data conversion
* error could occur; or if a database access error occurs
* @throws SQLFeatureNotSupportedException if the JDBC driver does not
* support this method
* @since 1.6
*/
- public void setNClob(String parameterName, NClob value) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
+ public void setNCharacterStream(String parameterName, Reader value, long length)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
}
-
/**
- * Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain
- * the number
- * of characters specified by length otherwise a <code>SQLException</code> will be
- * generated when the <code>CallableStatement</code> is executed.
- * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
- * because it informs the driver that the parameter value should be sent to
- * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
- * driver may have to do extra work to determine whether the parameter
- * data should be send to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
- *
- * @param parameterName the name of the parameter to be set
- * @param reader An object that contains the data to set the parameter value to.
- * @param length the number of characters in the parameter data.
- * @throws SQLException if parameterIndex does not correspond to a parameter
- * marker in the SQL statement; if the length specified is less than zero;
- * if the driver does not support national
- * character sets; if the driver can detect that a data conversion
- * error could occur; if a database access error occurs or
- * this method is called on a closed <code>CallableStatement</code>
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
- * @since 1.6
- */
- public void setNClob(String parameterName, Reader reader, long length)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object.
- * This method differs from the <code>setCharacterStream (int, Reader)</code> method
- * because it informs the driver that the parameter value should be sent to
- * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
- * driver may have to do extra work to determine whether the parameter
- * data should be send to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
+ * Sets the designated parameter to a <code>Reader</code> object. The
+ * <code>Reader</code> reads the data till end-of-file is reached. The
+ * driver does the necessary conversion from Java character format to
+ * the national character set in the database.
+ * <P><B>Note:</B> This stream object can either be a standard
+ * Java stream object or your own subclass that implements the
+ * standard interface.
* <P><B>Note:</B> Consult your JDBC driver documentation to determine if
* it might be more efficient to use a version of
- * <code>setNClob</code> which takes a length parameter.
+ * <code>setNCharacterStream</code> which takes a length parameter.
*
* @param parameterName the name of the parameter
- * @param reader An object that contains the data to set the parameter value to.
- * @throws SQLException if the driver does not support national character sets;
- * if the driver can detect that a data conversion
- * error could occur; if a database access error occurs or
- * this method is called on a closed <code>CallableStatement</code>
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
- *
- * @since 1.6
- */
- public void setNClob(String parameterName, Reader reader)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number
- * of characters specified by length otherwise a <code>SQLException</code> will be
- * generated when the <code>PreparedStatement</code> is executed.
- * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
- * because it informs the driver that the parameter value should be sent to
- * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
- * driver may have to do extra work to determine whether the parameter
- * data should be sent to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
- * @param parameterIndex index of the first parameter is 1, the second is 2, ...
- * @param reader An object that contains the data to set the parameter value to.
- * @param length the number of characters in the parameter data.
- * @throws SQLException if parameterIndex does not correspond to a parameter
- * marker in the SQL statement; if the length specified is less than zero;
- * if the driver does not support national character sets;
- * if the driver can detect that a data conversion
- * error could occur; if a database access error occurs or
- * this method is called on a closed <code>PreparedStatement</code>
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
- *
- * @since 1.6
- */
- public void setNClob(int parameterIndex, Reader reader, long length)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
- /**
- * Sets the designated parameter to a <code>java.sql.NClob</code> object. The driver converts this oa
- * SQL <code>NCLOB</code> value when it sends it to the database.
- * @param parameterIndex of the first parameter is 1, the second is 2, ...
* @param value the parameter value
* @throws SQLException if the driver does not support national
* character sets; if the driver can detect that a data conversion
- * error could occur ; or if a database access error occurs
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not
- * support this method
+ * error could occur ; if a database access error occurs; or
+ * this method is called on a closed <code>CallableStatement</code>
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
* @since 1.6
*/
- public void setNClob(int parameterIndex, NClob value) throws SQLException{
+ public void setNCharacterStream(String parameterName, Reader value)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>java.sql.NClob</code> object. The object
+ * implements the <code>java.sql.NClob</code> interface. This <code>NClob</code>
+ * object maps to a SQL <code>NCLOB</code>.
+ * @param parameterName the name of the column to be set
+ * @param value the parameter value
+ * @throws SQLException if the driver does not support national
+ * character sets; if the driver can detect that a data conversion
+ * error could occur; or if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setNClob(String parameterName, NClob value) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain
+ * the number
+ * of characters specified by length otherwise a <code>SQLException</code> will be
+ * generated when the <code>CallableStatement</code> is executed.
+ * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
+ * because it informs the driver that the parameter value should be sent to
+ * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
+ * driver may have to do extra work to determine whether the parameter
+ * data should be send to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
+ *
+ * @param parameterName the name of the parameter to be set
+ * @param reader An object that contains the data to set the parameter value to.
+ * @param length the number of characters in the parameter data.
+ * @throws SQLException if parameterIndex does not correspond to a parameter
+ * marker in the SQL statement; if the length specified is less than zero;
+ * if the driver does not support national
+ * character sets; if the driver can detect that a data conversion
+ * error could occur; if a database access error occurs or
+ * this method is called on a closed <code>CallableStatement</code>
+ * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
+ * this method
+ * @since 1.6
+ */
+ public void setNClob(String parameterName, Reader reader, long length)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object.
+ * This method differs from the <code>setCharacterStream (int, Reader)</code> method
+ * because it informs the driver that the parameter value should be sent to
+ * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
+ * driver may have to do extra work to determine whether the parameter
+ * data should be send to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
+ * <P><B>Note:</B> Consult your JDBC driver documentation to determine if
+ * it might be more efficient to use a version of
+ * <code>setNClob</code> which takes a length parameter.
+ *
+ * @param parameterName the name of the parameter
+ * @param reader An object that contains the data to set the parameter value to.
+ * @throws SQLException if the driver does not support national character sets;
+ * if the driver can detect that a data conversion
+ * error could occur; if a database access error occurs or
+ * this method is called on a closed <code>CallableStatement</code>
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
+ *
+ * @since 1.6
+ */
+ public void setNClob(String parameterName, Reader reader) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number
+ * of characters specified by length otherwise a <code>SQLException</code> will be
+ * generated when the <code>PreparedStatement</code> is executed.
+ * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
+ * because it informs the driver that the parameter value should be sent to
+ * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
+ * driver may have to do extra work to determine whether the parameter
+ * data should be sent to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
+ * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+ * @param reader An object that contains the data to set the parameter value to.
+ * @param length the number of characters in the parameter data.
+ * @throws SQLException if parameterIndex does not correspond to a parameter
+ * marker in the SQL statement; if the length specified is less than zero;
+ * if the driver does not support national character sets;
+ * if the driver can detect that a data conversion
+ * error could occur; if a database access error occurs or
+ * this method is called on a closed <code>PreparedStatement</code>
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ *
+ * @since 1.6
+ */
+ public void setNClob(int parameterIndex, Reader reader, long length)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+
+ /**
+ * Sets the designated parameter to a <code>java.sql.NClob</code> object. The driver converts this oa
+ * SQL <code>NCLOB</code> value when it sends it to the database.
+ * @param parameterIndex of the first parameter is 1, the second is 2, ...
+ * @param value the parameter value
+ * @throws SQLException if the driver does not support national
+ * character sets; if the driver can detect that a data conversion
+ * error could occur ; or if a database access error occurs
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not
+ * support this method
+ * @since 1.6
+ */
+ public void setNClob(int parameterIndex, NClob value) throws SQLException {
throw new SQLFeatureNotSupportedException("Feature not supported");
- }
+ }
+ /**
+ * Sets the designated parameter to a <code>Reader</code> object.
+ * This method differs from the <code>setCharacterStream (int, Reader)</code> method
+ * because it informs the driver that the parameter value should be sent to
+ * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
+ * driver may have to do extra work to determine whether the parameter
+ * data should be sent to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
+ * <P><B>Note:</B> Consult your JDBC driver documentation to determine if
+ * it might be more efficient to use a version of
+ * <code>setNClob</code> which takes a length parameter.
+ *
+ * @param parameterIndex index of the first parameter is 1, the second is 2, ...
+ * @param reader An object that contains the data to set the parameter value to.
+ * @throws SQLException if parameterIndex does not correspond to a parameter
+ * marker in the SQL statement;
+ * if the driver does not support national character sets;
+ * if the driver can detect that a data conversion
+ * error could occur; if a database access error occurs or
+ * this method is called on a closed <code>PreparedStatement</code>
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
+ *
+ * @since 1.6
+ */
+ public void setNClob(int parameterIndex, Reader reader)throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
- /**
- * Sets the designated parameter to a <code>Reader</code> object.
- * This method differs from the <code>setCharacterStream (int, Reader)</code> method
- * because it informs the driver that the parameter value should be sent to
- * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
- * driver may have to do extra work to determine whether the parameter
- * data should be sent to the server as a <code>LONGNVARCHAR</code> or a <code>NCLOB</code>
- * <P><B>Note:</B> Consult your JDBC driver documentation to determine if
- * it might be more efficient to use a version of
- * <code>setNClob</code> which takes a length parameter.
- *
- * @param parameterIndex index of the first parameter is 1, the second is 2, ...
- * @param reader An object that contains the data to set the parameter value to.
- * @throws SQLException if parameterIndex does not correspond to a parameter
- * marker in the SQL statement;
- * if the driver does not support national character sets;
- * if the driver can detect that a data conversion
- * error could occur; if a database access error occurs or
- * this method is called on a closed <code>PreparedStatement</code>
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
- *
- * @since 1.6
- */
- public void setNClob(int parameterIndex, Reader reader)
- throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
+ /**
+ * Sets the designated parameter to the given <code>java.net.URL</code> value.
+ * The driver converts this to an SQL <code>DATALINK</code> value
+ * when it sends it to the database.
+ *
+ * @param parameterIndex the first parameter is 1, the second is 2, ...
+ * @param x the <code>java.net.URL</code> object to be set
+ * @exception SQLException if a database access error occurs or
+ * this method is called on a closed <code>PreparedStatement</code>
+ * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
+ * @since 1.4
+ */
+ public void setURL(int parameterIndex, java.net.URL x) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Feature not supported");
+ }
+ static final long serialVersionUID = 4886719666485113312L;
- /**
- * Sets the designated parameter to the given <code>java.net.URL</code> value.
- * The driver converts this to an SQL <code>DATALINK</code> value
- * when it sends it to the database.
- *
- * @param parameterIndex the first parameter is 1, the second is 2, ...
- * @param x the <code>java.net.URL</code> object to be set
- * @exception SQLException if a database access error occurs or
- * this method is called on a closed <code>PreparedStatement</code>
- * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.4
- */
- public void setURL(int parameterIndex, java.net.URL x) throws SQLException{
- throw new SQLFeatureNotSupportedException("Feature not supported");
- }
-
-
-
- static final long serialVersionUID = 4886719666485113312L;
-
-} //end class
+} //end class
\ No newline at end of file
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
index adb1b02..4ffcb90 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
@@ -286,7 +286,7 @@
* <code>setSyncProvider</code>.
* <P>
* In order to use the optimistic concurrency control routine, the
- * <code>RIOptismisticProvider</code> maintains both its current
+ * <code>RIOptimisticProvider</code> maintains both its current
* value and its original value (the value it had immediately preceding the
* current value). Note that if no changes have been made to the data in a
* <code>RowSet</code> object, its current values and its original values are the same,
@@ -351,7 +351,7 @@
* <code>CachedRowSet</code> object can be used to augment the
* capabilities of a JDBC technology-enabled driver (hereafter called a
* "JDBC driver") when the DBMS does not provide full support for scrolling and
- * updating. To achieve the effect of making a non-scrollble and read-only
+ * updating. To achieve the effect of making a non-scrollable and read-only
* <code>ResultSet</code> object scrollable and updatable, a programmer
* simply needs to create a <code>CachedRowSet</code> object populated
* with that <code>ResultSet</code> object's data. This is demonstrated
@@ -732,7 +732,7 @@
* Note: The <code>acceptChanges()</code> method will determine if the
* <code>COMMIT_ON_ACCEPT_CHANGES</code> is set to true or not. If it is set
* to true, all updates in the synchronization are committed to the data
- * source. Otherwise, the application <b>must</b> explicity call the
+ * source. Otherwise, the application <b>must</b> explicitly call the
* <code>commit()</code> or <code>rollback()</code> methods as appropriate.
*
* @throws SyncProviderException if the underlying
@@ -801,7 +801,7 @@
* Note: The <code>acceptChanges()</code> method will determine if the
* <code>COMMIT_ON_ACCEPT_CHANGES</code> is set to true or not. If it is set
* to true, all updates in the synchronization are committed to the data
- * source. Otherwise, the application <b>must</b> explicity call the
+ * source. Otherwise, the application <b>must</b> explicitly call the
* <code>commit</code> or <code>rollback</code> methods as appropriate.
*
* @param con a standard JDBC <code>Connection</code> object
@@ -850,7 +850,7 @@
* associated updates are fully cleared, thus preventing 'dirty' reads by
* other components that hold a reference to this <code>RowSet</code> object.
* In addition, the contents cannot be released
- * until all all components reading this <code>CachedRowSet</code> object
+ * until all components reading this <code>CachedRowSet</code> object
* have completed their reads. This <code>CachedRowSet</code> object
* should be returned to normal behavior after firing the
* <code>rowSetChanged</code> event.
@@ -934,7 +934,7 @@
* effect until further modification to the rowset data has occurred.
*
* @throws SQLException if the cursor is before the first row or after the last
- * row in in this <code>CachedRowSet</code> object
+ * row in this <code>CachedRowSet</code> object
* @see #undoDelete
* @see #undoInsert
* @see java.sql.ResultSet#cancelRowUpdates
@@ -1071,7 +1071,7 @@
* <code>CachedRowSet</code> object. Internally, this method is used by a rowset
* to trigger read or write actions between the rowset
* and the data source. For example, a rowset may need to get a handle
- * on the the rowset reader (<code>RowSetReader</code> object) from the
+ * on the rowset reader (<code>RowSetReader</code> object) from the
* <code>SyncProvider</code> to allow the rowset to be populated.
* <pre>
* RowSetReader rowsetReader = null;
@@ -1096,7 +1096,7 @@
* it currently has set.
*
* @return the <code>SyncProvider</code> object that was set when the rowset
- * was instantiated, or if none was was set, the default provider
+ * was instantiated, or if none was set, the default provider
* @throws SQLException if an error occurs while returning the
* <code>SyncProvider</code> object
* @see #setSyncProvider
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
index d03d6c6..42d5a0f 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
@@ -108,7 +108,7 @@
* The <code>FilteredRowSet</code> range criterion can be modified by applying
* a new <code>Predicate</code> object to the <code>FilteredRowSet</code>
* instance at any time. This is possible if no additional references to the
- * <code>FilteredRowSet</code> object are detected. A new filter has has an
+ * <code>FilteredRowSet</code> object are detected. A new filter has an
* immediate effect on criterion enforcement within the
* <code>FilteredRowSet</code> object, and all subsequent views and updates will be
* subject to similar enforcement.
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java
index 774ac31..06f8e1c 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java
@@ -111,7 +111,7 @@
* and they do not have to store the exact same data type as long as the data types
* can be compared.
* <P>
- * A match column can be be set in two ways:
+ * A match column can be set in two ways:
* <ul>
* <li>By calling the <code>Joinable</code> method <code>setMatchColumn</code><br>
* This is the only method that can set the match column before a <code>RowSet</code>
@@ -527,7 +527,7 @@
public static int RIGHT_OUTER_JOIN = 3;
/**
- * An ANSI-style <code>JOIN</code> providing a a full JOIN. Specifies that all
+ * An ANSI-style <code>JOIN</code> providing a full JOIN. Specifies that all
* rows from either table be returned regardless of matching
* records on the other table.
*/
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java
index a3f674d..20a4019 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@
*/
// <h3>3.0 FilteredRowSet Internals</h3>
- // internalNext, Frist, Last. Discuss guidelines on how to approach this
+ // internalNext, First, Last. Discuss guidelines on how to approach this
// and cite examples in reference implementations.
public interface Predicate {
/**
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
index b15a4df..832b651 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -607,7 +607,7 @@
}
/**
- * Retrieves the the suggested column title for the designated
+ * Retrieves the suggested column title for the designated
* column for use in printouts and displays.
*
* @param columnIndex the first column is 1, the second is 2, and so on;
@@ -1073,7 +1073,7 @@
public int colType;
/**
- * The field that holds the the type name used by this particular data source
+ * The field that holds the type name used by this particular data source
* for the value stored in this column.
*
* @serial
@@ -1081,7 +1081,7 @@
public String colTypeName;
/**
- * The field that holds the updatablity boolean per column of a RowSet
+ * The field that holds the updatability boolean per column of a RowSet
*
* @serial
*/
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java
index e8c10c0..20aacfd 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetProvider.java
@@ -97,7 +97,7 @@
* The {@link ServiceLoader} API. The {@code ServiceLoader} API will look
* for a class name in the file
* {@code META-INF/services/javax.sql.rowset.RowSetFactory}
- * in jars available to the runtime. For example, to have the the RowSetFactory
+ * in jars available to the runtime. For example, to have the RowSetFactory
* implementation {@code com.sun.rowset.RowSetFactoryImpl } loaded, the
* entry in {@code META-INF/services/javax.sql.rowset.RowSetFactory} would be:
* <ul>
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
index ecdc9ad..b8f1c4b0 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,7 @@
* @param reason a <code>String</code> giving a description of the
* warning;
* @param SQLState an XOPEN code identifying the warning; if a non standard
- * XPOEN <i>SQLState</i> is supplied, no exception is thrown.
+ * XOPEN <i>SQLState</i> is supplied, no exception is thrown.
* @param vendorCode a database vendor-specific warning code
*/
public RowSetWarning(java.lang.String reason, java.lang.String SQLState, int vendorCode) {
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
index f588f00..85dee9c 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
* of the {@code WebRowSet} interface to ensure interoperability. In addition,
* the {@code WebRowSet} schema uses specific SQL/XML Schema annotations,
* thus ensuring greater cross
- * platform inter-operability. This is an effort currently under way at the ISO
+ * platform interoperability. This is an effort currently under way at the ISO
* organization. The SQL/XML definition is available at the following URI:
* <ul>
* <li>
@@ -109,7 +109,7 @@
* <max-rows>0</max-rows>
* <query-timeout>0</query-timeout>
* <read-only>false</read-only>
- * <rowset-type>TRANSACTION_READ_UNCOMMITED</rowset-type>
+ * <rowset-type>TRANSACTION_READ_UNCOMMITTED</rowset-type>
* <show-deleted>false</show-deleted>
* <table-name/>
* <url>jdbc:thin:oracle</url>
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
index b25e8a2..b84eb29 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
@@ -156,7 +156,7 @@
<li><b>3.2 Role of the <code>BaseRowSet</code> Class</b>
<p>
A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more
-standard interfaces specified in this package and and <b>may</b> extend the
+standard interfaces specified in this package and <b>may</b> extend the
<a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a
<code>CachedRowSet</code> implementation must implement the <code>CachedRowSet</code>
interface and extend the <code>BaseRowSet</code> abstract class. The
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
index 5715ea0..3bbaebb 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -202,7 +202,7 @@
}
/**
- * This method frees the {@code SeriableArray} object and releases the
+ * This method frees the {@code SerialArray} object and releases the
* resources that it holds. The object is invalid once the {@code free}
* method is called. <p> If {@code free} is called multiple times, the
* subsequent calls to {@code free} are treated as a no-op. </P>
@@ -313,7 +313,6 @@
return dst;
}
- //[if an error occurstype map used??]
/**
* Returns a new array that is a copy of this <code>SerialArray</code>
* object, using the given type map for the custom
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
index 66652d2..abdfc58 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -475,7 +475,7 @@
/**
- * This method frees the {@code SeriableBlob} object and releases the
+ * This method frees the {@code SerialBlob} object and releases the
* resources that it holds. The object is invalid once the {@code free}
* method is called. <p> If {@code free} is called multiple times, the
* subsequent calls to {@code free} are treated as a no-op. </P>
@@ -578,7 +578,7 @@
fields.put("len", len);
fields.put("origLen", origLen);
// Note: this check to see if it is an instance of Serializable
- // is for backwards compatibiity
+ // is for backwards compatibility
fields.put("blob", blob instanceof Serializable ? blob : null);
s.writeFields();
}
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
index 7f994f5..fe8a65a 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -565,7 +565,7 @@
}
/**
- * This method frees the {@code SeriableClob} object and releases the
+ * This method frees the {@code SerialClob} object and releases the
* resources that it holds.
* The object is invalid once the {@code free} method is called.
* <p>
@@ -670,7 +670,7 @@
fields.put("len", len);
fields.put("origLen", origLen);
// Note: this check to see if it is an instance of Serializable
- // is for backwards compatibiity
+ // is for backwards compatibility
fields.put("clob", clob instanceof Serializable ? clob : null);
s.writeFields();
}
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java
index 422fd25..a033658 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java
@@ -61,7 +61,7 @@
/**
* The SQL type of the elements in this <code>SerialDatalink</code>
- * object. The type is expressed as one of the contants from the
+ * object. The type is expressed as one of the constants from the
* class <code>java.sql.Types</code>.
* @serial
*/
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
index 91d3dcd..47a86c2 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,7 +243,7 @@
fields.put("baseTypeName", baseTypeName);
fields.put("object", object);
// Note: this check to see if it is an instance of Serializable
- // is for backwards compatibiity
+ // is for backwards compatibility
fields.put("reference", reference instanceof Serializable ? reference : null);
s.writeFields();
}
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
index 67f8714..5e44c8f 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
@@ -87,7 +87,7 @@
<h3>5.0 SerialDatalink</h3>
A serializable mapping in the Java programming language of an SQL DATALINK
value. A DATALINK value references a file outside of the underlying data source
-that the the originating data source manages. <br>
+that the originating data source manages. <br>
<br>
<code>RowSet</code> implementations can use the method <tt>RowSet.getURL() </tt>to retrieve
a <code>java.net.URL</code> object, which can be used to manipulate the external data.
@@ -141,7 +141,7 @@
The <tt>SQLInputImpl</tt> class provides a set of reader methods
analogous to the <tt>ResultSet</tt> getter methods. These methods make it
possible to read the values in an <tt>SQLInputImpl</tt> object. The method
-<code>wasNull</code> is used to determine whether the the last value read was SQL NULL.
+<code>wasNull</code> is used to determine whether the last value read was SQL NULL.
<br>
<br>
When a constructor or getter method that takes a <code>Map</code> object is called,
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
index 586e19f..686479f 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java
@@ -259,7 +259,7 @@
private static Hashtable<String, SyncProvider> implementations;
/**
- * Adds the the given synchronization provider to the factory register. Guidelines
+ * Adds the given synchronization provider to the factory register. Guidelines
* are provided in the <code>SyncProvider</code> specification for the
* required naming conventions for <code>SyncProvider</code>
* implementations.
@@ -462,7 +462,7 @@
/**
* Internal handler for all standard property parsing. Parses standard
- * ROWSET properties and stores lazy references into the the internal registry.
+ * ROWSET properties and stores lazy references into the internal registry.
*/
private static void parseProperties(Properties p) {
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java
index 14c6056..72439ab 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java
@@ -173,7 +173,7 @@
* are used as return values or parameters for <code>SyncProvider</code> methods.
* <code>SyncProvider</code> objects may be implemented to perform synchronization
* between a <code>RowSet</code> object and its underlying data source with varying
- * degrees of of care. The first group of constants indicate how synchronization
+ * degrees of care. The first group of constants indicate how synchronization
* is handled. For example, <code>GRADE_NONE</code> indicates that a
* <code>SyncProvider</code> object will not take any care to see what data is
* valid and will simply write the <code>RowSet</code> data to the data source.
diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
index 1b4c8ee..c54def4 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
@@ -122,7 +122,7 @@
<a href="http://www.syncml.org">http://www.syncml.org</a>
</PRE>
<P>
-For the the next level up, the
+For the next level up, the
writer checks to see if there are any conflicts, and if there are,
it does not write anything to the data source. The problem with this concurrency
level is that if another party has modified the corresponding data in the data source
diff --git a/jdk/src/java.sql/share/classes/java/sql/Array.java b/jdk/src/java.sql/share/classes/java/sql/Array.java
index fdc2436..e206731 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Array.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Array.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -181,7 +181,7 @@
Object getArray(long index, int count) throws SQLException;
/**
- * Retreives a slice of the SQL <code>ARRAY</code> value
+ * Retrieves a slice of the SQL <code>ARRAY</code> value
* designated by this <code>Array</code> object, beginning with the specified
* <code>index</code> and containing up to <code>count</code>
* successive elements of the SQL array.
diff --git a/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java b/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java
index fd5fb22..6603671 100644
--- a/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java
+++ b/jdk/src/java.sql/share/classes/java/sql/BatchUpdateException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -479,14 +479,14 @@
* to BatchUpdateException:
* <ul>
* <li>Add field longUpdateCounts</li>
- * <li>Add Constructorr which takes long[] for update counts</li>
+ * <li>Add Constructor which takes long[] for update counts</li>
* <li>Add getLargeUpdateCounts method</li>
* </ul>
* When any of the constructors are called, the int[] and long[] updateCount
* fields are populated by copying the one array to each other.
*
* As the JDBC driver passes in the updateCounts, there has always been the
- * possiblity for overflow and BatchUpdateException does not need to account
+ * possibility for overflow and BatchUpdateException does not need to account
* for that, it simply copies the arrays.
*
* JDBC drivers should always use the constructor that specifies long[] and
diff --git a/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java b/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java
index 20da9aa..5446c6d 100644
--- a/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java
+++ b/jdk/src/java.sql/share/classes/java/sql/CallableStatement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1145,7 +1145,7 @@
* Java <code>Object</code> types to SQL types. The given argument
* will be converted to the corresponding SQL type before being
* sent to the database.
- * <p>Note that this method may be used to pass datatabase-
+ * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java
* type.
*
@@ -1882,7 +1882,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>InputStream</code> object. The <code>inputstream</code> must contain the number
+ * Sets the designated parameter to a {@code InputStream} object.
+ * The <code>Inputstream</code> must contain the number
* of characters specified by length, otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@@ -1899,8 +1900,8 @@
* @param length the number of bytes in the parameter data.
* @throws SQLException if parameterName does not correspond to a named
* parameter; if the length specified
- * is less than zero; if the number of bytes in the inputstream does not match
- * the specified length; if a database access error occurs or
+ * is less than zero; if the number of bytes in the {@code InputStream}
+ * does not match the specified length; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
* this method
@@ -2378,7 +2379,7 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>InputStream</code> object.
+ * Sets the designated parameter to a {@code InputStream} object.
* This method differs from the <code>setBinaryStream (int, InputStream)</code>
* method because it informs the driver that the parameter value should be
* sent to the server as a <code>BLOB</code>. When the <code>setBinaryStream</code> method is used,
@@ -2430,7 +2431,7 @@
/**
- *<p>Returns an object representing the value of OUT parameter
+ * Returns an object representing the value of OUT parameter
* {@code parameterIndex} and will convert from the
* SQL type of the parameter to the requested Java data type, if the
* conversion is supported. If the conversion is not
@@ -2459,7 +2460,7 @@
/**
- *<p>Returns an object representing the value of OUT parameter
+ * Returns an object representing the value of OUT parameter
* {@code parameterName} and will convert from the
* SQL type of the parameter to the requested Java data type, if the
* conversion is supported. If the conversion is not
@@ -2490,7 +2491,7 @@
//------------------------- JDBC 4.2 -----------------------------------
/**
- * <p>Sets the value of the designated parameter with the given object.
+ * Sets the value of the designated parameter with the given object.
*
* If the second argument is an {@code InputStream} then the stream
* must contain the number of bytes specified by scaleOrLength.
diff --git a/jdk/src/java.sql/share/classes/java/sql/Connection.java b/jdk/src/java.sql/share/classes/java/sql/Connection.java
index ea191cd..ac73fde 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Connection.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Connection.java
@@ -274,7 +274,7 @@
* <code>close</code> method. If the <code>close</code> method is called
* and there is an active transaction, the results are implementation-defined.
*
- * @exception SQLException SQLException if a database access error occurs
+ * @exception SQLException if a database access error occurs
*/
void close() throws SQLException;
@@ -335,7 +335,7 @@
*
* @return <code>true</code> if this <code>Connection</code> object
* is read-only; <code>false</code> otherwise
- * @exception SQLException SQLException if a database access error occurs
+ * @exception SQLException if a database access error occurs
* or this method is called on a closed connection
*/
boolean isReadOnly() throws SQLException;
@@ -492,7 +492,7 @@
* returns <code>null</code> until a new warning is
* reported for this <code>Connection</code> object.
*
- * @exception SQLException SQLException if a database access error occurs
+ * @exception SQLException if a database access error occurs
* or this method is called on a closed connection
*/
void clearWarnings() throws SQLException;
@@ -632,7 +632,7 @@
* this <code>Connection</code> object. The type map will be used for the
* custom mapping of SQL structured types and distinct types.
* <p>
- * You must set the the values for the <code>TypeMap</code> prior to
+ * You must set the values for the <code>TypeMap</code> prior to
* callng <code>setMap</code> as a JDBC driver may create an internal copy
* of the <code>TypeMap</code>:
*
@@ -662,7 +662,7 @@
* Changes the default holdability of <code>ResultSet</code> objects
* created using this <code>Connection</code> object to the given
* holdability. The default holdability of <code>ResultSet</code> objects
- * can be be determined by invoking
+ * can be determined by invoking
* {@link DatabaseMetaData#getResultSetHoldability}.
*
* @param holdability a <code>ResultSet</code> holdability constant; one of
diff --git a/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java b/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
index 07b7475..937e58e 100644
--- a/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
+++ b/jdk/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1216,7 +1216,7 @@
* <code>PROCEDURE_CAT</code>, <code>PROCEDURE_SCHEM</code>,
* <code>PROCEDURE_NAME</code> and <code>SPECIFIC_ NAME</code>.
*
- * <P>Each procedure description has the the following columns:
+ * <P>Each procedure description has the following columns:
* <OL>
* <LI><B>PROCEDURE_CAT</B> String {@code =>} procedure catalog (may be <code>null</code>)
* <LI><B>PROCEDURE_SCHEM</B> String {@code =>} procedure schema (may be <code>null</code>)
@@ -1487,7 +1487,7 @@
* <LI><B>TABLE_TYPE</B> String {@code =>} table type. Typical types are "TABLE",
* "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
* "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
- * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the table
+ * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the table (may be {@code null})
* <LI><B>TYPE_CAT</B> String {@code =>} the types catalog (may be <code>null</code>)
* <LI><B>TYPE_SCHEM</B> String {@code =>} the types schema (may be <code>null</code>)
* <LI><B>TYPE_NAME</B> String {@code =>} type name (may be <code>null</code>)
@@ -1710,7 +1710,7 @@
* <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>)
* <LI><B>GRANTEE</B> String {@code =>} grantee of access
* <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT,
- * INSERT, UPDATE, REFRENCES, ...)
+ * INSERT, UPDATE, REFERENCES, ...)
* <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted
* to grant to others; "NO" if not; <code>null</code> if unknown
* </OL>
@@ -1755,7 +1755,7 @@
* <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>)
* <LI><B>GRANTEE</B> String {@code =>} grantee of access
* <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT,
- * INSERT, UPDATE, REFRENCES, ...)
+ * INSERT, UPDATE, REFERENCES, ...)
* <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted
* to grant to others; "NO" if not; <code>null</code> if unknown
* </OL>
@@ -2509,7 +2509,7 @@
* <LI><B>TYPE</B> short {@code =>} index type:
* <UL>
* <LI> tableIndexStatistic - this identifies table statistics that are
- * returned in conjuction with a table's index descriptions
+ * returned in conjunction with a table's index descriptions
* <LI> tableIndexClustered - this is a clustered index
* <LI> tableIndexHashed - this is a hashed index
* <LI> tableIndexOther - this is some other style of index
@@ -2524,7 +2524,7 @@
* <LI><B>CARDINALITY</B> long {@code =>} When TYPE is tableIndexStatistic, then
* this is the number of rows in the table; otherwise, it is the
* number of unique values in the index.
- * <LI><B>PAGES</B> long {@code =>} When TYPE is tableIndexStatisic then
+ * <LI><B>PAGES</B> long {@code =>} When TYPE is tableIndexStatistic then
* this is the number of pages used for the table, otherwise it
* is the number of pages used for the current index.
* <LI><B>FILTER_CONDITION</B> String {@code =>} Filter condition, if any.
@@ -2858,7 +2858,7 @@
* @return <code>true</code> if a <code>CallableStatement</code> object
* can return multiple <code>ResultSet</code> objects
* simultaneously; <code>false</code> otherwise
- * @exception SQLException if a datanase access error occurs
+ * @exception SQLException if a database access error occurs
* @since 1.4
*/
boolean supportsMultipleOpenResults() throws SQLException;
@@ -3302,7 +3302,7 @@
* <code>FUNCTION_NAME</code> and
* <code>SPECIFIC_ NAME</code>.
*
- * <P>Each function description has the the following columns:
+ * <P>Each function description has the following columns:
* <OL>
* <LI><B>FUNCTION_CAT</B> String {@code =>} function catalog (may be <code>null</code>)
* <LI><B>FUNCTION_SCHEM</B> String {@code =>} function schema (may be <code>null</code>)
diff --git a/jdk/src/java.sql/share/classes/java/sql/NClob.java b/jdk/src/java.sql/share/classes/java/sql/NClob.java
index f3d535c..b7ecd3d 100644
--- a/jdk/src/java.sql/share/classes/java/sql/NClob.java
+++ b/jdk/src/java.sql/share/classes/java/sql/NClob.java
@@ -25,8 +25,6 @@
package java.sql;
-import java.sql.Clob;
-
/**
* The mapping in the Java™ programming language
* for the SQL <code>NCLOB</code> type.
@@ -34,7 +32,7 @@
* that stores a Character Large Object using the National Character Set
* as a column value in a row of a database table.
* <P>The <code>NClob</code> interface extends the <code>Clob</code> interface
- * which provides provides methods for getting the
+ * which provides methods for getting the
* length of an SQL <code>NCLOB</code> value,
* for materializing a <code>NCLOB</code> value on the client, and for
* searching for a substring or <code>NCLOB</code> object within a
diff --git a/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java b/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java
index f33fd10..10da026 100644
--- a/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java
+++ b/jdk/src/java.sql/share/classes/java/sql/PreparedStatement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -415,7 +415,7 @@
* will be converted to the corresponding SQL type before being
* sent to the database.
*
- * <p>Note that this method may be used to pass datatabase-
+ * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java
* type.
*
@@ -838,7 +838,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>InputStream</code> object. The inputstream must contain the number
+ * Sets the designated parameter to a <code>InputStream</code> object.
+ * The {@code Inputstream} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@@ -854,8 +855,8 @@
* @throws SQLException if parameterIndex does not correspond to a parameter
* marker in the SQL statement; if a database access error occurs;
* this method is called on a closed <code>PreparedStatement</code>;
- * if the length specified
- * is less than zero or if the number of bytes in the inputstream does not match
+ * if the length specified
+ * is less than zero or if the number of bytes in the {@code InputStream} does not match
* the specified length.
* @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
*
diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLException.java b/jdk/src/java.sql/share/classes/java/sql/SQLException.java
index 0076679..95276a0 100644
--- a/jdk/src/java.sql/share/classes/java/sql/SQLException.java
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
* <P>Each <code>SQLException</code> provides several kinds of information:
* <UL>
* <LI> a string describing the error. This is used as the Java Exception
- * message, available via the method <code>getMesasge</code>.
+ * message, available via the method <code>getMessage</code>.
* <LI> a "SQLstate" string, which follows either the XOPEN SQLstate conventions
* or the SQL:2003 conventions.
* The values of the SQLState string are described in the appropriate spec.
diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java b/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java
index 1224738..a6fb269 100644
--- a/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
* <code>DriverManager.setLogStream</code> (deprecated) method,
* {@code SyncFactory.setJNDIContext} method,
* {@code SyncFactory.setLogger} method,
- * {@code Connection.setNetworktimeout} method,
+ * {@code Connection.setNetworkTimeout} method,
* or the <code>Connection.abort</code> method.
* If there is no <code>SQLPermission</code> object, these methods
* throw a <code>java.lang.SecurityException</code> as a runtime exception.
diff --git a/jdk/src/java.sql/share/classes/java/sql/SQLXML.java b/jdk/src/java.sql/share/classes/java/sql/SQLXML.java
index b7e5522..680ab7d 100644
--- a/jdk/src/java.sql/share/classes/java/sql/SQLXML.java
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLXML.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -174,7 +174,7 @@
* reading APIs are called: getBinaryStream(), getCharacterStream(), getSource(), and getString().
* Implementations may also change the state to not writable when this occurs.
* <p>
- * The state moves from writable to not writeable once free() or any of the
+ * The state moves from writable to not writable once free() or any of the
* writing APIs are called: setBinaryStream(), setCharacterStream(), setResult(), and setString().
* Implementations may also change the state to not readable when this occurs.
*
@@ -192,7 +192,7 @@
{
/**
* This method closes this object and releases the resources that it held.
- * The SQL XML object becomes invalid and neither readable or writeable
+ * The SQL XML object becomes invalid and neither readable or writable
* when this method is called.
*
* After <code>free</code> has been called, any attempt to invoke a
@@ -231,7 +231,7 @@
* The behavior of this method is the same as ResultSet.updateBinaryStream()
* when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
* <p>
- * The SQL XML object becomes not writeable when this method is called and
+ * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation.
*
* @return a stream to which data can be written.
@@ -277,7 +277,7 @@
* The behavior of this method is the same as ResultSet.updateCharacterStream()
* when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
* <p>
- * The SQL XML object becomes not writeable when this method is called and
+ * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation.
*
* @return a stream to which data can be written.
@@ -325,7 +325,7 @@
* The behavior of this method is the same as ResultSet.updateString()
* when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
* <p>
- * The SQL XML object becomes not writeable when this method is called and
+ * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation.
*
* @param value the XML value
@@ -387,7 +387,7 @@
* <p>
* The systemID of the Result is implementation dependent.
* <p>
- * The SQL XML object becomes not writeable when this method is called and
+ * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation.
* <p>
* Note that SAX is a callback architecture and the returned
diff --git a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
index 71c5a3e..06ca264 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -590,7 +590,7 @@
* the provided instant
* @exception NullPointerException if {@code instant} is null.
* @exception IllegalArgumentException if the instant is too large to
- * represent as a {@code Timesamp}
+ * represent as a {@code Timestamp}
* @since 1.8
*/
public static Timestamp from(Instant instant) {
diff --git a/jdk/src/java.sql/share/classes/java/sql/Types.java b/jdk/src/java.sql/share/classes/java/sql/Types.java
index f12ff0d..9f613ea 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Types.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Types.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,7 +243,7 @@
public final static int REF = 2006;
/**
- * The constant in the Java programming language, somtimes referred to
+ * The constant in the Java programming language, sometimes referred to
* as a type code, that identifies the generic SQL type <code>DATALINK</code>.
*
* @since 1.4
@@ -251,7 +251,7 @@
public final static int DATALINK = 70;
/**
- * The constant in the Java programming language, somtimes referred to
+ * The constant in the Java programming language, sometimes referred to
* as a type code, that identifies the generic SQL type <code>BOOLEAN</code>.
*
* @since 1.4
diff --git a/jdk/src/java.sql/share/classes/javax/sql/RowSet.java b/jdk/src/java.sql/share/classes/javax/sql/RowSet.java
index 2f7b0ab..264e6e3 100644
--- a/jdk/src/java.sql/share/classes/javax/sql/RowSet.java
+++ b/jdk/src/java.sql/share/classes/javax/sql/RowSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,9 +66,9 @@
* changes to its data while it is disconnected and then send the changes back
* to the original source of the data, but it must reestablish a connection to do so.
* <P>
- * A disconnected rowset may have a reader (a <code>RowSetReader</code> object)
+ * A disconnected rowset may have a {@code Reader} (a <code>RowSetReader</code> object)
* and a writer (a <code>RowSetWriter</code> object) associated with it.
- * The reader may be implemented in many different ways to populate a rowset
+ * The {@code Reader} may be implemented in many different ways to populate a rowset
* with data, including getting data from a non-relational data source. The
* writer can also be implemented in many different ways to propagate changes
* made to the rowset's data back to the underlying data source.
@@ -727,7 +727,7 @@
/**
* Sets the designated parameter in this <code>RowSet</code> object's command
- * to the given <code>java.math.BigDeciaml</code> value.
+ * to the given {@code java.math.BigDecimal} value.
* The driver converts this to
* an SQL <code>NUMERIC</code> value before sending it to the database.
*
@@ -974,7 +974,7 @@
* standard interface.
*
* @param parameterIndex the first parameter is 1, the second is 2, ...
- * @param reader the <code>Reader</code> object that contains the UNICODE data
+ * @param reader the {@code Reader} object that contains the UNICODE data
* to be set
* @param length the number of characters in the stream
* @exception SQLException if a database access error occurs
@@ -984,7 +984,7 @@
int length) throws SQLException;
/**
- * Sets the designated parameter to the given <code>Reader</code>
+ * Sets the designated parameter to the given {@code Reader}
* object, which is the given number of characters long.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
* parameter, it may be more practical to send it via a
@@ -1112,7 +1112,7 @@
/**
* Sets the designated parameter in this <code>RowSet</code> object's command
- * to the given <code>Reader</code>
+ * to the given {@code Reader}
* object.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
* parameter, it may be more practical to send it via a
@@ -1139,7 +1139,7 @@
java.io.Reader reader) throws SQLException;
/**
- * Sets the designated parameter to the given <code>Reader</code>
+ * Sets the designated parameter to the given {@code Reader}
* object.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
* parameter, it may be more practical to send it via a
@@ -1167,8 +1167,8 @@
/**
* Sets the designated parameter in this <code>RowSet</code> object's command
- * to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
+ * to a {@code Reader} object. The
+ * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to
* the national character set in the database.
@@ -1200,7 +1200,8 @@
*
* If the second argument is an <code>InputStream</code> then the stream must contain
* the number of bytes specified by scaleOrLength. If the second argument is a
- * <code>Reader</code> then the reader must contain the number of characters specified * by scaleOrLength. If these conditions are not true the driver will generate a
+ * {@code Reader} then the {@code Reader} must contain the number of characters specified
+ * by scaleOrLength. If these conditions are not true the driver will generate a
* <code>SQLException</code> when the prepared statement is executed.
*
* <p>The given Java object will be converted to the targetSqlType
@@ -1216,7 +1217,7 @@
* value of the corresponding SQL type.
*
*
- * <p>Note that this method may be used to pass datatabase-specific
+ * <p>Note that this method may be used to pass database-specific
* abstract data types.
*
* @param parameterIndex the first parameter is 1, the second is 2, ...
@@ -1227,9 +1228,9 @@
* @param scaleOrLength for <code>java.sql.Types.DECIMAL</code>
* or <code>java.sql.Types.NUMERIC types</code>,
* this is the number of digits after the decimal point. For
- * Java Object types <code>InputStream</code> and <code>Reader</code>,
+ * Java Object types <code>InputStream</code> and {@code Reader},
* this is the length
- * of the data in the stream or reader. For all other types,
+ * of the data in the stream or {@code Reader}. For all other types,
* this value will be ignored.
* @exception SQLException if a database access error occurs
* @see java.sql.Types
@@ -1255,7 +1256,7 @@
* or <code>Array</code>, the driver should pass it to the database as a
* value of the corresponding SQL type.
* <P>
- * Note that this method may be used to pass datatabase-
+ * Note that this method may be used to pass database-
* specific abstract data types.
*
* @param parameterName the name of the parameter
@@ -1335,7 +1336,7 @@
* will be converted to the corresponding SQL type before being
* sent to the database.
*
- * <p>Note that this method may be used to pass datatabase-
+ * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java
* type.
*
@@ -1373,7 +1374,7 @@
* given Java object to its standard SQL mapping before sending it
* to the database.
*
- * <p>Note that this method may be used to pass datatabase-specific
+ * <p>Note that this method may be used to pass database-specific
* abstract data types by using a driver-specific Java type.
*
* If the object is of a class implementing <code>SQLData</code>,
@@ -1420,7 +1421,8 @@
void setBlob (int i, Blob x) throws SQLException;
/**
- * Sets the designated parameter to a <code>InputStream</code> object. The inputstream must contain the number
+ * Sets the designated parameter to a <code>InputStream</code> object.
+ * The <code>InputStream</code> must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@@ -1437,7 +1439,7 @@
* this method is called on a closed <code>PreparedStatement</code>,
* if parameterIndex does not correspond
* to a parameter marker in the SQL statement, if the length specified
- * is less than zero or if the number of bytes in the inputstream does not match
+ * is less than zero or if the number of bytes in the <code>InputStream</code> does not match
* the specified length.
* @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
*
@@ -1474,7 +1476,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>InputStream</code> object. The <code>inputstream</code> must contain the number
+ * Sets the designated parameter to a <code>InputStream</code> object.
+ * The "{@code InputStream} must contain the number
* of characters specified by length, otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@@ -1491,7 +1494,7 @@
* @param length the number of bytes in the parameter data.
* @throws SQLException if parameterIndex does not correspond
* to a parameter marker in the SQL statement, or if the length specified
- * is less than zero; if the number of bytes in the inputstream does not match
+ * is less than zero; if the number of bytes in the <code>InputStream</code> does not match
* the specified length; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support
@@ -1554,7 +1557,8 @@
void setClob (int i, Clob x) throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number
+ * Sets the designated parameter to a {@code Reader} object.
+ * The {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed.
*This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@@ -1576,7 +1580,7 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object.
+ * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to
* the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
@@ -1600,7 +1604,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain the number
+ * Sets the designated parameter to a {@code Reader} object. The
+ * {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@@ -1639,7 +1644,7 @@
void setClob (String parameterName, Clob x) throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object.
+ * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to
* the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
@@ -1859,10 +1864,10 @@
* outstanding updates, they are ignored.
* <P>
* If this <code>RowSet</code> object does not maintain a continuous connection
- * with its source of data, it may use a reader (a <code>RowSetReader</code>
- * object) to fill itself with data. In this case, a reader will have been
+ * with its source of data, it may use a {@code Reader} (a <code>RowSetReader</code>
+ * object) to fill itself with data. In this case, a {@code Reader} will have been
* registered with this <code>RowSet</code> object, and the method
- * <code>execute</code> will call on the reader's <code>readData</code>
+ * <code>execute</code> will call on the {@code Reader}'s <code>readData</code>
* method as part of its implementation.
*
* @exception SQLException if a database access error occurs or any of the
@@ -1987,8 +1992,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
+ * Sets the designated parameter to a {@code Reader} object. The
+ * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to
* the national character set in the database.
* @param parameterIndex of the first parameter is 1, the second is 2, ...
@@ -2002,8 +2007,8 @@
void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
+ * Sets the designated parameter to a {@code Reader} object. The
+ * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to
* the national character set in the database.
* @param parameterName the name of the column to be set
@@ -2018,8 +2023,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The
- * <code>Reader</code> reads the data till end-of-file is reached. The
+ * Sets the designated parameter to a {@code Reader} object. The
+ * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to
* the national character set in the database.
@@ -2055,7 +2060,8 @@
void setNClob(String parameterName, NClob value) throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain the number
+ * Sets the designated parameter to a {@code Reader} object.
+ * The {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@@ -2081,7 +2087,7 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object.
+ * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to
* the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
@@ -2105,7 +2111,8 @@
throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number
+ * Sets the designated parameter to a {@code Reader} object.
+ * The {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@@ -2142,7 +2149,7 @@
void setNClob(int parameterIndex, NClob value) throws SQLException;
/**
- * Sets the designated parameter to a <code>Reader</code> object.
+ * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to
* the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 774b43a..494e4e0 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -217,6 +217,9 @@
java/security/KeyPairGenerator/SolarisShortDSA.java solaris-all
sun/security/tools/keytool/standard.sh solaris-all
+# 8049312
+com/sun/crypto/provider/Cipher/AES/CICO.java generic-all
+
############################################################################
# jdk_sound
@@ -257,7 +260,7 @@
# 8031555
com/sun/jdi/JdbMethodExitTest.sh generic-all
-# 8041934
+# 8043571
com/sun/jdi/RepStep.java generic-all
# 8044419
@@ -284,13 +287,15 @@
# 8033104
sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
-# 8041989
-sun/tools/jstatd/TestJstatdDefaults.java generic-all
-
-# 8037285
-sun/tools/jstatd/TestJstatdServer.java generic-all
+# 8027668
+sun/tools/jstatd/TestJstatdDefaults.java generic-all
+sun/tools/jstatd/TestJstatdServer.java generic-all
+sun/tools/jstatd/TestJstatdPort.java generic-all
# 8046355
sun/tools/jstatd/TestJstatdExternalRegistry.java generic-all
+# 6456333
+sun/tools/jps/TestJpsJarRelative.java generic-all
+
############################################################################
diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
index e6cb169..7288a09 100644
--- a/jdk/test/TEST.ROOT
+++ b/jdk/test/TEST.ROOT
@@ -8,7 +8,7 @@
othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces
# Tests that cannot run concurrently
-exclusiveAccess.dirs=java/rmi/Naming java/util/Currency java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
+exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
# Group definitions
groups=TEST.groups [closed/TEST.groups]
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java
new file mode 100644
index 0000000..811724b
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Random;
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.CipherOutputStream;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+
+/**
+ * @test
+ * @bug 8043836
+ * @summary Test AES ciphers with different modes and padding schemes (ECB mode
+ * doesn't use IV). The test tries 3 different read methods of
+ * CipherInputStream.
+ */
+public class CICO {
+ private static final String ALGORITHM = "aEs";
+ private static final String[] MODES = { "PCBC", "ECb", "cbC", "cFB",
+ "cFB24", "cFB32", "Cfb40", "CFB72", "OfB", "OfB20", "OfB48",
+ "OfB56", "OFB64", "OFB112", "CFB112", "pCbC" };
+ private static final String[] PADDING = { "noPadding", "pkcs5padding" };
+ private static final String PROVIDER = "SunJCE";
+ private static final int NREADS = 3;
+ private static final int KEY_LENGTH = 128;
+
+ private final byte[] plainText = new byte[1600000];
+
+
+ public static void main(String argv[]) throws Exception {
+ CICO test = new CICO();
+ for (String mode : MODES) {
+ for (String pad : PADDING) {
+ for (int m = 0; m < NREADS; m++) {
+ test.runTest(ALGORITHM, mode, pad, m);
+ }
+ }
+ }
+ }
+
+ public void runTest(String algo, String mo, String pad, int whichRead) throws Exception {
+ Cipher ci1 = null;
+ Cipher ci2 = null;
+ byte[] iv = null;
+ AlgorithmParameterSpec aps = null;
+ SecretKey key = null;
+
+ try {
+ // Do initialization
+ Random rdm = new Random();
+ rdm.nextBytes(plainText);
+ KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
+ if (!kg.getAlgorithm().equals(algo)) {
+ throw new RuntimeException("Unexpected algorithm <"
+ + kg.getAlgorithm() + ">, expected value is <" + algo
+ + ">");
+ }
+
+ kg.init(KEY_LENGTH);
+ key = kg.generateKey();
+
+ ci1 = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+
+ if (mo.equalsIgnoreCase("ECB")) {
+ ci1.init(Cipher.ENCRYPT_MODE, key);
+ } else {
+ ci1.init(Cipher.ENCRYPT_MODE, key, aps);
+ }
+
+ if (!mo.equalsIgnoreCase("ECB")) {
+ iv = ci1.getIV();
+ aps = new IvParameterSpec(iv);
+ } else {
+ aps = null;
+ }
+
+ ci2 = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+ if (mo.equalsIgnoreCase("ECB")) {
+ ci2.init(Cipher.DECRYPT_MODE, key);
+ } else {
+ ci2.init(Cipher.DECRYPT_MODE, key, aps);
+ }
+
+ ByteArrayInputStream baInput = new ByteArrayInputStream(plainText);
+ ByteArrayOutputStream baOutput = new ByteArrayOutputStream();
+ try (CipherInputStream ciInput = new CipherInputStream(baInput, ci1);
+ CipherOutputStream ciOutput = new CipherOutputStream(
+ baOutput, ci2)) {
+ // According to specification, CipherInputStream does not support the
+ // mark and reset methods
+ if (ciInput.markSupported()) {
+ throw new RuntimeException(
+ "CipherInputStream unexpectedly supports the mark and reset methods");
+ }
+
+ // Read from the input and write to the output using 2 types
+ // of buffering : byte[] and int
+ switch (whichRead) {
+ case 0:
+ int buffer0 = ciInput.read();
+ while (buffer0 != -1) {
+ ciOutput.write(buffer0);
+ buffer0 = ciInput.read();
+ }
+ break;
+ case 1:
+ byte[] buffer1 = new byte[20];
+ int len1 = ciInput.read(buffer1);
+ while (len1 != -1) {
+ ciOutput.write(buffer1, 0, len1);
+ len1 = ciInput.read(buffer1);
+ }
+ break;
+ case NREADS - 1:
+ byte[] buffer2 = new byte[ci1
+ .getOutputSize(plainText.length)];
+ int offset2 = 0;
+ int len2 = 0;
+ while (len2 != -1) {
+ len2 = ciInput.read(buffer2, offset2, buffer2.length
+ - offset2);
+ offset2 += len2;
+ }
+ ciOutput.write(buffer2, 0, buffer2.length);
+ break;
+ }
+ }
+
+ // Get the output
+ byte[] recoveredText = new byte[baOutput.size()];
+ recoveredText = baOutput.toByteArray();
+ if (!java.util.Arrays.equals(plainText, recoveredText)) {
+ throw new RuntimeException(
+ "Original text is not equal with recovered text, with "
+ + algo + "/" + mo + "/" + pad + "/" + whichRead);
+ }
+
+ // Compare input and output
+
+ } catch (NoSuchAlgorithmException e) {
+ //OFB20 is for negative testing
+ if (!mo.equalsIgnoreCase("OFB20")) {
+ System.out.println("Unexpected NoSuchAlgorithmException with "
+ + algo + "/" + mo + "/" + pad + "/" + whichRead);
+ throw new RuntimeException("Test failed!");
+ }
+ } catch (IOException | NoSuchProviderException | NoSuchPaddingException
+ | InvalidKeyException | InvalidAlgorithmParameterException e) {
+ System.out.println("Unexpected Exception with "
+ + algo + "/" + mo + "/" + pad + "/" + whichRead);
+ System.out.println("Test failed!");
+ throw e;
+ }
+ }
+}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java
new file mode 100644
index 0000000..808f3e2
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+import java.util.Random;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.IvParameterSpec;
+
+
+/**
+ * @test
+ * @bug 8043836
+ * @summary Test AES ciphers with 4 different modes with NoPadding. Check if
+ * data before encryption and after decryption is the same.
+ */
+
+public class CTR {
+
+ private static final String ALGORITHM = "AES";
+
+ private static final String PROVIDER = "SunJCE";
+
+ private static final String[] MODES = {"CTR","CFB24","OFB32","GCM"};
+
+ private static final String PADDING = "NoPadding";
+
+
+ private static final int KEY_LENGTH = 128;
+
+ public static void main(String argv[]) throws Exception {
+ CTR test = new CTR();
+ for (String mode : MODES) {
+ test.runTest(ALGORITHM, mode, PADDING);
+ }
+ }
+
+
+ public void runTest(String algo, String mo, String pad) throws Exception {
+ Cipher ci = null;
+ byte[] iv = null;
+ AlgorithmParameterSpec aps = null;
+ SecretKey key = null;
+
+ try {
+ Random rdm = new Random();
+ byte[] plainText;
+
+ ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+ KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
+ kg.init(KEY_LENGTH);
+ key = kg.generateKey();
+
+ for (int i = 0; i < 15; i++) {
+ plainText = new byte[1600 + i + 1];
+ rdm.nextBytes(plainText);
+
+ if (!mo.equalsIgnoreCase("GCM")) {
+ ci.init(Cipher.ENCRYPT_MODE, key, aps);
+ } else {
+ ci.init(Cipher.ENCRYPT_MODE, key);
+ }
+
+ byte[] cipherText = new byte[ci.getOutputSize(plainText.length)];
+ int offset = ci.update(plainText, 0, plainText.length,
+ cipherText, 0);
+
+ ci.doFinal(cipherText, offset);
+
+ if (!mo.equalsIgnoreCase("ECB")) {
+ iv = ci.getIV();
+ aps = new IvParameterSpec(iv);
+ } else {
+ aps = null;
+ }
+
+ if (!mo.equalsIgnoreCase("GCM")) {
+ ci.init(Cipher.DECRYPT_MODE, key, aps);
+ } else {
+ ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters());
+ }
+
+ byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)];
+ int len = ci.doFinal(cipherText, 0, cipherText.length,
+ recoveredText);
+ byte[] tmp = new byte[len];
+
+ for (int j = 0; j < len; j++) {
+ tmp[j] = recoveredText[j];
+ }
+ Arrays.toString(plainText);
+ if (!java.util.Arrays.equals(plainText, tmp)) {
+ System.out.println("Original: ");
+ dumpBytes(plainText);
+ System.out.println("Recovered: ");
+ dumpBytes(tmp);
+ throw new RuntimeException("Original text is not equal with recovered text, with mode:" + mo);
+ }
+ }
+ } catch (NoSuchAlgorithmException | NoSuchProviderException | NoSuchPaddingException
+ | InvalidKeyException | InvalidAlgorithmParameterException
+ | ShortBufferException | IllegalBlockSizeException
+ | BadPaddingException e) {
+ System.out.println("Test failed!");
+ throw e;
+ }
+ }
+
+ private void dumpBytes(byte[] bytes){
+ for (byte b : bytes){
+ System.out.print(Integer.toHexString(b));
+ }
+ System.out.println();
+ }
+}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java
new file mode 100644
index 0000000..6023ec7
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Random;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.IvParameterSpec;
+
+/**
+ * @test
+ * @bug 8043836
+ * @summary Test AES ciphers with different modes and padding schemes (ECB mode
+ * doesn't use IV). The test tries 3 different read methods of
+ * CipherInputStream.
+ */
+public class Padding {
+
+ private static final String ALGORITHM = "AES";
+ private static final String PROVIDER = "SunJCE";
+ private static final String[] MODES = { "ECb", "CbC", "PCBC", "OFB",
+ "OFB150", "cFB", "CFB7", "cFB8", "cFB16", "cFB24", "cFB32",
+ "Cfb40", "cfB48", "cfB56", "cfB64", "cfB72", "cfB80", "cfB88",
+ "cfB96", "cfb104", "cfB112", "cfB120", "OFB8", "OFB16", "OFB24",
+ "OFB32", "OFB40", "OFB48", "OFB56", "OFB64", "OFB72", "OFB80",
+ "OFB88", "OFB96", "OFB104", "OFB112", "OFB120", "GCM" };
+ private static final String PADDING = "PKCS5Padding";
+ private static final int KEY_LENGTH = 128;
+
+ public static void main(String argv[]) throws Exception {
+ Padding test = new Padding();
+ for (String mode : MODES) {
+ test.runTest(ALGORITHM, mode, PADDING);
+ }
+ }
+
+ public void runTest(String algo, String mo, String pad) throws Exception {
+ Cipher ci = null;
+ byte[] iv = null;
+ AlgorithmParameterSpec aps = null;
+ SecretKey key = null;
+ try {
+ Random rdm = new Random();
+ byte[] plainText;
+
+ ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+ KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
+ kg.init(KEY_LENGTH);
+ key = kg.generateKey();
+
+ for (int i = 0; i < 15; i++) {
+ plainText = new byte[1600 + i + 1];
+ rdm.nextBytes(plainText);
+
+ if (!mo.equalsIgnoreCase("GCM")) {
+ ci.init(Cipher.ENCRYPT_MODE, key, aps);
+ } else {
+ ci.init(Cipher.ENCRYPT_MODE, key);
+ }
+
+ byte[] cipherText = new byte[ci.getOutputSize(plainText.length)];
+ int offset = ci.update(plainText, 0, plainText.length,
+ cipherText, 0);
+ ci.doFinal(cipherText, offset);
+
+ if (!mo.equalsIgnoreCase("ECB")) {
+ iv = ci.getIV();
+ aps = new IvParameterSpec(iv);
+ } else {
+ aps = null;
+ }
+
+ if (!mo.equalsIgnoreCase("GCM")) {
+ ci.init(Cipher.DECRYPT_MODE, key, aps);
+ } else {
+ ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters());
+ }
+
+ byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)];
+ int len = ci.doFinal(cipherText, 0, cipherText.length,
+ recoveredText);
+ byte[] tmp = new byte[len];
+
+ for (int j = 0; j < len; j++) {
+ tmp[j] = recoveredText[j];
+ }
+
+ if (!java.util.Arrays.equals(plainText, tmp)) {
+ System.out.println("Original: ");
+ dumpBytes(plainText);
+ System.out.println("Recovered: ");
+ dumpBytes(tmp);
+ throw new RuntimeException(
+ "Original text is not equal with recovered text, with mode:"
+ + mo);
+ }
+ }
+ } catch (NoSuchAlgorithmException e) {
+ //CFB7 and OFB150 are for negative testing
+ if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("OFB150")) {
+ System.out
+ .println("Unexpected NoSuchAlgorithmException with mode: "
+ + mo);
+ throw new RuntimeException("Test failed!");
+ }
+ } catch ( NoSuchProviderException | NoSuchPaddingException
+ | InvalidKeyException | InvalidAlgorithmParameterException
+ | ShortBufferException | IllegalBlockSizeException
+ | BadPaddingException e) {
+ System.out.println("Test failed!");
+ throw e;
+ }
+ }
+
+ private void dumpBytes(byte[] bytes) {
+ for (byte b : bytes) {
+ System.out.print(Integer.toHexString(b));
+ }
+
+ System.out.println();
+ }
+}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java
new file mode 100644
index 0000000..190b586
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Random;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.IvParameterSpec;
+
+/**
+ * @test
+ * @bug 8043836
+ * @summary Test AES ciphers with different modes and padding schemes (ECB mode
+ * doesn't use IV).
+ * @author Liwen Wang
+ * @author Parag Salvi
+ */
+public class TestAESCipher {
+
+ private static final String ALGORITHM = "AES";
+ private static final String PROVIDER = "SunJCE";
+ private static final String[] MODES = { "ECb", "CbC", "CTR", "PCBC", "OFB",
+ "OFB150", "cFB", "CFB7", "cFB8", "cFB16", "cFB24", "cFB32",
+ "Cfb40", "cfB48", "cfB56", "cfB64", "cfB72", "cfB80", "cfB88",
+ "cfB96", "cfb104", "cfB112", "cfB120", "OFB8", "OFB16", "OFB24",
+ "OFB32", "OFB40", "OFB48", "OFB56", "OFB64", "OFB72", "OFB80",
+ "OFB88", "OFB96", "OFB104", "OFB112", "OFB120", "GCM" };
+ private static final String[] PADDING = { "NoPadding", "PKCS5Padding" };
+ private static final int KEY_LENGTH = 128;
+
+ public static void main(String argv[]) throws Exception {
+ TestAESCipher test = new TestAESCipher();
+ for (String mode : MODES) {
+ int padKinds = 1;
+ if (mode.equalsIgnoreCase("ECB") || mode.equalsIgnoreCase("PCBC")
+ || mode.equalsIgnoreCase("CBC")) {
+ padKinds = PADDING.length;
+ }
+
+ for (int k = 0; k < padKinds; k++) {
+ test.runTest(ALGORITHM, mode, PADDING[k]);
+ }
+ }
+ }
+
+ public void runTest(String algo, String mo, String pad) throws Exception {
+ Cipher ci = null;
+ byte[] iv = null;
+ AlgorithmParameterSpec aps = null;
+ SecretKey key = null;
+ try {
+ // Initialization
+ Random rdm = new Random();
+ byte[] plainText = new byte[128];
+ rdm.nextBytes(plainText);
+
+ ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+ KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
+ kg.init(KEY_LENGTH);
+ key = kg.generateKey();
+
+ // encrypt
+ if (!mo.equalsIgnoreCase("GCM")) {
+ ci.init(Cipher.ENCRYPT_MODE, key, aps);
+ } else {
+ ci.init(Cipher.ENCRYPT_MODE, key);
+ }
+
+ byte[] cipherText = new byte[ci.getOutputSize(plainText.length)];
+ int offset = ci.update(plainText, 0, plainText.length, cipherText,
+ 0);
+ ci.doFinal(cipherText, offset);
+
+ if (!mo.equalsIgnoreCase("ECB")) {
+ iv = ci.getIV();
+ aps = new IvParameterSpec(iv);
+ } else {
+ aps = null;
+ }
+
+ if (!mo.equalsIgnoreCase("GCM")) {
+ ci.init(Cipher.DECRYPT_MODE, key, aps);
+ } else {
+ ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters());
+ }
+
+ byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)];
+ int len = ci.doFinal(cipherText, 0, cipherText.length,
+ recoveredText);
+ byte[] tmp = new byte[len];
+ System.arraycopy(recoveredText, 0, tmp, 0, len);
+
+ // Comparison
+ if (!java.util.Arrays.equals(plainText, tmp)) {
+ System.out.println("Original: ");
+ dumpBytes(plainText);
+ System.out.println("Recovered: ");
+ dumpBytes(tmp);
+ throw new RuntimeException(
+ "Original text is not equal with recovered text, with mode:"
+ + mo);
+ }
+
+ } catch (NoSuchAlgorithmException e) {
+ //CFB7 and OFB150 are for negative testing
+ if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("OFB150")) {
+ System.out.println("Unexpected NoSuchAlgorithmException with mode: "
+ + mo);
+ throw new RuntimeException("Test failed!");
+ }
+ } catch ( NoSuchProviderException | NoSuchPaddingException
+ | InvalidKeyException | InvalidAlgorithmParameterException
+ | ShortBufferException | IllegalBlockSizeException
+ | BadPaddingException e) {
+ System.out.println("Test failed!");
+ throw e;
+ }
+ }
+
+ private void dumpBytes(byte[] bytes) {
+ for (byte b : bytes) {
+ System.out.print(Integer.toHexString(b));
+ }
+
+ System.out.println();
+ }
+}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java
new file mode 100644
index 0000000..200d38b
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.InvalidParameterSpecException;
+import java.util.Random;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.GCMParameterSpec;
+
+/**
+ * @test
+ * @bug 8043836
+ * @summary Test AES encryption with no padding. Expect the original data length
+ * is the same as the encrypted data.
+ */
+public class TestNonexpanding {
+
+ private static final String ALGORITHM = "AES";
+ private static final String PROVIDER = "SunJCE";
+ private static final String[] MODES = { "ECb", "CbC", "OFB", "OFB150",
+ "cFB", "CFB7", "cFB8", "cFB16", "cFB24", "cFB32", "Cfb40", "cfB48",
+ "cfB56", "cfB64", "cfB72", "cfB80", "cfB88", "cfB96", "cfb104",
+ "cfB112", "cfB120", "GCM" };
+ private static final String PADDING = "NoPadding";
+ private static final int KEY_LENGTH = 128;
+
+ public static void main(String argv[]) throws Exception {
+ TestNonexpanding test = new TestNonexpanding();
+ for (String mode : MODES) {
+ test.runTest(ALGORITHM, mode, PADDING);
+ }
+ }
+
+ public void runTest(String algo, String mo, String pad) throws Exception {
+ Cipher ci = null;
+ SecretKey key = null;
+ try {
+ // Initialization
+ Random rdm = new Random();
+ byte[] plainText = new byte[128];
+ rdm.nextBytes(plainText);
+
+ ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+
+ KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
+ kg.init(KEY_LENGTH);
+ key = kg.generateKey();
+
+ // encrypt
+ ci.init(Cipher.ENCRYPT_MODE, key);
+ byte[] cipherText = new byte[ci.getOutputSize(plainText.length)];
+ int offset = ci.update(plainText, 0, plainText.length, cipherText,
+ 0);
+ ci.doFinal(cipherText, offset);
+
+ // Comparison
+ if (!(plainText.length == cipherText.length)) {
+ // The result of encryption in GCM is a combination of an
+ // authentication tag and cipher text.
+ if (mo.equalsIgnoreCase("GCM")) {
+ GCMParameterSpec spec = ci.getParameters().getParameterSpec(GCMParameterSpec.class);
+ int cipherTextLength = cipherText.length - spec.getTLen()
+ / 8;
+ if (plainText.length == cipherTextLength) {
+ return;
+ }
+ }
+ System.out.println("Original length: " + plainText.length);
+ System.out.println("Cipher text length: " + cipherText.length);
+ throw new RuntimeException("Test failed!");
+ }
+ } catch (NoSuchAlgorithmException e) {
+ //CFB7 and OFB150 are for negative testing
+ if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("OFB150")) {
+ System.out.println("Unexpected NoSuchAlgorithmException with mode: "
+ + mo);
+ throw new RuntimeException("Test failed!");
+ }
+ } catch ( NoSuchProviderException | NoSuchPaddingException
+ | InvalidKeyException | InvalidParameterSpecException
+ | ShortBufferException | IllegalBlockSizeException
+ | BadPaddingException e) {
+ System.out.println("Test failed!");
+ throw e;
+ }
+ }
+}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java
new file mode 100644
index 0000000..bbba223
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Random;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.IvParameterSpec;
+
+/**
+ * @test
+ * @bug 8043836
+ * @summary Test AES ciphers with different modes and padding schemes (ECB mode
+ * doesn't use IV). The test tries 3 different read methods of
+ * CipherInputStream.
+ */
+public class TestSameBuffer {
+
+ private static final String ALGORITHM = "Rijndael";
+ private static final String PROVIDER = "SunJCE";
+ private static final String[] MODES = { "ECb", "CbC", "OFB", "CFB150",
+ "cFB", "CFB7", " cFB8", "cFB16", "cFB24", "cFB32", "Cfb40",
+ "cfB48", " cfB56", "cfB64", "cfB72", "cfB80", "cfB88", "cfB96",
+ "cfb104", "cfB112", "cfB120" };
+ private static final String PADDING = "NoPadding";
+ private static final int KEY_LENGTH = 128;
+
+ public static void main(String argv[]) throws Exception {
+ TestSameBuffer test = new TestSameBuffer();
+ for (String mode : MODES) {
+ test.runTest(ALGORITHM, mode, PADDING);
+ }
+ }
+
+ public void runTest(String algo, String mo, String pad) throws Exception {
+ Cipher ci = null;
+ byte[] iv = null;
+ AlgorithmParameterSpec aps = null;
+ SecretKey key = null;
+ try {
+ // Initialization
+ Random rdm = new Random();
+ byte[] plainText = new byte[128];
+ rdm.nextBytes(plainText);
+
+ // keep the plain text
+ byte[] tmpText = new byte[plainText.length];
+ for (int i = 0; i < plainText.length; i++) {
+ tmpText[i] = plainText[i];
+ }
+
+ ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER);
+
+ KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER);
+ kg.init(KEY_LENGTH);
+ key = kg.generateKey();
+
+ // encrypt
+ ci.init(Cipher.ENCRYPT_MODE, key);
+ int offset = ci
+ .update(plainText, 0, plainText.length, plainText, 0);
+ ci.doFinal(plainText, offset);
+
+ if (!mo.equalsIgnoreCase("ECB")) {
+ iv = ci.getIV();
+ aps = new IvParameterSpec(iv);
+ } else {
+ aps = null;
+ }
+
+ ci.init(Cipher.DECRYPT_MODE, key, aps);
+ byte[] recoveredText = new byte[ci.getOutputSize(plainText.length)];
+ ci.doFinal(plainText, 0, plainText.length, recoveredText);
+
+ // Comparison
+ if (!java.util.Arrays.equals(tmpText, recoveredText)) {
+ System.out.println("Original: ");
+ dumpBytes(plainText);
+ System.out.println("Recovered: ");
+ dumpBytes(recoveredText);
+ throw new RuntimeException(
+ "Original text is not equal with recovered text, with mode:"
+ + mo);
+ }
+
+ } catch (NoSuchAlgorithmException e) {
+ //CFB7 and CFB150 are for negative testing
+ if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("CFB150")) {
+ System.out.println("Unexpected NoSuchAlgorithmException with mode: "
+ + mo);
+ throw new RuntimeException("Test failed!");
+ }
+ } catch (NoSuchProviderException | NoSuchPaddingException
+ | InvalidKeyException | InvalidAlgorithmParameterException
+ | ShortBufferException | IllegalBlockSizeException
+ | BadPaddingException e) {
+ System.out.println("Test failed!");
+ throw e;
+ }
+ }
+
+ private void dumpBytes(byte[] bytes) {
+ for (byte b : bytes) {
+ System.out.print(Integer.toHexString(b));
+ }
+
+ System.out.println();
+ }
+}
diff --git a/jdk/test/com/sun/jdi/ShellScaffold.sh b/jdk/test/com/sun/jdi/ShellScaffold.sh
index dec8ed4..d2fd876 100644
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh
@@ -882,7 +882,7 @@
startDebuggee()
{
- args=$TESTVMOPTS $TESTJAVAOPTS
+ args="$TESTVMOPTS $TESTJAVAOPTS"
if [ ! -z "$args" ] ; then
echo "--Starting debuggee with args from TESTVMOPTS and/or TESTJAVAOPTS: $args"
diff --git a/jdk/test/com/sun/tools/attach/StartManagementAgent.java b/jdk/test/com/sun/tools/attach/StartManagementAgent.java
index adb7104..0bfa9d9 100644
--- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java
+++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java
@@ -40,7 +40,7 @@
* @test
* @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
* @library /lib/testlibrary
- * @run build Application jdk.testlibrary.*
+ * @run build Application SimpleProvider jdk.testlibrary.*
* @run main StartManagementAgent
*/
diff --git a/jdk/test/java/awt/Focus/8044614/TestApplet.java b/jdk/test/java/awt/Focus/8044614/TestApplet.java
new file mode 100644
index 0000000..fbc6fbc
--- /dev/null
+++ b/jdk/test/java/awt/Focus/8044614/TestApplet.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.applet.Applet;
+import java.awt.TextField;
+
+public class TestApplet extends Applet {
+ TextField textField = null;
+
+ public void init() {
+ textField = new TextField(25);
+ add(textField);
+ }
+}
diff --git a/jdk/test/java/awt/Focus/8044614/applet1.html b/jdk/test/java/awt/Focus/8044614/applet1.html
new file mode 100644
index 0000000..5e7e124
--- /dev/null
+++ b/jdk/test/java/awt/Focus/8044614/applet1.html
@@ -0,0 +1,37 @@
+<!--
+ Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>First Applet</title>
+</head>
+ <body>
+ <applet
+ code="TestApplet.class"
+ width="400"
+ height="200"/>
+ </applet>
+ </body>
+</html>
diff --git a/jdk/test/java/awt/Focus/8044614/applet2.html b/jdk/test/java/awt/Focus/8044614/applet2.html
new file mode 100644
index 0000000..3541405
--- /dev/null
+++ b/jdk/test/java/awt/Focus/8044614/applet2.html
@@ -0,0 +1,37 @@
+<!--
+ Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Second Applet</title>
+</head>
+ <body>
+ <applet
+ code="TestApplet.class"
+ width="400"
+ height="200"/>
+ </applet>
+ </body>
+</html>
diff --git a/jdk/test/java/awt/Focus/8044614/bug8044614.html b/jdk/test/java/awt/Focus/8044614/bug8044614.html
new file mode 100644
index 0000000..c07382f
--- /dev/null
+++ b/jdk/test/java/awt/Focus/8044614/bug8044614.html
@@ -0,0 +1,36 @@
+<!--
+ Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<html>
+<head>
+<title>bug8044614</title>
+</head>
+<body>
+
+<h1>bug8044614</h1>
+
+<p> See the dialog box (usually in upper left corner) for instructions</p>
+
+<APPLET CODE="bug8044614.class" WIDTH=200 HEIGHT=200></APPLET>
+</body>
+</html>
diff --git a/jdk/test/java/awt/Focus/8044614/bug8044614.java b/jdk/test/java/awt/Focus/8044614/bug8044614.java
new file mode 100644
index 0000000..9ed3921
--- /dev/null
+++ b/jdk/test/java/awt/Focus/8044614/bug8044614.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8044614
+ * @summary Tests focus transfer between applets in different browser windows
+ * @author Dmitry Markov
+ * @library ../../regtesthelpers
+ * @build Sysout
+ * @run applet/manual=yesno bug8044614.html
+ */
+
+import javax.swing.JApplet;
+
+import test.java.awt.regtesthelpers.Sysout;
+
+public class bug8044614 extends JApplet {
+ public void init() {
+ String[] instructions = {
+ "(1) Go to the test directory test/java/awt/Focus/8044614",
+ "(2) Compile source file: javac TestApplet.java",
+ "(3) Open the \"main.html\" file in the browser",
+ "(4) Click the \"Start First Applet\" link to open the first applet window",
+ "(5) Wait for the applet to start (press \"Run\" to any security alerts that appears)",
+ "(6) Enter \"Hello\" to the text field",
+ "(7) Click the \"Start Second Applet)\" link to open the second applet window",
+ "(8) Wait for the applet to start (press \"Run\" to any security alerts that appears)",
+ "(9) Enter \"World\" to the text field",
+ "(10) Go back to the first applet and make sure you can enter some text to the text field"
+ };
+
+ Sysout.createDialogWithInstructions(instructions);
+ }
+}
+
diff --git a/jdk/test/java/awt/Focus/8044614/main.html b/jdk/test/java/awt/Focus/8044614/main.html
new file mode 100644
index 0000000..d7c3033
--- /dev/null
+++ b/jdk/test/java/awt/Focus/8044614/main.html
@@ -0,0 +1,46 @@
+<!--
+ Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Applet Focus Bug main window</title>
+ <script language="JavaScript">
+ function openWindow(strURL, strWindowName, strWindowFeatures) {
+ var win = window.open(strURL, strWindowName, strWindowFeatures);
+ }
+ </script>
+
+</head>
+ <body>
+ <table>
+ <tr>
+ <td><a href="javascript:openWindow('applet1.html', '', 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, width=400, height=400, top=0, left=0, hide=no')">Start First Applet</a></td>
+ </tr>
+ <tr>
+ <td><a href="javascript:openWindow('applet2.html', '', 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, width=400, height=400, top=0, left=350, hide=no')">Start Second Applet</a></td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java b/jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java
new file mode 100644
index 0000000..3fe6c19
--- /dev/null
+++ b/jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ @test
+ @bug 8047288
+ @summary Tests method isFocusable of Window component. It should be accessed only from EDT
+ @author artem.malinko@oracle.com
+ @library ../../regtesthelpers
+ @build Util
+ @run main WindowIsFocusableAccessByThreadsTest
+*/
+
+import test.java.awt.regtesthelpers.Util;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class WindowIsFocusableAccessByThreadsTest {
+ private static AtomicBoolean testPassed = new AtomicBoolean(true);
+ private static volatile TestFrame frame;
+ private static volatile TestWindow window;
+ private static volatile Button openWindowBtn;
+
+ public static void main(String[] args) {
+ frame = new TestFrame("Test EDT access to Window components");
+ window = new TestWindow(frame);
+
+ SwingUtilities.invokeLater(WindowIsFocusableAccessByThreadsTest::init);
+
+ Util.waitTillShown(frame);
+ Robot robot = Util.createRobot();
+ Util.clickOnComp(frame, robot, 100);
+ Util.clickOnComp(openWindowBtn, robot, 100);
+
+ Util.waitTillShown(window);
+
+ if (!testPassed.get()) {
+ throw new RuntimeException("Window component methods has been accessed not " +
+ "from Event Dispatching Thread");
+ }
+ }
+
+ private static void init() {
+ frame.setSize(400, 400);
+ frame.setLayout(new FlowLayout());
+ openWindowBtn = new Button("open window");
+ openWindowBtn.addActionListener(e -> {
+ window.setSize(100, 100);
+ window.setLocation(400, 100);
+ window.setVisible(true);
+ });
+ frame.add(openWindowBtn);
+ frame.setVisible(true);
+ }
+
+ private static void testThread() {
+ if (!SwingUtilities.isEventDispatchThread()) {
+ testPassed.set(false);
+ }
+ }
+
+ private static class TestWindow extends Window {
+ public TestWindow(Frame owner) {
+ super(owner);
+ }
+
+ // isFocusable method is final and we can't add this test to it.
+ // But it invokes getFocusableWindowState and here we can check
+ // if thread is EDT.
+ @Override
+ public boolean getFocusableWindowState() {
+ testThread();
+ return super.getFocusableWindowState();
+ }
+ }
+
+ private static class TestFrame extends Frame {
+ private TestFrame(String title) throws HeadlessException {
+ super(title);
+ }
+
+ // isFocusable method is final and we can't add this test to it.
+ // But it invokes getFocusableWindowState and here we can check
+ // if thread is EDT.
+ @Override
+ public boolean getFocusableWindowState() {
+ testThread();
+ return super.getFocusableWindowState();
+ }
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java
new file mode 100644
index 0000000..9ff150c
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether an application modal Dialog created with null Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopAppModal1Test
+ */
+
+public class OnTopAppModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ OnTopFDFTest.DialogOwner.NULL_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java
new file mode 100644
index 0000000..21de602
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether an application modal Dialog created with null Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopAppModal2Test
+ */
+
+public class OnTopAppModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ OnTopFDFTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java
new file mode 100644
index 0000000..9cf58c1
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether an application modal Dialog created with hidden Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopAppModal3Test
+ */
+
+public class OnTopAppModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ OnTopFDFTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java
new file mode 100644
index 0000000..0fce109
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether an application modal Dialog created with hidden Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopAppModal4Test
+ */
+
+public class OnTopAppModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ OnTopFDFTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java
new file mode 100644
index 0000000..ef0610a
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether an application modal Dialog created with visible Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopAppModal5Test
+ */
+
+public class OnTopAppModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ OnTopFDFTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java
index 2bab4b2..730d698 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,28 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether an application modal Dialog created with visible
+ * Dialog constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopAppModal6Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopAppModal6Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopDDFTest(
+ Dialog.ModalityType.APPLICATION_MODAL)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDDFTest.java b/jdk/test/java/awt/Modal/OnTop/OnTopDDFTest.java
new file mode 100644
index 0000000..041f863
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDDFTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import java.awt.*;
+import static jdk.testlibrary.Asserts.*;
+
+// DDF: Dialog - Dialog - Frame
+
+public class OnTopDDFTest {
+
+ private volatile TestDialog dialog, leftDialog;
+ private volatile TestFrame rightFrame;
+ private volatile Frame hiddenFrame;
+
+ private static final int delay = 500;
+ private final ExtendedRobot robot;
+
+ boolean setModal;
+
+ Dialog.ModalityType modalityType;
+
+ private OnTopDDFTest(Dialog.ModalityType modType,
+ boolean modal) throws Exception {
+ modalityType = modType;
+ setModal = modal;
+
+ robot = new ExtendedRobot();
+ EventQueue.invokeLater(this::createGUI);
+ }
+
+ public OnTopDDFTest(Dialog.ModalityType modalityType) throws Exception {
+ this(modalityType, false);
+ }
+
+ public OnTopDDFTest() throws Exception {
+ this(null, true);
+ }
+
+ private void createGUI() {
+
+ hiddenFrame = new Frame();
+ leftDialog = new TestDialog(hiddenFrame);
+ leftDialog.setSize(200, 100);
+ leftDialog.setLocation(50, 50);
+ leftDialog.setVisible(true);
+
+ dialog = new CustomDialog(leftDialog);
+ if (setModal) {
+ dialog.setModal(true);
+ modalityType = dialog.getModalityType();
+ } else if (modalityType != null) {
+ dialog.setModalityType(modalityType);
+ }
+
+ dialog.setSize(200, 100);
+ dialog.setLocation(200, 50);
+
+ rightFrame = new TestFrame();
+ rightFrame.setSize(200, 100);
+ rightFrame.setLocation(350, 50);
+
+ dialog.setVisible(true);
+ }
+
+ public void doTest() throws Exception {
+
+ try {
+
+ robot.waitForIdle(delay);
+
+ dialog.activated.waitForFlagTriggered();
+ assertTrue(dialog.activated.flag(), "Dialog still not visible.");
+
+ dialog.clickOpenButton(robot);
+ robot.waitForIdle(delay);
+
+ if ((modalityType == Dialog.ModalityType.MODELESS) ||
+ (modalityType == Dialog.ModalityType.DOCUMENT_MODAL)) {
+
+ rightFrame.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+
+ rightFrame.closeClicked.reset();
+ dialog.transferFocusToDialog(robot, "A Frame partially hides the " +
+ modalityType + " Dialog.", dialog.openButton);
+ robot.waitForIdle(delay);
+
+ dialog.checkUnblockedDialog(robot,
+ "This is " + modalityType + " dialog and no other Dialogs blocks it.");
+ robot.waitForIdle(delay);
+
+ rightFrame.closeClicked.waitForFlagTriggered(5);
+ assertFalse(rightFrame.closeClicked.flag(), "Clicking on " + modalityType +
+ "dialog did not bring it to the top. A frame on top of Dialog.");
+ robot.waitForIdle(delay);
+
+ dialog.closeClicked.reset();
+ if (modalityType == Dialog.ModalityType.MODELESS) {
+ leftDialog.transferFocusToDialog(robot, "This dialog is not " +
+ "blocked by any other dialogs.", leftDialog.closeButton);
+ } else {
+ leftDialog.transferFocusToBlockedDialog(robot, "This dialog is not " +
+ "blocked by any other dialogs.", leftDialog.closeButton);
+ }
+ } else {
+ dialog.checkUnblockedDialog(robot, "Checking if modal dialog " +
+ "appears on top of blocked Frame.");
+ robot.waitForIdle(delay);
+
+ rightFrame.closeClicked.waitForFlagTriggered(5);
+ assertFalse(rightFrame.closeClicked.flag(),
+ "Frame on top of an application modal Dialog.");
+ robot.waitForIdle(delay);
+
+ leftDialog.transferFocusToBlockedDialog(robot,
+ "An application modal dialog blocks the Dialog.", leftDialog.closeButton);
+ }
+
+ robot.waitForIdle(delay);
+
+ dialog.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+
+ } finally {
+ EventQueue.invokeAndWait(this::closeAll);
+ }
+ }
+
+ private void closeAll() {
+ if (dialog != null) { dialog.dispose(); }
+ if (leftDialog != null) { leftDialog.dispose(); }
+ if (rightFrame != null) { rightFrame.dispose(); }
+ if (hiddenFrame != null) { hiddenFrame.dispose(); }
+ }
+
+
+ class CustomDialog extends TestDialog {
+
+ public CustomDialog(Dialog d) { super(d); }
+
+ @Override
+ public void doOpenAction() {
+ if (rightFrame != null) {
+ rightFrame.setVisible(true);
+ }
+ }
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java
index 2bab4b2..c3f8f9d 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a document modal Dialog created with null Frame
+ * constructor follows normal Z order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopDocModal1Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopDocModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.DOCUMENT_MODAL,
+ OnTopFDFTest.DialogOwner.NULL_FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java
index 2bab4b2..8f6ff61 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a document modal Dialog created with null Dialog
+ * constructor follows normal Z order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopDocModal2Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopDocModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.DOCUMENT_MODAL,
+ OnTopFDFTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java
similarity index 60%
rename from hotspot/src/share/vm/services/memPtr.cpp
rename to jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java
index 2bab4b2..e6b508b 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a document modal Dialog created with hidden Frame
+ * constructor follows normal Z order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopDocModal3Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopDocModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.DOCUMENT_MODAL,
+ OnTopFDFTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java
index 2bab4b2..486d60e 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a document modal Dialog created with hidden Dialog
+ * constructor follows normal Z order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopDocModal4Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopDocModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.DOCUMENT_MODAL,
+ OnTopFDFTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java
new file mode 100644
index 0000000..735646e
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a document modal Dialog created with visible Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopDocModal5Test
+ */
+
+public class OnTopDocModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.DOCUMENT_MODAL,
+ OnTopFDFTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java
index 2bab4b2..5697006 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,27 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a document modal Dialog created with visible
+ * Dialog constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopDocModal6Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopDocModal6Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopDDFTest(Dialog.ModalityType.DOCUMENT_MODAL)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopFDFTest.java b/jdk/test/java/awt/Modal/OnTop/OnTopFDFTest.java
new file mode 100644
index 0000000..4d3cd7a
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopFDFTest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import java.awt.*;
+import static jdk.testlibrary.Asserts.*;
+
+// FDF: Frame - Dialog - Frame
+
+public class OnTopFDFTest {
+
+ private volatile CustomDialog dialog;
+ private volatile TestFrame leftFrame, rightFrame;
+ private volatile Dialog hiddenDialog;
+ private volatile Frame hiddenFrame;
+
+ private static final int delay = 500;
+ private final ExtendedRobot robot;
+
+ public enum DialogOwner {HIDDEN_DIALOG, NULL_DIALOG, HIDDEN_FRAME, NULL_FRAME, FRAME};
+
+ private DialogOwner owner;
+ boolean setModal;
+
+ Dialog.ModalityType modalityType;
+
+ private OnTopFDFTest(Dialog.ModalityType modType,
+ boolean modal,
+ DialogOwner o) throws Exception {
+
+ modalityType = modType;
+ setModal = modal;
+ owner = o;
+ robot = new ExtendedRobot();
+ EventQueue.invokeLater(this::createGUI);
+ }
+
+ public OnTopFDFTest(Dialog.ModalityType modalityType,
+ DialogOwner o) throws Exception {
+ this(modalityType, false, o);
+ }
+
+ public OnTopFDFTest(DialogOwner o) throws Exception {
+ this(null, true, o);
+ }
+
+ private void createGUI() {
+
+ leftFrame = new TestFrame();
+ leftFrame.setSize(200, 100);
+ leftFrame.setLocation(50, 50);
+ leftFrame.setVisible(true);
+
+ switch (owner) {
+ case HIDDEN_DIALOG:
+ hiddenDialog = new Dialog((Frame) null);
+ dialog = new CustomDialog(hiddenDialog);
+ break;
+ case NULL_DIALOG:
+ dialog = new CustomDialog((Dialog) null);
+ break;
+ case HIDDEN_FRAME:
+ hiddenFrame = new Frame();
+ dialog = new CustomDialog(hiddenFrame);
+ break;
+ case NULL_FRAME:
+ dialog = new CustomDialog((Frame) null);
+ break;
+ case FRAME:
+ dialog = new CustomDialog(leftFrame);
+ break;
+ }
+
+ if (setModal) {
+ dialog.setModal(true);
+ modalityType = dialog.getModalityType();
+ } else if (modalityType != null) {
+ dialog.setModalityType(modalityType);
+ }
+
+ dialog.setSize(200, 100);
+ dialog.setLocation(200, 50);
+
+ rightFrame = new TestFrame();
+ rightFrame.setSize(200, 100);
+ rightFrame.setLocation(350, 50);
+
+ dialog.setVisible(true);
+ }
+
+ private void BlockingTest() throws Exception {
+
+ dialog.checkUnblockedDialog(robot, "Checking if " + modalityType +
+ " dialog appears on top of blocked Frame.");
+ robot.waitForIdle(delay);
+
+ rightFrame.closeClicked.waitForFlagTriggered(5);
+ assertFalse(rightFrame.closeClicked.flag(),
+ "Frame is on top of " + modalityType + " Dialog.");
+ robot.waitForIdle(delay);
+
+ leftFrame.transferFocusToBlockedFrame(robot,
+ modalityType + " dialog blocks the Frame.", leftFrame.closeButton);
+ robot.waitForIdle(delay);
+
+ dialog.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+ }
+
+ private void Test() throws Exception {
+
+ rightFrame.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+
+ rightFrame.closeClicked.reset();
+ dialog.transferFocusToDialog(
+ robot, "Frame partially hides the dialog.", dialog.openButton);
+ robot.waitForIdle(delay);
+
+ dialog.checkUnblockedDialog(
+ robot, "This is " + modalityType + " dialog.");
+ robot.waitForIdle(delay);
+
+ rightFrame.closeClicked.waitForFlagTriggered(5);
+ assertFalse(rightFrame.closeClicked.flag(), "Clicking on a " +
+ modalityType + " dialog did not bring it to the top. " +
+ "A frame is on top of the dialog.");
+ robot.waitForIdle(delay);
+
+ dialog.closeClicked.reset();
+
+ if (owner == DialogOwner.FRAME) {
+
+ if (modalityType == Dialog.ModalityType.MODELESS) {
+ leftFrame.transferFocusToFrame(robot, "modeless dialog " +
+ "partially hides the Frame.", leftFrame.closeButton);
+ } else {
+ leftFrame.transferFocusToBlockedFrame(robot, "a document modal " +
+ "dialog partially hides the Frame.", leftFrame.closeButton);
+ }
+
+ } else {
+
+ leftFrame.transferFocusToFrame(robot,
+ "A dialog partially hides the Frame.", leftFrame.closeButton);
+ robot.waitForIdle(delay);
+
+ leftFrame.checkUnblockedFrame(robot,
+ modalityType + " dialog present should not block this Frame.");
+ robot.waitForIdle(delay);
+
+ dialog.closeClicked.waitForFlagTriggered(5);
+ assertFalse(dialog.closeClicked.flag(), "Clicking on a frame did not " +
+ "bring it to the top. The document modal dialog is staying on top.");
+ }
+
+ robot.waitForIdle(delay);
+ }
+
+
+ public void doTest() throws Exception {
+
+ try {
+
+ robot.waitForIdle(delay);
+
+ dialog.activated.waitForFlagTriggered();
+ assertTrue(dialog.activated.flag(), "Dialog still not visible.");
+
+ dialog.clickOpenButton(robot);
+ robot.waitForIdle(delay);
+
+ switch (modalityType) {
+ case DOCUMENT_MODAL:
+ case MODELESS:
+ Test();
+ break;
+ case APPLICATION_MODAL:
+ case TOOLKIT_MODAL:
+ BlockingTest();
+ break;
+ }
+
+ } finally {
+ EventQueue.invokeAndWait(this::closeAll);
+ }
+ }
+
+ private void closeAll() {
+ if (dialog != null) { dialog.dispose(); }
+ if (leftFrame != null) { leftFrame.dispose(); }
+ if (rightFrame != null) { rightFrame.dispose(); }
+ if (hiddenDialog != null) { hiddenDialog.dispose(); }
+ if (hiddenFrame != null) { hiddenFrame.dispose(); }
+ }
+
+
+ class CustomDialog extends TestDialog {
+
+ public CustomDialog(Dialog d) { super(d); }
+ public CustomDialog(Frame f) { super(f); }
+
+ @Override
+ public void doOpenAction() {
+ if (rightFrame != null) {
+ rightFrame.setVisible(true);
+ }
+ }
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java
index 2bab4b2..6f817ee 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,28 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modal Dialog created with null Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModal1Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ OnTopFDFTest.DialogOwner.NULL_FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java
index 2bab4b2..6e4799e 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,28 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modal Dialog created with null Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModal2Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ OnTopFDFTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java
index 2bab4b2..5c696b3 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,28 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modal Dialog created with hidden Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModal3Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ OnTopFDFTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java
index 2bab4b2..770fafb 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,28 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modal Dialog created with hidden Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModal4Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ OnTopFDFTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java
index 2bab4b2..1b6fbe7 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,28 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modal Dialog created with visible Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModal5Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ OnTopFDFTest.DialogOwner.FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java
index 2bab4b2..a7d57a6 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,27 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modal Dialog created with visible Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModal6Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModal6Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopDDFTest()).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java
index 2bab4b2..723c142 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modeless Dialog created with a
+ * null Frame constructor follows normal Z Order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModeless1Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModeless1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.MODELESS,
+ OnTopFDFTest.DialogOwner.NULL_FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java
index 2bab4b2..dd7d308 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modeless Dialog created with a
+ * null Dialog constructor follows normal Z Order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModeless2Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModeless2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.MODELESS,
+ OnTopFDFTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java
index 2bab4b2..54cf899 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modeless Dialog created with a
+ * hidden Frame constructor follows normal Z Order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModeless3Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModeless3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.MODELESS,
+ OnTopFDFTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java
index 2bab4b2..9b5cfa4 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modeless Dialog created with a
+ * hidden Dialog constructor follows normal Z Order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModeless4Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModeless4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.MODELESS,
+ OnTopFDFTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java
index 2bab4b2..9df9a62 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,29 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modeless Dialog created with a
+ * visible Frame constructor follows normal Z Order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModeless5Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModeless5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.MODELESS,
+ OnTopFDFTest.DialogOwner.FRAME)).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java
index 2bab4b2..e03e6cd 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,27 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a modeless Dialog created with a visible Dialog
+ * constructor follows a normal Z order.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopModeless6Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopModeless6Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopDDFTest(Dialog.ModalityType.MODELESS)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java
new file mode 100644
index 0000000..5ab64a6
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a toolkit modal Dialog created with null Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopTKModal1Test
+ */
+
+public class OnTopTKModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ OnTopFDFTest.DialogOwner.NULL_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java
new file mode 100644
index 0000000..904e509
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a toolkit modal Dialog created with null Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopTKModal2Test
+ */
+
+public class OnTopTKModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ OnTopFDFTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java
new file mode 100644
index 0000000..2ecb970
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a toolkit modal Dialog created with hidden Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopTKModal3Test
+ */
+
+public class OnTopTKModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ OnTopFDFTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java
new file mode 100644
index 0000000..f535ab2
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a toolkit modal Dialog created with hidden Dialog
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopTKModal4Test
+ */
+
+public class OnTopTKModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ OnTopFDFTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java
new file mode 100644
index 0000000..52f860d
--- /dev/null
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a toolkit modal Dialog created with visible Frame
+ * constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopTKModal5Test
+ */
+
+public class OnTopTKModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopFDFTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ OnTopFDFTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java
index 2bab4b2..eda000f 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,27 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+import java.awt.Dialog;
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8052012
+ * @summary Check whether a toolkit modal Dialog created with visible
+ * Dialog constructor stays on top of the windows it blocks.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main OnTopTKModal6Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class OnTopTKModal6Test {
+
+ public static void main(String[] args) throws Exception {
+ (new OnTopDDFTest(Dialog.ModalityType.TOOLKIT_MODAL)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java
new file mode 100644
index 0000000..41d27d9
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a dialog in presence of
+ * blocking application modal dialog does not bring it to the top
+ * of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main DialogToFrontAppModalTest
+ */
+
+public class DialogToFrontAppModalTest {
+
+ public static void main(String[] args) throws Exception {
+ (new DialogToFrontModalBlockedTest(
+ Dialog.ModalityType.APPLICATION_MODAL)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java
new file mode 100644
index 0000000..65cf9ff
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a dialog in presence of
+ * blocking document modal dialog does not bring it to the top
+ * of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main DialogToFrontDocModalTest
+ */
+
+public class DialogToFrontDocModalTest {
+
+ public static void main(String[] args) throws Exception {
+ (new DialogToFrontModalBlockedTest(
+ Dialog.ModalityType.DOCUMENT_MODAL)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java
new file mode 100644
index 0000000..7912e5c
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.*;
+
+public class DialogToFrontModalBlockedTest {
+
+ private volatile CustomDialog dialog;
+ private volatile TestDialog leftDialog;
+ private volatile TestFrame rightFrame;
+ private volatile Frame parent;
+
+ private static final int delay = 500;
+ private final ExtendedRobot robot;
+
+ private DialogToFrontModalBlockedTest(Dialog.ModalityType modalityType,
+ boolean setModal) throws Exception {
+
+ robot = new ExtendedRobot();
+ EventQueue.invokeLater(() -> {
+ createGUI(modalityType, setModal);
+ });
+ }
+
+ public DialogToFrontModalBlockedTest(Dialog.ModalityType modalityType) throws Exception {
+ this(modalityType, false);
+ }
+
+ public DialogToFrontModalBlockedTest() throws Exception {
+ this(null, true);
+ }
+
+ private void createGUI(Dialog.ModalityType modalityType,
+ boolean setModal) {
+
+ parent = new Frame();
+ leftDialog = new TestDialog(parent);
+ leftDialog.setSize(200, 100);
+ leftDialog.setLocation(50, 50);
+ leftDialog.setVisible(true);
+
+ dialog = new CustomDialog(leftDialog);
+
+ if (setModal) { dialog.setModal(true); }
+ else if (modalityType != null) {
+ dialog.setModalityType(modalityType);
+ }
+
+ dialog.setSize(200, 100);
+ dialog.setLocation(150, 50);
+
+ rightFrame = new TestFrame();
+ rightFrame.setSize(200, 100);
+ rightFrame.setLocation(250, 50);
+
+ if (setModal || modalityType == Dialog.ModalityType.APPLICATION_MODAL) {
+ rightFrame.setModalExclusionType(
+ Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
+ } else if (modalityType == Dialog.ModalityType.TOOLKIT_MODAL) {
+ rightFrame.setModalExclusionType(
+ Dialog.ModalExclusionType.TOOLKIT_EXCLUDE);
+ }
+
+ dialog.setVisible(true);
+ }
+
+ public void doTest() throws Exception {
+
+ try {
+ robot.waitForIdle(delay);
+
+ dialog.clickOpenButton(robot);
+ robot.waitForIdle(delay);
+
+ rightFrame.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+
+ EventQueue.invokeAndWait(() -> { leftDialog.toFront(); });
+ robot.waitForIdle(delay);
+
+ rightFrame.clickDummyButton(robot);
+
+ EventQueue.invokeAndWait(() -> { leftDialog.toFront(); });
+ robot.waitForIdle(delay);
+
+ leftDialog.clickDummyButton(robot, 7, false, "Calling toFront " +
+ "for Dialog blocked by " + dialog.getModalityType() +
+ "dialog brought it to the top of the modal dialog");
+
+ robot.waitForIdle(delay);
+ } finally {
+ EventQueue.invokeAndWait(this::closeAll);
+ }
+ }
+
+ private void closeAll() {
+ if (dialog != null) { dialog.dispose(); }
+ if (parent != null) { parent.dispose(); }
+ if (leftDialog != null) { leftDialog.dispose(); }
+ if (rightFrame != null) { rightFrame.dispose(); }
+ }
+
+ class CustomDialog extends TestDialog {
+
+ public CustomDialog(Dialog d) { super(d); }
+ public CustomDialog(Frame f) { super(f); }
+
+ @Override
+ public void doOpenAction() {
+ if (rightFrame != null) {
+ rightFrame.setVisible(true);
+ }
+ }
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java
index 2bab4b2..6c20549 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,26 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a dialog in presence of
+ * blocking modal dialog does not bring it to the top
+ * of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main DialogToFrontModalTest
+ */
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+public class DialogToFrontModalTest {
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+ public static void main(String[] args) throws Exception {
+ (new DialogToFrontModalBlockedTest()).doTest();
+ }
}
-
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
index 2bab4b2..be5da09 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,25 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method does not bring a dialog to the top
+ * of a child modeless dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main DialogToFrontModeless1Test
+ */
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+public class DialogToFrontModeless1Test {
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+ public static void main(String[] args) throws Exception {
+ (new DialogToFrontModelessTest()).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModelessTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModelessTest.java
new file mode 100644
index 0000000..080488c
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModelessTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.*;
+
+public class DialogToFrontModelessTest {
+
+ private volatile TestDialog dialog, leftDialog;
+ private volatile TestFrame rightFrame;
+ private volatile Frame parent;
+
+ private static final int delay = 500;
+ private final ExtendedRobot robot;
+
+ private boolean isModeless;
+
+ public DialogToFrontModelessTest(boolean modeless) throws Exception {
+ isModeless = modeless;
+ robot = new ExtendedRobot();
+ EventQueue.invokeLater(this::createGUI);
+ }
+
+ public DialogToFrontModelessTest() throws Exception { this(true); }
+
+ private void createGUI() {
+
+ parent = new Frame();
+
+ leftDialog = new TestDialog(parent);
+ leftDialog.setSize(200, 100);
+ leftDialog.setLocation(50, 50);
+ leftDialog.setVisible(true);
+
+ dialog = new TestDialog(leftDialog);
+
+ if (isModeless) { dialog.setModalityType(Dialog.ModalityType.MODELESS); }
+
+ dialog.setSize(200, 100);
+ dialog.setLocation(150, 50);
+
+ rightFrame = new TestFrame();
+ rightFrame.setSize(200, 100);
+ rightFrame.setLocation(250, 50);
+
+ dialog.setVisible(true);
+ rightFrame.setVisible(true);
+ }
+
+ public void doTest() throws Exception {
+
+ try {
+ robot.waitForIdle(delay);
+
+ rightFrame.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+
+ EventQueue.invokeAndWait(() -> { leftDialog.toFront(); });
+ robot.waitForIdle(delay);
+
+ leftDialog.clickDummyButton(robot, 7, false,
+ "Calling toFront method for the parent left dialog " +
+ "brought it to the top of the child dialog.");
+ robot.waitForIdle(delay);
+
+ rightFrame.clickDummyButton(robot);
+ robot.waitForIdle(delay);
+
+ String msg = "The " + (isModeless ? "modeless" : "non-modal") +
+ " dialog still on top of the right frame" +
+ " even after a button on the frame is clicked.";
+ dialog.clickDummyButton(robot, 7, false, msg);
+ robot.waitForIdle(delay);
+
+ } finally {
+ EventQueue.invokeAndWait(this::closeAll);
+ }
+ }
+
+ private void closeAll() {
+ if (dialog != null) { dialog.dispose(); }
+ if (parent != null) { parent.dispose(); }
+ if (leftDialog != null) { leftDialog.dispose(); }
+ if (rightFrame != null) { rightFrame.dispose(); }
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java
index 2bab4b2..6e6b70f 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,25 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method does not bring a dialog to the top
+ * of a non-modal child dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main DialogToFrontNonModalTest
+ */
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+public class DialogToFrontNonModalTest {
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+ public static void main(String[] args) throws Exception {
+ (new DialogToFrontModelessTest(false)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java
new file mode 100644
index 0000000..c48eac0
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a dialog in presence of
+ * blocking toolkit modal dialog does not bring it to the top
+ * of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main DialogToFrontTKModalTest
+ */
+
+public class DialogToFrontTKModalTest {
+
+ public static void main(String[] args) throws Exception {
+ (new DialogToFrontModalBlockedTest(
+ Dialog.ModalityType.TOOLKIT_MODAL)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java
new file mode 100644
index 0000000..0b32758
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking application modal dialog having a null Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontAppModal1Test
+ */
+
+public class FrameToFrontAppModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.NULL_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java
new file mode 100644
index 0000000..7a8e8eb
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking application modal dialog having a null Dialog parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontAppModal2Test
+ */
+
+public class FrameToFrontAppModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java
new file mode 100644
index 0000000..d57d1e3
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking application modal dialog having a hidden Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontAppModal3Test
+ */
+
+public class FrameToFrontAppModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java
new file mode 100644
index 0000000..447a13e
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking application modal dialog having a hidden Dialog parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontAppModal4Test
+ */
+
+public class FrameToFrontAppModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java
new file mode 100644
index 0000000..3165711
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking application modal dialog having a visible Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontAppModal5Test
+ */
+
+public class FrameToFrontAppModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.APPLICATION_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java
new file mode 100644
index 0000000..357be00
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking document modal dialog having a visible Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontDocModal1Test
+ */
+
+public class FrameToFrontDocModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.DOCUMENT_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java
new file mode 100644
index 0000000..4524afb
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check if toFront method works correctly for a document modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontDocModal2Test
+ */
+
+public class FrameToFrontDocModal2Test {
+
+ public static void main(String[] args) throws Exception {
+
+ for (FrameToFrontModalBlockedTest.DialogOwner o:
+ FrameToFrontModalBlockedTest.DialogOwner.values()) {
+
+ if (o != FrameToFrontModalBlockedTest.DialogOwner.FRAME) {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.DOCUMENT_MODAL, o)).doTest();
+ }
+ }
+
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java
new file mode 100644
index 0000000..eb1d4e7
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking modal dialog having a null Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontModal1Test
+ */
+
+public class FrameToFrontModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ FrameToFrontModalBlockedTest.DialogOwner.NULL_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java
new file mode 100644
index 0000000..4e1ab89
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking modal dialog having a null Dialog parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontModal2Test
+ */
+
+public class FrameToFrontModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ FrameToFrontModalBlockedTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java
new file mode 100644
index 0000000..da6dc06
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking modal dialog having a hidden Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontModal3Test
+ */
+
+public class FrameToFrontModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ FrameToFrontModalBlockedTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java
new file mode 100644
index 0000000..e967d4b
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking modal dialog having a hidden Dialog parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontModal4Test
+ */
+
+public class FrameToFrontModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ FrameToFrontModalBlockedTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java
new file mode 100644
index 0000000..ba3ae7d
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking modal dialog having a visible Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontModal5Test
+ */
+
+public class FrameToFrontModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ FrameToFrontModalBlockedTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java
new file mode 100644
index 0000000..2a7e0de
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.*;
+
+
+public class FrameToFrontModalBlockedTest {
+
+ private volatile CustomDialog dialog;
+ private volatile TestFrame leftFrame, rightFrame;
+ private volatile Dialog hiddenDialog;
+ private volatile Frame hiddenFrame;
+
+ private static final int delay = 500;
+ private final ExtendedRobot robot;
+
+ public enum DialogOwner {HIDDEN_DIALOG, NULL_DIALOG, HIDDEN_FRAME, NULL_FRAME, FRAME};
+
+ private DialogOwner owner;
+ boolean setModal;
+
+ Dialog.ModalityType modalityType;
+
+ private FrameToFrontModalBlockedTest(Dialog.ModalityType modType,
+ boolean modal,
+ DialogOwner o) throws Exception {
+ modalityType = modType;
+ setModal = modal;
+ owner = o;
+
+ robot = new ExtendedRobot();
+ EventQueue.invokeLater(this::createGUI);
+ }
+
+ public FrameToFrontModalBlockedTest(Dialog.ModalityType modalityType,
+ DialogOwner o) throws Exception {
+ this(modalityType, false, o);
+ }
+
+ public FrameToFrontModalBlockedTest(DialogOwner o) throws Exception {
+ this(null, true, o);
+ }
+
+ private void createGUI() {
+
+ leftFrame = new TestFrame();
+ leftFrame.setSize(200, 100);
+ leftFrame.setLocation(50, 50);
+ leftFrame.setVisible(true);
+
+ switch (owner) {
+ case HIDDEN_DIALOG:
+ hiddenDialog = new Dialog((Frame) null);
+ dialog = new CustomDialog(hiddenDialog);
+ break;
+ case NULL_DIALOG:
+ dialog = new CustomDialog((Dialog) null);
+ break;
+ case HIDDEN_FRAME:
+ hiddenFrame = new Frame();
+ dialog = new CustomDialog(hiddenFrame);
+ break;
+ case NULL_FRAME:
+ dialog = new CustomDialog((Frame) null);
+ break;
+ case FRAME:
+ dialog = new CustomDialog(leftFrame);
+ break;
+ }
+
+ if (setModal) {
+ dialog.setModal(true);
+ modalityType = dialog.getModalityType();
+ } else if (modalityType != null) {
+ dialog.setModalityType(modalityType);
+ }
+
+ dialog.setSize(200, 100);
+ dialog.setLocation(230, 50);
+
+ rightFrame = new TestFrame();
+ rightFrame.setSize(200, 100);
+ rightFrame.setLocation(280, 50);
+
+ if (setModal ||
+ (modalityType == Dialog.ModalityType.APPLICATION_MODAL)) {
+ rightFrame.setModalExclusionType(
+ Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
+ }
+
+ if (modalityType == Dialog.ModalityType.TOOLKIT_MODAL) {
+ rightFrame.setModalExclusionType(
+ Dialog.ModalExclusionType.TOOLKIT_EXCLUDE);
+ }
+
+ dialog.setVisible(true);
+ }
+
+ private void blockingTest() throws Exception {
+
+ dialog.clickOpenButton(robot);
+ robot.waitForIdle(delay);
+
+ rightFrame.clickCloseButton(robot);
+ robot.waitForIdle(delay);
+
+ EventQueue.invokeAndWait(() -> { leftFrame.toFront(); });
+ robot.waitForIdle(delay);
+
+ rightFrame.clickDummyButton(robot);
+ robot.waitForIdle(delay);
+
+ EventQueue.invokeAndWait(() -> { leftFrame.toFront(); });
+ robot.waitForIdle(delay);
+
+ leftFrame.clickDummyButton(robot, 7, false,
+ "Calling toFront for Frame blocked by " + dialog.getModalityType() +
+ " dialog brought it to the top of the modal dialog.");
+ robot.waitForIdle(delay);
+ }
+
+ private void docModalTest() throws Exception {
+
+ if (owner == DialogOwner.FRAME) { blockingTest(); }
+ else {
+ EventQueue.invokeAndWait(() -> { leftFrame.toFront(); });
+ robot.waitForIdle(delay);
+
+ leftFrame.clickDummyButton(robot);
+ robot.waitForIdle(delay);
+
+ EventQueue.invokeAndWait(() -> { dialog.toFront(); });
+ robot.waitForIdle(delay);
+
+ dialog.clickDummyButton(robot);
+ robot.waitForIdle(delay);
+ }
+
+ }
+
+
+ public void doTest() throws Exception {
+
+ try {
+
+ robot.waitForIdle(delay);
+
+ switch (modalityType) {
+ case APPLICATION_MODAL:
+ case TOOLKIT_MODAL:
+ blockingTest();
+ break;
+ case DOCUMENT_MODAL:
+ docModalTest();
+ break;
+ default:
+ throw new RuntimeException(
+ "improper modality type, please do not use it for this test");
+ }
+
+ } finally {
+ EventQueue.invokeAndWait(this::closeAll);
+ }
+ }
+
+ private void closeAll() {
+ if (dialog != null) { dialog.dispose(); }
+ if (leftFrame != null) { leftFrame.dispose(); }
+ if (rightFrame != null) { rightFrame.dispose(); }
+ if (hiddenDialog != null) { hiddenDialog.dispose(); }
+ if (hiddenFrame != null) { hiddenFrame.dispose(); }
+ }
+
+
+ class CustomDialog extends TestDialog {
+
+ public CustomDialog(Dialog d) { super(d); }
+ public CustomDialog(Frame f) { super(f); }
+
+ @Override
+ public void doOpenAction() {
+ if (rightFrame != null) {
+ rightFrame.setVisible(true);
+ }
+ }
+ }
+}
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java
index 2bab4b2..29be38f 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,26 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method does not bring a frame to the top of
+ * a modeless child dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontModeless1Test
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class FrameToFrontModeless1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModelessTest(true)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModelessTest.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModelessTest.java
new file mode 100644
index 0000000..03ceb6e
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModelessTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import java.awt.*;
+
+
+public class FrameToFrontModelessTest {
+
+ private volatile TestDialog dialog;
+ private volatile TestFrame leftFrame, rightFrame;
+
+ private static final int delay = 500;
+ private final ExtendedRobot robot;
+
+ private boolean isModeless;
+
+ public FrameToFrontModelessTest(boolean modeless) throws Exception {
+ isModeless = modeless;
+ robot = new ExtendedRobot();
+ EventQueue.invokeLater(this::createGUI);
+ }
+
+ private void createGUI() {
+
+ leftFrame = new TestFrame();
+ leftFrame.setSize(200, 100);
+ leftFrame.setLocation(50, 50);
+ leftFrame.setVisible(true);
+
+ dialog = new TestDialog(leftFrame);
+ if (isModeless) { dialog.setModalityType(Dialog.ModalityType.MODELESS); }
+ dialog.setSize(200, 100);
+ dialog.setLocation(150, 50);
+ dialog.setVisible(true);
+
+ rightFrame = new TestFrame();
+ rightFrame.setSize(200, 100);
+ rightFrame.setLocation(250, 50);
+ rightFrame.setVisible(true);
+ }
+
+
+ public void doTest() throws Exception {
+
+ try {
+
+ robot.waitForIdle(delay);
+
+ EventQueue.invokeAndWait(() -> { leftFrame.toFront(); });
+ robot.waitForIdle(delay);
+
+ leftFrame.clickDummyButton(
+ robot, 7, false, "Calling toFront method on the parent " +
+ "left frame brought it to the top of the child dialog");
+ robot.waitForIdle(delay);
+
+ // show the right frame appear on top of the dialog
+ rightFrame.clickDummyButton(robot);
+ robot.waitForIdle(delay);
+
+ String msg = "The " + (isModeless ? "modeless" : "non-modal") +
+ " dialog still on top of the right frame" +
+ " even after a button on the frame is clicked";
+ dialog.clickDummyButton(robot, 7, false, msg);
+
+ } finally {
+ EventQueue.invokeAndWait(this::closeAll);
+ }
+ }
+
+ private void closeAll() {
+ if (dialog != null) { dialog.dispose(); }
+ if (leftFrame != null) { leftFrame.dispose(); }
+ if (rightFrame != null) { rightFrame.dispose(); }
+ }
+}
+
diff --git a/hotspot/src/share/vm/services/memPtr.cpp b/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java
similarity index 60%
copy from hotspot/src/share/vm/services/memPtr.cpp
copy to jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java
index 2bab4b2..5e16f14 100644
--- a/hotspot/src/share/vm/services/memPtr.cpp
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -19,25 +19,26 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
- *
*/
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "services/memPtr.hpp"
-#include "services/memTracker.hpp"
-volatile jint SequenceGenerator::_seq_number = 1;
-volatile unsigned long SequenceGenerator::_generation = 1;
-NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method does not bring a frame to the top
+ * of a non-modal child dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontNonModalTest
+ */
-jint SequenceGenerator::next() {
- jint seq = Atomic::add(1, &_seq_number);
- if (seq < 0) {
- MemTracker::shutdown(MemTracker::NMT_sequence_overflow);
- } else {
- NOT_PRODUCT(_max_seq_number = (seq > _max_seq_number) ? seq : _max_seq_number;)
- }
- return seq;
+public class FrameToFrontNonModalTest {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModelessTest(false)).doTest();
+ }
}
-
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java
new file mode 100644
index 0000000..528847e
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking modal toolkit dialog having a null Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontTKModal1Test
+ */
+
+public class FrameToFrontTKModal1Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.NULL_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java
new file mode 100644
index 0000000..7cd3122
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking toolkit modal dialog having a null Dialog parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontTKModal2Test
+ */
+
+public class FrameToFrontTKModal2Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.NULL_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
new file mode 100644
index 0000000..90eff04
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking toolkit modal dialog having a hidden Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontTKModal3Test
+ */
+
+public class FrameToFrontTKModal3Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.HIDDEN_FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java
new file mode 100644
index 0000000..625ced9
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking toolkit modal dialog having a hidden Dialog parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontTKModal4Test
+ */
+
+public class FrameToFrontTKModal4Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.HIDDEN_DIALOG)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java
new file mode 100644
index 0000000..1e91e9a
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Dialog;
+
+/*
+ * @test
+ * @bug 8050885
+ * @summary Check that calling toFront method for a frame in presence of
+ * blocking toolkit modal dialog having a visible Frame parent
+ * does not bring the frame to the top of the modal dialog.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main FrameToFrontTKModal5Test
+ */
+
+public class FrameToFrontTKModal5Test {
+
+ public static void main(String[] args) throws Exception {
+ (new FrameToFrontModalBlockedTest(
+ Dialog.ModalityType.TOOLKIT_MODAL,
+ FrameToFrontModalBlockedTest.DialogOwner.FRAME)).doTest();
+ }
+}
diff --git a/jdk/test/java/awt/Modal/helpers/TestDialog.java b/jdk/test/java/awt/Modal/helpers/TestDialog.java
index d547886..1a45154 100644
--- a/jdk/test/java/awt/Modal/helpers/TestDialog.java
+++ b/jdk/test/java/awt/Modal/helpers/TestDialog.java
@@ -211,36 +211,63 @@
}
public void clickOpenButton(ExtendedRobot robot) throws Exception {
+ clickOpenButton(robot, true, "");
+ }
+
+ public void clickOpenButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
openClicked.reset();
clickButton(openButton, robot);
-
openClicked.waitForFlagTriggered();
- assertTrue(openClicked.flag(),
- "clicking the dialog Open button did not trigger an action");
+
+ String msg = "Clicking the dialog Open button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(openClicked.flag(), refState, msg + " " + message);
}
public void clickCloseButton(ExtendedRobot robot) throws Exception {
+ clickCloseButton(robot, true, "");
+ }
+
+ public void clickCloseButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
closeClicked.reset();
clickButton(closeButton, robot);
-
closeClicked.waitForFlagTriggered();
- assertTrue(closeClicked.flag(),
- "clicking the dialog Close button did not trigger an action");
+
+ String msg = "Clicking the dialog Close button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(closeClicked.flag(), refState, msg + " " + message);
}
public void clickDummyButton(ExtendedRobot robot) throws Exception {
clickDummyButton(robot, Flag.ATTEMPTS);
}
- public void clickDummyButton(ExtendedRobot robot, int attempts) throws Exception {
+ public void clickDummyButton(ExtendedRobot robot,
+ int attempts) throws Exception {
+ clickDummyButton(robot, attempts, true, "");
+ }
+
+ public void clickDummyButton(ExtendedRobot robot,
+ int attempts,
+ boolean refState,
+ String message) throws Exception {
dummyClicked.reset();
clickButton(dummyButton, robot);
-
dummyClicked.waitForFlagTriggered(attempts);
- assertTrue(dummyClicked.flag(),
- "clicking the dialog Dummy button did not trigger an action");
+
+ String msg = "Clicking the dialog Dummy button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(dummyClicked.flag(), refState, msg + " " + message);
}
+
private void clickInside(ExtendedRobot robot) throws Exception {
try {
diff --git a/jdk/test/java/awt/Modal/helpers/TestFrame.java b/jdk/test/java/awt/Modal/helpers/TestFrame.java
index cbe0fea..f7b3412 100644
--- a/jdk/test/java/awt/Modal/helpers/TestFrame.java
+++ b/jdk/test/java/awt/Modal/helpers/TestFrame.java
@@ -203,19 +203,37 @@
}
public void clickOpenButton(ExtendedRobot robot) throws Exception {
+ clickOpenButton(robot, true, "");
+ }
+
+ public void clickOpenButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
openClicked.reset();
clickButton(openButton, robot);
openClicked.waitForFlagTriggered();
- assertTrue(openClicked.flag(),
- "clicking the frame Open button did not trigger an action");
+
+ String msg = "Clicking the frame Open button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(openClicked.flag(), refState, msg + " " + message);
}
public void clickCloseButton(ExtendedRobot robot) throws Exception {
+ clickCloseButton(robot, true, "");
+ }
+
+ public void clickCloseButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
closeClicked.reset();
clickButton(closeButton, robot);
closeClicked.waitForFlagTriggered();
- assertTrue(closeClicked.flag(),
- "clicking the frame Close button did not trigger an action");
+
+ String msg = "Clicking the frame Close button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(closeClicked.flag(), refState, msg + " " + message);
}
public void clickDummyButton(ExtendedRobot robot) throws Exception {
@@ -223,13 +241,22 @@
}
public void clickDummyButton(ExtendedRobot robot,
- int amountOfAttempts) throws Exception {
+ int attempts) throws Exception {
+ clickDummyButton(robot, attempts, true, "");
+ }
+
+ public void clickDummyButton(ExtendedRobot robot,
+ int attempts,
+ boolean refState,
+ String message) throws Exception {
dummyClicked.reset();
clickButton(dummyButton, robot);
-
dummyClicked.waitForFlagTriggered();
- assertTrue(dummyClicked.flag(),
- "clicking the frame Dummy button did not trigger an action");
+
+ String msg = "Clicking the frame Dummy button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(dummyClicked.flag(), refState, msg + " " + message);
}
public void clickInside(ExtendedRobot robot) throws Exception {
diff --git a/jdk/test/java/awt/Modal/helpers/TestWindow.java b/jdk/test/java/awt/Modal/helpers/TestWindow.java
index 4e7cdb6..a81746b 100644
--- a/jdk/test/java/awt/Modal/helpers/TestWindow.java
+++ b/jdk/test/java/awt/Modal/helpers/TestWindow.java
@@ -210,30 +210,54 @@
}
public void clickOpenButton(ExtendedRobot robot) throws Exception {
+ clickOpenButton(robot, true, "");
+ }
+
+ public void clickOpenButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
openClicked.reset();
clickButton(openButton, robot);
-
openClicked.waitForFlagTriggered();
- assertTrue(openClicked.flag(),
- "clicking the window Open button did not trigger an action");
+
+ String msg = "Clicking the window Open button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(openClicked.flag(), refState, msg + " " + message);
}
public void clickCloseButton(ExtendedRobot robot) throws Exception {
+ clickCloseButton(robot, true, "");
+ }
+
+ public void clickCloseButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
closeClicked.reset();
clickButton(closeButton, robot);
-
closeClicked.waitForFlagTriggered();
- assertTrue(closeClicked.flag(),
- "clicking the window Close button did not trigger an action");
+
+ String msg = "Clicking the window Close button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(closeClicked.flag(), refState, msg + " " + message);
}
public void clickDummyButton(ExtendedRobot robot) throws Exception {
+ clickDummyButton(robot, true, "");
+ }
+
+ public void clickDummyButton(ExtendedRobot robot,
+ boolean refState,
+ String message) throws Exception {
dummyClicked.reset();
clickButton(dummyButton, robot);
-
dummyClicked.waitForFlagTriggered();
- assertTrue(dummyClicked.flag(),
- "clicking the window Dummy button did not trigger an action");
+
+ String msg = "Clicking the window Dummy button " + (refState ?
+ "did not trigger an action." :
+ "triggered an action when it should not.");
+ assertEQ(dummyClicked.flag(), refState, msg + " " + message);
}
public void checkBlockedWindow(ExtendedRobot robot,
diff --git a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
index 4bc4dd1..e12e90c 100644
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
@@ -23,11 +23,10 @@
* questions.
*/
-import sun.awt.datatransfer.DataTransferer;
-
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.SystemFlavorMap;
import java.util.*;
+import java.nio.charset.Charset;
/*
* @test
@@ -70,17 +69,8 @@
// construct a unique String native
key = key.concat("TEST");
- for (DataFlavor element : flavorsSet)
+ for (DataFlavor element : flavorsSet) {
flavorMap.addFlavorForUnencodedNative(key, element);
-
- // This part is valid only for X-based graphical systems
- if (!System.getProperty("os.name").startsWith("Win") && !System.getProperty("os.name").startsWith("Mac") ) {
- if (key.contains("/")) {
- Set<DataFlavor> fls = DataTransferer.getInstance().getPlatformMappingsForNative(key);
- flavorsSet.addAll(fls);
- if (!fls.isEmpty() && key.startsWith("text/"))
- flavorsSet.addAll(convertMimeTypeToDataFlavors(key));
- }
}
hashVerify.put(key, new Vector(flavorsSet));
}
@@ -103,12 +93,10 @@
}
void compareFlavors(List<DataFlavor> flavors1, List<DataFlavor> flavors2, String key){
- DataTransferer.DataFlavorComparator comparator = new DataTransferer.DataFlavorComparator();
for (DataFlavor flavor1 : flavors1) {
boolean result = false;
for (DataFlavor flavor2 : flavors2) {
- if (comparator.compare(flavor1, flavor2) == 0)
- result = true;
+ if (flavor1.equals(flavor2)) result = true;
}
if (!result)
throw new RuntimeException("\n*** Error in verifyNewMappings()" +
@@ -125,7 +113,7 @@
Set<DataFlavor> convertMimeTypeToDataFlavors(String baseType) throws Exception {
Set<DataFlavor> result = new LinkedHashSet<>();
- for (String charset : DataTransferer.standardEncodings()) {
+ for (String charset : getStandardEncodings()) {
for (String txtClass : new String[]{"java.io.InputStream", "java.nio.ByteBuffer", "\"[B\""}) {
String mimeType = baseType + ";charset=" + charset + ";class=" + txtClass;
@@ -142,5 +130,17 @@
}
return result;
}
+
+ Set<String> getStandardEncodings() {
+ Set<String> tempSet = new HashSet<>();
+ tempSet.add("US-ASCII");
+ tempSet.add("ISO-8859-1");
+ tempSet.add("UTF-8");
+ tempSet.add("UTF-16BE");
+ tempSet.add("UTF-16LE");
+ tempSet.add("UTF-16");
+ tempSet.add(Charset.defaultCharset().name());
+ return tempSet;
+ }
}
diff --git a/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java b/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java
new file mode 100644
index 0000000..844ca26
--- /dev/null
+++ b/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ @test
+ @bug 4718897
+ @summary tests that a Unicode string can be transferred between JVMs.
+ @author das@sparc.spb.su area=datatransfer
+ @library ../../regtesthelpers/process
+ @build ProcessResults ProcessCommunicator
+ @run main UnicodeTransferTest
+*/
+
+import java.awt.datatransfer.*;
+import java.awt.*;
+import java.text.Normalizer;
+
+import test.java.awt.regtesthelpers.process.ProcessResults;
+import test.java.awt.regtesthelpers.process.ProcessCommunicator;
+
+public class UnicodeTransferTest {
+ private static final Toolkit tk = Toolkit.getDefaultToolkit();
+ private static final Clipboard clipboard = tk.getSystemClipboard();
+ private static final Transferable t = new StringSelection(Util.getTestString());
+
+ public static void main(String[] args) throws Exception {
+ Util.setClipboardContents(clipboard, t, null);
+ ProcessResults result = ProcessCommunicator.executeChildProcess(
+ UnicodeTransferTestChild.class, new String[0]);
+ verifyTestResults(result);
+ }
+
+ private static void verifyTestResults(ProcessResults processResults) {
+ if (processResults.getExitValue() != 0) {
+ processResults.printProcessErrorOutput(System.err);
+ throw new RuntimeException("TEST IS FAILED. See child stderr");
+ }
+ processResults.verifyStdErr(System.err);
+ processResults.verifyProcessExitValue(System.err);
+ processResults.printProcessStandartOutput(System.out);
+ }
+
+}
+
+class Util {
+ private static String testString = null;
+
+ static {
+ StringBuilder buf = new StringBuilder();
+ for (int i = 1; i < 0x10000; i++) {
+ // Skip surrogates.
+ if (i < 0xD800 || (i > 0xDFFF && i < 0xFFF0)) {
+ buf.append((char) i);
+ } else {
+ buf.append(0x20);
+ }
+ }
+ // On OS X the unicode string is normalized but the clipboard,
+ // so we need to use normalized strings as well to be able to
+ // check the result
+ testString = Normalizer.normalize(buf.toString(), Normalizer.Form.NFC);
+ }
+
+ public static String getTestString() {
+ return testString;
+ }
+
+ public static void setClipboardContents(Clipboard cb,
+ Transferable contents,
+ ClipboardOwner owner) {
+
+ boolean set = false;
+ while (!set) {
+ try {
+ cb.setContents(contents, owner);
+ set = true;
+ } catch (IllegalStateException ise) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ public static Transferable getClipboardContents(Clipboard cb,
+ Object requestor) {
+ while (true) {
+ try {
+ return cb.getContents(requestor);
+ } catch (IllegalStateException ise) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
+
+class UnicodeTransferTestChild {
+ private static final Toolkit tk = Toolkit.getDefaultToolkit();
+ private static final Clipboard clipboard = tk.getSystemClipboard();
+
+ public static void main(String[] args) {
+ Transferable t = Util.getClipboardContents(clipboard, null);
+
+ if (t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+ Object o = null;
+ try {
+ o = t.getTransferData(DataFlavor.stringFlavor);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ String testStr = Util.getTestString();
+
+ if (!testStr.equals(o)) {
+ if (o instanceof String) {
+ String s = (String)o;
+ if (s.length() != testStr.length()) {
+ System.err.println("Received length:" + s.length() +
+ " Expected length: " +
+ testStr.length());
+ } else {
+ for (int i = 0; i < s.length(); i++) {
+ char ch = s.charAt(i);
+ char expected = testStr.charAt(i);
+ if (ch != expected) {
+ System.err.println("i=" + i +
+ " char=" +
+ Integer.toHexString((int)ch) +
+ " expected=" +
+ Integer.toHexString(expected));
+ }
+ }
+ }
+ } else {
+ System.err.println("Received object:" + o);
+ }
+ throw new RuntimeException("String doesn't match.");
+ }
+ } else {
+ throw new RuntimeException("Clipboard content was not set");
+ }
+ }
+}
diff --git a/jdk/test/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java b/jdk/test/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java
new file mode 100644
index 0000000..2c07f31
--- /dev/null
+++ b/jdk/test/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.awt.SunToolkit;
+
+import java.awt.*;
+import java.awt.event.AWTEventListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+
+/*
+ * @test
+ * @bug 8046495
+ * @summary Verifies that mouse/key events has always increasing 'when' timestamps
+ * @author Anton Nashatyrev
+ * @run main EventWhenTest
+ */
+public class EventWhenTest {
+
+ private static volatile int eventsCount = 0;
+ private static volatile boolean failed = false;
+
+ static {
+ Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
+ long lastWhen = 0;
+
+ @Override
+ public void eventDispatched(AWTEvent event) {
+ long curWhen;
+ if (event instanceof KeyEvent) {
+ curWhen = ((KeyEvent) event).getWhen();
+ } else if (event instanceof MouseEvent) {
+ curWhen = ((MouseEvent) event).getWhen();
+ } else {
+ return;
+ }
+
+ eventsCount++;
+
+ if (curWhen < lastWhen) {
+ System.err.println("FAILED: " + curWhen + " < " + lastWhen +
+ " for " + event);
+ failed = true;
+ } else {
+ lastWhen = curWhen;
+ }
+ }
+ }, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK);
+ }
+
+ public static void main(String[] args) throws Exception {
+
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ Frame frame = new Frame();
+
+ try {
+ Button b = new Button("Button");
+ frame.setBounds(300, 300, 300, 300);
+ frame.add(b);
+ frame.setVisible(true);
+ toolkit.realSync();
+
+ Robot robot = new Robot();
+ robot.mouseMove((int)frame.getLocationOnScreen().getX() + 150,
+ (int)frame.getLocationOnScreen().getY() + 150);
+
+ eventsCount = 0;
+ System.out.println("Clicking mouse...");
+ for (int i = 0; i < 300 && !failed; i++) {
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Thread.sleep(10);
+ b.setLabel("Click: " + i);
+ }
+
+ if (eventsCount == 0) {
+ throw new RuntimeException("No events were received");
+ }
+
+ if (failed) {
+ throw new RuntimeException("Test failed.");
+ }
+ System.out.println("Clicking mouse done: " + eventsCount + " events.");
+
+ b.requestFocusInWindow();
+ toolkit.realSync();
+
+ eventsCount = 0;
+ System.out.println("Typing a key...");
+ for (int i = 0; i < 300 && !failed; i++) {
+ robot.keyPress(KeyEvent.VK_A);
+ robot.keyRelease(KeyEvent.VK_A);
+ Thread.sleep(10);
+ b.setLabel("Type: " + i);
+ }
+ System.out.println("Key typing done: " + eventsCount + " events.");
+
+ if (eventsCount == 0) {
+ throw new RuntimeException("No events were received");
+ }
+
+ if (failed) {
+ throw new RuntimeException("Test failed.");
+ }
+
+ System.out.println("Success!");
+ } finally {
+ frame.dispose();
+ }
+ }
+}
diff --git a/jdk/test/java/lang/Long/ParsingTest.java b/jdk/test/java/lang/Long/ParsingTest.java
index 388c889..42c49dd 100644
--- a/jdk/test/java/lang/Long/ParsingTest.java
+++ b/jdk/test/java/lang/Long/ParsingTest.java
@@ -128,10 +128,10 @@
}
private static void checkNumberFormatException(String val, int radix, int start) {
- int n = 0;
+ long n = 0;
try {
- n = Integer.parseInt(val, radix, start);
- System.err.println("parseInt(" + val + ", " + radix + ", " + start +
+ n = Long.parseLong(val, radix, start);
+ System.err.println("parseLong(" + val + ", " + radix + ", " + start +
") incorrectly returned " + n);
throw new RuntimeException();
} catch (NumberFormatException nfe) {
@@ -143,7 +143,7 @@
long n = 0;
try {
n = Long.parseLong(val, radix, start, end);
- System.err.println("parseInt(" + val + ", " + radix + ", " + start + ", " + end +
+ System.err.println("parseLong(" + val + ", " + radix + ", " + start + ", " + end +
") incorrectly returned " + n);
throw new RuntimeException();
} catch (NumberFormatException nfe) {
@@ -152,10 +152,10 @@
}
private static void checkIndexOutOfBoundsException(String val, int radix, int start) {
- int n = 0;
+ long n = 0;
try {
- n = Integer.parseInt(val, radix, start);
- System.err.println("parseInt(" + val + ", " + radix + ", " + start +
+ n = Long.parseLong(val, radix, start);
+ System.err.println("parseLong(" + val + ", " + radix + ", " + start +
") incorrectly returned " + n);
throw new RuntimeException();
} catch (IndexOutOfBoundsException ioob) {
@@ -167,7 +167,7 @@
long n = 0;
try {
n = Long.parseLong(val, radix, start, end);
- System.err.println("parseInt(" + val + ", " + radix + ", " + start + ", " + end +
+ System.err.println("parseLong(" + val + ", " + radix + ", " + start + ", " + end +
") incorrectly returned " + n);
throw new RuntimeException();
} catch (IndexOutOfBoundsException ioob) {
@@ -179,7 +179,7 @@
long n = 0;
try {
n = Long.parseLong(null, 10, start, end);
- System.err.println("parseInt(null, " + radix + ", " + start + ", " + end +
+ System.err.println("parseLong(null, " + radix + ", " + start + ", " + end +
") incorrectly returned " + n);
throw new RuntimeException();
} catch (NullPointerException npe) {
diff --git a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
index 3a493e0..118a60f 100644
--- a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
@@ -92,8 +92,6 @@
String osName = System.getProperty("os.name");
if (osName.contains("OS X")) {
pkgs.add("apple."); // add apple package for OS X
- } else if (osName.startsWith("Windows")) {
- pkgs.add("com.sun.java.accessibility.");
}
List<String> jspkgs =
diff --git a/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java b/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java
new file mode 100644
index 0000000..0e64edc
--- /dev/null
+++ b/jdk/test/java/lang/SecurityManager/CheckSecurityProvider.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6997010
+ * @summary Consolidate java.security files into one file with modifications
+ */
+
+import java.security.Provider;
+import java.security.Security;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/*
+ * The main benefit of this test is to catch merge errors or other types
+ * of issues where one or more of the security providers are accidentally
+ * removed. This is why the known security providers have to
+ * be explicitly listed below.
+ */
+public class CheckSecurityProvider {
+ public static void main(String[] args) throws Exception {
+
+ String os = System.getProperty("os.name");
+
+ /*
+ * This array should be updated whenever new security providers
+ * are added to the the java.security file.
+ * NOTE: it should be in the same order as the java.security file
+ */
+
+ List<String> expected = new ArrayList<>();
+
+ if (os.equals("SunOS")) {
+ if (!isOpenJDKOnly()) {
+ expected.add("com.oracle.security.ucrypto.UcryptoProvider");
+ }
+ expected.add("sun.security.pkcs11.SunPKCS11");
+ }
+ expected.add("sun.security.provider.Sun");
+ expected.add("sun.security.rsa.SunRsaSign");
+ expected.add("sun.security.ec.SunEC");
+ expected.add("com.sun.net.ssl.internal.ssl.Provider");
+ expected.add("com.sun.crypto.provider.SunJCE");
+ expected.add("sun.security.jgss.SunProvider");
+ expected.add("com.sun.security.sasl.Provider");
+ expected.add("org.jcp.xml.dsig.internal.dom.XMLDSigRI");
+ expected.add("sun.security.smartcardio.SunPCSC");
+ if (os.startsWith("Windows")) {
+ expected.add("sun.security.mscapi.SunMSCAPI");
+ }
+ if (os.contains("OS X")) {
+ expected.add("apple.security.AppleProvider");
+ }
+
+ Iterator<String> iter = expected.iterator();
+ for (Provider p: Security.getProviders()) {
+ if (!iter.hasNext()) {
+ throw new Exception("Less expected");
+ }
+ String n1 = iter.next();
+ String n2 = p.getClass().getName();
+ if (!n1.equals(n2)) {
+ throw new Exception("Expected " + n1 + ", actual " + n2);
+ }
+ }
+ if (iter.hasNext()) {
+ throw new Exception("More expected");
+ }
+ }
+
+ // Copied from CheckPackageAccess.java in the same directory
+ private static boolean isOpenJDKOnly() {
+ String prop = System.getProperty("java.runtime.name");
+ return prop != null && prop.startsWith("OpenJDK");
+ }
+}
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java b/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java
index d4a75da..fb31450 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/ConstructorReceiverTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8023651
+ * @bug 8023651 8044629
* @summary Test that the receiver annotations and the return annotations of
* constructors behave correctly.
* @run testng ConstructorReceiverTest
@@ -38,11 +38,16 @@
import static org.testng.Assert.*;
public class ConstructorReceiverTest {
+ public static final Integer EMPTY_ANNOTATED_TYPE = Integer.valueOf(-1);
+
// Format is {
// { Class to get ctor for,
// ctor param class,
// value of anno of return type,
- // value of anno for receiver or null if there should be no receiver anno
+ // value of anno for receiver,
+ // or null if there should be no receiver,
+ // or EMPTY_ANNOTATED_TYPE of there should be a receiver but
+ // no annotation
// },
// ...
// }
@@ -51,13 +56,15 @@
{ ConstructorReceiverTest.Middle.class, ConstructorReceiverTest.class, Integer.valueOf(10), Integer.valueOf(15) },
{ ConstructorReceiverTest.Middle.Inner.class, ConstructorReceiverTest.Middle.class, Integer.valueOf(100), Integer.valueOf(150) },
{ ConstructorReceiverTest.Middle.Inner.Innermost.class, ConstructorReceiverTest.Middle.Inner.class, Integer.valueOf(1000), Integer.valueOf(1500) },
- { ConstructorReceiverTest.Middle.InnerNoReceiver.class, ConstructorReceiverTest.Middle.class, Integer.valueOf(300), null },
+ { ConstructorReceiverTest.Middle.InnerNoReceiver.class, ConstructorReceiverTest.Middle.class, Integer.valueOf(300), EMPTY_ANNOTATED_TYPE },
{ ConstructorReceiverTest.Nested.class, null, Integer.valueOf(20), null },
{ ConstructorReceiverTest.Nested.NestedMiddle.class, ConstructorReceiverTest.Nested.class, Integer.valueOf(200), Integer.valueOf(250)},
{ ConstructorReceiverTest.Nested.NestedMiddle.NestedInner.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(2000), Integer.valueOf(2500)},
- { ConstructorReceiverTest.Nested.NestedMiddle.NestedInnerNoReceiver.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(4000), null},
+ { ConstructorReceiverTest.Nested.NestedMiddle.NestedInnerNoReceiver.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(4000), EMPTY_ANNOTATED_TYPE},
+ { ConstructorReceiverTest.Nested.NestedMiddle.SecondNestedInnerNoReceiver.class, ConstructorReceiverTest.Nested.NestedMiddle.class, Integer.valueOf(5000), EMPTY_ANNOTATED_TYPE},
};
+
@DataProvider
public Object[][] data() { return TESTS; }
@@ -71,14 +78,27 @@
c = toTest.getDeclaredConstructor(ctorParamType);
AnnotatedType annotatedReceiverType = c.getAnnotatedReceiverType();
- Annotation[] receiverAnnotations = annotatedReceiverType.getAnnotations();
+ // Some Constructors doesn't conceptually have a receiver, they should return null
if (receiverVal == null) {
- assertEquals(receiverAnnotations.length, 0, Arrays.asList(receiverAnnotations).toString() +
- " should be empty. Looking at 'length': ");
+ assertNull(annotatedReceiverType, "getAnnotatedReciverType should return null for Constructor: " + c);
return;
}
+ // check that getType() matches the receiver
+ assertEquals(annotatedReceiverType.getType(),
+ ctorParamType,
+ "getType() doesn't match receiver type: " + ctorParamType);
+
+ Annotation[] receiverAnnotations = annotatedReceiverType.getAnnotations();
+
+ // Some Constructors have no annotations on but in theory can have a receiver
+ if (receiverVal.equals(EMPTY_ANNOTATED_TYPE)) {
+ assertEquals(receiverAnnotations.length, 0, "expecting an empty annotated type for: " + c);
+ return;
+ }
+
+ // The rest should have annotations
assertEquals(receiverAnnotations.length, 1, "expecting a 1 element array. Looking at 'length': ");
assertEquals(((Annot)receiverAnnotations[0]).value(), receiverVal.intValue(), " wrong annotation found. Found " +
receiverAnnotations[0] +
@@ -136,6 +156,10 @@
class NestedInnerNoReceiver {
@Annot(4000) public NestedInnerNoReceiver() {}
}
+
+ class SecondNestedInnerNoReceiver {
+ @Annot(5000) public SecondNestedInnerNoReceiver(NestedMiddle NestedMiddle.this) {}
+ }
}
}
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
index e3dd646..e960808 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,11 @@
/*
* @test
- * @bug 8024915
+ * @bug 8024915 8044629
*/
import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.Executable;
import java.util.Arrays;
public class GetAnnotatedReceiverType {
@@ -42,41 +43,115 @@
public Inner1(GetAnnotatedReceiverType GetAnnotatedReceiverType.this) {}
}
+ public static class Nested {
+ public Nested() {}
+
+ public class NestedInner {
+ public NestedInner() { }
+
+ public Class<?> getLocalClass () {
+ class NestedInnerLocal { public NestedInnerLocal() {} }
+ return NestedInnerLocal.class;
+ }
+
+ public Class<?> getAnonymousClass() {
+ return new Object() {}.getClass();
+ }
+ }
+ }
+
+ public class Inner2 {
+ public Inner2() { }
+
+ public class Inner3 {
+ public Inner3() { }
+
+ public Class<?> getLocalClass () {
+ class InnerLocal { public InnerLocal() {} }
+ return InnerLocal.class;
+ }
+
+ public Class<?> getAnonymousClass() {
+ return new Object() {}.getClass();
+ }
+ }
+
+ public Class<?> getLocalClass () {
+ class InnerLocal { public InnerLocal() {} }
+ return InnerLocal.class;
+ }
+
+ public Class<?> getAnonymousClass() {
+ return new Object() {}.getClass();
+ }
+ }
+
private static int failures = 0;
private static int tests = 0;
public static void main(String[] args) throws NoSuchMethodException {
- checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method").getAnnotatedReceiverType(),
+ checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method"),
"getAnnotatedReceiverType for \"method\" should return an empty AnnotatedType");
- checkEmptyAT(Inner0.class.getConstructor(GetAnnotatedReceiverType.class).getAnnotatedReceiverType(),
+ checkEmptyAT(Inner0.class.getConstructor(GetAnnotatedReceiverType.class),
"getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
- checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method0").getAnnotatedReceiverType(),
+ checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method0"),
"getAnnotatedReceiverType for \"method0\" should return an empty AnnotatedType");
- checkEmptyAT(Inner1.class.getConstructor(GetAnnotatedReceiverType.class).getAnnotatedReceiverType(),
+ checkEmptyAT(Inner1.class.getConstructor(GetAnnotatedReceiverType.class),
"getAnnotatedReceiverType for a ctor with a \"this\" should return an empty AnnotatedType");
- checkNull(GetAnnotatedReceiverType.class.getMethod("method4").getAnnotatedReceiverType(),
+ checkNull(GetAnnotatedReceiverType.class.getMethod("method4"),
"getAnnotatedReceiverType() on a static method should return null");
+ // More nested, inner, local and anonymous classes
+ Nested nested = new Nested();
+ Nested.NestedInner instance = nested.new NestedInner();
+ checkNull(nested.getClass().getConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for a static class should return null");
+ checkEmptyAT(instance.getClass().getConstructors()[0],
+ "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
+ checkNull(instance.getLocalClass().getConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for a local class should return null");
+ checkNull(instance.getAnonymousClass().getDeclaredConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
+
+ GetAnnotatedReceiverType outer = new GetAnnotatedReceiverType();
+ Inner2 instance2 = outer.new Inner2();
+ checkEmptyAT(instance2.getClass().getConstructors()[0],
+ "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
+ checkNull(instance2.getLocalClass().getConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for a local class should return null");
+ checkNull(instance2.getAnonymousClass().getDeclaredConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
+
+ Inner2.Inner3 instance3 = instance2.new Inner3();
+ checkEmptyAT(instance3.getClass().getConstructors()[0],
+ "getAnnotatedReceiverType for a ctor without a \"this\" should return an empty AnnotatedType");
+ checkNull(instance3.getLocalClass().getConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for a local class should return null");
+ checkNull(instance3.getAnonymousClass().getDeclaredConstructors()[0],
+ "getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
+
if (failures != 0)
throw new RuntimeException("Test failed, see log for details");
- else if (tests != 5)
+ else if (tests != 15)
throw new RuntimeException("Not all cases ran, failing");
}
- private static void checkNull(Object o, String msg) {
- if (o != null) {
+ private static void checkNull(Executable e, String msg) {
+ AnnotatedType a = e.getAnnotatedReceiverType();
+ if (a != null) {
failures++;
- System.err.println(msg);
+ System.err.println(msg + ": " + e);
}
tests++;
}
- private static void checkEmptyAT(AnnotatedType a, String msg) {
+ private static void checkEmptyAT(Executable e, String msg) {
+ AnnotatedType a = e.getAnnotatedReceiverType();
if (a.getAnnotations().length != 0) {
failures++;
- System.err.print(msg);
+ System.err.print(msg + ": " + e);
}
tests++;
}
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java b/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java
index ad8a87a..6735f46 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/TestExecutableGetAnnotatedType.java
@@ -73,13 +73,11 @@
testParameters(e.getParameters());
}
- // should test constructors as well, see JDK-8044629
@Test(dataProvider = "genericMethodData")
public void testGenericReceiverType(Executable e) throws Exception {
testReceiverType0(e);
}
- // should test constructors as well, see JDK-8044629
@Test(dataProvider = "methodData")
public void testReceiverType(Executable e) throws Exception {
testReceiverType0(e);
diff --git a/jdk/test/java/lang/instrument/NMTHelper.java b/jdk/test/java/lang/instrument/NMTHelper.java
index ad08fdb..c5843f8 100644
--- a/jdk/test/java/lang/instrument/NMTHelper.java
+++ b/jdk/test/java/lang/instrument/NMTHelper.java
@@ -32,8 +32,8 @@
executeDcmd("vmNativeMemory", "baseline");
}
- // Total: reserved=3484685KB +293KB, committed=266629KB +293KB
- private static Pattern totalLine = Pattern.compile("^Total: reserved=\\d+KB .*KB, committed=\\d+KB (.*)KB$");
+ // Total: reserved=3484685KB +293KB, committed=266629KB +293KB
+ private static Pattern totalLine = Pattern.compile("^Total: reserved=\\d+KB .*KB, committed=\\d+KB (.*)KB$");
public static long committedDiff() throws Exception {
String res = (String) executeDcmd("vmNativeMemory", "detail.diff");
diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
index 891e2fb..450cc87 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
@@ -50,6 +50,7 @@
private static boolean testFailed = false;
private static final int NUM_TRIGGERS = 5;
private static final int NUM_CHUNKS = 2;
+ private static final int YOUNG_GEN_SIZE = 8 * 1024 * 1024;
private static long chunkSize;
/**
@@ -59,11 +60,14 @@
*/
public static void main(String a[]) throws Throwable {
final String main = "LowMemoryTest$TestMain";
- RunUtil.runTestKeepGcOpts(main);
- RunUtil.runTestClearGcOpts(main, "-XX:+UseSerialGC");
- RunUtil.runTestClearGcOpts(main, "-XX:+UseParallelGC");
- RunUtil.runTestClearGcOpts(main, "-XX:+UseG1GC");
- RunUtil.runTestClearGcOpts(main, "-XX:+UseConcMarkSweepGC");
+ // Use a low young gen size to ensure that the
+ // allocated objects are put in the old gen.
+ final String nmFlag = "-Xmn" + YOUNG_GEN_SIZE;
+ RunUtil.runTestKeepGcOpts(main, nmFlag);
+ RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseSerialGC");
+ RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseParallelGC");
+ RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseG1GC");
+ RunUtil.runTestClearGcOpts(main, nmFlag, "-XX:+UseConcMarkSweepGC");
}
private static volatile boolean listenerInvoked = false;
@@ -156,6 +160,16 @@
chunkSize = (mu.getMax() - mu.getUsed()) / 20;
newThreshold = mu.getUsed() + (chunkSize * NUM_CHUNKS);
+ // Sanity check. Make sure the chunkSize is large than the YOUNG_GEN_SIZE
+ // If the chunkSize are lower than the YOUNG_GEN_SIZE, we will get intermittent
+ // failures when objects end up in the young gen instead of the old gen.
+ // Tweak the test if this fails.
+ if (chunkSize < YOUNG_GEN_SIZE) {
+ throw new RuntimeException("TEST FAILED: " +
+ " chunkSize: " + chunkSize + " is less than YOUNG_GEN_SIZE: " + YOUNG_GEN_SIZE +
+ " max: " + mu.getMax() + " used: " + mu.getUsed() + " newThreshold: " + newThreshold);
+ }
+
System.out.println("Setting threshold for " + mpool.getName() +
" from " + mpool.getUsageThreshold() + " to " + newThreshold +
". Current used = " + mu.getUsed());
diff --git a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java
index 4077d2a..b9db049 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java
@@ -31,7 +31,7 @@
* @author Mandy Chung
*
* @build MemoryManagement MemoryUtil
- * @run main/othervm/timeout=600 MemoryManagement
+ * @run main/othervm/timeout=600 -Xmn8m MemoryManagement
*/
import java.lang.management.*;
@@ -49,6 +49,8 @@
private static volatile boolean trace = false;
private static volatile boolean testFailed = false;
private static final int NUM_CHUNKS = 2;
+ // Must match -Xmn set on the @run line
+ private static final int YOUNG_GEN_SIZE = 8 * 1024 * 1024;
private static volatile long chunkSize;
private static volatile int listenerInvoked = 0;
@@ -112,6 +114,16 @@
}
newThreshold = mu.getUsed() + (chunkSize * NUM_CHUNKS);
+ // Sanity check. Make sure the chunkSize is large than the YOUNG_GEN_SIZE
+ // If the chunkSize are lower than the YOUNG_GEN_SIZE, we will get intermittent
+ // failures when objects end up in the young gen instead of the old gen.
+ // Tweak the test if this fails.
+ if (chunkSize < YOUNG_GEN_SIZE) {
+ throw new RuntimeException("TEST FAILED: " +
+ " chunkSize: " + chunkSize + " is less than YOUNG_GEN_SIZE: " + YOUNG_GEN_SIZE +
+ " max: " + mu.getMax() + " used: " + mu.getUsed() + " newThreshold: " + newThreshold);
+ }
+
System.out.println("Setting threshold for " + mpool.getName() +
" from " + mpool.getUsageThreshold() + " to " + newThreshold +
". Current used = " + mu.getUsed());
diff --git a/jdk/test/java/net/ipv6tests/Tests.java b/jdk/test/java/net/ipv6tests/Tests.java
index 8f1793b..a0d78fa 100644
--- a/jdk/test/java/net/ipv6tests/Tests.java
+++ b/jdk/test/java/net/ipv6tests/Tests.java
@@ -26,6 +26,9 @@
import java.util.*;
public class Tests {
+
+ static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+
/**
* performs a simple exchange of data between the two sockets
* and throws an exception if there is any problem.
@@ -264,6 +267,12 @@
if (ifs != null) {
while (ifs.hasMoreElements()) {
NetworkInterface nic = (NetworkInterface)ifs.nextElement();
+ // Skip (Windows)Teredo Tunneling Pseudo-Interface
+ if (isWindows) {
+ String dName = nic.getDisplayName();
+ if (dName != null && dName.contains("Teredo"))
+ continue;
+ }
try {
if (nic.isUp() && !nic.isLoopback())
return nic;
diff --git a/jdk/test/java/util/Base64/TestBase64.java b/jdk/test/java/util/Base64/TestBase64.java
index bbde587..5466cf3 100644
--- a/jdk/test/java/util/Base64/TestBase64.java
+++ b/jdk/test/java/util/Base64/TestBase64.java
@@ -114,8 +114,6 @@
testDecodeIgnoredAfterPadding();
}
- private static sun.misc.BASE64Encoder sunmisc = new sun.misc.BASE64Encoder();
-
private static void test(Base64.Encoder enc, Base64.Decoder dec,
int numRuns, int numBytes) throws Throwable {
Random rnd = new java.util.Random();
@@ -143,21 +141,6 @@
throw new RuntimeException(
"Base64 enc.encode().withoutPadding() has padding!");
}
- // compare to sun.misc.BASE64Encoder
-
- byte[] encoded2 = sunmisc.encode(orig).getBytes("ASCII");
- if (!withoutPadding) { // don't test for withoutPadding()
- checkEqual(normalize(encoded), normalize(encoded2),
- "Base64 enc.encode() does not match sun.misc.base64!");
- }
- // remove padding '=' to test non-padding decoding case
- if (encoded[encoded.length -2] == '=')
- encoded2 = Arrays.copyOf(encoded, encoded.length -2);
- else if (encoded[encoded.length -1] == '=')
- encoded2 = Arrays.copyOf(encoded, encoded.length -1);
- else
- encoded2 = null;
-
// --------testing encodetoString(byte[])/decode(String)--------
String str = enc.encodeToString(orig);
if (!Arrays.equals(str.getBytes("ASCII"), encoded)) {
@@ -167,11 +150,6 @@
byte[] buf = dec.decode(new String(encoded, "ASCII"));
checkEqual(buf, orig, "Base64 decoding(String) failed!");
- if (encoded2 != null) {
- buf = dec.decode(new String(encoded2, "ASCII"));
- checkEqual(buf, orig, "Base64 decoding(String) failed!");
- }
-
//-------- testing encode/decode(Buffer)--------
testEncode(enc, ByteBuffer.wrap(orig), encoded);
ByteBuffer bin = ByteBuffer.allocateDirect(orig.length);
@@ -183,9 +161,6 @@
bin.put(encoded).flip();
testDecode(dec, bin, orig);
- if (encoded2 != null)
- testDecode(dec, ByteBuffer.wrap(encoded2), orig);
-
// --------testing decode.wrap(input stream)--------
// 1) random buf length
ByteArrayInputStream bais = new ByteArrayInputStream(encoded);
diff --git a/jdk/test/java/util/Base64/TestBase64Golden.java b/jdk/test/java/util/Base64/TestBase64Golden.java
index 0543ae8..aee4294 100644
--- a/jdk/test/java/util/Base64/TestBase64Golden.java
+++ b/jdk/test/java/util/Base64/TestBase64Golden.java
@@ -40,9 +40,6 @@
import java.util.Objects;
import java.util.Random;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
public class TestBase64Golden {
public static void main(String[] args) throws Exception {
@@ -138,16 +135,6 @@
resArr = decoder.decode(encodedStr);
assertEqual(resArr, srcArr);
- // test compatible with sun.misc.Base64Encoder
- if (type == Base64Type.MIME) {
- sun.misc.BASE64Encoder miscEncoder = new BASE64Encoder();
- sun.misc.BASE64Decoder miscDecoder = new BASE64Decoder();
- resArr = decoder.decode(miscEncoder.encode(srcArr));
- assertEqual(resArr, srcArr);
-
- resArr = encoder.encode(miscDecoder.decodeBuffer(encodedStr));
- assertEqual(new String(resArr, DEF_CHARSET), encodedStr);
- }
}
}
diff --git a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java
new file mode 100644
index 0000000..5cc0bdc
--- /dev/null
+++ b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.text.SimpleDateFormat;
+import java.time.chrono.JapaneseDate;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import static java.util.GregorianCalendar.*;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/*
+ * Usage:
+ * java SupplementalJapaneseEraTest <flag>
+ * <flag>
+ * -s prints start time for a test era
+ * -e prints the English name of the last predefined era
+ *
+ * java -Djdk.calendar.japanese.supplemental.era=... SupplementalJapaneseEraTest <flag>
+ * -t executes tests with a valid property value
+ * -b <eraname>
+ * executes tests with an invalid property value
+ * <eraname> must be the output with -e
+ */
+
+public class SupplementalJapaneseEraTest {
+ private static final Locale WAREKI_LOCALE = Locale.forLanguageTag("ja-JP-u-ca-japanese");
+ private static final String NEW_ERA_NAME = "NewEra";
+ private static final String NEW_ERA_ABBR = "N.E.";
+ private static int errors = 0;
+
+ public static void main(String[] args) {
+ // args[0] is a flag.
+ switch (args[0]) {
+ case "-s":
+ // print the start time of the new era for testing
+ Calendar cal = new Calendar.Builder()
+ .setCalendarType("japanese")
+ .setTimeZone(TimeZone.getTimeZone("GMT"))
+ .setDate(200, FEBRUARY, 11)
+ .build();
+ System.out.println(cal.getTimeInMillis());
+ break;
+
+ case "-e":
+ // print the current era name in English
+ Calendar jcal = new Calendar.Builder()
+ .setCalendarType("japanese")
+ .setFields(YEAR, 1, DAY_OF_YEAR, 1)
+ .build();
+ System.out.println(jcal.getDisplayName(ERA, LONG, Locale.US));
+ break;
+
+ case "-t":
+ // test with a valid property value
+ testProperty();
+ break;
+
+ case "-b":
+ // test with an invalid property value
+ // args[1] is the current era name given by -e.
+ testValidation(args[1].replace("\r", "")); // remove any CR for Cygwin
+ break;
+ }
+ if (errors != 0) {
+ throw new RuntimeException("test failed");
+ }
+ }
+
+ private static void testProperty() {
+ Calendar jcal = new Calendar.Builder()
+ .setCalendarType("japanese")
+ .setFields(YEAR, 1, DAY_OF_YEAR, 1)
+ .build();
+ Date firstDayOfEra = jcal.getTime();
+
+ jcal.set(ERA, jcal.get(ERA) - 1); // previous era
+ jcal.set(YEAR, 1);
+ jcal.set(DAY_OF_YEAR, 1);
+ Calendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(jcal.getTimeInMillis());
+ cal.add(YEAR, 199);
+ int year = cal.get(YEAR);
+
+ SimpleDateFormat sdf;
+ String expected, got;
+
+ // test long era name
+ sdf = new SimpleDateFormat("GGGG y-MM-dd", WAREKI_LOCALE);
+ got = sdf.format(firstDayOfEra);
+ expected = NEW_ERA_NAME + " 1-02-11";
+ if (!expected.equals(got)) {
+ System.err.printf("GGGG y-MM-dd: got=\"%s\", expected=\"%s\"%n", got, expected);
+ errors++;
+ }
+
+ // test era abbreviation
+ sdf = new SimpleDateFormat("G y-MM-dd", WAREKI_LOCALE);
+ got = sdf.format(firstDayOfEra);
+ expected = NEW_ERA_ABBR+" 1-02-11";
+ if (!expected.equals(got)) {
+ System.err.printf("GGGG y-MM-dd: got=\"%s\", expected=\"%s\"%n", got, expected);
+ errors++;
+ }
+
+ // confirm the gregorian year
+ sdf = new SimpleDateFormat("y", Locale.US);
+ int y = Integer.parseInt(sdf.format(firstDayOfEra));
+ if (y != year) {
+ System.err.printf("Gregorian year: got=%d, expected=%d%n", y, year);
+ errors++;
+ }
+
+ // test java.time.chrono.JapaneseEra
+ JapaneseDate jdate = JapaneseDate.of(year, 2, 11);
+ got = jdate.toString();
+ expected = "Japanese " + NEW_ERA_NAME + " 1-02-11";
+ if (!expected.equals(got)) {
+ System.err.printf("JapaneseDate: got=\"%s\", expected=\"%s\"%n", got, expected);
+ errors++;
+ }
+ }
+
+ private static void testValidation(String eraName) {
+ Calendar jcal = new Calendar.Builder()
+ .setCalendarType("japanese")
+ .setFields(YEAR, 1, DAY_OF_YEAR, 1)
+ .build();
+ if (!jcal.getDisplayName(ERA, LONG, Locale.US).equals(eraName)) {
+ errors++;
+ String prop = System.getProperty("jdk.calendar.japanese.supplemental.era");
+ System.err.println("Era changed with invalid property: " + prop);
+ }
+ }
+}
diff --git a/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh
new file mode 100644
index 0000000..ade093c
--- /dev/null
+++ b/jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.sh
@@ -0,0 +1,74 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# @test
+# @bug 8048123
+# @summary Test for jdk.calendar.japanese.supplemental.era support
+# @build SupplementalJapaneseEraTest
+# @run shell SupplementalJapaneseEraTest.sh
+
+PROPERTY=jdk.calendar.japanese.supplemental.era
+STATUS=0
+
+# get the start time of the fictional next era
+SINCE=`${TESTJAVA}/bin/java -cp "${TESTCLASSES}" SupplementalJapaneseEraTest -s`
+
+echo "Tests with valid property values..."
+for P in "name=NewEra,abbr=N.E.,since=$SINCE" \
+ "name = NewEra, abbr = N.E., since = $SINCE"
+do
+ if ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp "${TESTCLASSES}" \
+ -D$PROPERTY="$P" SupplementalJapaneseEraTest -t; then
+ echo "$P: passed"
+ else
+ echo "$P: failed"
+ STATUS=1
+ fi
+done
+
+# get the name of the current era to be used to confirm that
+# invalid property values are ignored.
+ERA=`${TESTJAVA}/bin/java -cp "${TESTCLASSES}" SupplementalJapaneseEraTest -e`
+
+echo "Tests with invalid property values..."
+for P in "foo=Bar,name=NewEra,abbr=N.E.,since=$SINCE" \
+ "=NewEra,abbr=N.E.,since=$SINCE" \
+ "=,abbr=N.E.,since=$SINCE" \
+ "name,abbr=N.E.,since=$SINCE" \
+ "abbr=N.E.,since=$SINCE" \
+ "name=NewEra,since=$SINCE" \
+ "name=,abbr=N.E.,since=$SINCE" \
+ "name=NewEra,abbr=,since=$SINCE" \
+ "name=NewEra,abbr=N.E." \
+ "name=NewEra,abbr=N.E.,since=0" \
+ "name=NewEra,abbr=N.E.,since=9223372036854775808" # Long.MAX_VALUE+1
+do
+ if ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp "${TESTCLASSES}" \
+ -D$PROPERTY="$P" SupplementalJapaneseEraTest -b "$ERA"; then
+ echo "$P: passed"
+ else
+ echo "$P: failed"
+ STATUS=1
+ fi
+done
+exit $STATUS
diff --git a/jdk/test/java/util/Currency/PropertiesTest.sh b/jdk/test/java/util/Currency/PropertiesTest.sh
index 01f1326..cae14e6 100644
--- a/jdk/test/java/util/Currency/PropertiesTest.sh
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh
@@ -97,25 +97,16 @@
# Dump built-in currency data + overrides in properties file copied into
# JRE image.
-# Copy the test properties file. If testjava is not a typical jdk-image
-# or testjava is not writable, make a private copy of it.
-COPIED=0
-if [ -w ${TESTJAVA}${FS}jre${FS}lib ]
-then
- WRITABLEJDK=$TESTJAVA
+# Make a private copy of the jdk so we can write to the properties file location
+# without disturbing other users, including concurrently executing tests.
+WRITABLEJDK=.${FS}testjava
+cp -Hr $TESTJAVA $WRITABLEJDK
+if [ -d ${TESTJAVA}${FS}jre ]; then
PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
else
- WRITABLEJDK=.${FS}testjava
- if [ -d ${TESTJAVA}${FS}jre ]
- then
- PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
- else
- PROPLOCATION=${WRITABLEJDK}${FS}lib
- fi
- cp -r $TESTJAVA $WRITABLEJDK
- chmod -R +w $WRITABLEJDK
- COPIED=1
+ PROPLOCATION=${WRITABLEJDK}${FS}lib
fi
+chmod -R +w $WRITABLEJDK
cp ${PROPS} $PROPLOCATION
echo "Properties location: ${PROPLOCATION}"
@@ -125,11 +116,7 @@
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
# Cleanup
-rm -f ${PROPLOCATION}${FS}currency.properties
-if [ $COPIED -eq 1 ]
-then
- rm -rf $WRITABLEJDK
-fi
+rm -rf $WRITABLEJDK
# compare the two dump files
run PropertiesTest -c dump1 dump3 ${PROPS}
diff --git a/jdk/test/java/util/StringJoiner/MergeTest.java b/jdk/test/java/util/StringJoiner/MergeTest.java
index 9361e9b..63085b1 100644
--- a/jdk/test/java/util/StringJoiner/MergeTest.java
+++ b/jdk/test/java/util/StringJoiner/MergeTest.java
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 8017231 8020977
+ * @bug 8017231 8020977 8054221
* @summary test StringJoiner::merge
* @run testng MergeTest
*/
@@ -36,98 +36,135 @@
@Test
public class MergeTest {
- public void testNull() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- try {
- sj.merge(null);
- fail("Should throw NullPointerException!");
- } catch (NullPointerException npe) {
- // expected
+ private final static String[] PREFIXES = {"", "{", "@#$%"};
+ private final static String[] SUFFIXES = {"", "}", "*&%$"};
+
+ private static class Fixes {
+ public String pre0, suf0;
+ public String pre1, suf1;
+ public Fixes(String prefix0, String suffix0,
+ String prefix1, String suffix1) {
+ this.pre0 = prefix0;
+ this.suf0 = suffix0;
+ this.pre1 = prefix1;
+ this.suf1 = suffix1;
}
}
- public void testSimple() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- StringJoiner other = new StringJoiner(",", "[", "]");
- Stream.of("a", "b", "c").forEachOrdered(sj::add);
- Stream.of("d", "e", "f").forEachOrdered(other::add);
+ private static Stream<Fixes> fixesStream() {
+ Stream.Builder<Fixes> builder = Stream.builder();
+ for (final String prefix0 : PREFIXES) {
+ for (final String suffix0 : SUFFIXES) {
+ for (final String prefix1 : PREFIXES) {
+ for (final String suffix1 : SUFFIXES) {
+ builder.accept(new Fixes(prefix0, suffix0,
+ prefix1, suffix1));
+ }
+ }
+ }
+ }
+ return builder.build();
+ }
- sj.merge(other);
- assertEquals(sj.toString(), "{a,b,c,d,e,f}");
+ @Test(expectedExceptions = {NullPointerException.class})
+ public void testNull() {
+ StringJoiner sj = new StringJoiner(",", "{", "}");
+ sj.merge(null);
+ }
+
+ public void testSimple() {
+ fixesStream().forEach(fixes -> {
+ StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
+ StringJoiner other = new StringJoiner(",", fixes.pre1, fixes.suf1);
+ Stream.of("a", "b", "c").forEachOrdered(sj::add);
+ Stream.of("d", "e", "f").forEachOrdered(other::add);
+
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + "a,b,c,d,e,f" + fixes.suf0);
+ });
}
public void testEmptyOther() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- StringJoiner other = new StringJoiner(",", "[", "]");
- Stream.of("a", "b", "c").forEachOrdered(sj::add);
+ fixesStream().forEach(fixes -> {
+ StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
+ StringJoiner other = new StringJoiner(",", fixes.pre1, fixes.suf1);
+ Stream.of("a", "b", "c").forEachOrdered(sj::add);
- sj.merge(other);
- assertEquals(sj.toString(), "{a,b,c}");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + "a,b,c" + fixes.suf0);
- other.setEmptyValue("EMPTY");
- sj.merge(other);
- assertEquals(sj.toString(), "{a,b,c}");
+ other.setEmptyValue("EMPTY");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + "a,b,c" + fixes.suf0);
+ });
}
public void testEmptyThis() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- StringJoiner other = new StringJoiner(":", "[", "]");
- Stream.of("d", "e", "f").forEachOrdered(other::add);
+ fixesStream().forEach(fixes -> {
+ StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
+ StringJoiner other = new StringJoiner(":", fixes.pre1, fixes.suf1);
+ Stream.of("d", "e", "f").forEachOrdered(other::add);
- sj.merge(other);
- assertEquals(sj.toString(), "{d:e:f}");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + "d:e:f" + fixes.suf0);
- sj = new StringJoiner(",", "{", "}").setEmptyValue("EMPTY");
- assertEquals(sj.toString(), "EMPTY");
- sj.merge(other);
- assertEquals(sj.toString(), "{d:e:f}");
+ sj = new StringJoiner(",", fixes.pre0, fixes.suf0).setEmptyValue("EMPTY");
+ assertEquals(sj.toString(), "EMPTY");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + "d:e:f" + fixes.suf0);
+ });
}
public void testEmptyBoth() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- StringJoiner other = new StringJoiner(":", "[", "]");
+ fixesStream().forEach(fixes -> {
+ StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
+ StringJoiner other = new StringJoiner(":", fixes.pre1, fixes.suf1);
- sj.merge(other);
- assertEquals(sj.toString(), "{}");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + fixes.suf0);
- other.setEmptyValue("NOTHING");
- sj.merge(other);
- assertEquals(sj.toString(), "{}");
+ other.setEmptyValue("NOTHING");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + fixes.suf0);
- sj = new StringJoiner(",", "{", "}").setEmptyValue("EMPTY");
- assertEquals(sj.toString(), "EMPTY");
- sj.merge(other);
- assertEquals(sj.toString(), "EMPTY");
+ sj = new StringJoiner(",", fixes.pre0, fixes.suf0).setEmptyValue("EMPTY");
+ assertEquals(sj.toString(), "EMPTY");
+ sj.merge(other);
+ assertEquals(sj.toString(), "EMPTY");
+ });
}
public void testCascadeEmpty() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- StringJoiner o1 = new StringJoiner(":", "[", "]").setEmptyValue("Empty1");
- StringJoiner o2 = new StringJoiner(",", "<", ">").setEmptyValue("Empty2");
+ fixesStream().forEach(fixes -> {
+ StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
+ StringJoiner o1 = new StringJoiner(":", fixes.pre1, fixes.suf1).setEmptyValue("Empty1");
+ StringJoiner o2 = new StringJoiner(",", "<", ">").setEmptyValue("Empty2");
- o1.merge(o2);
- assertEquals(o1.toString(), "Empty1");
+ o1.merge(o2);
+ assertEquals(o1.toString(), "Empty1");
- sj.merge(o1);
- assertEquals(sj.toString(), "{}");
+ sj.merge(o1);
+ assertEquals(sj.toString(), fixes.pre0 + fixes.suf0);
+ });
}
public void testDelimiter() {
- StringJoiner sj = new StringJoiner(",", "{", "}");
- StringJoiner other = new StringJoiner(":", "[", "]");
- Stream.of("a", "b", "c").forEachOrdered(sj::add);
- Stream.of("d", "e", "f").forEachOrdered(other::add);
+ fixesStream().forEach(fixes -> {
+ StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
+ StringJoiner other = new StringJoiner(":", fixes.pre1, fixes.suf1);
+ Stream.of("a", "b", "c").forEachOrdered(sj::add);
+ Stream.of("d", "e", "f").forEachOrdered(other::add);
- sj.merge(other);
- assertEquals(sj.toString(), "{a,b,c,d:e:f}");
+ sj.merge(other);
+ assertEquals(sj.toString(), fixes.pre0 + "a,b,c,d:e:f" + fixes.suf0);
+ });
}
public void testMergeSelf() {
- final StringJoiner sj = new StringJoiner(",", "[", "]").add("a").add("b");
- assertEquals(sj.merge(sj).toString(), "[a,b,a,b]");
- assertEquals(sj.merge(sj).toString(), "[a,b,a,b,a,b,a,b]");
-
- final StringJoiner sj2 = new StringJoiner(",").add("c").add("d");
- assertEquals(sj2.merge(sj2).toString(), "c,d,c,d");
+ fixesStream().forEach(fixes -> {
+ final StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0).add("a").add("b");
+ assertEquals(sj.merge(sj).toString(), fixes.pre0 + "a,b,a,b" + fixes.suf0);
+ assertEquals(sj.merge(sj).toString(), fixes.pre0 + "a,b,a,b,a,b,a,b" + fixes.suf0);
+ });
}
}
diff --git a/jdk/test/java/util/StringJoiner/StringJoinerTest.java b/jdk/test/java/util/StringJoiner/StringJoinerTest.java
index e1b6fd3..ace4519 100644
--- a/jdk/test/java/util/StringJoiner/StringJoinerTest.java
+++ b/jdk/test/java/util/StringJoiner/StringJoinerTest.java
@@ -305,9 +305,9 @@
sj.add("2");
assertEquals(sj.toString(), prefix + "1" + infix + "2" + suffix);
sj.add("");
- assertEquals(sj.toString(), prefix + "1" + infix + "2" +infix + suffix);
+ assertEquals(sj.toString(), prefix + "1" + infix + "2" + infix + suffix);
sj.add("3");
- assertEquals(sj.toString(), prefix + "1" + infix + "2" +infix + infix + "3" + suffix);
+ assertEquals(sj.toString(), prefix + "1" + infix + "2" + infix + infix + "3" + suffix);
}
public void testDelimiterCombinations() {
diff --git a/jdk/test/java/util/logging/CheckZombieLockTest.java b/jdk/test/java/util/logging/CheckZombieLockTest.java
index f0b0a930..ab65a81 100644
--- a/jdk/test/java/util/logging/CheckZombieLockTest.java
+++ b/jdk/test/java/util/logging/CheckZombieLockTest.java
@@ -51,23 +51,23 @@
import java.util.logging.LogRecord;
public class CheckZombieLockTest {
- private static final String WRITABLE_DIR = "writable-dir";
+ private static final String WRITABLE_DIR = "writable-lockfile-dir";
private static volatile boolean supportsLocking = true;
static enum TestCase {
- WRITABLE, // just verifies that we can create a file in our 'writable-dir'
+ WRITABLE, // just verifies that we can create a file in our 'writable-lockfile-dir'
CLOSE, // checks that closing a FileHandler removes its lock file
- CREATE_FIRST, // verifies that 'writable-dir' contains no lock, then creates a first FileHandler.
- CREATE_NEXT, // verifies that 'writable-dir' contains a single lock, then creates the next FileHandler
+ CREATE_FIRST, // verifies that 'writable-lockfile-dir' contains no lock, then creates a first FileHandler.
+ CREATE_NEXT, // verifies that 'writable-lockfile-dir' contains a single lock, then creates the next FileHandler
REUSE, // verifies that zombie lock files can be reused
- CLEANUP // removes "writable-dir"
+ CLEANUP // removes "writable-lockfile-dir"
};
public static void main(String... args) throws IOException {
// we'll base all file creation attempts on the system temp directory,
// %t
File writableDir = setup();
- System.out.println("Writable dir is: "+writableDir.getAbsolutePath());
+ System.out.println("Writable dir is: " + writableDir.getAbsolutePath());
// we now have one writable directory to work with:
// writableDir
if (args == null || args.length == 0) {
@@ -104,7 +104,7 @@
case REUSE: testFileHandlerReuse(writableDir); break;
// Removes the writableDir
case CLEANUP: delete(writableDir); break;
- default: throw new RuntimeException("No such test case: "+arg);
+ default: throw new RuntimeException("No such test case: " + arg);
}
}
}
@@ -120,7 +120,7 @@
// Test 1: make sure we can create/delete files in the writable dir.
final File file = new File(writableDir, "test.txt");
if (!createFile(file, false)) {
- throw new IOException("Can't create "+file+"\n\tUnable to run test");
+ throw new IOException("Can't create " + file + "\n\tUnable to run test");
} else {
delete(file);
}
@@ -159,22 +159,22 @@
private static void testFileHandlerClose(File writableDir) throws IOException {
File fakeLock = new File(writableDir, "log.log.lck");
if (!createFile(fakeLock, false)) {
- throw new IOException("Can't create fake lock file: "+fakeLock);
+ throw new IOException("Can't create fake lock file: " + fakeLock);
}
try {
List<File> before = listLocks(writableDir, true);
- System.out.println("before: " +before.size() + " locks found");
+ System.out.println("before: " + before.size() + " locks found");
FileHandler handler = createFileHandler(writableDir);
- System.out.println("handler created: "+handler);
+ System.out.println("handler created: " + handler);
List<File> after = listLocks(writableDir, true);
System.out.println("after creating handler: " + after.size() + " locks found");
handler.close();
- System.out.println("handler closed: "+handler);
+ System.out.println("handler closed: " + handler);
List<File> afterClose = listLocks(writableDir, true);
System.out.println("after closing handler: " + afterClose.size() + " locks found");
afterClose.removeAll(before);
if (!afterClose.isEmpty()) {
- throw new RuntimeException("Zombie lock file detected: "+ afterClose);
+ throw new RuntimeException("Zombie lock file detected: " + afterClose);
}
} finally {
if (fakeLock.canRead()) delete(fakeLock);
@@ -186,21 +186,22 @@
private static void testFileHandlerReuse(File writableDir) throws IOException {
List<File> before = listLocks(writableDir, true);
- System.out.println("before: " +before.size() + " locks found");
+ System.out.println("before: " + before.size() + " locks found");
try {
if (!before.isEmpty()) {
- throw new RuntimeException("Expected no lock file! Found: "+before);
+ throw new RuntimeException("Expected no lock file! Found: " + before);
}
} finally {
before.stream().forEach(CheckZombieLockTest::delete);
}
FileHandler handler1 = createFileHandler(writableDir);
- System.out.println("handler created: "+handler1);
+ System.out.println("handler created: " + handler1);
List<File> after = listLocks(writableDir, true);
System.out.println("after creating handler: " + after.size() + " locks found");
if (after.size() != 1) {
- throw new RuntimeException("Unexpected number of lock files found for "+handler1+": "+after);
+ throw new RuntimeException("Unexpected number of lock files found for "
+ + handler1 + ": " + after);
}
final File lock = after.get(0);
after.clear();
@@ -208,33 +209,34 @@
after = listLocks(writableDir, true);
System.out.println("after closing handler: " + after.size() + " locks found");
if (!after.isEmpty()) {
- throw new RuntimeException("Unexpected number of lock files found for "+handler1+": "+after);
+ throw new RuntimeException("Unexpected number of lock files found for "
+ + handler1 + ": " + after);
}
if (!createFile(lock, false)) {
- throw new IOException("Can't create fake lock file: "+lock);
+ throw new IOException("Can't create fake lock file: " + lock);
}
try {
before = listLocks(writableDir, true);
- System.out.println("before: " +before.size() + " locks found");
+ System.out.println("before: " + before.size() + " locks found");
if (before.size() != 1) {
- throw new RuntimeException("Unexpected number of lock files found: "+before+" expected ["
- +lock+"].");
+ throw new RuntimeException("Unexpected number of lock files found: "
+ + before + " expected [" + lock + "].");
}
FileHandler handler2 = createFileHandler(writableDir);
- System.out.println("handler created: "+handler2);
+ System.out.println("handler created: " + handler2);
after = listLocks(writableDir, true);
System.out.println("after creating handler: " + after.size() + " locks found");
after.removeAll(before);
if (!after.isEmpty()) {
- throw new RuntimeException("Unexpected lock file found: "+after
+ throw new RuntimeException("Unexpected lock file found: " + after
+ "\n\t" + lock + " should have been reused");
}
handler2.close();
- System.out.println("handler closed: "+handler2);
+ System.out.println("handler closed: " + handler2);
List<File> afterClose = listLocks(writableDir, true);
System.out.println("after closing handler: " + afterClose.size() + " locks found");
if (!afterClose.isEmpty()) {
- throw new RuntimeException("Zombie lock file detected: "+ afterClose);
+ throw new RuntimeException("Zombie lock file detected: " + afterClose);
}
if (supportsLocking) {
@@ -243,18 +245,19 @@
StandardOpenOption.WRITE);
try {
if (fc.tryLock() != null) {
- System.out.println("locked: "+lock);
+ System.out.println("locked: " + lock);
handler2 = createFileHandler(writableDir);
- System.out.println("handler created: "+handler2);
+ System.out.println("handler created: " + handler2);
after = listLocks(writableDir, true);
- System.out.println("after creating handler: " + after.size() + " locks found");
+ System.out.println("after creating handler: " + after.size()
+ + " locks found");
after.removeAll(before);
if (after.size() != 1) {
- throw new RuntimeException("Unexpected lock files found: "+after
+ throw new RuntimeException("Unexpected lock files found: " + after
+ "\n\t" + lock + " should not have been reused");
}
} else {
- throw new RuntimeException("Failed to lock: "+lock);
+ throw new RuntimeException("Failed to lock: " + lock);
}
} finally {
delete(lock);
@@ -271,22 +274,23 @@
private static void testFileHandlerCreate(File writableDir, boolean first)
throws IOException {
List<File> before = listLocks(writableDir, true);
- System.out.println("before: " +before.size() + " locks found");
+ System.out.println("before: " + before.size() + " locks found");
try {
if (first && !before.isEmpty()) {
- throw new RuntimeException("Expected no lock file! Found: "+before);
+ throw new RuntimeException("Expected no lock file! Found: " + before);
} else if (!first && before.size() != 1) {
- throw new RuntimeException("Expected a single lock file! Found: "+before);
+ throw new RuntimeException("Expected a single lock file! Found: " + before);
}
} finally {
before.stream().forEach(CheckZombieLockTest::delete);
}
FileHandler handler = createFileHandler(writableDir);
- System.out.println("handler created: "+handler);
+ System.out.println("handler created: " + handler);
List<File> after = listLocks(writableDir, true);
System.out.println("after creating handler: " + after.size() + " locks found");
if (after.size() != 1) {
- throw new RuntimeException("Unexpected number of lock files found for "+handler+": "+after);
+ throw new RuntimeException("Unexpected number of lock files found for "
+ + handler + ": " + after);
}
}
@@ -305,7 +309,7 @@
tmpDir = System.getProperty("user.home");
}
File tmpOrHomeDir = new File(tmpDir);
- // Create a writable directory here (%t/writable-dir)
+ // Create a writable directory here (%t/writable-lockfile-dir)
File writableDir = new File(tmpOrHomeDir, WRITABLE_DIR);
if (!createFile(writableDir, true)) {
throw new RuntimeException("Test setup failed: unable to create"
@@ -314,9 +318,10 @@
}
// try to determine whether file locking is supported
+ final String uniqueFileName = UUID.randomUUID().toString()+".lck";
try {
FileChannel fc = FileChannel.open(Paths.get(writableDir.getAbsolutePath(),
- UUID.randomUUID().toString()+".lck"),
+ uniqueFileName),
StandardOpenOption.CREATE_NEW, StandardOpenOption.APPEND,
StandardOpenOption.DELETE_ON_CLOSE);
try {
@@ -326,9 +331,11 @@
} finally {
fc.close();
}
- } catch(Throwable t) {
+ } catch (IOException t) {
// should not happen
- t.printStackTrace();
+ System.err.println("Failed to create new file " + uniqueFileName +
+ " in " + writableDir.getAbsolutePath());
+ throw new RuntimeException("Test setup failed: unable to run test", t);
}
return writableDir;
}
diff --git a/jdk/test/java/util/logging/TestLoggerBundleSync.java b/jdk/test/java/util/logging/TestLoggerBundleSync.java
index 48933c9..7f5e514 100644
--- a/jdk/test/java/util/logging/TestLoggerBundleSync.java
+++ b/jdk/test/java/util/logging/TestLoggerBundleSync.java
@@ -58,6 +58,7 @@
*/
public class TestLoggerBundleSync {
+ static final boolean VERBOSE = false;
static volatile Exception thrown = null;
static volatile boolean goOn = true;
@@ -65,6 +66,7 @@
static final long TIME = 4 * 1000; // 4 sec.
static final long STEP = 1 * 1000; // message every 1 sec.
static final int LCOUNT = 50; // change bundle 50 times...
+ static final AtomicLong ignoreLogCount = new AtomicLong(0);
static final AtomicLong setRBcount = new AtomicLong(0);
static final AtomicLong setRBNameCount = new AtomicLong(0);
static final AtomicLong getRBcount = new AtomicLong(0);
@@ -150,6 +152,7 @@
long sSetRBNameCount = setRBNameCount.get();
long sCheckCount = checkCount.get();
long sNextLong = nextLong.get();
+ long sIgnoreLogCount = ignoreLogCount.get();
List<Thread> threads = new ArrayList<>();
for (Class<? extends ResourceBundle> type : classes) {
threads.add(new SetRB(type));
@@ -181,21 +184,58 @@
+ " resource bundles set by " + classes.size() + " Thread(s),");
System.out.println("\t " + (setRBNameCount.get() - sSetRBNameCount)
+ " resource bundle names set by " + classes.size() + " Thread(s),");
+ System.out.println("\t " + (ignoreLogCount.get() - sIgnoreLogCount)
+ + " log messages emitted by other GetRB threads were ignored"
+ + " to ensure MT test consistency,");
System.out.println("\t ThreadMXBean.findDeadlockedThreads called "
+ (checkCount.get() -sCheckCount) + " times by 1 Thread.");
}
final static class GetRB extends Thread {
- final static class MyHandler extends Handler {
+ final class MyHandler extends Handler {
volatile ResourceBundle rb;
volatile String rbName;
volatile int count = 0;
@Override
public synchronized void publish(LogRecord record) {
- count++;
- rb = record.getResourceBundle();
- rbName = record.getResourceBundleName();
+ Object[] params = record.getParameters();
+ // Each GetRB thread has its own handler, but since they
+ // log into the same logger, each handler may receive
+ // messages emitted by other threads.
+ // This means that GetRB#2.handler may receive a message
+ // emitted by GetRB#1 at a time where the resource bundle
+ // was still null.
+ // To avoid falling into this trap, the GetRB thread passes
+ // 'this' as argument to the messages it logs - which does
+ // allow us here to ignore messages that where not emitted
+ // by our own GetRB.this thread...
+ if (params.length == 1) {
+ if (params[0] == GetRB.this) {
+ // The message was emitted by our thread.
+ count++;
+ rb = record.getResourceBundle();
+ rbName = record.getResourceBundleName();
+ } else {
+ // The message was emitted by another thread: just
+ // ignore it, as it may have been emitted at a time
+ // where the resource bundle was still null, and
+ // processing it may overwrite the 'rb' and 'rbName'
+ // recorded from the message emitted by our own thread.
+ if (VERBOSE) {
+ System.out.println("Ignoring message logged by " + params[0]);
+ }
+ ignoreLogCount.incrementAndGet();
+ }
+ } else {
+ ignoreLogCount.incrementAndGet();
+ System.err.println("Unexpected message received");
+ }
+ }
+
+ void reset() {
+ rbName = null;
+ rb = null;
}
@Override
@@ -207,6 +247,7 @@
}
};
final MyHandler handler = new MyHandler();
+
@Override
public void run() {
try {
@@ -234,9 +275,10 @@
+ handler.getLevel());
}
final int countBefore = handler.count;
+ handler.reset();
ll.setLevel(Level.FINEST);
ll.addHandler(handler);
- ll.fine("dummy");
+ ll.log(Level.FINE, "dummy {0}", this);
ll.removeHandler(handler);
final int countAfter = handler.count;
if (countBefore == countAfter) {
diff --git a/jdk/test/javax/swing/JLayer/8041982/bug8041982.java b/jdk/test/javax/swing/JLayer/8041982/bug8041982.java
new file mode 100644
index 0000000..7413c7e
--- /dev/null
+++ b/jdk/test/javax/swing/JLayer/8041982/bug8041982.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8041982
+ * @summary Use of animated icon in JLayer causes CPU spin
+ * @author Alexander Potochkin
+ */
+
+import javax.swing.*;
+import javax.swing.plaf.LayerUI;
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+
+public class bug8041982 extends JFrame {
+
+ public bug8041982() {
+ setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ add(new JLayer<>(new JPanel(), new BusyLayer()));
+ setSize(200, 300);
+ setVisible(true);
+ }
+
+ public static void main(String... args) throws Exception {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ new bug8041982().setVisible(true);
+ }
+ });
+ Thread.sleep(5000);
+ }
+
+ private class BusyLayer extends LayerUI<JComponent> {
+ private volatile boolean animated = true;
+ private Icon icon = new ImageIcon(bug8041982.class.getResource("cupanim.gif"));
+ private int imageUpdateCount;
+
+ @Override
+ public void paint(Graphics g, JComponent c) {
+ super.paint(g, c);
+ if (isAnimated()) {
+ icon.paintIcon(c, g, c.getWidth() / 2 - icon.getIconWidth() /
+ 2,
+ c.getHeight() / 2 - icon.getIconHeight() / 2);
+ }
+ }
+
+ public boolean isAnimated() {
+ return animated;
+ }
+
+ public void setAnimated(boolean animated) {
+ if (this.animated != animated) {
+ this.animated = animated;
+ firePropertyChange("animated", !animated, animated);
+ }
+ }
+
+ @Override
+ public void applyPropertyChange(PropertyChangeEvent evt, JLayer l) {
+ // this will be called when the busy flag is changed
+ l.repaint();
+ }
+
+ @Override
+ public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h, JLayer<? extends JComponent> l) {
+ System.out.println("imageUpdate " + imageUpdateCount);
+ if (imageUpdateCount++ == 100) {
+ setAnimated(false);
+ } else if (imageUpdateCount > 100) {
+ throw new RuntimeException("Test failed");
+ }
+ return isAnimated() && super.imageUpdate(img, infoflags, x, y, w, h, l);
+ }
+ }
+}
+
diff --git a/jdk/test/javax/swing/JLayer/8041982/cupanim.gif b/jdk/test/javax/swing/JLayer/8041982/cupanim.gif
new file mode 100644
index 0000000..934d093
--- /dev/null
+++ b/jdk/test/javax/swing/JLayer/8041982/cupanim.gif
Binary files differ
diff --git a/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java b/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java
new file mode 100644
index 0000000..db99233
--- /dev/null
+++ b/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.awt.BorderLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import sun.awt.SunToolkit;
+
+/**
+ * @test
+ * @bug 8017284
+ * @author Alexander Scherbatiy
+ * @summary Aqua LaF: memory leak when HTML is used for JTabbedPane tab titles
+ * @run main/othervm/timeout=60 -Xmx128m bug8017284
+ */
+public class bug8017284 {
+
+ private static final int TAB_COUNT = 100;
+ private static final int ITERATIONS = 100;
+ private static JFrame frame;
+ private static JTabbedPane tabbedPane;
+
+ public static void main(String[] args) throws Exception {
+
+ SwingUtilities.invokeAndWait(() -> {
+ frame = new JFrame();
+ frame.setSize(500, 500);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ tabbedPane = new JTabbedPane();
+
+ for (int i = 0; i < TAB_COUNT; i++) {
+ tabbedPane.add("Header " + i, new JLabel("Content: " + i));
+ }
+
+ frame.getContentPane().setLayout(new BorderLayout());
+ frame.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+ frame.setVisible(true);
+ });
+
+ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
+
+ SwingUtilities.invokeAndWait(() -> {
+ for (int j = 0; j < ITERATIONS; j++) {
+ for (int i = 0; i < TAB_COUNT; i++) {
+ tabbedPane.setTitleAt(i, getHtmlText(j * TAB_COUNT + i));
+ }
+ }
+ });
+ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
+
+ SwingUtilities.invokeAndWait(() -> frame.dispose());
+ }
+
+ private static String getHtmlText(int i) {
+ return "<html><b><i>" + i + "</b></i>";
+ }
+}
diff --git a/jdk/test/javax/swing/SwingUtilities/8049533/bug8049533.java b/jdk/test/javax/swing/SwingUtilities/8049533/bug8049533.java
new file mode 100644
index 0000000..15b38d6
--- /dev/null
+++ b/jdk/test/javax/swing/SwingUtilities/8049533/bug8049533.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Frame;
+import java.awt.Panel;
+import java.awt.event.MouseWheelEvent;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 8049533
+ * @summary SwingUtilities.convertMouseEvent misses
+ * MouseWheelEvent.preciseWheelRotation
+ * @run main bug8049533
+ */
+public class bug8049533 {
+
+ private static final double PRECISE_WHEEL_ROTATION = 3.14;
+
+ public static void main(String[] args) {
+ Frame frame = new Frame();
+ Panel panel = new Panel();
+ frame.add(panel);
+
+ MouseWheelEvent event = new MouseWheelEvent(panel,
+ 0, 0, 0, 0, 0, 0, 0, 0, false, 0, 0,
+ 2, // wheelRotation
+ PRECISE_WHEEL_ROTATION); // preciseWheelRotation
+
+ MouseWheelEvent convertedEvent = (MouseWheelEvent) SwingUtilities.
+ convertMouseEvent(event.getComponent(), event, null);
+
+ if (convertedEvent.getPreciseWheelRotation() != PRECISE_WHEEL_ROTATION) {
+ throw new RuntimeException("PreciseWheelRotation field is not copied!");
+ }
+ }
+}
diff --git a/jdk/test/javax/swing/reliability/GUIUndFrame.java b/jdk/test/javax/swing/reliability/GUIUndFrame.java
new file mode 100644
index 0000000..faeb825
--- /dev/null
+++ b/jdk/test/javax/swing/reliability/GUIUndFrame.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+/*
+ * @author Aruna Samji
+ */
+
+public class GUIUndFrame extends Frame {
+
+ JFrame jframe1, jframe2, jframe3;
+ Component comp;
+ JButton jbutton1, jbutton2, jbutton3, jbutton4;
+ JTextArea jtextarea;
+
+ volatile boolean win_act, win_deact, win_ico, win_deico, win_close;
+
+ public GUIUndFrame() {
+ //GUI for UndJFrameProperties
+ jframe1 = new JFrame();
+ jframe1.getContentPane().setLayout(new FlowLayout());
+ jframe1.setSize(500,255);
+ jframe1.setUndecorated(true);
+ jframe1.getContentPane().setBackground(Color.red);
+
+ jframe1.addWindowListener( new WindowAdapter() {
+ public void windowActivated(WindowEvent e){
+ comp = null;
+ comp = e.getComponent();
+ if (e.getComponent() == jframe1)
+ win_act = true;
+ }
+
+ public void windowDeactivated(WindowEvent e){
+ win_deact = true;
+ }
+ });
+
+
+ jbutton1 = new JButton("Hide me");
+ jbutton1.addActionListener(e -> jframe1.setVisible(false));
+
+
+ //Create a normal decorated frame to test all the relevant assertions
+ jframe2 = new JFrame();
+ jframe2.getContentPane().setLayout(new FlowLayout());
+ jframe2.setLocation(0,270);
+ jframe2.setSize(500,255);
+ jframe2.getContentPane().setBackground(Color.blue);
+ jbutton2 = new JButton("Show hiddenJFrame");
+ jbutton2.addActionListener(e -> jframe1.setVisible(true));
+
+
+ //GUI for UndFrameIconifyRepaint
+ jframe3 = new JFrame();
+ jframe3.getContentPane().setLayout(new FlowLayout());
+ jframe3.setSize(500,255);
+ jframe3.getContentPane().setBackground(Color.green);
+ jframe3.setUndecorated(true);
+ jframe3.addWindowListener( new WindowAdapter() {
+ public void windowActivated(WindowEvent e) {
+ comp = null;
+ comp = e.getComponent();
+ if(e.getComponent() == jframe3){
+ win_act=true;
+
+ }
+ }
+ public void windowIconified(WindowEvent e){ win_ico = true; }
+ public void windowDeiconified(WindowEvent e){ win_deico = true; }
+ public void windowDeactivated(WindowEvent e){ win_deact = true; }
+ public void windowClosed(WindowEvent e){ win_close = true; }
+ });
+
+ jbutton3 = new JButton("Minimize me");
+ jbutton3.addActionListener(e -> jframe3.setState(Frame.ICONIFIED));
+ jbutton4 = new JButton("Maximize me");
+ jbutton4.addActionListener(e -> {
+ if (Toolkit.getDefaultToolkit().isFrameStateSupported
+ (Frame.MAXIMIZED_BOTH)) {
+ jframe3.setExtendedState(Frame.MAXIMIZED_BOTH);
+ }
+ });
+
+ jtextarea = new JTextArea("Textarea");
+ }
+}
diff --git a/jdk/test/javax/swing/reliability/GUIZoomFrame.java b/jdk/test/javax/swing/reliability/GUIZoomFrame.java
new file mode 100644
index 0000000..e107d27
--- /dev/null
+++ b/jdk/test/javax/swing/reliability/GUIZoomFrame.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+/*
+ * @author Aruna Samji
+ */
+
+public class GUIZoomFrame extends Frame {
+
+ JFrame jframe1, jframe2;
+ JButton jbutton;
+ JTextArea jtextarea;
+ volatile boolean maxHor, maxVer, maxBoth, normal, iconify;
+
+ public GUIZoomFrame() {
+ //GUI for ZoomJFrameChangeState
+ jframe1 = new JFrame("ZoomJFrameChangeState");
+ jframe1.getContentPane().setBackground(Color.red);
+ jframe1.getContentPane().setLayout(null);
+ jframe1.setSize(500,270);
+
+ //GUI for ZoomJFrameRepaint
+ jframe2 = new JFrame("ZoomJFrameRepaint");
+ jframe2.getContentPane().setBackground(Color.red);
+ jframe2.setSize(500, 270);
+ jframe2.getContentPane().setLayout(null);
+ jbutton = new JButton("TestButton");
+ jtextarea = new JTextArea("TextArea");
+ jbutton.setBounds(20, 100, 80, 60);
+ jtextarea.setBounds(120, 100, 80, 60);
+
+ //Listeners for ZoomJFrameChangeState
+ jframe1.addWindowStateListener(new WindowAdapter() {
+ public void windowStateChanged(WindowEvent e) {
+ if (e.getNewState() == Frame.MAXIMIZED_BOTH)
+ maxBoth = true;
+
+ if (e.getNewState() == Frame.NORMAL)
+ normal = true;
+
+ if (e.getNewState() == Frame.ICONIFIED)
+ iconify = true;
+
+ if (e.getNewState() == Frame.MAXIMIZED_HORIZ)
+ maxHor = true;
+
+ if (e.getNewState() == Frame.MAXIMIZED_VERT)
+ maxVer = true;
+ }
+ });
+
+ //Listeners for ZoomJFrameRepaint
+ jframe2.addWindowStateListener( new WindowAdapter() {
+ public void windowStateChanged(WindowEvent e) {
+ if (e.getNewState() == Frame.MAXIMIZED_BOTH)
+ maxBoth = true;
+
+ if (e.getNewState() == Frame.NORMAL)
+ normal = true;
+ }
+ });
+ }
+}
diff --git a/jdk/test/javax/swing/reliability/Task.java b/jdk/test/javax/swing/reliability/Task.java
new file mode 100644
index 0000000..7f67ee8
--- /dev/null
+++ b/jdk/test/javax/swing/reliability/Task.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+/*
+ * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
+ */
+
+public abstract class Task <T extends Frame> {
+
+ protected T gui;
+ protected ExtendedRobot robot;
+
+ public Task(Class guiClass, ExtendedRobot robot) throws Exception {
+ this.robot = robot;
+ SwingUtilities.invokeAndWait( () -> {
+ try {
+ this.gui = (T) guiClass.getConstructor().newInstance();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+
+ robot.waitForIdle(1000);
+ }
+
+ public abstract void task() throws Exception;
+}
diff --git a/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java b/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java
new file mode 100644
index 0000000..4cea8f9
--- /dev/null
+++ b/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+/*
+ * @test
+ * @summary Construct a Undecorated JFrame, try to change the properties
+ * using setVisible() method.
+ * @author Aruna Samji
+ * @library ../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main TaskUndJFrameProperties
+ */
+
+public class TaskUndJFrameProperties extends Task<GUIUndFrame> {
+
+ public static void main (String[] args) throws Exception {
+ new TaskUndJFrameProperties(GUIUndFrame.class, new ExtendedRobot()).task();
+ }
+
+ TaskUndJFrameProperties(Class guiClass, ExtendedRobot robot) throws Exception {
+ super(guiClass, robot);
+ }
+
+ public void task() throws Exception {
+ SwingUtilities.invokeAndWait(() -> {
+ gui.jframe2.setVisible(true);
+ gui.jframe1.setVisible(true);
+
+ gui.jframe1.getContentPane().removeAll();
+ gui.jframe2.getContentPane().removeAll();
+ gui.jframe1.getContentPane().add(gui.jbutton1);
+ gui.jframe2.getContentPane().add(gui.jbutton2);
+ gui.jframe1.revalidate();
+ gui.jframe2.revalidate();
+ });
+ robot.waitForIdle(1000);
+
+ Point button1Origin = gui.jbutton1.getLocationOnScreen();
+ Point button1Center = gui.jbutton1.getLocationOnScreen();
+ button1Center.translate(gui.jbutton1.getWidth()/2, gui.jbutton1.getHeight()/2);
+ Point button2Origin = gui.jbutton2.getLocationOnScreen();
+ Point button2Center = gui.jbutton2.getLocationOnScreen();
+ button2Center.translate(gui.jbutton2.getWidth()/2, gui.jbutton2.getHeight()/2);
+
+ robot.glide(button1Origin, button1Center);
+ robot.waitForIdle(1000);
+ robot.click();
+ //After Hide
+ if (gui.win_deact == false)
+ throw new RuntimeException("Undecorated JFrame has not triggered " +
+ "WINDOW_DEACTIVATED event when in Hide state\n");
+
+ if (gui.jframe1.hasFocus() == true)
+ throw new RuntimeException("Undecorated Frame Still has Focus even " +
+ "when in Hide state\n");
+
+ //click on the jbutton2 in jframe2
+ SwingUtilities.invokeAndWait(gui.jframe2::toFront);
+ robot.waitForIdle(1000);
+ robot.glide(button2Origin, button2Center);
+ robot.waitForIdle(1000);
+ robot.click();
+ //After Show
+ if (gui.win_act == false)
+ throw new RuntimeException("Undecorated Frame can't trigger " +
+ "WINDOW_ACTIVATED when visible\n");
+ }
+}
diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java b/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java
new file mode 100644
index 0000000..d8a3374
--- /dev/null
+++ b/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+/*
+ * @test
+ * @summary Construct a JFrame, zoom it from the normal state and back forth
+ * using Frame.ZOOMED and Frame.NORMAL. Iconofy from the zoomed
+ * state and back forth using Frame.ICONIFIED and Frame.NORMAL and
+ * check the zoomed size is same as the screen size. Check the
+ * location of the jframe after restoration from zoom or icon.
+ * @author Aruna Samji
+ * @library ../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main TaskZoomJFrameChangeState
+ */
+
+public class TaskZoomJFrameChangeState extends Task<GUIZoomFrame> {
+
+ public static void main (String[] args) throws Exception {
+ new TaskZoomJFrameChangeState(GUIZoomFrame.class, new ExtendedRobot()).task();
+ }
+
+ TaskZoomJFrameChangeState(Class guiClass, ExtendedRobot robot) throws Exception {
+ super(guiClass, robot);
+ }
+
+ public void task() throws Exception {
+ SwingUtilities.invokeAndWait(() -> {
+ gui.jframe1.setVisible(true);
+ gui.jframe1.getContentPane().removeAll();
+ if (gui.jframe1.getExtendedState() != Frame.NORMAL)
+ gui.jframe1.setExtendedState(Frame.NORMAL);
+ });
+ robot.waitForIdle(1000);
+
+ Point frameOrigin = gui.jframe1.getLocationOnScreen();
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.ICONIFIED)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for ICONIFIED state is set
+ if (gui.jframe1.getExtendedState() != Frame.ICONIFIED)
+ throw new RuntimeException("The bitwise mask Frame.ICONIFIED is " +
+ "not set when the frame is in ICONIFIED state");
+
+ //To check whether the Frame is iconified programmatically
+ if (!gui.iconify)
+ throw new RuntimeException("Frame is not Iconified");
+
+ //Normalising the Frame.
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.NORMAL)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for NORMAL state is set
+ if (gui.jframe1.getExtendedState() != Frame.NORMAL)
+ throw new RuntimeException("The bitwise mask Frame.NORMAL is " +
+ "not set when the frame is in NORMAL state");
+
+ //To check whether the Frame is normalised programmatically
+ if (!gui.normal)
+ throw new RuntimeException("Frame is not restored to normal");
+
+ Point newposition = gui.jframe1.getLocationOnScreen();
+
+ if ((frameOrigin.x != newposition.x) & (frameOrigin.y != newposition.y))
+ throw new RuntimeException("The frame is not positioned back to " +
+ "the original place on the screen after iconified");
+
+ robot.waitForIdle(1000);
+
+ //To check whether the state is supported in the platform
+ if (Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_HORIZ)) {
+ //Maximising the Frame horizontally
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.MAXIMIZED_HORIZ)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for MAXIMIZED_HORIZ state is set
+ if (gui.jframe1.getExtendedState() != Frame.MAXIMIZED_HORIZ)
+ throw new RuntimeException("The bitwise mask Frame.MAXIMIZED_HOR " +
+ "is not set when the frame is in MAXIMIZED_HOR state");
+
+ //To check whether the Frame is maximized horizontally
+ if (!gui.maxHor)
+ throw new RuntimeException("Frame is not maximized horizontally");
+
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.NORMAL)
+ );
+ robot.waitForIdle(1000);
+ }
+
+ //To check whether the state is supported in the platform
+ if (Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_VERT)) {
+ //Maximising the Frame vertically
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.MAXIMIZED_VERT)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for MAXIMIZED_VERT state is set
+ if (gui.jframe1.getExtendedState() != Frame.MAXIMIZED_VERT)
+ throw new RuntimeException("The bitwise mask Frame.MAXIMIZED_VERT " +
+ "is not set when the frame is in MAXIMIZED_VERT state");
+
+ //To check whether the Frame is maximized vertically
+ if (!gui.maxVer)
+ throw new RuntimeException("Frame is not maximized vertically");
+
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.NORMAL)
+ );
+ robot.waitForIdle(1000);
+ }
+
+ if (Toolkit.getDefaultToolkit().isFrameStateSupported
+ (Frame.MAXIMIZED_BOTH)){
+ //Maximising the Frame fully
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.MAXIMIZED_BOTH)
+ );
+ }
+ robot.waitForIdle(1000);
+
+ //To check whether the state is supported in the platform
+ if (Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH)) {
+ //To check whether the bitwise mask for MAXIMIZED_BOTH state is set
+ if (gui.jframe1.getExtendedState() != Frame.MAXIMIZED_BOTH)
+ throw new RuntimeException("The bitwise mask Frame.MAXIMIZED_BOTH " +
+ "is not set when the frame is in MAXIMIZED_BOTH state");
+
+ //To check whether the Frame is maximized fully
+ if (!gui.maxBoth)
+ throw new RuntimeException("Frame is not maximized fully");
+ }
+
+ //Normalising the Frame
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe1.setExtendedState(Frame.NORMAL)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for NORMAL state is set
+ if (gui.jframe1.getExtendedState() != Frame.NORMAL)
+ throw new RuntimeException("The bitwise mask Frame.NORMAL is not " +
+ "set when the frame is in NORMAL state after Zoomed");
+
+ //To check whether the Frame is normalised programmatically
+ if (!gui.normal)
+ throw new RuntimeException("Frame is not restored to normal after Zoomed");
+ }
+}
+
diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java b/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java
new file mode 100644
index 0000000..54e434b
--- /dev/null
+++ b/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+/*
+ * @test
+ * @summary Construct a jframe with some components and zoom the frame and bring it back to normal state.
+ * @author Aruna Samji
+ * @library ../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main TaskZoomJFrameRepaint
+ */
+
+public class TaskZoomJFrameRepaint extends Task<GUIZoomFrame> {
+
+ public static void main (String[] args) throws Exception {
+ new TaskZoomJFrameRepaint(GUIZoomFrame.class, new ExtendedRobot()).task();
+ }
+
+ TaskZoomJFrameRepaint(Class guiClass, ExtendedRobot robot) throws Exception {
+ super(guiClass, robot);
+ }
+
+ public void task() throws Exception {
+ SwingUtilities.invokeAndWait(() -> {
+ gui.jframe2.setVisible(true);
+ gui.jframe2.getContentPane().removeAll();
+ gui.jframe2.getContentPane().add(gui.jbutton);
+ gui.jframe2.getContentPane().add(gui.jtextarea);
+ if (gui.jframe2.getExtendedState() != Frame.NORMAL)
+ gui.jframe2.setExtendedState(Frame.NORMAL);
+ });
+ robot.waitForIdle(1000);
+
+ Point buttonOrigin, newbuttonOrigin, newbuttonCenter;
+ Point textareaOrigin, newtextareaOrigin, newtextareaCenter ;
+
+ //to find the lenght and width of the component originally
+ buttonOrigin = gui.jbutton.getLocationOnScreen();
+ textareaOrigin = gui.jtextarea.getLocationOnScreen();
+
+ if (Toolkit.getDefaultToolkit().isFrameStateSupported(
+ Frame.MAXIMIZED_BOTH)){
+ //Maximising the Frame fully
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe2.setExtendedState(Frame.MAXIMIZED_BOTH)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for MAXIMIZED_BOTH state is set
+ if (gui.jframe2.getExtendedState() != Frame.MAXIMIZED_BOTH)
+ throw new RuntimeException("The bitwise mask Frame.MAXIMIZED_BOTH " +
+ "is not set when the frame is in MAXIMIZED_BOTH state");
+
+ //To check whether the Frame is maximized fully
+ if (gui.maxBoth == false)
+ throw new RuntimeException("Frame is not maximized fully");
+ }
+
+ //Normalising the Frame....
+ SwingUtilities.invokeAndWait(() ->
+ gui.jframe2.setExtendedState(Frame.NORMAL)
+ );
+ robot.waitForIdle(1000);
+
+ //To check whether the bitwise mask for NORMAL state is set
+ if (gui.jframe2.getExtendedState() != Frame.NORMAL)
+ throw new RuntimeException("The bitwise mask Frame.NORMAL is not " +
+ "set when the frame is in NORMAL state");
+
+ //To check whether the Frame is normalised programmatically
+ if (! gui.normal)
+ throw new RuntimeException("Frame is not restored to normal");
+
+ //to find the lenght and width of the component after zommed and back to normal
+ newbuttonOrigin = gui.jbutton.getLocationOnScreen();
+ newtextareaOrigin = gui.jtextarea.getLocationOnScreen();
+ newbuttonCenter = gui.jbutton.getLocationOnScreen();
+ newbuttonCenter.translate(gui.jbutton.getWidth()/2, gui.jbutton.getHeight()/2);
+ newtextareaCenter = gui.jtextarea.getLocationOnScreen();
+ newtextareaCenter.translate(gui.jtextarea.getWidth()/2, gui.jtextarea.getHeight()/2);
+
+ if((buttonOrigin.x != newbuttonOrigin.x) & (buttonOrigin.y != newbuttonOrigin.y))
+ throw new RuntimeException("The button is not positioned back " +
+ "to the original place on the screen after iconified");
+
+ if((textareaOrigin.x != newtextareaOrigin.x) & (textareaOrigin.y != newtextareaOrigin.y))
+ throw new RuntimeException("The TextArea is not positioned back " +
+ "to the original place on the screen after iconified");
+ }
+}
diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
index 954aefc..2795b29 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
@@ -126,7 +126,10 @@
* GC specified by the framework must first be removed.
* @return A copy of given opts with all GC options removed.
*/
- private static final Pattern useGcPattern = Pattern.compile("\\-XX\\:[\\+\\-]Use.+GC");
+ private static final Pattern useGcPattern = Pattern.compile(
+ "(?:\\-XX\\:[\\+\\-]Use.+GC)"
+ + "|(?:\\-Xconcgc)"
+ + "|(?:\\-Xincgc)");
public static List<String> removeGcOpts(List<String> opts) {
List<String> optsWithoutGC = new ArrayList<String>();
for (String opt : opts) {
diff --git a/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
index 7d9cd4b..7508209 100644
--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
@@ -73,7 +73,6 @@
public final class MonitorVmStartTerminate {
private static final int PROCESS_COUNT = 10;
- private static final long PROCESS_TIMEOUT_IN_NS = 1000*1000_000_000L;
public static void main(String... args) throws Exception {
@@ -223,13 +222,12 @@
private static void createFile(Path path) throws IOException {
Files.write(path, new byte[0], StandardOpenOption.CREATE);
- if (!Files.exists(path)) {
- throw new Error("Newly created file " + path
- + " does not exist!");
- }
}
private static void waitForRemoval(Path path) {
+ String timeoutFactorText = System.getProperty("test.timeout.factor", "1.0");
+ double timeoutFactor = Double.parseDouble(timeoutFactorText);
+ long timeoutNanos = 1000_000_000L*(long)(1000*timeoutFactor);
long start = System.nanoTime();
while (true) {
long now = System.nanoTime();
@@ -238,10 +236,10 @@
if (!Files.exists(path)) {
return;
}
- if (waited > PROCESS_TIMEOUT_IN_NS) {
+ if (waited > timeoutNanos) {
System.out.println("Start: " + start);
System.out.println("Now: " + now);
- System.out.print("Process timed out after " + waited + " ns. Abort.");
+ System.out.println("Process timed out after " + waited + " ns. Abort.");
System.exit(1);
}
takeNap();
@@ -293,7 +291,14 @@
public void terminate() {
try {
System.out.println("Terminating " + mainArgsIdentifier);
- Files.delete(Paths.get(mainArgsIdentifier));
+ // File must be created before proceeding,
+ // otherwise Java process may loop forever
+ // waiting for file to be removed.
+ Path path = Paths.get(mainArgsIdentifier);
+ while (!Files.exists(path)) {
+ takeNap();
+ }
+ Files.delete(path);
} catch (IOException e) {
e.printStackTrace();
}
@@ -303,10 +308,11 @@
private void executeJava() throws Exception, IOException {
String className = JavaProcess.class.getName();
String classPath = System.getProperty("test.classes");
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-cp",
- classPath, className, mainArgsIdentifier);
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Dtest.timeout.factor=" + System.getProperty("test.timeout.factor", "1.0"),
+ "-cp", classPath, className, mainArgsIdentifier);
OutputBuffer ob = ProcessTools.getOutput(pb.start());
- System.out.println("Java Process " + getMainArgsIdentifier() + " stder:"
+ System.out.println("Java Process " + getMainArgsIdentifier() + " stderr:"
+ ob.getStderr());
System.err.println("Java Process " + getMainArgsIdentifier() + " stdout:"
+ ob.getStdout());
diff --git a/jdk/test/sun/security/krb5/ccache/DefaultFile.java b/jdk/test/sun/security/krb5/ccache/DefaultFile.java
new file mode 100644
index 0000000..b2348e3
--- /dev/null
+++ b/jdk/test/sun/security/krb5/ccache/DefaultFile.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8054817
+ * @summary File ccache only recognizes Linux and Solaris defaults
+ */
+
+import sun.security.krb5.internal.ccache.FileCredentialsCache;
+
+public class DefaultFile {
+ public static void main(String[] args) throws Exception {
+ // There are 2 cases where default ccache name is not
+ // /tmp/krb5cc_uid.
+ if (System.getenv("KRB5CCNAME") != null) {
+ return;
+ }
+ if (System.getProperty("os.name").startsWith("Windows")) {
+ return;
+ }
+ String name = FileCredentialsCache.getDefaultCacheName();
+ if (!name.startsWith("/tmp/krb5cc_")) {
+ throw new Exception("default name is " + name);
+ }
+ }
+}
diff --git a/jdk/test/sun/security/smartcardio/TestAll.java b/jdk/test/sun/security/smartcardio/TestAll.java
index 1bd1d76..72a0f85 100644
--- a/jdk/test/sun/security/smartcardio/TestAll.java
+++ b/jdk/test/sun/security/smartcardio/TestAll.java
@@ -40,6 +40,7 @@
TestMultiplePresent.class,
TestPresent.class,
TestTransmit.class,
+ TestDirect.class,
};
public static void main(String[] args) throws Exception {
diff --git a/jdk/test/sun/security/smartcardio/TestDirect.java b/jdk/test/sun/security/smartcardio/TestDirect.java
new file mode 100644
index 0000000..964cbfa
--- /dev/null
+++ b/jdk/test/sun/security/smartcardio/TestDirect.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8046343
+ * @summary Make sure that direct protocol is available
+ * @run main/manual TestDirect
+ */
+
+// This test requires special hardware.
+
+import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
+import javax.smartcardio.CardTerminals;
+import javax.smartcardio.TerminalFactory;
+
+public class TestDirect {
+ public static void main(String[] args) throws Exception {
+ TerminalFactory terminalFactory = TerminalFactory.getDefault();
+ CardTerminals cardTerminals = terminalFactory.terminals();
+ CardTerminal cardTerminal = cardTerminals.list().get(0);
+ Card card = cardTerminal.connect("DIRECT");
+ card.disconnect(true);
+
+ System.out.println("OK.");
+ }
+}
diff --git a/jdk/test/sun/tools/jps/JpsBase.java b/jdk/test/sun/tools/jps/JpsBase.java
new file mode 100644
index 0000000..59b293b
--- /dev/null
+++ b/jdk/test/sun/tools/jps/JpsBase.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/**
+ * The base class for testing the jps utility.
+ * The test sequence is to start jps with different combinations of arguments
+ * and verify the output contains proper values.
+ */
+public final class JpsBase {
+
+ private static final String shortProcessName;
+ private static final String fullProcessName;
+
+ /**
+ * The jps output should contain processes' names
+ * (except when jps is started in quite mode).
+ * The expected name of the test process is prepared here.
+ */
+ static {
+ URL url = JpsBase.class.getResource("JpsBase.class");
+ boolean isJar = url.getProtocol().equals("jar");
+
+ if (isJar) {
+ shortProcessName = JpsBase.class.getSimpleName() + ".jar";
+ String urlPath = url.getPath();
+ File jar = new File(urlPath.substring(urlPath.indexOf("file:") + 5, urlPath.indexOf("jar!") + 3));
+ fullProcessName = jar.getAbsolutePath();
+ } else {
+ shortProcessName = JpsBase.class.getSimpleName();
+ fullProcessName = JpsBase.class.getName();
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ int pid = ProcessTools.getProcessId();
+
+ List<List<JpsHelper.JpsArg>> combinations = JpsHelper.JpsArg.generateCombinations();
+ for (List<JpsHelper.JpsArg> combination : combinations) {
+ OutputAnalyzer output = JpsHelper.jps(JpsHelper.JpsArg.asCmdArray(combination));
+ output.shouldHaveExitValue(0);
+
+ boolean isQuiet = false;
+ boolean isFull = false;
+ String pattern;
+ for (JpsHelper.JpsArg jpsArg : combination) {
+ switch (jpsArg) {
+ case q:
+ // If '-q' is specified output should contain only a list of local VM identifiers:
+ // 30673
+ isQuiet = true;
+ JpsHelper.verifyJpsOutput(output, "^\\d+$");
+ output.shouldContain(Integer.toString(pid));
+ break;
+ case l:
+ // If '-l' is specified output should contain the full package name for the application's main class
+ // or the full path name to the application's JAR file:
+ // 30673 /tmp/jtreg/jtreg-workdir/scratch/JpsBase.jar ...
+ isFull = true;
+ pattern = "^" + pid + "\\s+" + replaceSpecialChars(fullProcessName) + ".*";
+ output.shouldMatch(pattern);
+ break;
+ case m:
+ // If '-m' is specified output should contain the arguments passed to the main method:
+ // 30673 JpsBase monkey ...
+ for (String arg : args) {
+ pattern = "^" + pid + ".*" + replaceSpecialChars(arg) + ".*";
+ output.shouldMatch(pattern);
+ }
+ break;
+ case v:
+ // If '-v' is specified output should contain VM arguments:
+ // 30673 JpsBase -Xmx512m -XX:+UseParallelGC -XX:Flags=/tmp/jtreg/jtreg-workdir/scratch/vmflags ...
+ for (String vmArg : JpsHelper.getVmArgs()) {
+ pattern = "^" + pid + ".*" + replaceSpecialChars(vmArg) + ".*";
+ output.shouldMatch(pattern);
+ }
+ break;
+ case V:
+ // If '-V' is specified output should contain VM flags:
+ // 30673 JpsBase +DisableExplicitGC ...
+ pattern = "^" + pid + ".*" + replaceSpecialChars(JpsHelper.VM_FLAG) + ".*";
+ output.shouldMatch(pattern);
+ break;
+ }
+
+ if (isQuiet) {
+ break;
+ }
+ }
+
+ if (!isQuiet) {
+ // Verify output line by line.
+ // Output should only contain lines with pids after the first line with pid.
+ JpsHelper.verifyJpsOutput(output, "^\\d+\\s+.*");
+ if (!isFull) {
+ pattern = "^" + pid + "\\s+" + replaceSpecialChars(shortProcessName);
+ if (combination.isEmpty()) {
+ // If no arguments are specified output should only contain
+ // pid and process name
+ pattern += "$";
+ } else {
+ pattern += ".*";
+ }
+ output.shouldMatch(pattern);
+ }
+ }
+ }
+ }
+
+ private static String replaceSpecialChars(String str) {
+ String tmp = str.replace("\\", "\\\\");
+ tmp = tmp.replace("+", "\\+");
+ tmp = tmp.replace(".", "\\.");
+ return tmp;
+ }
+
+}
diff --git a/jdk/test/sun/tools/jps/JpsHelper.java b/jdk/test/sun/tools/jps/JpsHelper.java
new file mode 100644
index 0000000..84bc6be
--- /dev/null
+++ b/jdk/test/sun/tools/jps/JpsHelper.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static jdk.testlibrary.Asserts.assertGreaterThan;
+import static jdk.testlibrary.Asserts.assertTrue;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import jdk.testlibrary.Asserts;
+import jdk.testlibrary.JDKToolLauncher;
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.Utils;
+
+/**
+ * The helper class for running jps utility and verifying output from it
+ */
+public final class JpsHelper {
+
+ /**
+ * Helper class for handling jps arguments
+ */
+ public enum JpsArg {
+ q,
+ l,
+ m,
+ v,
+ V;
+
+ /**
+ * Generate all possible combinations of {@link JpsArg}
+ * (31 argument combinations and no arguments case)
+ */
+ public static List<List<JpsArg>> generateCombinations() {
+ final int argCount = JpsArg.values().length;
+ // If there are more than 30 args this algorithm will overflow.
+ Asserts.assertLessThan(argCount, 31, "Too many args");
+
+ List<List<JpsArg>> combinations = new ArrayList<>();
+ int combinationCount = (int) Math.pow(2, argCount);
+ for (int currCombo = 0; currCombo < combinationCount; ++currCombo) {
+ List<JpsArg> combination = new ArrayList<>();
+ for (int position = 0; position < argCount; ++position) {
+ int bit = 1 << position;
+ if ((bit & currCombo) != 0) {
+ combination.add(JpsArg.values()[position]);
+ }
+ }
+ combinations.add(combination);
+ }
+ return combinations;
+ }
+
+ /**
+ * Return combination of {@link JpsArg} as a String array
+ */
+ public static String[] asCmdArray(List<JpsArg> jpsArgs) {
+ List<String> list = new ArrayList<>();
+ for (JpsArg jpsArg : jpsArgs) {
+ list.add("-" + jpsArg.toString());
+ }
+ return list.toArray(new String[list.size()]);
+ }
+
+ }
+
+ /**
+ * VM arguments to start test application with
+ */
+ public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+UseParallelGC"};
+ /**
+ * VM flag to start test application with
+ */
+ public static final String VM_FLAG = "+DisableExplicitGC";
+
+ private static File vmFlagsFile = null;
+ private static List<String> testVmArgs = null;
+ private static File manifestFile = null;
+
+ /**
+ * Create a file containing VM_FLAG in the working directory
+ */
+ public static File getVmFlagsFile() throws IOException {
+ if (vmFlagsFile == null) {
+ vmFlagsFile = new File("vmflags");
+ try (BufferedWriter output = new BufferedWriter(new FileWriter(vmFlagsFile))) {
+ output.write(VM_FLAG);
+ }
+ vmFlagsFile.deleteOnExit();
+ }
+ return vmFlagsFile;
+ }
+
+ /**
+ * Return a list of VM arguments
+ */
+ public static List<String> getVmArgs() throws IOException {
+ if (testVmArgs == null) {
+ testVmArgs = new ArrayList<>();
+ testVmArgs.addAll(Arrays.asList(VM_ARGS));
+ testVmArgs.add("-XX:Flags=" + getVmFlagsFile().getAbsolutePath());
+ }
+ return testVmArgs;
+ }
+
+ /**
+ * Start jps utility without any arguments
+ */
+ public static OutputAnalyzer jps() throws Exception {
+ return jps(null, null);
+ }
+
+ /**
+ * Start jps utility with tool arguments
+ */
+ public static OutputAnalyzer jps(String... toolArgs) throws Exception {
+ return jps(null, Arrays.asList(toolArgs));
+ }
+
+ /**
+ * Start jps utility with VM args and tool arguments
+ */
+ public static OutputAnalyzer jps(List<String> vmArgs, List<String> toolArgs) throws Exception {
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
+ if (vmArgs != null) {
+ for (String vmArg : vmArgs) {
+ launcher.addVMArg(vmArg);
+ }
+ }
+ if (toolArgs != null) {
+ for (String toolArg : toolArgs) {
+ launcher.addToolArg(toolArg);
+ }
+ }
+
+ ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
+ System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+ System.out.println(output.getOutput());
+
+ return output;
+ }
+
+ /**
+ * Verify jps output contains pids and programs' name information.
+ * The function will discard any lines that come before the first line with pid.
+ * This can happen if the JVM outputs a warning message for some reason
+ * before running jps.
+ *
+ * The output can look like:
+ * 35536 Jps
+ * 35417 Main
+ * 31103 org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar
+ */
+ public static void verifyJpsOutput(OutputAnalyzer output, String regex) throws Exception {
+ output.shouldHaveExitValue(0);
+ int matchedCount = output.shouldMatchByLineFrom(regex, regex);
+ assertGreaterThan(matchedCount , 0, "Found no lines matching pattern: " + regex);
+ }
+
+ /**
+ * Compare jps output with a content in a file line by line
+ */
+ public static void verifyOutputAgainstFile(OutputAnalyzer output) throws IOException {
+ String testSrc = System.getProperty("test.src", "?");
+ File file = new File(testSrc, "usage.out");
+ List<String> fileOutput = Utils.fileAsList(file);
+ List<String> outputAsLines = output.asLines();
+ assertTrue(outputAsLines.containsAll(fileOutput),
+ "The ouput should contain all content of " + file.getAbsolutePath());
+ }
+
+ private static File getManifest(String className) throws IOException {
+ if (manifestFile == null) {
+ manifestFile = new File(className + ".mf");
+ try (BufferedWriter output = new BufferedWriter(new FileWriter(manifestFile))) {
+ output.write("Main-Class: " + className + Utils.NEW_LINE);
+ }
+ }
+ return manifestFile;
+ }
+
+ /**
+ * Build a jar of test classes in runtime
+ */
+ public static File buildJar(String className) throws Exception {
+ File jar = new File(className + ".jar");
+
+ List<String> jarArgs = new ArrayList<>();
+ jarArgs.add("-cfm");
+ jarArgs.add(jar.getAbsolutePath());
+ File manifestFile = getManifest(className);
+ jarArgs.add(manifestFile.getAbsolutePath());
+ String testClassPath = System.getProperty("test.class.path", "?");
+ for (String path : testClassPath.split(File.pathSeparator)) {
+ jarArgs.add("-C");
+ jarArgs.add(path);
+ jarArgs.add(".");
+ }
+
+ System.out.println("Running jar " + jarArgs.toString());
+ sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
+ if (!jarTool.run(jarArgs.toArray(new String[jarArgs.size()]))) {
+ throw new Exception("jar failed: args=" + jarArgs.toString());
+ }
+
+ manifestFile.delete();
+ jar.deleteOnExit();
+
+ return jar;
+ }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsClass.java b/jdk/test/sun/tools/jps/TestJpsClass.java
new file mode 100644
index 0000000..0133e9c
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsClass.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary The test application will be started with java class:
+ * java JpsBase
+ * For all possible combinations of jps arguments a jps process
+ * will be started from within the test application.
+ * The output should contain proper values.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @run driver TestJpsClass
+ */
+public class TestJpsClass {
+
+ public static void main(String[] args) throws Throwable {
+ String testJdk = System.getProperty("test.jdk", "?");
+ String testSrc = System.getProperty("test.src", "?");
+ String testClassPath = System.getProperty("test.class.path", "?");
+
+ List<String> cmd = new ArrayList<>();
+ cmd.addAll(JpsHelper.getVmArgs());
+ cmd.add("-Dtest.jdk=" + testJdk);
+ cmd.add("-Dtest.src=" + testSrc);
+ cmd.add("-cp");
+ cmd.add(testClassPath);
+ cmd.add("JpsBase");
+ cmd.add("monkey");
+
+ ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(cmd.toArray(new String[cmd.size()]));
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+ System.out.println(output.getOutput());
+ output.shouldHaveExitValue(0);
+ }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsJar.java b/jdk/test/sun/tools/jps/TestJpsJar.java
new file mode 100644
index 0000000..37230ae
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsJar.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary The test application will be started with absolute jar:
+ * java -jar /tmp/jtreg/jtreg-workdir/scratch/JpsBase.jar
+ * For all possible combinations of jps arguments a jps process
+ * will be started from within the test application.
+ * The output should contain proper values.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @run driver TestJpsJar
+ */
+public class TestJpsJar {
+
+ public static void main(String[] args) throws Throwable {
+ String testJdk = System.getProperty("test.jdk", "?");
+ String testSrc = System.getProperty("test.src", "?");
+ File jar = JpsHelper.buildJar("JpsBase");
+
+ List<String> cmd = new ArrayList<>();
+ cmd.addAll(JpsHelper.getVmArgs());
+ cmd.add("-Dtest.jdk=" + testJdk);
+ cmd.add("-Dtest.src=" + testSrc);
+ cmd.add("-jar");
+ cmd.add(jar.getAbsolutePath());
+ cmd.add("monkey");
+
+ ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(cmd.toArray(new String[cmd.size()]));
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+ System.out.println(output.getOutput());
+ output.shouldHaveExitValue(0);
+ }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsJarRelative.java b/jdk/test/sun/tools/jps/TestJpsJarRelative.java
new file mode 100644
index 0000000..8b7def5
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsJarRelative.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary The test application will be started with relative jar:
+ * java -jar ./JpsBase.jar
+ * For all possible combinations of jps arguments a jps process
+ * will be started from within the test application.
+ * The output should contain proper values.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @run driver TestJpsJarRelative
+ */
+public class TestJpsJarRelative {
+
+ public static void main(String[] args) throws Throwable {
+ String testJdk = System.getProperty("test.jdk", "?");
+ String testSrc = System.getProperty("test.src", "?");
+ File jar = JpsHelper.buildJar("JpsBase");
+
+ List<String> cmd = new ArrayList<>();
+ cmd.addAll(JpsHelper.getVmArgs());
+ cmd.add("-Dtest.jdk=" + testJdk);
+ cmd.add("-Dtest.src=" + testSrc);
+ cmd.add("-jar");
+ cmd.add("." + File.separator + jar.getName());
+ cmd.add("monkey");
+
+ ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(cmd.toArray(new String[cmd.size()]));
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+ System.out.println(output.getOutput());
+ output.shouldHaveExitValue(0);
+ }
+
+}
diff --git a/jdk/test/sun/tools/jps/TestJpsSanity.java b/jdk/test/sun/tools/jps/TestJpsSanity.java
new file mode 100644
index 0000000..5a0868a
--- /dev/null
+++ b/jdk/test/sun/tools/jps/TestJpsSanity.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.testlibrary.Asserts;
+import jdk.testlibrary.OutputAnalyzer;
+
+/*
+ * @test
+ * @summary This test verifies jps usage and checks that appropriate error message is shown
+ * when running jps with illegal arguments.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* JpsHelper
+ * @run driver TestJpsSanity
+ */
+public class TestJpsSanity {
+
+ public static void main(String[] args) throws Throwable {
+ testJpsUsage();
+ testJpsVersion();
+ testJpsUnknownHost();
+ }
+
+ private static void testJpsUsage() throws Exception {
+ OutputAnalyzer output = JpsHelper.jps("-?");
+ JpsHelper.verifyOutputAgainstFile(output);
+
+ output = JpsHelper.jps("-help");
+ JpsHelper.verifyOutputAgainstFile(output);
+ }
+
+ private static void testJpsVersion() throws Exception {
+ OutputAnalyzer output = JpsHelper.jps("-version");
+ Asserts.assertNotEquals(output.getExitValue(), 0, "Exit code shouldn't be 0");
+ Asserts.assertFalse(output.getStderr().isEmpty(), "Error output should not be empty");
+ output.shouldContain("illegal argument: -version");
+ }
+
+ private static void testJpsUnknownHost() throws Exception {
+ String invalidHostName = "Oja781nh2ev7vcvbajdg-Sda1-C";
+ OutputAnalyzer output = JpsHelper.jps(invalidHostName);
+ Asserts.assertNotEquals(output.getExitValue(), 0, "Exit code shouldn't be 0");
+ Asserts.assertFalse(output.getStderr().isEmpty(), "Error output should not be empty");
+ output.shouldContain("Unknown host: " + invalidHostName);
+ }
+
+}
diff --git a/jdk/test/sun/tools/jps/jps-Defaults.sh b/jdk/test/sun/tools/jps/jps-Defaults.sh
deleted file mode 100644
index a8cd1ad..0000000
--- a/jdk/test/sun/tools/jps/jps-Defaults.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-Defaults.sh
-# @summary Test that output of 'jps' matches a specific pattern
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData 2>&1 | awk -f ${TESTSRC}/jps_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-V_2.sh b/jdk/test/sun/tools/jps/jps-V_2.sh
deleted file mode 100644
index 2ab10ee..0000000
--- a/jdk/test/sun/tools/jps/jps-V_2.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-V_2.sh
-# @summary Test that output of 'jps -V' shows JVM flags
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -V | awk -f ${TESTSRC}/jps-V_Output2.awk
diff --git a/jdk/test/sun/tools/jps/jps-V_Output2.awk b/jdk/test/sun/tools/jps/jps-V_Output2.awk
deleted file mode 100644
index 3f1be04..0000000
--- a/jdk/test/sun/tools/jps/jps-V_Output2.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Jps.* \+DisableExplicitGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-Vm_2.sh b/jdk/test/sun/tools/jps/jps-Vm_2.sh
deleted file mode 100644
index ba9fa0f..0000000
--- a/jdk/test/sun/tools/jps/jps-Vm_2.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-Vm_2.sh
-# @summary Test that output of 'jps -Vm' shows JVM flags and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -Vm | awk -f ${TESTSRC}/jps-Vm_Output2.awk
diff --git a/jdk/test/sun/tools/jps/jps-Vm_Output2.awk b/jdk/test/sun/tools/jps/jps-Vm_Output2.awk
deleted file mode 100644
index 65f358b..0000000
--- a/jdk/test/sun/tools/jps/jps-Vm_Output2.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Jps -Vm.* \+DisableExplicitGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-Vvm.sh b/jdk/test/sun/tools/jps/jps-Vvm.sh
deleted file mode 100644
index d60896a..0000000
--- a/jdk/test/sun/tools/jps/jps-Vvm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-Vvm.sh
-# @summary Test that output of 'jps -Vvm' shows JVM flags, arguments and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -Vvm | awk -f ${TESTSRC}/jps-Vvm_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-Vvm_Output1.awk b/jdk/test/sun/tools/jps/jps-Vvm_Output1.awk
deleted file mode 100644
index 99187dc..0000000
--- a/jdk/test/sun/tools/jps/jps-Vvm_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Jps -Vvm.*-XX:Flags=.*vmflags.* \+DisableExplicitGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-Vvml.sh b/jdk/test/sun/tools/jps/jps-Vvml.sh
deleted file mode 100644
index f8d5fa3..0000000
--- a/jdk/test/sun/tools/jps/jps-Vvml.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-Vvml.sh
-# @summary Test that output of 'jps -Vvml' shows JVM arguments, flags, and main args with long class names
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-Vvml_2.sh b/jdk/test/sun/tools/jps/jps-Vvml_2.sh
deleted file mode 100644
index 6fc88a3..0000000
--- a/jdk/test/sun/tools/jps/jps-Vvml_2.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 5009652
-# @library ../../jvmstat/testlibrary
-# @build Sleeper
-# @run shell jps-Vvml_2.sh
-# @summary Test that output of 'jps -Vvml' shows proper output when no JVM arguments, flags, or main args are present
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-cleanup() {
- kill_proc ${SLEEPER_PID}
-}
-
-trap 'cleanup' 0 HUP INT QUIT TERM
-
-JPS="${TESTJAVA}/bin/jps"
-
-JAVA="${TESTJAVA}/bin/java"
-
-# fire up a Sleeper that block indefinitely - but don't pass
-# any args to Sleeper.main() or any jvm flags or options, as we
-# need to inspect jps output for the no args condition.
-#
-# Note: this test can not pass on a VM with UsePerfData disabled by default,
-# and we can not set -XX:+UsePerfData as that invalidates the test premise of
-# there being no jvm flags
-
-${JAVA} -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper &
-SLEEPER_PID=$!
-
-${JPS} -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output2.awk
-RC=$?
-
-cleanup
-
-exit ${RC}
-
diff --git a/jdk/test/sun/tools/jps/jps-Vvml_Output1.awk b/jdk/test/sun/tools/jps/jps-Vvml_Output1.awk
deleted file mode 100644
index b4d4191..0000000
--- a/jdk/test/sun/tools/jps/jps-Vvml_Output1.awk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ sun.tools.jps.Jps -Vvml.*-XX:Flags=.*vmflags.* \+DisableExplicitGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-Vvml_Output2.awk b/jdk/test/sun/tools/jps/jps-Vvml_Output2.awk
deleted file mode 100644
index e7cad75..0000000
--- a/jdk/test/sun/tools/jps/jps-Vvml_Output2.awk
+++ /dev/null
@@ -1,24 +0,0 @@
-# 1.1 04/03/08
-
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Sleeper$/ {
- matched++;
- }
-
-/^[0-9]+ sun.tools.jps.Jps -Vvml.*-XX:Flags=.*vmflags.* \+DisableExplicitGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 2)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-help.sh b/jdk/test/sun/tools/jps/jps-help.sh
deleted file mode 100644
index c6c1cbd..0000000
--- a/jdk/test/sun/tools/jps/jps-help.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-help.sh
-# @summary Test that output of 'jps -?' matches the usage.out file
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-
-JPS="${TESTJAVA}/bin/jps"
-
-rm -f jps.out 2>/dev/null
-${JPS} -J-XX:+UsePerfData -? > jps.out 2>&1
-
-diff -w jps.out ${TESTSRC}/usage.out
-if [ $? != 0 ]
-then
- echo "Output of jps -? differ from expected output. Failed."
- rm -f jps.out 2>/dev/null
- exit 1
-fi
-
-rm -f jps.out 2>/dev/null
-${JPS} -J-XX:+UsePerfData -help > jps.out 2>&1
-
-diff -w jps.out ${TESTSRC}/usage.out
-if [ $? != 0 ]
-then
- echo "Output of jps -help differ from expected output. Failed."
- rm -f jps.out 2>/dev/null
- exit 1
-fi
-
-exit 0
diff --git a/jdk/test/sun/tools/jps/jps-l_1.sh b/jdk/test/sun/tools/jps/jps-l_1.sh
deleted file mode 100644
index 4cb65ea..0000000
--- a/jdk/test/sun/tools/jps/jps-l_1.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-l_1.sh
-# @summary Test that output of 'jps -l' matches a specific pattern
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -l 2>&1 | awk -f ${TESTSRC}/jps-l_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-l_2.sh b/jdk/test/sun/tools/jps/jps-l_2.sh
deleted file mode 100644
index 95784db..0000000
--- a/jdk/test/sun/tools/jps/jps-l_2.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-l_2.sh
-# @summary Test that output of 'jps -l' shows the long class name
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -l | awk -f ${TESTSRC}/jps-l_Output2.awk
diff --git a/jdk/test/sun/tools/jps/jps-l_Output1.awk b/jdk/test/sun/tools/jps/jps-l_Output1.awk
deleted file mode 100644
index 08a48c1..0000000
--- a/jdk/test/sun/tools/jps/jps-l_Output1.awk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-# match on a fully qualified class name
-/^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\.|\$|\+]*$/ {
- matched++;
- }
-
-# or match on a jar or war file name - note, jar files ending with
-# ".jar" is only a convention , not a requirement. Theoretically,
-# any valid file name could occur here.
-/^[0-9]+ .*\.(jar|war)$/ {
- matched++;
-}
-
-# or match on the condition that the class name is not available
-/^[0-9]+ -- .*$/ {
- matched++;
- }
-
-# or match an empty class name
-/^[0-9]+ $/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched == totallines)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-l_Output2.awk b/jdk/test/sun/tools/jps/jps-l_Output2.awk
deleted file mode 100644
index 4df71f0..0000000
--- a/jdk/test/sun/tools/jps/jps-l_Output2.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ sun.tools.jps.Jps$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-lm.sh b/jdk/test/sun/tools/jps/jps-lm.sh
deleted file mode 100644
index 4a45512..0000000
--- a/jdk/test/sun/tools/jps/jps-lm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-lm.sh
-# @summary Test that output of 'jps -lm' shows the long class name and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -lm | awk -f ${TESTSRC}/jps-lm_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-lm_Output1.awk b/jdk/test/sun/tools/jps/jps-lm_Output1.awk
deleted file mode 100644
index e3fcbee..0000000
--- a/jdk/test/sun/tools/jps/jps-lm_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ sun.tools.jps.Jps -lm$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-m.sh b/jdk/test/sun/tools/jps/jps-m.sh
deleted file mode 100644
index f900b9f..0000000
--- a/jdk/test/sun/tools/jps/jps-m.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-m.sh
-# @summary Test that output of 'jps -m' shows args to main
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-m_2.sh b/jdk/test/sun/tools/jps/jps-m_2.sh
deleted file mode 100644
index b881c35..0000000
--- a/jdk/test/sun/tools/jps/jps-m_2.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 5009652
-# @library ../../jvmstat/testlibrary
-# @build Sleeper
-# @run shell jps-m_2.sh
-# @summary Test that output of 'jps -m' shows proper output for main with no args.
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-cleanup() {
- kill_proc ${SLEEPER_PID}
-}
-
-trap 'cleanup' 0 HUP INT QUIT TERM
-
-JPS="${TESTJAVA}/bin/jps"
-JAVA="${TESTJAVA}/bin/java"
-
-# fire up a Sleeper that blocks indefinitely - but don't pass
-# any args to Sleeper.main(), as we need to inspect jps output
-# for the no args condition.
-#
-${JAVA} -XX:+UsePerfData -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper &
-SLEEPER_PID=$!
-
-${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output2.awk
-RC=$?
-
-cleanup
-
-exit ${RC}
-
diff --git a/jdk/test/sun/tools/jps/jps-m_Output1.awk b/jdk/test/sun/tools/jps/jps-m_Output1.awk
deleted file mode 100644
index 560f6e8..0000000
--- a/jdk/test/sun/tools/jps/jps-m_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Jps -m$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-m_Output2.awk b/jdk/test/sun/tools/jps/jps-m_Output2.awk
deleted file mode 100644
index 0ba09ad..0000000
--- a/jdk/test/sun/tools/jps/jps-m_Output2.awk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Sleeper$/ {
- matched++;
- }
-
-/^[0-9]+ Jps -m$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 2)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-q.sh b/jdk/test/sun/tools/jps/jps-q.sh
deleted file mode 100644
index cd6a4ac..0000000
--- a/jdk/test/sun/tools/jps/jps-q.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-q.sh
-# @summary Test that output of 'jps -q' shows only the process ids
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -q | awk -f ${TESTSRC}/jps-q_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-q_Output1.awk b/jdk/test/sun/tools/jps/jps-q_Output1.awk
deleted file mode 100644
index 53ae3a8..0000000
--- a/jdk/test/sun/tools/jps/jps-q_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-v_1.sh b/jdk/test/sun/tools/jps/jps-v_1.sh
deleted file mode 100644
index 21d0852..0000000
--- a/jdk/test/sun/tools/jps/jps-v_1.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-v_1.sh
-# @summary Test that output of 'jps -v' shows JVM arguments
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:+UseParallelGC -v | awk -f ${TESTSRC}/jps-v_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-v_Output1.awk b/jdk/test/sun/tools/jps/jps-v_Output1.awk
deleted file mode 100644
index 02ad298..0000000
--- a/jdk/test/sun/tools/jps/jps-v_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Jps.* -XX:\+UseParallelGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps-vm_1.sh b/jdk/test/sun/tools/jps/jps-vm_1.sh
deleted file mode 100644
index 80bb62e..0000000
--- a/jdk/test/sun/tools/jps/jps-vm_1.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4990825
-# @run shell jps-vm_1.sh
-# @summary Test that output of 'jps -vm' shows JVM arguments and main args
-
-. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
-
-setup
-verify_os
-
-JPS="${TESTJAVA}/bin/jps"
-
-${JPS} -J-XX:+UsePerfData -J-XX:+UseParallelGC -vm | awk -f ${TESTSRC}/jps-vm_Output1.awk
diff --git a/jdk/test/sun/tools/jps/jps-vm_Output1.awk b/jdk/test/sun/tools/jps/jps-vm_Output1.awk
deleted file mode 100644
index 0cda3ca..0000000
--- a/jdk/test/sun/tools/jps/jps-vm_Output1.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-/^[0-9]+ Jps -vm.* -XX:\+UseParallelGC$/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched >= 1)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/jps_Output1.awk b/jdk/test/sun/tools/jps/jps_Output1.awk
deleted file mode 100644
index c64b0f1..0000000
--- a/jdk/test/sun/tools/jps/jps_Output1.awk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-BEGIN {
- totallines=0; matched=0
- }
-
-# match on a main class name
-/^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\$|\+]*$/ {
- matched++;
- }
-
-# or match on a path name to a jar or war file - note, jar files ending with
-# ".jar" is only a convention, not a requirement. Theoretically,
-# any valid file name could occur here.
-/^[0-9]+ .*\.(jar|war)$/ {
- matched++;
-}
-
-# or match on the condition that the class name is not available
-/^[0-9]+ -- .*$/ {
- matched++;
- }
-
-# or match an empty class name
-/^[0-9]+ $/ {
- matched++;
- }
-
- { totallines++; print $0 }
-
-END {
- if ((totallines > 0) && (matched == totallines)) {
- exit 0
- }
- else {
- exit 1
- }
- }
diff --git a/jdk/test/sun/tools/jps/vmflags b/jdk/test/sun/tools/jps/vmflags
deleted file mode 100644
index be0e23c..0000000
--- a/jdk/test/sun/tools/jps/vmflags
+++ /dev/null
@@ -1 +0,0 @@
-+DisableExplicitGC
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 2b07047..fdcb153 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -269,3 +269,4 @@
980b18627fd3f4936be2d9e2b013abb461cb2ddb jdk9-b24
d60b572d759449913d02478219ad87e0574a3909 jdk9-b25
5b20a93f8db0b87b902bde48bb7cbb05e88e6e9c jdk9-b26
+10fc81ac75b445528851c9e46c6eeb4438d4e363 jdk9-b27
diff --git a/langtools/make/build.properties b/langtools/make/build.properties
index ab5f02e..5d9116a 100644
--- a/langtools/make/build.properties
+++ b/langtools/make/build.properties
@@ -68,7 +68,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
# in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all -Werror
+javac.lint.opts = -Xlint:all,-deprecation -Werror
# options for the <javadoc> task for javac
#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff --git a/langtools/make/intellij/langtools.iml b/langtools/make/intellij/langtools.iml
index fd7d1b4..de9aeda 100644
--- a/langtools/make/intellij/langtools.iml
+++ b/langtools/make/intellij/langtools.iml
@@ -6,10 +6,14 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/bootstrap/gensrc" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/genstubs" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/share/classes" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/test" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/java.base" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/java.compiler" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/jdk.compiler" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/jdk.dev" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/jdk.javadoc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
- <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
</component>
</module>
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 2147b19..fb01769 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -2196,16 +2196,6 @@
}
@Override
- public Type visitWildcardType(WildcardType t, Boolean recurse) {
- final List<Attribute.TypeCompound> annos = t.getAnnotationMirrors();
- Type erased = erasure(wildUpperBound(t), recurse);
- if (!annos.isEmpty()) {
- erased = erased.annotatedType(annos);
- }
- return erased;
- }
-
- @Override
public Type visitClassType(ClassType t, Boolean recurse) {
Type erased = t.tsym.erasure(Types.this);
List<Attribute.TypeCompound> annos = t.getAnnotationMirrors();
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 7a1c088..3b57998 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -919,14 +919,14 @@
// Empty bodies are only allowed for
// abstract, native, or interface methods, or for methods
// in a retrofit signature class.
- if (isDefaultMethod || (tree.sym.flags() & (ABSTRACT | NATIVE)) == 0 &&
- !relax)
- log.error(tree.pos(), "missing.meth.body.or.decl.abstract");
if (tree.defaultValue != null) {
if ((owner.flags() & ANNOTATION) == 0)
log.error(tree.pos(),
"default.allowed.in.intf.annotation.member");
}
+ if (isDefaultMethod || (tree.sym.flags() & (ABSTRACT | NATIVE)) == 0 &&
+ !relax)
+ log.error(tree.pos(), "missing.meth.body.or.decl.abstract");
} else if ((tree.sym.flags() & ABSTRACT) != 0 && !isDefaultMethod) {
if ((owner.flags() & INTERFACE) != 0) {
log.error(tree.body.pos(), "intf.meth.cant.have.body");
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java
index 71e42f8..4b802e0 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,15 +31,17 @@
import java.util.Map;
import java.util.Set;
+import com.sun.tools.javac.util.Assert;
+
/**
* The build state class captures the source code and generated artifacts
* from a build. There are usually two build states, the previous one (prev),
* loaded from the javac_state file, and the current one (now).
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class BuildState {
private Map<String,Module> modules = new HashMap<>();
@@ -75,7 +77,7 @@
*/
Module findModuleFromPackageName(String pkg) {
int cp = pkg.indexOf(':');
- assert(cp != -1);
+ Assert.check(cp != -1);
String mod = pkg.substring(0, cp);
return lookupModule(mod);
}
@@ -94,7 +96,7 @@
for (Map.Entry<String,Package> j : i.packages().entrySet()) {
Package p = packages.get(j.getKey());
// Check that no two different packages are stored under same name.
- assert(p == null || p == j.getValue());
+ Assert.check(p == null || p == j.getValue());
if (p == null) {
p = j.getValue();
packages.put(j.getKey(),j.getValue());
@@ -102,7 +104,7 @@
for (Map.Entry<String,Source> k : p.sources().entrySet()) {
Source s = sources.get(k.getKey());
// Check that no two different sources are stored under same name.
- assert(s == null || s == k.getValue());
+ Assert.check(s == null || s == k.getValue());
if (s == null) {
s = k.getValue();
sources.put(k.getKey(), k.getValue());
@@ -111,7 +113,7 @@
for (Map.Entry<String,File> g : p.artifacts().entrySet()) {
File f = artifacts.get(g.getKey());
// Check that no two artifacts are stored under the same file.
- assert(f == null || f == g.getValue());
+ Assert.check(f == null || f == g.getValue());
if (f == null) {
f = g.getValue();
artifacts.put(g.getKey(), g.getValue());
@@ -134,13 +136,13 @@
for (Map.Entry<String,Package> j : i.packages().entrySet()) {
Package p = packages.get(j.getKey());
// Check that no two different packages are stored under same name.
- assert(p == null || p == j.getValue());
+ Assert.check(p == null || p == j.getValue());
p = j.getValue();
packages.put(j.getKey(),j.getValue());
for (Map.Entry<String,File> g : p.artifacts().entrySet()) {
File f = artifacts.get(g.getKey());
// Check that no two artifacts are stored under the same file.
- assert(f == null || f == g.getValue());
+ Assert.check(f == null || f == g.getValue());
artifacts.put(g.getKey(), g.getValue());
}
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java
index 3c39532..0a7ae6b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java
@@ -36,19 +36,18 @@
import java.util.Properties;
import com.sun.tools.sjavac.options.Options;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
/**
* The clean properties transform should not be necessary.
* Eventually we will cleanup the property file sources in the OpenJDK instead.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
-public class CleanProperties implements Transformer
-{
+public class CleanProperties implements Transformer {
public void setExtra(String e) {
// Any extra information is ignored for clean properties.
}
@@ -57,7 +56,7 @@
// Any extra information is ignored for clean properties.
}
- public boolean transform(JavacService javacService,
+ public boolean transform(Sjavac sjavac,
Map<String,Set<URI>> pkgSrcs,
Set<URI> visibleSrcs,
Map<URI,Set<String>> visibleClasses,
@@ -70,8 +69,7 @@
boolean incremental,
int numCores,
PrintStream out,
- PrintStream err)
- {
+ PrintStream err) {
boolean rc = true;
for (String pkgName : pkgSrcs.keySet()) {
String pkgNameF = pkgName.replace('.',File.separatorChar);
@@ -87,9 +85,12 @@
return rc;
}
- boolean clean(String pkgName, String pkgNameF, File src, File destRoot, int debugLevel,
- Map<String,Set<URI>> packageArtifacts)
- {
+ boolean clean(String pkgName,
+ String pkgNameF,
+ File src,
+ File destRoot,
+ int debugLevel,
+ Map<String,Set<URI>> packageArtifacts) {
// Load the properties file.
Properties p = new Properties();
try {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java
index 2c0f70c..d8db6b0 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileChunk.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,10 @@
* A compile chunk is a list of sources/packages to be compiled. Possibly a subset of
* the total number of sources/packages to be compiled for this sjavac invocation.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class CompileChunk implements Comparable<CompileChunk> {
public int numPackages;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
index 93346c6..2605ba8 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
@@ -30,13 +30,12 @@
import java.net.URI;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Random;
import java.util.Set;
import java.util.Map;
import com.sun.tools.sjavac.options.Options;
import com.sun.tools.sjavac.server.CompilationResult;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
import com.sun.tools.sjavac.server.SysInfo;
/**
@@ -67,7 +66,7 @@
args = a;
}
- public boolean transform(final JavacService javacService,
+ public boolean transform(final Sjavac sjavac,
Map<String,Set<URI>> pkgSrcs,
final Set<URI> visibleSources,
final Map<URI,Set<String>> visibleClasses,
@@ -86,18 +85,12 @@
boolean concurrentCompiles = true;
// Fetch the id.
- String idOpt = Util.extractStringOption("id", args.getServerConf());
- if (idOpt == null || idOpt.equals("")) {
- // No explicit id set. Create a random id so that the requests can be
- // grouped properly in the server.
- idOpt = "id"+(((new Random()).nextLong())&Long.MAX_VALUE);
- }
- final String id = idOpt;
+ final String id = Util.extractStringOption("id", sjavac.serverSettings());
// Only keep portfile and sjavac settings..
- String psServerSettings = Util.cleanSubOptions(Util.set("portfile","sjavac","background","keepalive"), args.getServerConf());
+ String psServerSettings = Util.cleanSubOptions(Util.set("portfile","sjavac","background","keepalive"), sjavac.serverSettings());
// Get maximum heap size from the server!
- SysInfo sysinfo = javacService.getSysInfo();
+ SysInfo sysinfo = sjavac.getSysInfo();
if (sysinfo.numCores == -1) {
Log.error("Could not query server for sysinfo!");
return false;
@@ -222,7 +215,7 @@
requests[i] = new Thread() {
@Override
public void run() {
- rn[ii] = javacService.compile("n/a",
+ rn[ii] = sjavac.compile("n/a",
id + "-" + ii,
args.prepJavacArgs(),
Collections.<File>emptyList(),
@@ -253,6 +246,8 @@
requests[ii].run();
// If there was an error, then stop early when running single threaded.
if (rn[i].returnCode != 0) {
+ Log.info(rn[i].stdout);
+ Log.error(rn[i].stderr);
return false;
}
}
@@ -269,6 +264,8 @@
for (int i=0; i<numCompiles; ++i) {
if (compileChunks[i].srcs.size() > 0) {
if (rn[i].returnCode != 0) {
+ Log.info(rn[i].stdout);
+ Log.error(rn[i].stderr);
rc = false;
}
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java
index 4658f96..eee124a 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java
@@ -38,20 +38,19 @@
import java.util.Map;
import com.sun.tools.sjavac.options.Options;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
/**
* Compile properties transform a properties file into a Java source file.
* Java has built in support for reading properties from either a text file
* in the source or a compiled java source file.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
-public class CompileProperties implements Transformer
-{
+public class CompileProperties implements Transformer {
// Any extra information passed from the command line, for example if:
// -tr .proppp=com.sun.tools.javac.smart.CompileProperties,sun.util.resources.LocaleNamesBundle
// then extra will be "sun.util.resources.LocaleNamesBundle"
@@ -64,7 +63,7 @@
public void setExtra(Options a) {
}
- public boolean transform(JavacService javacService,
+ public boolean transform(Sjavac sjavac,
Map<String,Set<URI>> pkgSrcs,
Set<URI> visibleSrcs,
Map<URI,Set<String>> visibleClasses,
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java
index 3d32229..bd4b6f1 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java
@@ -32,16 +32,16 @@
import java.util.Map;
import com.sun.tools.sjavac.options.Options;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
/**
* The copy file transform simply copies a matching file from -src to -d .
* Such files are typically images, xml documents and other data files.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class CopyFile implements Transformer {
@@ -51,7 +51,7 @@
public void setExtra(Options a) {
}
- public boolean transform(JavacService javacService,
+ public boolean transform(Sjavac sjavac,
Map<String,Set<URI>> pkgSrcs,
Set<URI> visibleSrcs,
Map<URI,Set<String>> visibleClasses,
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java
index aa26025..0300e40 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java
@@ -26,7 +26,6 @@
package com.sun.tools.sjavac;
import java.io.*;
-import java.nio.file.Path;
import java.util.Collections;
import java.util.Date;
import java.util.Set;
@@ -39,20 +38,18 @@
import java.util.*;
import com.sun.tools.sjavac.options.Options;
-import com.sun.tools.sjavac.options.SourceLocation;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
/**
* The javac state class maintains the previous (prev) and the current (now)
* build states and everything else that goes into the javac_state file.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
-public class JavacState
-{
+public class JavacState {
// The arguments to the compile. If not identical, then it cannot
// be an incremental build!
String theArgs;
@@ -60,7 +57,6 @@
int numCores;
// The bin_dir/javac_state
- private String javacStateFilename;
private File javacState;
// The previous build state is loaded from javac_state
@@ -99,7 +95,7 @@
private Set<String> recompiledPackages;
// The output directories filled with tasty artifacts.
- private File binDir, gensrcDir, headerDir;
+ private File binDir, gensrcDir, headerDir, stateDir;
// The current status of the file system.
private Set<File> binArtifacts;
@@ -128,7 +124,11 @@
// Where to send stdout and stderr.
private PrintStream out, err;
- JavacState(Options options, boolean removeJavacState, PrintStream o, PrintStream e) {
+ // Command line options.
+ private Options options;
+
+ JavacState(Options op, boolean removeJavacState, PrintStream o, PrintStream e) {
+ options = op;
out = o;
err = e;
numCores = options.getNumCores();
@@ -136,8 +136,8 @@
binDir = Util.pathToFile(options.getDestDir());
gensrcDir = Util.pathToFile(options.getGenSrcDir());
headerDir = Util.pathToFile(options.getHeaderDir());
- javacStateFilename = binDir.getPath()+File.separator+"javac_state";
- javacState = new File(javacStateFilename);
+ stateDir = Util.pathToFile(options.getStateDir());
+ javacState = new File(stateDir, "javac_state");
if (removeJavacState && javacState.exists()) {
javacState.delete();
}
@@ -148,7 +148,7 @@
// We do not want to risk building a broken incremental build.
// BUT since the makefiles still copy things straight into the bin_dir et al,
// we avoid deleting files here, if the option --permit-unidentified-classes was supplied.
- if (!options.isUnidentifiedArtifactPermitted()) {
+ if (!options.areUnidentifiedArtifactsPermitted()) {
deleteContents(binDir);
deleteContents(gensrcDir);
deleteContents(headerDir);
@@ -268,7 +268,7 @@
*/
public void save() throws IOException {
if (!needsSaving) return;
- try (FileWriter out = new FileWriter(javacStateFilename)) {
+ try (FileWriter out = new FileWriter(javacState)) {
StringBuilder b = new StringBuilder();
long millisNow = System.currentTimeMillis();
Date d = new Date(millisNow);
@@ -311,7 +311,7 @@
boolean newCommandLine = false;
boolean syntaxError = false;
- try (BufferedReader in = new BufferedReader(new FileReader(db.javacStateFilename))) {
+ try (BufferedReader in = new BufferedReader(new FileReader(db.javacState))) {
for (;;) {
String l = in.readLine();
if (l==null) break;
@@ -512,7 +512,8 @@
allKnownArtifacts.add(javacState);
for (File f : binArtifacts) {
- if (!allKnownArtifacts.contains(f)) {
+ if (!allKnownArtifacts.contains(f) &&
+ !options.isUnidentifiedArtifactPermitted(f.getAbsolutePath())) {
Log.debug("Removing "+f.getPath()+" since it is unknown to the javac_state.");
f.delete();
}
@@ -605,13 +606,16 @@
/**
* Recursively delete a directory and all its contents.
*/
- private static void deleteContents(File dir) {
+ private void deleteContents(File dir) {
if (dir != null && dir.exists()) {
for (File f : dir.listFiles()) {
if (f.isDirectory()) {
deleteContents(f);
}
- f.delete();
+ if (!options.isUnidentifiedArtifactPermitted(f.getAbsolutePath())) {
+ Log.debug("Removing "+f.getAbsolutePath());
+ f.delete();
+ }
}
}
}
@@ -648,7 +652,7 @@
/**
* Compile all the java sources. Return true, if it needs to be called again!
*/
- public boolean performJavaCompilations(JavacService javacService,
+ public boolean performJavaCompilations(Sjavac sjavac,
Options args,
Set<String> recentlyCompiled,
boolean[] rcValue) {
@@ -656,7 +660,7 @@
suffixRules.put(".java", compileJavaPackages);
compileJavaPackages.setExtra(args);
- rcValue[0] = perform(javacService, binDir, suffixRules);
+ rcValue[0] = perform(sjavac, binDir, suffixRules);
recentlyCompiled.addAll(taintedPackages());
clearTaintedPackages();
boolean again = !packagesWithChangedPublicApis.isEmpty();
@@ -686,10 +690,9 @@
* For all packages, find all sources belonging to the package, group the sources
* based on their transformers and apply the transformers on each source code group.
*/
- private boolean perform(JavacService javacService,
+ private boolean perform(Sjavac sjavac,
File outputDir,
- Map<String,Transformer> suffixRules)
- {
+ Map<String,Transformer> suffixRules) {
boolean rc = true;
// Group sources based on transforms. A source file can only belong to a single transform.
Map<Transformer,Map<String,Set<URI>>> groupedSources = new HashMap<>();
@@ -713,7 +716,7 @@
Map<String,String> packagePublicApis =
Collections.synchronizedMap(new HashMap<String, String>());
- boolean r = t.transform(javacService,
+ boolean r = t.transform(sjavac,
srcs,
visibleSrcs,
visibleClasses,
@@ -791,9 +794,7 @@
* Used to detect bugs where the makefile and sjavac have different opinions on which files
* should be compiled.
*/
- public void compareWithMakefileList(File makefileSourceList)
- throws ProblemException
- {
+ public void compareWithMakefileList(File makefileSourceList) throws ProblemException {
// If we are building on win32 using for example cygwin the paths in the makefile source list
// might be /cygdrive/c/.... which does not match c:\....
// We need to adjust our calculated sources to be identical, if necessary.
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java
index 6606907..b5ee22b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Log.java
@@ -31,10 +31,10 @@
* Utility class only for sjavac logging.
* The log level can be set using for example --log=DEBUG on the sjavac command line.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Log {
private static PrintStream out, err;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java
index 3ec46f6..5ea2abf 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java
@@ -31,19 +31,21 @@
import java.nio.file.Path;
import java.nio.file.Files;
+import com.sun.tools.sjavac.client.SjavacClient;
+import com.sun.tools.sjavac.comp.SjavacImpl;
+import com.sun.tools.sjavac.comp.PooledSjavac;
import com.sun.tools.sjavac.options.Options;
import com.sun.tools.sjavac.options.SourceLocation;
-import com.sun.tools.sjavac.server.JavacService;
-import com.sun.tools.sjavac.server.JavacServer;
-import com.sun.tools.sjavac.server.JavacServiceClient;
+import com.sun.tools.sjavac.server.Sjavac;
+import com.sun.tools.sjavac.server.SjavacServer;
/**
* The main class of the smart javac wrapper tool.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Main {
@@ -163,13 +165,19 @@
return;
}
// Spawn a background server.
- int rc = JavacServer.startServer(args[0], System.err);
- System.exit(rc);
+ try {
+ SjavacServer server = new SjavacServer(args[0], System.err);
+ int rc = server.startServer();
+ System.exit(rc);
+ } catch (IOException ioex) {
+ Log.error("IOException caught: " + ioex);
+ System.exit(-1);
+ }
}
Main main = new Main();
int rc = main.go(args, System.out, System.err);
// Remove the portfile, but only if this background=false was used.
- JavacServer.cleanup(args);
+ SjavacServer.cleanup(args);
System.exit(rc);
}
@@ -205,6 +213,9 @@
if (!createIfMissing(options.getDestDir()))
return -1;
+ if (!createIfMissing(options.getStateDir()))
+ return -1;
+
Path gensrc = options.getGenSrcDir();
if (gensrc != null && !createIfMissing(gensrc))
return -1;
@@ -302,7 +313,7 @@
// For examples, files that have been manually copied into these dirs.
// Artifacts with bad timestamps (ie the on disk timestamp does not match the timestamp
// in javac_state) have already been removed when the javac_state was loaded.
- if (!options.isUnidentifiedArtifactPermitted()) {
+ if (!options.areUnidentifiedArtifactsPermitted()) {
javac_state.removeUnidentifiedArtifacts();
}
// Go through all sources and taint all packages that miss artifacts.
@@ -338,15 +349,22 @@
// Collect the name of all compiled packages.
Set<String> recently_compiled = new HashSet<>();
boolean[] rc = new boolean[1];
+ Sjavac sjavac;
+ boolean background = Util.extractBooleanOption("background", options.getServerConf(), true);
do {
// Clean out artifacts in tainted packages.
javac_state.deleteClassArtifactsInTaintedPackages();
- // Create a JavacService to delegate the actual compilation to.
- // Currently sjavac always connects to a server through a socket
- // regardless if sjavac runs as a background service or not.
- // This will most likely change in the future.
- JavacService javacService = new JavacServiceClient(options.getServerConf());
- again = javac_state.performJavaCompilations(javacService, options, recently_compiled, rc);
+ // Create an sjavac implementation to be used for compilation
+ if (background) {
+ sjavac = new SjavacClient(options);
+ } else {
+ int poolsize = Util.extractIntOption("poolsize", options.getServerConf());
+ if (poolsize <= 0)
+ poolsize = Runtime.getRuntime().availableProcessors();
+ sjavac = new PooledSjavac(new SjavacImpl(), poolsize);
+ }
+
+ again = javac_state.performJavaCompilations(sjavac, options, recently_compiled, rc);
if (!rc[0]) break;
} while (again);
// Only update the state if the compile went well.
@@ -357,6 +375,8 @@
// Remove artifacts that were generated during the last compile, but not this one.
javac_state.removeSuperfluousArtifacts(recently_compiled);
}
+ if (!background)
+ sjavac.shutdown();
return rc[0] ? 0 : -1;
} catch (ProblemException e) {
Log.error(e.getMessage());
@@ -375,8 +395,6 @@
err = "Please specify output directory.";
} else if (options.isJavaFilesAmongJavacArgs()) {
err = "Sjavac does not handle explicit compilation of single .java files.";
- } else if (options.isAtFilePresent()) {
- err = "Sjavac does not handle @-files.";
} else if (options.getServerConf() == null) {
err = "No server configuration provided.";
} else if (!options.getImplicitPolicy().equals("none")) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java
index dbe84e8..188d869 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,10 @@
* The module is the root of a set of packages/sources/artifacts.
* At the moment there is only one module in use, the empty/no-name/default module.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Module implements Comparable<Module> {
private String name;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
index 18a9281..244b689 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.sun.tools.javac.util.Assert;
/**
* The Package class maintains meta information about a package.
@@ -54,10 +55,10 @@
* the visible recompilation of the dependent packages indicates how much circular
* dependencies your code has.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Package implements Comparable<Package> {
// The module this package belongs to. (There is a legacy module with an empty string name,
@@ -83,9 +84,9 @@
public Package(Module m, String n) {
int c = n.indexOf(":");
- assert(c != -1);
+ Assert.check(c != -1);
String mn = n.substring(0,c);
- assert(m.name().equals(m.name()));
+ Assert.check(m.name().equals(m.name()));
name = n;
dirname = n.replace('.', File.separatorChar);
if (m.name().length() > 0) {
@@ -256,7 +257,7 @@
}
public void setArtifacts(Set<URI> as) {
- assert(!artifacts.isEmpty());
+ Assert.check(!artifacts.isEmpty());
artifacts = new HashMap<>();
addArtifacts(as);
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java
index d9b32db..b6aa759 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/ProblemException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,10 @@
/**
* Used to signal serious problems when running sjavac.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class ProblemException extends Exception {
static final long serialVersionUID = -3387516993124229949L;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java
index d32fc3a..ad94ef4 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java
@@ -37,10 +37,10 @@
* The class also knows how to find source files (scanRoot) given include/exclude
* patterns and a root.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Source implements Comparable<Source> {
// The package the source belongs to.
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
index 9922c7a..616557e 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
@@ -31,7 +31,7 @@
import java.util.Map;
import com.sun.tools.sjavac.options.Options;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
/**
* The transform interface is used to transform content inside a package, from one form to another.
@@ -39,13 +39,12 @@
* but can also be an unpredictable number of generated source files (eg idl2java)
* or a single predictable output file (eg when copying,cleaning or compiling a properties file).
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
-public interface Transformer
-{
+public interface Transformer {
/**
* The transform method takes a set of package names, mapped to their source files and to the
* pubapis of the packages.
@@ -83,7 +82,7 @@
* If num_cores is set to a non-zero value. The transform should attempt to use no more than these
* number of threads for heavy work.
*/
- boolean transform(JavacService javacService,
+ boolean transform(Sjavac sjavac,
Map<String,Set<URI>> pkgSrcs,
Set<URI> visibleSources,
Map<URI,Set<String>> visibleClasses,
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
index 5039051..b1db5f4 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java
@@ -26,8 +26,6 @@
package com.sun.tools.sjavac;
import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.HashSet;
@@ -37,10 +35,10 @@
/**
* Utilities.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Util {
@@ -64,7 +62,8 @@
public static String justPackageName(String pkgName) {
int c = pkgName.indexOf(":");
- assert(c != -1);
+ if (c == -1)
+ throw new IllegalArgumentException("Expected ':' in package name (" + pkgName + ")");
return pkgName.substring(c+1);
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java
new file mode 100644
index 0000000..d978309
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.client;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URI;
+import java.util.List;
+import java.util.Set;
+
+import com.sun.tools.sjavac.Log;
+import com.sun.tools.sjavac.ProblemException;
+import com.sun.tools.sjavac.Util;
+import com.sun.tools.sjavac.server.CompilationResult;
+import com.sun.tools.sjavac.server.PortFile;
+import com.sun.tools.sjavac.server.Sjavac;
+import com.sun.tools.sjavac.server.SjavacServer;
+import com.sun.tools.sjavac.server.SysInfo;
+import com.sun.tools.sjavac.options.Options;
+
+/**
+ * Sjavac implementation that delegates requests to a SjavacServer.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class SjavacClient implements Sjavac {
+
+ // The id can perhaps be used in the future by the javac server to reuse the
+ // JavaCompiler instance for several compiles using the same id.
+ private final String id;
+ private final String portfileName;
+ private final String logfile;
+ private final String stdouterrfile;
+ private final boolean background;
+
+ // Default keepalive for server is 120 seconds.
+ // I.e. it will accept 120 seconds of inactivity before quitting.
+ private final int keepalive;
+ private final int poolsize;
+
+ // The sjavac option specifies how the server part of sjavac is spawned.
+ // If you have the experimental sjavac in your path, you are done. If not, you have
+ // to point to a com.sun.tools.sjavac.Main that supports --startserver
+ // for example by setting: sjavac=java%20-jar%20...javac.jar%com.sun.tools.sjavac.Main
+ private final String sjavacForkCmd;
+
+ // Wait 2 seconds for response, before giving up on javac server.
+ static int CONNECTION_TIMEOUT = 2000;
+ static int MAX_CONNECT_ATTEMPTS = 3;
+ static int WAIT_BETWEEN_CONNECT_ATTEMPTS = 2000;
+
+ // Store the server conf settings here.
+ private final String settings;
+
+ public SjavacClient(Options options) {
+ String tmpServerConf = options.getServerConf();
+ String serverConf = (tmpServerConf!=null)? tmpServerConf : "";
+ String tmpId = Util.extractStringOption("id", serverConf);
+ id = (tmpId!=null) ? tmpId : "id"+(((new java.util.Random()).nextLong())&Long.MAX_VALUE);
+ String p = Util.extractStringOption("portfile", serverConf);
+ portfileName = (p!=null) ? p : options.getStateDir().toFile().getAbsolutePath()+File.separatorChar+"javac_server";
+ logfile = Util.extractStringOption("logfile", serverConf, portfileName + ".javaclog");
+ stdouterrfile = Util.extractStringOption("stdouterrfile", serverConf, portfileName + ".stdouterr");
+ background = Util.extractBooleanOption("background", serverConf, true);
+ sjavacForkCmd = Util.extractStringOption("sjavac", serverConf, "sjavac");
+ int poolsize = Util.extractIntOption("poolsize", serverConf);
+ keepalive = Util.extractIntOption("keepalive", serverConf, 120);
+
+ this.poolsize = poolsize > 0 ? poolsize : Runtime.getRuntime().availableProcessors();
+ settings = (serverConf.equals("")) ? "id="+id+",portfile="+portfileName : serverConf;
+ }
+
+ /**
+ * Hand out the server settings.
+ * @return The server settings, possibly a default value.
+ */
+ public String serverSettings() {
+ return settings;
+ }
+
+ /**
+ * Make a request to the server only to get the maximum possible heap size to use for compilations.
+ *
+ * @param port_file The port file used to synchronize creation of this server.
+ * @param id The identify of the compilation.
+ * @param out Standard out information.
+ * @param err Standard err information.
+ * @return The maximum heap size in bytes.
+ */
+ @Override
+ public SysInfo getSysInfo() {
+ try (Socket socket = tryConnect()) {
+ // The ObjectInputStream constructor will block until the
+ // corresponding ObjectOutputStream has written and flushed the
+ // header, so it is important that the ObjectOutputStreams on server
+ // and client are opened before the ObjectInputStreams.
+ ObjectOutputStream oos = new ObjectOutputStream(socket.getOutputStream());
+ ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
+ oos.writeObject(id);
+ oos.writeObject(SjavacServer.CMD_SYS_INFO);
+ oos.flush();
+ return (SysInfo) ois.readObject();
+ } catch (IOException | ClassNotFoundException ex) {
+ Log.error("[CLIENT] Exception caught: " + ex);
+ StringWriter sw = new StringWriter();
+ ex.printStackTrace(new PrintWriter(sw));
+ }
+ return null;
+ }
+
+ @Override
+ public CompilationResult compile(String protocolId,
+ String invocationId,
+ String[] args,
+ List<File> explicitSources,
+ Set<URI> sourcesToCompile,
+ Set<URI> visibleSources) {
+ CompilationResult result;
+ try (Socket socket = tryConnect()) {
+ // The ObjectInputStream constructor will block until the
+ // corresponding ObjectOutputStream has written and flushed the
+ // header, so it is important that the ObjectOutputStreams on server
+ // and client are opened before the ObjectInputStreams.
+ ObjectOutputStream oos = new ObjectOutputStream(socket.getOutputStream());
+ ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
+ oos.writeObject(id);
+ oos.writeObject(SjavacServer.CMD_COMPILE);
+ oos.writeObject(protocolId);
+ oos.writeObject(invocationId);
+ oos.writeObject(args);
+ oos.writeObject(explicitSources);
+ oos.writeObject(sourcesToCompile);
+ oos.writeObject(visibleSources);
+ oos.flush();
+ result = (CompilationResult) ois.readObject();
+ } catch (IOException | ClassNotFoundException ex) {
+ Log.error("Exception caught: " + ex);
+ result = new CompilationResult(CompilationResult.ERROR_FATAL);
+ result.stderr = ex.getMessage();
+ }
+ return result;
+ }
+
+ private Socket tryConnect() throws IOException {
+
+ PortFile portFile;
+ try {
+ // This should be taken care of at a higher level (JDK-8048451)
+ portFile = SjavacServer.getPortFile(portfileName);
+ } catch (FileNotFoundException e) {
+ // Reached for instance if directory of port file does not exist
+ Log.error("Port file inaccessable: " + e);
+ throw new RuntimeException(e);
+ }
+ for (int i = 0; i < MAX_CONNECT_ATTEMPTS; i++) {
+ Log.info(String.format("Trying to connect (attempt %d of %d)",
+ i+1, MAX_CONNECT_ATTEMPTS));
+ try {
+ if (!makeSureServerIsRunning(portFile))
+ continue;
+ Socket socket = new Socket();
+ InetAddress localhost = InetAddress.getByName(null);
+ socket.connect(new InetSocketAddress(localhost, portFile.getPort()),
+ CONNECTION_TIMEOUT);
+ return socket;
+ } catch (ProblemException | IOException ex) {
+ Log.error("Caught exception during tryConnect: " + ex);
+ }
+
+ try {
+ Thread.sleep(WAIT_BETWEEN_CONNECT_ATTEMPTS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ throw new IOException("Could not connect to server");
+ }
+
+ private boolean makeSureServerIsRunning(PortFile portFile)
+ throws IOException, ProblemException, FileNotFoundException {
+
+ synchronized (portFile) {
+ portFile.lock();
+ portFile.getValues();
+ portFile.unlock();
+ }
+
+ if (!portFile.containsPortInfo()) {
+ String forkCmd = SjavacServer.fork(sjavacForkCmd,
+ portFile.getFilename(),
+ logfile,
+ poolsize,
+ keepalive,
+ System.err,
+ stdouterrfile,
+ background);
+ if (!portFile.waitForValidValues()) {
+ // This can be simplified once JDK-8048457 has been addressed
+ // since we won't have an SjavacClient if background = false
+ if (background) {
+ // There seems be some problem with spawning the external
+ // process (for instance no fork command provided and no
+ // sjavac on path)
+ StringWriter sw = new StringWriter();
+ SjavacClient.printFailedAttempt(forkCmd,
+ stdouterrfile,
+ new PrintWriter(sw));
+ Log.error(sw.toString());
+ }
+ }
+ }
+ return portFile.containsPortInfo();
+ }
+
+
+ public static void printFailedAttempt(String cmd, String f, PrintWriter err) {
+ err.println("---- Failed to start javac server with this command -----");
+ err.println(cmd);
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(f));
+ err.println("---- stdout/stderr output from attempt to start javac server -----");
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ break;
+ }
+ err.println(l);
+ }
+ err.println("------------------------------------------------------------------");
+ } catch (Exception e) {
+ err.println("The stdout/stderr output in file " + f + " does not exist and the server did not start.");
+ }
+ }
+
+ @Override
+ public void shutdown() {
+ // Nothing to clean up
+ }
+}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java
index e10d396..c81f3f3 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/AttrWithDeps.java
@@ -30,10 +30,10 @@
/** Subclass to Attr that overrides reportDepedence.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class AttrWithDeps extends Attr {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
index 2c7c5eb..1273f47 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
@@ -34,6 +34,7 @@
import java.util.Set;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Name;
@@ -41,10 +42,10 @@
/** Utility class containing dependency information between packages
* and the pubapi for a package.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Dependencies {
protected static final Context.Key<Dependencies> dependenciesKey = new Context.Key<>();
@@ -154,7 +155,7 @@
Name n = ((ClassSymbol)e).fullname;
Name p = ((ClassSymbol)e).packge().fullname;
StringBuffer sb = publicApiPerClass.get(n);
- assert(sb == null);
+ Assert.check(sb == null);
sb = new StringBuffer();
PubapiVisitor v = new PubapiVisitor(sb);
v.visit(e);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
index 0599a81..d55181a 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
@@ -32,29 +32,29 @@
/** Subclass to Resolve that overrides collect.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class JavaCompilerWithDeps extends JavaCompiler {
/** The dependency database
*/
protected Dependencies deps;
- protected JavacServiceImpl javacService;
+ protected SjavacErrorHandler errorHandler;
- public JavaCompilerWithDeps(Context context, JavacServiceImpl jsi) {
+ public JavaCompilerWithDeps(Context context, SjavacErrorHandler eh) {
super(context);
deps = Dependencies.instance(context);
- javacService = jsi;
+ errorHandler = eh;
needRootClasses = true;
}
- public static void preRegister(Context context, final JavacServiceImpl t) {
+ public static void preRegister(Context context, final SjavacErrorHandler eh) {
context.put(compilerKey, new Context.Factory<JavaCompiler>() {
public JavaCompiler make(Context c) {
- JavaCompiler instance = new JavaCompilerWithDeps(c, t);
+ JavaCompiler instance = new JavaCompilerWithDeps(c, eh);
c.put(JavaCompiler.class, instance);
return instance;
}
@@ -97,7 +97,7 @@
// Now check if the truncated uri ends with the path. (It does not == failure!)
if (path.length() > 0 && !path.equals("/unnamed package/") && !pp.endsWith(path)) {
- javacService.logError("Error: The source file "+sym.sourcefile.getName()+
+ errorHandler.logError("Error: The source file "+sym.sourcefile.getName()+
" is located in the wrong package directory, because it contains the class "+
sym.getQualifiedName());
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java
new file mode 100644
index 0000000..26a6b69
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.comp;
+
+import java.io.File;
+import java.net.URI;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.sun.tools.sjavac.Log;
+import com.sun.tools.sjavac.server.CompilationResult;
+import com.sun.tools.sjavac.server.Sjavac;
+import com.sun.tools.sjavac.server.SysInfo;
+
+/**
+ * An sjavac implementation that limits the number of concurrent calls by
+ * wrapping invocations in Callables and delegating them to a FixedThreadPool.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class PooledSjavac implements Sjavac {
+
+ final Sjavac delegate;
+ final ExecutorService pool;
+
+ public PooledSjavac(Sjavac delegate, int poolsize) {
+ Objects.requireNonNull(delegate);
+ this.delegate = delegate;
+ pool = Executors.newFixedThreadPool(poolsize, new ThreadFactory() {
+ AtomicInteger count = new AtomicInteger();
+ @Override
+ public Thread newThread(Runnable runnable) {
+ String cls = PooledSjavac.class.getSimpleName();
+ int num = count.incrementAndGet();
+ Thread t = new Thread(runnable, cls + "-" + num);
+ t.setDaemon(true);
+ return t;
+ }
+ });
+ }
+
+ @Override
+ public SysInfo getSysInfo() {
+ try {
+ return pool.submit(new Callable<SysInfo>() {
+ @Override
+ public SysInfo call() throws Exception {
+ return delegate.getSysInfo();
+ }
+ }).get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("Error during getSysInfo", e);
+ }
+ }
+
+ @Override
+ public CompilationResult compile(final String protocolId,
+ final String invocationId,
+ final String[] args,
+ final List<File> explicitSources,
+ final Set<URI> sourcesToCompile,
+ final Set<URI> visibleSources) {
+ try {
+ return pool.submit(new Callable<CompilationResult>() {
+ @Override
+ public CompilationResult call() throws Exception {
+ return delegate.compile(protocolId,
+ invocationId,
+ args,
+ explicitSources,
+ sourcesToCompile,
+ visibleSources);
+ }
+ }).get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("Error during compile", e);
+ }
+ }
+
+ @Override
+ public void shutdown() {
+ pool.shutdown(); // Disable new tasks from being submitted
+ try {
+ // Wait a while for existing tasks to terminate
+ if (!pool.awaitTermination(60, TimeUnit.SECONDS)) {
+ pool.shutdownNow(); // Cancel currently executing tasks
+ // Wait a while for tasks to respond to being cancelled
+ if (!pool.awaitTermination(60, TimeUnit.SECONDS))
+ Log.error("ThreadPool did not terminate");
+ }
+ // Grace period for thread termination
+ Thread.sleep(1000);
+ } catch (InterruptedException ie) {
+ // (Re-)Cancel if current thread also interrupted
+ pool.shutdownNow();
+ // Preserve interrupt status
+ Thread.currentThread().interrupt();
+ }
+
+ delegate.shutdown();
+ }
+
+ @Override
+ public String serverSettings() {
+ return delegate.serverSettings();
+ }
+}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
index 6ee47be..6a8b284 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,10 +37,10 @@
/** Utility class that constructs a textual representation
* of the public api of a class.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class PubapiVisitor extends ElementScanner9<Void, Void> {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
index d82e81d..0c8de2e 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,10 @@
/** Subclass to Resolve that overrides collect.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class ResolveWithDeps extends Resolve {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacErrorHandler.java
similarity index 70%
copy from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
copy to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacErrorHandler.java
index 91f7230..e422b2f 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacErrorHandler.java
@@ -23,21 +23,14 @@
* questions.
*/
-package com.sun.tools.sjavac.server;
+package com.sun.tools.sjavac.comp;
-import java.io.File;
-import java.net.URI;
-import java.util.List;
-import java.util.Set;
-
-public interface JavacService {
-
- SysInfo getSysInfo();
-
- CompilationResult compile(String protocolId,
- String invocationId,
- String[] args,
- List<File> explicitSources,
- Set<URI> sourcesToCompile,
- Set<URI> visibleSources);
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public interface SjavacErrorHandler {
+ void logError(String msg);
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java
similarity index 75%
rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java
index df70e2c..2b3caf6 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java
@@ -22,7 +22,6 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package com.sun.tools.sjavac.comp;
import java.io.File;
@@ -32,6 +31,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.tools.JavaCompiler.CompilationTask;
import javax.tools.JavaFileObject;
@@ -41,26 +41,21 @@
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.sjavac.Util;
+import com.sun.tools.javac.util.Options;
import com.sun.tools.sjavac.server.CompilationResult;
-import com.sun.tools.sjavac.server.JavacServer;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
import com.sun.tools.sjavac.server.SysInfo;
-public class JavacServiceImpl implements JavacService {
-
- JavacServer javacServer;
- private ThreadLocal<Boolean> forcedExit;
-
- public JavacServiceImpl(JavacServer javacServer) {
- this.javacServer = javacServer;
-
- }
-
- public void logError(String msg) {
-// stderr.println(msg);
- forcedExit.set(true);
- }
+/**
+ * The sjavac implementation that interacts with javac and performs the actual
+ * compilation.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class SjavacImpl implements Sjavac {
@Override
public SysInfo getSysInfo() {
@@ -75,6 +70,7 @@
List<File> explicitSources,
Set<URI> sourcesToCompile,
Set<URI> visibleSources) {
+ final AtomicBoolean forcedExit = new AtomicBoolean();
JavacTool compiler = JavacTool.create();
StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
@@ -82,7 +78,12 @@
Context context = new Context();
ResolveWithDeps.preRegister(context);
AttrWithDeps.preRegister(context);
- JavaCompilerWithDeps.preRegister(context, this);
+ JavaCompilerWithDeps.preRegister(context, new SjavacErrorHandler() {
+ @Override
+ public void logError(String msg) {
+ forcedExit.set(true);
+ }
+ });
// Now setup the actual compilation....
CompilationResult compilationResult = new CompilationResult(0);
@@ -100,13 +101,6 @@
for (JavaFileObject i : fileManager.getJavaFileObjectsFromFiles(sourcesToCompileFiles)) {
compilationUnits.append(i);
}
- // Log the options to be used.
- StringBuilder options = new StringBuilder();
- for (String s : args) {
- options.append(">").append(s).append("< ");
- }
- javacServer.log(protocolId+" <"+invocationId+"> options "+options.toString());
-
forcedExit.set(false);
// Create a new logger.
StringWriter stdoutLog = new StringWriter();
@@ -120,14 +114,20 @@
smartFileManager.cleanArtifacts();
smartFileManager.setLog(stdout);
-
// Do the compilation!
- CompilationTask task = compiler.getTask(stderr, smartFileManager, null, Arrays.asList(args), null, compilationUnits, context);
+ CompilationTask task = compiler.getTask(stderr,
+ smartFileManager,
+ null,
+ Arrays.asList(args),
+ null,
+ compilationUnits,
+ context);
+ smartFileManager.setSymbolFileEnabled(!Options.instance(context).isSet("ignore.symbol.file"));
rc = ((JavacTaskImpl) task).doCall();
smartFileManager.flush();
}
} catch (Exception e) {
- stderr.println(e.getMessage());
+ stderrLog.append(e.getMessage());
forcedExit.set(true);
}
@@ -139,8 +139,22 @@
compilationResult.stdout = stdoutLog.toString();
compilationResult.stderr = stderrLog.toString();
+
compilationResult.returnCode = rc.exitCode == 0 && forcedExit.get() ? -1 : rc.exitCode;
return compilationResult;
}
+
+ @Override
+ public void shutdown() {
+ // Nothing to clean up
+ // ... maybe we should wait for any current request to finish?
+ }
+
+
+ @Override
+ public String serverSettings() {
+ return "";
+ }
+
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
index 43baf12..f0f5188 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
@@ -37,7 +37,6 @@
import javax.tools.JavaFileObject.Kind;
import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.BaseFileManager;
import com.sun.tools.javac.util.ListBuffer;
/**
@@ -50,10 +49,10 @@
* Can also blind out the filemanager from seeing certain files in the file system.
* Necessary to prevent javac from seeing some sources where the source path points.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class SmartFileManager extends ForwardingJavaFileManager<JavaFileManager> {
@@ -97,9 +96,7 @@
public Iterable<JavaFileObject> list(Location location,
String packageName,
Set<Kind> kinds,
- boolean recurse)
- throws IOException
- {
+ boolean recurse) throws IOException {
// Acquire the list of files.
Iterable<JavaFileObject> files = super.list(location, packageName, kinds, recurse);
if (visibleSources.isEmpty()) {
@@ -112,8 +109,7 @@
String t = uri.toString();
if (t.startsWith("jar:")
|| t.endsWith(".class")
- || visibleSources.contains(uri))
- {
+ || visibleSources.contains(uri)) {
filteredFiles.add(f);
}
}
@@ -128,9 +124,7 @@
@Override
public JavaFileObject getJavaFileForInput(Location location,
String className,
- Kind kind)
- throws IOException
- {
+ Kind kind) throws IOException {
JavaFileObject file = super.getJavaFileForInput(location, className, kind);
if (file == null || visibleSources.isEmpty()) {
return file;
@@ -146,9 +140,7 @@
public JavaFileObject getJavaFileForOutput(Location location,
String className,
Kind kind,
- FileObject sibling)
- throws IOException
- {
+ FileObject sibling) throws IOException {
JavaFileObject file = super.getJavaFileForOutput(location, className, kind, sibling);
if (file == null) return file;
int dp = className.lastIndexOf('.');
@@ -165,9 +157,7 @@
@Override
public FileObject getFileForInput(Location location,
String packageName,
- String relativeName)
- throws IOException
- {
+ String relativeName) throws IOException {
FileObject file = super.getFileForInput(location, packageName, relativeName);
if (file == null || visibleSources.isEmpty()) {
return file;
@@ -183,9 +173,7 @@
public FileObject getFileForOutput(Location location,
String packageName,
String relativeName,
- FileObject sibling)
- throws IOException
- {
+ FileObject sibling) throws IOException {
FileObject file = super.getFileForOutput(location, packageName, relativeName, sibling);
if (file == null) return file;
if (location.equals(StandardLocation.NATIVE_HEADER_OUTPUT) &&
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
index 761b8cb..8e6dfa1 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,10 @@
* and compare the new content with the old content on disk. Only if they differ,
* will the file be updated.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class SmartFileObject implements JavaFileObject {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
index b353ec0..23b2f7c 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,9 @@
* If not, the file is not touched.
*
* <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class SmartWriter extends Writer {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java
index abb6d70..69d89e7 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/ArgumentIterator.java
@@ -27,6 +27,12 @@
import java.util.Iterator;
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
public class ArgumentIterator implements Iterator<String> {
/** The underlying argument iterator */
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java
index 25a5f00..364c48b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java
@@ -47,6 +47,11 @@
* This enum represents all options from (1) and (2). Note that instances of
* this enum only entail static information about the option. For storage of
* option values, refer to com.sun.tools.sjavac.options.Options.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public enum Option {
@@ -231,7 +236,14 @@
helper.logLevel("info");
}
},
- PERMIT_UNIDENTIFIED_ARTIFACTS("--permit-unidentified-artifacts", "Keep unidentified artifacts in destination directory") {
+ PERMIT_ARTIFACT("--permit-artifact=", "Allow this artifact in destination directory") {
+ @Override
+ protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
+ String a = iter.current().substring(arg.length());
+ helper.permitArtifact(Paths.get(a).toFile().getAbsolutePath());
+ }
+ },
+ PERMIT_UNIDENTIFIED_ARTIFACTS("--permit-unidentified-artifacts", "Allow unidentified artifacts in destination directory") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
helper.permitUnidentifiedArtifacts();
@@ -274,8 +286,16 @@
if (dir != null)
helper.headerDir(dir);
}
+ },
+ STATE_DIR("--state-dir=", "Directory used to store sjavac state and log files.") {
+ @Override
+ protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
+ String p = iter.current().substring(arg.length());
+ helper.stateDir(Paths.get(p));
+ }
};
+
public final String arg;
final String description;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
index 5fe92ce..9b1baf0 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
@@ -25,17 +25,23 @@
package com.sun.tools.sjavac.options;
-import java.nio.file.Files;
+import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
+import com.sun.tools.javac.main.CommandLine;
import com.sun.tools.sjavac.Transformer;
/**
* This class is used to decode sjavac options.
* See com.sun.tools.sjavac.options.Options for example usage.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public abstract class OptionHelper {
@@ -78,6 +84,9 @@
/** Record path for reference source list */
public abstract void compareFoundSources(Path referenceList);
+ /** Record a single permitted artifact */
+ public abstract void permitArtifact(String f);
+
/** Record the fact that unidentified artifacts are permitted */
public abstract void permitUnidentifiedArtifacts();
@@ -102,6 +111,9 @@
/** Sets the directory for generated headers */
public abstract void headerDir(Path dir);
+ /** Sets the directory for state and log files generated by sjavac */
+ public abstract void stateDir(Path dir);
+
/** Sets the implicit policy */
public abstract void implicit(String policy);
@@ -112,7 +124,11 @@
* @param args the arguments to traverse.
*/
void traverse(String[] args) {
-
+ try {
+ args = CommandLine.parse(args); // Detect @file and load it as a command line.
+ } catch (java.io.IOException e) {
+ throw new IllegalArgumentException("Problem reading @"+e.getMessage());
+ }
ArgumentIterator argIter = new ArgumentIterator(Arrays.asList(args));
nextArg:
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
index e27c6ac..9393710 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
@@ -32,16 +32,23 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
import com.sun.tools.sjavac.Transformer;
/**
* Instances of this class represent values for sjavac command line options.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class Options {
// Output directories
- private Path destDir, genSrcDir, headerDir;
+ private Path destDir, genSrcDir, headerDir, stateDir;
// Input directories
private List<SourceLocation> sources = new ArrayList<>();
@@ -51,7 +58,8 @@
private String logLevel = "info";
- private boolean permitUnidentifiedArtifact = false;
+ private Set<String> permitted_artifacts = new HashSet<>();
+ private boolean permitUnidentifiedArtifacts = false;
private boolean permitSourcesInDefaultPackage = false;
private Path sourceReferenceList;
@@ -86,6 +94,11 @@
return headerDir;
}
+ /** Get the path for the state directory, defaults to destDir. */
+ public Path getStateDir() {
+ return stateDir != null ? stateDir : destDir;
+ }
+
/** Get all source locations for files to be compiled */
public List<SourceLocation> getSources() {
return sources;
@@ -114,10 +127,15 @@
return logLevel;
}
+ /** Returns true iff the artifact is permitted in the output dir. */
+ public boolean isUnidentifiedArtifactPermitted(String f) {
+ return permitted_artifacts.contains(f);
+ }
+
/** Returns true iff artifacts in the output directories should be kept,
* even if they would not be generated in a clean build. */
- public boolean isUnidentifiedArtifactPermitted() {
- return permitUnidentifiedArtifact;
+ public boolean areUnidentifiedArtifactsPermitted() {
+ return permitUnidentifiedArtifacts;
}
/** Returns true iff sources in the default package should be permitted. */
@@ -176,14 +194,6 @@
return false;
}
- /** Returns true iff an @-file is among the javac arguments */
- public boolean isAtFilePresent() {
- for (String javacArg : javacArgs)
- if (javacArg.startsWith("@"))
- return true;
- return false;
- }
-
/**
* Returns a string representation of the options that affect the result of
* the compilation. (Used for saving the state of the options used in a
@@ -239,6 +249,9 @@
if (destDir != null)
args.addArg(Option.D, destDir.normalize());
+ if (stateDir != null)
+ args.addArg(Option.STATE_DIR, stateDir.normalize());
+
// Source roots
args.addSourceLocations(Option.SRC, sources);
args.addSourceLocations(Option.SOURCEPATH, sourceSearchPaths);
@@ -249,7 +262,11 @@
if (permitSourcesInDefaultPackage)
args.addArg(Option.PERMIT_SOURCES_WITHOUT_PACKAGE);
- if (permitUnidentifiedArtifact)
+ for (String f : permitted_artifacts) {
+ args.addArg(Option.PERMIT_ARTIFACT, f);
+ }
+
+ if (permitUnidentifiedArtifacts)
args.addArg(Option.PERMIT_UNIDENTIFIED_ARTIFACTS);
// Translation rules
@@ -327,6 +344,7 @@
boolean headerProvided = false;
boolean genSrcProvided = false;
+ boolean stateProvided = false;
@Override
public void reportError(String msg) {
@@ -399,8 +417,13 @@
}
@Override
+ public void permitArtifact(String f) {
+ permitted_artifacts.add(f);
+ }
+
+ @Override
public void permitUnidentifiedArtifacts() {
- permitUnidentifiedArtifact = true;
+ permitUnidentifiedArtifacts = true;
}
@Override
@@ -465,6 +488,16 @@
headerDir = dir.toAbsolutePath();
}
+ @Override
+ public void stateDir(Path dir) {
+ if (stateProvided) {
+ reportError("State directory already specified.");
+ return;
+ }
+ stateProvided = true;
+ stateDir = dir.toAbsolutePath();
+ }
+
private List<SourceLocation> createSourceLocations(List<Path> paths) {
List<SourceLocation> result = new ArrayList<>();
for (Path path : paths) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java
index b643cd6..ecc5b96 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/SourceLocation.java
@@ -37,6 +37,11 @@
/**
* Represents a directory to be used for input to sjavac. (For instance a
* sourcepath or classpath.)
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
public class SourceLocation {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
index bf44a34..62ed6ac 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
@@ -25,28 +25,35 @@
package com.sun.tools.sjavac.server;
+import java.io.Serializable;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-public class CompilationResult {
+/**
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class CompilationResult implements Serializable {
+
+ static final long serialVersionUID = 46739181113L;
// Return code constants
- public final static int ERROR_BUT_TRY_AGAIN = -4712;
public final static int ERROR_FATAL = -1;
public int returnCode;
public Map<String, Set<URI>> packageArtifacts = new HashMap<>();
public Map<String, Set<String>> packageDependencies = new HashMap<>();
public Map<String, String> packagePubapis = new HashMap<>();
- public SysInfo sysinfo;
- public String stdout;
- public String stderr;
+ public String stdout = "";
+ public String stderr = "";
public CompilationResult(int returnCode) {
this.returnCode = returnCode;
- this.sysinfo = new SysInfo(-1, -1);
}
public void setReturnCode(int returnCode) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerPool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerPool.java
deleted file mode 100644
index 38e2399..0000000
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerPool.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.sjavac.server;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-import java.util.Stack;
-import java.util.concurrent.Future;
-
-import com.sun.tools.sjavac.comp.JavacServiceImpl;
-
-/** The compiler pool maintains compiler threads.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
- */
-public class CompilerPool {
- // The javac server that created this pool.
- private JavacServer javacServer;
- // A semaphore protecting the poolsize number of threads.
- private Semaphore available;
- // The stack of compiler threads.
- private Stack<CompilerThread> compilers = new Stack<>();
- // And the executor server to spawn threads.
- private final ExecutorService executorPool;
- // How many requests are active right now?
- private int concurrentRequests = 0;
- // When was the last request finished?
- private long lastRequestFinished = 0;
- // The total number of requests to this pool.
- private int numRequests = 0;
- // Protect access to the three above values.
- private static final Object conc = new Object();
-
- /**
- * Return the javac server that this pool belongs to.
- */
- public JavacServer getJavacServer() {
- return javacServer;
- }
-
- /**
- * Return how many threads are running at this very moment.
- */
- public int numActiveRequests()
- {
- synchronized (conc) {
- return concurrentRequests;
- }
- }
-
- /**
- * Return when the last request was finished.
- * I.e. the pool has been idle since.
- */
- public long lastRequestFinished()
- {
- synchronized (conc) {
- return lastRequestFinished;
- }
- }
-
- /**
- * Up the number of active requests.
- */
- public int startRequest() {
- int n;
- synchronized (conc) {
- concurrentRequests++;
- numRequests++;
- n = numRequests;
- }
- return n;
- }
-
- /**
- * Down the number of active requests. Return the current time.
- */
- public long stopRequest() {
- synchronized (conc) {
- concurrentRequests--;
- lastRequestFinished = System.currentTimeMillis();
- }
- return lastRequestFinished;
- }
-
- /**
- * Create a new compiler pool.
- */
- CompilerPool(int poolsize, JavacServer server) {
- available = new Semaphore(poolsize, true);
- javacServer = server;
- executorPool = Executors.newFixedThreadPool(poolsize);
- lastRequestFinished = System.currentTimeMillis();
- }
-
- /**
- * Execute a compiler thread.
- */
- public void execute(CompilerThread ct) {
- executorPool.execute(ct);
- }
-
- /**
- * Execute a minor task, for example generating bytecodes and writing them to disk,
- * that belong to a major compiler thread task.
- */
- public Future<?> executeSubtask(CompilerThread t, Runnable r) {
- return executorPool.submit(r);
- }
-
- /**
- * Shutdown the pool.
- */
- public void shutdown() {
- executorPool.shutdown();
- }
-
- /**
- * Acquire a compiler thread from the pool, or block until a thread is available.
- * If the pools is empty, create a new thread, but never more than is "available".
- */
- public CompilerThread grabCompilerThread() throws InterruptedException {
- available.acquire();
- if (compilers.empty()) {
- return new CompilerThread(this, new JavacServiceImpl(javacServer));
- }
- return compilers.pop();
- }
-
- /**
- * Return the specified compiler thread to the pool.
- */
- public void returnCompilerThread(CompilerThread h) {
- compilers.push(h);
- available.release();
- }
-}
-
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerThread.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerThread.java
deleted file mode 100644
index 59bff44..0000000
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilerThread.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.sjavac.server;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.Socket;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import javax.tools.JavaCompiler.CompilationTask;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-
-import com.sun.tools.javac.api.JavacTaskImpl;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.Options;
-import com.sun.tools.javac.util.StringUtils;
-import com.sun.tools.sjavac.comp.AttrWithDeps;
-import com.sun.tools.sjavac.comp.Dependencies;
-import com.sun.tools.sjavac.comp.JavaCompilerWithDeps;
-import com.sun.tools.sjavac.comp.JavacServiceImpl;
-import com.sun.tools.sjavac.comp.ResolveWithDeps;
-import com.sun.tools.sjavac.comp.SmartFileManager;
-
-/**
- * The compiler thread maintains a JavaCompiler instance and
- * can receive a request from the client, perform the compilation
- * requested and report back the results.
- *
- * * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
- */
-public class CompilerThread implements Runnable {
- private JavacServer javacServer;
- private CompilerPool compilerPool;
- private JavacServiceImpl javacServiceImpl;
- private List<Future<?>> subTasks;
-
- // Communicating over this socket.
- private Socket socket;
-
- // The necessary classes to do a compilation.
- private com.sun.tools.javac.api.JavacTool compiler;
- private StandardJavaFileManager fileManager;
- private SmartFileManager smartFileManager;
- private Context context;
-
- // If true, then this thread is serving a request.
- private boolean inUse = false;
-
- CompilerThread(CompilerPool cp, JavacServiceImpl javacServiceImpl) {
- compilerPool = cp;
- javacServer = cp.getJavacServer();
- this.javacServiceImpl = javacServiceImpl;
- }
-
- /**
- * Execute a minor task, for example generating bytecodes and writing them to disk,
- * that belong to a major compiler thread task.
- */
- public synchronized void executeSubtask(Runnable r) {
- subTasks.add(compilerPool.executeSubtask(this, r));
- }
-
- /**
- * Count the number of active sub tasks.
- */
- public synchronized int numActiveSubTasks() {
- int c = 0;
- for (Future<?> f : subTasks) {
- if (!f.isDone() && !f.isCancelled()) {
- c++;
- }
- }
- return c;
- }
-
- /**
- * Use this socket for the upcoming request.
- */
- public void setSocket(Socket s) {
- socket = s;
- }
-
- /**
- * Prepare the compiler thread for use. It is not yet started.
- * It will be started by the executor service.
- */
- public synchronized void use() {
- assert(!inUse);
- inUse = true;
- compiler = com.sun.tools.javac.api.JavacTool.create();
- fileManager = compiler.getStandardFileManager(null, null, null);
- smartFileManager = new SmartFileManager(fileManager);
- context = new Context();
- ResolveWithDeps.preRegister(context);
- AttrWithDeps.preRegister(context);
- JavaCompilerWithDeps.preRegister(context, javacServiceImpl);
- subTasks = new ArrayList<>();
- }
-
- /**
- * Prepare the compiler thread for idleness.
- */
- public synchronized void unuse() {
- assert(inUse);
- inUse = false;
- compiler = null;
- fileManager = null;
- smartFileManager = null;
- context = null;
- subTasks = null;
- }
-
- /**
- * Expect this key on the next line read from the reader.
- */
- private static boolean expect(BufferedReader in, String key) throws IOException {
- String s = in.readLine();
- if (s != null && s.equals(key)) {
- return true;
- }
- return false;
- }
-
- // The request identifier, for example GENERATE_NEWBYTECODE
- String id = "";
-
- public String currentRequestId() {
- return id;
- }
-
- PrintWriter stdout;
- PrintWriter stderr;
- int forcedExitCode = 0;
-
- public void logError(String msg) {
- stderr.println(msg);
- forcedExitCode = -1;
- }
-
- /**
- * Invoked by the executor service.
- */
- public void run() {
- // Unique nr that identifies this request.
- int thisRequest = compilerPool.startRequest();
- long start = System.currentTimeMillis();
- int numClasses = 0;
- StringBuilder compiledPkgs = new StringBuilder();
- use();
-
- PrintWriter out = null;
- try {
- javacServer.log("<"+thisRequest+"> Connect from "+socket.getRemoteSocketAddress()+" activethreads="+compilerPool.numActiveRequests());
- BufferedReader in = new BufferedReader(new InputStreamReader(
- socket.getInputStream()));
- out = new PrintWriter(new OutputStreamWriter(
- socket.getOutputStream()));
- if (!expect(in, JavacServer.PROTOCOL_COOKIE_VERSION)) {
- javacServer.log("<"+thisRequest+"> Bad protocol from ip "+socket.getRemoteSocketAddress());
- return;
- }
-
- String cookie = in.readLine();
- if (cookie == null || !cookie.equals(""+javacServer.getCookie())) {
- javacServer.log("<"+thisRequest+"> Bad cookie from ip "+socket.getRemoteSocketAddress());
- return;
- }
- if (!expect(in, JavacServer.PROTOCOL_CWD)) {
- return;
- }
- String cwd = in.readLine();
- if (cwd == null)
- return;
- if (!expect(in, JavacServer.PROTOCOL_ID)) {
- return;
- }
- id = in.readLine();
- if (id == null)
- return;
- if (!expect(in, JavacServer.PROTOCOL_ARGS)) {
- return;
- }
- ArrayList<String> the_options = new ArrayList<>();
- ArrayList<File> the_classes = new ArrayList<>();
- Iterable<File> path = Arrays.<File> asList(new File(cwd));
-
- for (;;) {
- String l = in.readLine();
- if (l == null)
- return;
- if (l.equals(JavacServer.PROTOCOL_SOURCES_TO_COMPILE))
- break;
- if (l.startsWith("--server:"))
- continue;
- if (!l.startsWith("-") && l.endsWith(".java")) {
- the_classes.add(new File(l));
- numClasses++;
- } else {
- the_options.add(l);
- }
- continue;
- }
-
- // Load sources to compile
- Set<URI> sourcesToCompile = new HashSet<>();
- for (;;) {
- String l = in.readLine();
- if (l == null)
- return;
- if (l.equals(JavacServer.PROTOCOL_VISIBLE_SOURCES))
- break;
- try {
- sourcesToCompile.add(new URI(l));
- numClasses++;
- } catch (URISyntaxException e) {
- return;
- }
- }
- // Load visible sources
- Set<URI> visibleSources = new HashSet<>();
- boolean fix_drive_letter_case =
- StringUtils.toLowerCase(System.getProperty("os.name")).startsWith("windows");
- for (;;) {
- String l = in.readLine();
- if (l == null)
- return;
- if (l.equals(JavacServer.PROTOCOL_END))
- break;
- try {
- URI u = new URI(l);
- if (fix_drive_letter_case) {
- // Make sure the driver letter is lower case.
- String s = u.toString();
- if (s.startsWith("file:/") &&
- Character.isUpperCase(s.charAt(6))) {
- u = new URI("file:/"+Character.toLowerCase(s.charAt(6))+s.substring(7));
- }
- }
- visibleSources.add(u);
- } catch (URISyntaxException e) {
- return;
- }
- }
-
- // A completed request has been received.
-
- // Now setup the actual compilation....
- // First deal with explicit source files on cmdline and in at file.
- ListBuffer<JavaFileObject> compilationUnits = new ListBuffer<>();
- for (JavaFileObject i : fileManager.getJavaFileObjectsFromFiles(the_classes)) {
- compilationUnits.append(i);
- }
- // Now deal with sources supplied as source_to_compile.
- ListBuffer<File> sourcesToCompileFiles = new ListBuffer<>();
- for (URI u : sourcesToCompile) {
- sourcesToCompileFiles.append(new File(u));
- }
- for (JavaFileObject i : fileManager.getJavaFileObjectsFromFiles(sourcesToCompileFiles)) {
- compilationUnits.append(i);
- }
- // Log the options to be used.
- StringBuilder options = new StringBuilder();
- for (String s : the_options) {
- options.append(">").append(s).append("< ");
- }
- javacServer.log(id+" <"+thisRequest+"> options "+options.toString());
-
- forcedExitCode = 0;
- // Create a new logger.
- StringWriter stdoutLog = new StringWriter();
- StringWriter stderrLog = new StringWriter();
- stdout = new PrintWriter(stdoutLog);
- stderr = new PrintWriter(stderrLog);
- com.sun.tools.javac.main.Main.Result rc = com.sun.tools.javac.main.Main.Result.OK;
- try {
- if (compilationUnits.size() > 0) {
- smartFileManager.setVisibleSources(visibleSources);
- smartFileManager.cleanArtifacts();
- smartFileManager.setLog(stdout);
-
- // Do the compilation!
- CompilationTask task = compiler.getTask(stderr, smartFileManager, null, the_options, null, compilationUnits, context);
- smartFileManager.setSymbolFileEnabled(!Options.instance(context).isSet("ignore.symbol.file"));
- rc = ((JavacTaskImpl) task).doCall();
-
- while (numActiveSubTasks()>0) {
- try { Thread.sleep(1000); } catch (InterruptedException e) { }
- }
-
- smartFileManager.flush();
- }
- } catch (Exception e) {
- stderr.println(e.getMessage());
- forcedExitCode = -1;
- }
-
- // Send the response..
- out.println(JavacServer.PROTOCOL_STDOUT);
- out.print(stdoutLog);
- out.println(JavacServer.PROTOCOL_STDERR);
- out.print(stderrLog);
- // The compilation is complete! And errors will have already been printed on out!
- out.println(JavacServer.PROTOCOL_PACKAGE_ARTIFACTS);
- Map<String,Set<URI>> pa = smartFileManager.getPackageArtifacts();
- for (String aPkgName : pa.keySet()) {
- out.println("+"+aPkgName);
- Set<URI> as = pa.get(aPkgName);
- for (URI a : as) {
- out.println(" "+a.toString());
- }
- }
- Dependencies deps = Dependencies.instance(context);
- out.println(JavacServer.PROTOCOL_PACKAGE_DEPENDENCIES);
- Map<String,Set<String>> pd = deps.getDependencies();
- for (String aPkgName : pd.keySet()) {
- out.println("+"+aPkgName);
- Set<String> ds = pd.get(aPkgName);
- // Everything depends on java.lang
- if (!ds.contains(":java.lang")) ds.add(":java.lang");
- for (String d : ds) {
- out.println(" "+d);
- }
- }
- out.println(JavacServer.PROTOCOL_PACKAGE_PUBLIC_APIS);
- Map<String,String> pp = deps.getPubapis();
- for (String aPkgName : pp.keySet()) {
- out.println("+"+aPkgName);
- String ps = pp.get(aPkgName);
- // getPubapis added a space to each line!
- out.println(ps);
- compiledPkgs.append(aPkgName+" ");
- }
- out.println(JavacServer.PROTOCOL_SYSINFO);
- out.println("num_cores=" + Runtime.getRuntime().availableProcessors());
- out.println("max_memory=" + Runtime.getRuntime().maxMemory());
- out.println(JavacServer.PROTOCOL_RETURN_CODE);
-
- // Errors from sjavac that affect compilation status!
- int rcv = rc.exitCode;
- if (rcv == 0 && forcedExitCode != 0) {
- rcv = forcedExitCode;
- }
- out.println("" + rcv);
- out.println(JavacServer.PROTOCOL_END);
- out.flush();
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- if (out != null) out.close();
- if (!socket.isClosed()) {
- socket.close();
- }
- socket = null;
- } catch (Exception e) {
- javacServer.log("ERROR "+e);
- e.printStackTrace();
- }
- compilerPool.stopRequest();
- long duration = System.currentTimeMillis()-start;
- javacServer.addBuildTime(duration);
- float classpersec = ((float)numClasses)*(((float)1000.0)/((float)duration));
- javacServer.log(id+" <"+thisRequest+"> "+compiledPkgs+" duration " + duration+ " ms num_classes="+numClasses+
- " classpersec="+classpersec+" subtasks="+subTasks.size());
- javacServer.flushLog();
- unuse();
- compilerPool.returnCompilerThread(this);
- }
- }
-}
-
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java
new file mode 100644
index 0000000..2f8d6fe
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.server;
+
+import java.io.File;
+import java.net.URI;
+import java.util.List;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * An sjavac implementation that keeps track of idleness and shuts down the
+ * given Terminable upon idleness timeout.
+ *
+ * An idleness timeout kicks in {@code idleTimeout} milliseconds after the last
+ * request is completed.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class IdleResetSjavac implements Sjavac {
+
+ private final Sjavac delegate;
+ private final AtomicInteger outstandingCalls = new AtomicInteger();
+ private final Terminable toShutdown;
+ private final Timer idlenessTimer = new Timer();
+ private final long idleTimeout;
+
+ // Class invariant: idlenessTimerTask != null <-> idlenessTimerTask is scheduled
+ private TimerTask idlenessTimerTask;
+
+ public IdleResetSjavac(Sjavac delegate,
+ Terminable toShutdown,
+ long idleTimeout) {
+ this.delegate = delegate;
+ this.toShutdown = toShutdown;
+ this.idleTimeout = idleTimeout;
+ scheduleTimeout();
+ }
+
+ @Override
+ public SysInfo getSysInfo() {
+ startCall();
+ try {
+ return delegate.getSysInfo();
+ } finally {
+ endCall();
+ }
+ }
+
+ @Override
+ public CompilationResult compile(String protocolId,
+ String invocationId,
+ String[] args,
+ List<File> explicitSources,
+ Set<URI> sourcesToCompile,
+ Set<URI> visibleSources) {
+ startCall();
+ try {
+ return delegate.compile(protocolId,
+ invocationId,
+ args,
+ explicitSources,
+ sourcesToCompile,
+ visibleSources);
+ } finally {
+ endCall();
+ }
+ }
+
+ private void startCall() {
+ // Was there no outstanding calls before this call?
+ if (outstandingCalls.incrementAndGet() == 1) {
+ // Then the timer task must have been scheduled
+ if (idlenessTimerTask == null)
+ throw new IllegalStateException("Idle timeout already cancelled");
+ // Cancel timeout task
+ idlenessTimerTask.cancel();
+ idlenessTimerTask = null;
+ }
+ }
+
+ private void endCall() {
+ if (outstandingCalls.decrementAndGet() == 0) {
+ // No more outstanding calls. Schedule timeout.
+ scheduleTimeout();
+ }
+ }
+
+ private void scheduleTimeout() {
+ if (idlenessTimerTask != null)
+ throw new IllegalStateException("Idle timeout already scheduled");
+ idlenessTimerTask = new TimerTask() {
+ public void run() {
+ toShutdown.shutdown("Server has been idle for " + (idleTimeout / 1000) + " seconds.");
+ }
+ };
+ idlenessTimer.schedule(idlenessTimerTask, idleTimeout);
+ }
+
+ @Override
+ public void shutdown() {
+ idlenessTimer.cancel();
+ delegate.shutdown();
+ }
+
+ @Override
+ public String serverSettings() {
+ return delegate.serverSettings();
+ }
+}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServer.java
deleted file mode 100644
index c181be9..0000000
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServer.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 2011-2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.tools.sjavac.server;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.Map;
-
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Random;
-
-import com.sun.tools.sjavac.Util;
-import com.sun.tools.sjavac.ProblemException;
-import java.io.*;
-
-/**
- * The JavacServer class contains methods both to setup a server that responds to requests and methods to connect to this server.
- *
- * <p><b>This is NOT part of any supported API. If you write code that depends on this, you do so at your own risk. This code and its internal interfaces are
- * subject to change or deletion without notice.</b></p>
- */
-public class JavacServer {
- // Responding to this tcp/ip port on localhost.
-
- private final ServerSocket serverSocket;
- // The secret cookie shared between server and client through the port file.
- private final long myCookie;
- // When the server was started.
- private long serverStart;
- // Accumulated build time for all requests, not counting idle time.
- private long totalBuildTime;
- // The javac server specific log file.
- PrintWriter theLog;
- // The compiler pool that maintains the compiler threads.
- CompilerPool compilerPool;
- // For the client, all port files fetched, one per started javac server.
- // Though usually only one javac server is started by a client.
- private static Map<String, PortFile> allPortFiles;
- private static Map<String, Long> maxServerMemory;
- final static String PROTOCOL_COOKIE_VERSION = "----THE-COOKIE-V2----";
- final static String PROTOCOL_CWD = "----THE-CWD----";
- final static String PROTOCOL_ID = "----THE-ID----";
- final static String PROTOCOL_ARGS = "----THE-ARGS----";
- final static String PROTOCOL_SOURCES_TO_COMPILE = "----THE-SOURCES-TO-COMPILE----";
- final static String PROTOCOL_VISIBLE_SOURCES = "----THE-VISIBLE-SOURCES----";
- final static String PROTOCOL_END = "----THE-END----";
- final static String PROTOCOL_STDOUT = "----THE-STDOUT----";
- final static String PROTOCOL_STDERR = "----THE-STDERR----";
- final static String PROTOCOL_PACKAGE_ARTIFACTS = "----THE-PACKAGE_ARTIFACTS----";
- final static String PROTOCOL_PACKAGE_DEPENDENCIES = "----THE-PACKAGE_DEPENDENCIES----";
- final static String PROTOCOL_PACKAGE_PUBLIC_APIS = "----THE-PACKAGE-PUBLIC-APIS----";
- final static String PROTOCOL_SYSINFO = "----THE-SYSINFO----";
- final static String PROTOCOL_RETURN_CODE = "----THE-RETURN-CODE----";
- // Check if the portfile is gone, every 5 seconds.
- static int CHECK_PORTFILE_INTERVAL = 5;
- // Wait 2 seconds for response, before giving up on javac server.
- static int CONNECTION_TIMEOUT = 2;
- static int WAIT_BETWEEN_CONNECT_ATTEMPTS = 1;
- static int MAX_NUM_CONNECT_ATTEMPTS = 3;
-
- /**
- * Acquire the port file. Synchronized since several threads inside an smart javac wrapper client acquires the same port file at the same time.
- */
- public static synchronized PortFile getPortFile(String filename) throws FileNotFoundException {
- if (allPortFiles == null) {
- allPortFiles = new HashMap<>();
- }
- PortFile pf = allPortFiles.get(filename);
-
- // Port file known. Does it still exist?
- if (pf != null) {
- try {
- if (!pf.exists())
- pf = null;
- } catch (IOException ioex) {
- ioex.printStackTrace();
- }
- }
-
- if (pf == null) {
- pf = new PortFile(filename);
- allPortFiles.put(filename, pf);
- }
- return pf;
- }
-
- /**
- * Get the cookie used for this server.
- */
- long getCookie() {
- return myCookie;
- }
-
- /**
- * Get the port used for this server.
- */
- int getPort() {
- return serverSocket.getLocalPort();
- }
-
- /**
- * Sum up the total build time for this javac server.
- */
- public void addBuildTime(long inc) {
- totalBuildTime += inc;
- }
-
- /**
- * Log this message.
- */
- public void log(String msg) {
- if (theLog != null) {
- theLog.println(msg);
- } else {
- System.err.println(msg);
- }
- }
-
- /**
- * Make sure the log is flushed.
- */
- public void flushLog() {
- if (theLog != null) {
- theLog.flush();
- }
- }
-
- /**
- * Start a server using a settings string. Typically: "--startserver:portfile=/tmp/myserver,poolsize=3" and the string "portfile=/tmp/myserver,poolsize=3"
- * is sent as the settings parameter. Returns 0 on success, -1 on failure.
- */
- public static int startServer(String settings, PrintStream err) {
- try {
- String portfile = Util.extractStringOption("portfile", settings);
- // The log file collects more javac server specific log information.
- String logfile = Util.extractStringOption("logfile", settings);
- // The stdouterr file collects all the System.out and System.err writes to disk.
- String stdouterrfile = Util.extractStringOption("stdouterrfile", settings);
- // We could perhaps use System.setOut and setErr here.
- // But for the moment we rely on the client to spawn a shell where stdout
- // and stderr are redirected already.
- // The pool size is a limit the number of concurrent compiler threads used.
- // The server might use less than these to avoid memory problems.
- int defaultPoolSize = Runtime.getRuntime().availableProcessors();
- int poolsize = Util.extractIntOption("poolsize", settings, defaultPoolSize);
-
- // How many seconds of inactivity will the server accept before quitting?
- int keepalive = Util.extractIntOption("keepalive", settings, 120);
-
- // The port file is locked and the server port and cookie is written into it.
- PortFile portFile = getPortFile(portfile);
- JavacServer s;
-
- synchronized (portFile) {
- portFile.lock();
- portFile.getValues();
- if (portFile.containsPortInfo()) {
- err.println("Javac server not started because portfile exists!");
- portFile.unlock();
- return -1;
- }
- s = new JavacServer(poolsize, logfile);
- portFile.setValues(s.getPort(), s.getCookie());
- portFile.unlock();
- }
-
- // Run the server. Will delete the port file when shutting down.
- // It will shut down automatically when no new requests have come in
- // during the last 125 seconds.
- s.run(portFile, err, keepalive);
- // The run loop for the server has exited.
- return 0;
- } catch (Exception e) {
- e.printStackTrace(err);
- return -1;
- }
- }
-
- /**
- * Spawn the server instance.
- */
-
- private JavacServer(int poolSize, String logfile) throws IOException {
- serverStart = System.currentTimeMillis();
- // Create a server socket on a random port that is bound to the localhost/127.0.0.1 interface.
- // I.e only local processes can connect to this port.
- serverSocket = new ServerSocket(0, 128, InetAddress.getByName(null));
- compilerPool = new CompilerPool(poolSize, this);
- Random rnd = new Random();
- myCookie = rnd.nextLong();
- theLog = new PrintWriter(logfile);
- log("Javac server started. port=" + getPort() + " date=" + (new java.util.Date()) + " with poolsize=" + poolSize);
- flushLog();
- }
-
- /**
- * Fork a background process. Returns the command line used that can be printed if something failed.
- */
- public static String fork(String sjavac, String portfile, String logfile, int poolsize, int keepalive,
- final PrintStream err, String stdouterrfile, boolean background)
- throws IOException, ProblemException {
- if (stdouterrfile != null && stdouterrfile.trim().equals("")) {
- stdouterrfile = null;
- }
- final String startserver = "--startserver:portfile=" + portfile + ",logfile=" + logfile + ",stdouterrfile=" + stdouterrfile + ",poolsize=" + poolsize + ",keepalive="+ keepalive;
-
- if (background) {
- sjavac += "%20" + startserver;
- sjavac = sjavac.replaceAll("%20", " ");
- sjavac = sjavac.replaceAll("%2C", ",");
- // If the java/sh/cmd launcher fails the failure will be captured by stdouterr because of the redirection here.
- String[] cmd = {"/bin/sh", "-c", sjavac + " >> " + stdouterrfile + " 2>&1"};
- if (!(new File("/bin/sh")).canExecute()) {
- ArrayList<String> wincmd = new ArrayList<>();
- wincmd.add("cmd");
- wincmd.add("/c");
- wincmd.add("start");
- wincmd.add("cmd");
- wincmd.add("/c");
- wincmd.add(sjavac + " >> " + stdouterrfile + " 2>&1");
- cmd = wincmd.toArray(new String[wincmd.size()]);
- }
- Process pp = null;
- try {
- pp = Runtime.getRuntime().exec(cmd);
- } catch (Exception e) {
- e.printStackTrace(err);
- e.printStackTrace(new PrintWriter(stdouterrfile));
- }
- StringBuilder rs = new StringBuilder();
- for (String s : cmd) {
- rs.append(s + " ");
- }
- return rs.toString();
- }
-
- // Do not spawn a background server, instead run it within the same JVM.
- Thread t = new Thread() {
- @Override
- public void run() {
- try {
- JavacServer.startServer(startserver, err);
- } catch (Throwable t) {
- t.printStackTrace(err);
- }
- }
- };
- t.start();
- return "";
- }
-
- /**
- * Run the server thread until it exits. Either because of inactivity or because the port file has been deleted by someone else, or overtaken by some other
- * javac server.
- */
- private void run(PortFile portFile, PrintStream err, int keepalive) {
- boolean fileDeleted = false;
- long timeSinceLastCompile;
- try {
- // Every 5 second (check_portfile_interval) we test if the portfile has disappeared => quit
- // Or if the last request was finished more than 125 seconds ago => quit
- // 125 = seconds_of_inactivity_before_shutdown+check_portfile_interval
- serverSocket.setSoTimeout(CHECK_PORTFILE_INTERVAL*1000);
- for (;;) {
- try {
- Socket s = serverSocket.accept();
- CompilerThread ct = compilerPool.grabCompilerThread();
- ct.setSocket(s);
- compilerPool.execute(ct);
- flushLog();
- } catch (java.net.SocketTimeoutException e) {
- if (compilerPool.numActiveRequests() > 0) {
- // Never quit while there are active requests!
- continue;
- }
- // If this is the timeout after the portfile
- // has been deleted by us. Then we truly stop.
- if (fileDeleted) {
- log("Quitting because of "+(keepalive+CHECK_PORTFILE_INTERVAL)+" seconds of inactivity!");
- break;
- }
- // Check if the portfile is still there.
- if (!portFile.exists()) {
- // Time to quit because the portfile was deleted by another
- // process, probably by the makefile that is done building.
- log("Quitting because portfile was deleted!");
- flushLog();
- break;
- }
- // Check if portfile.stop is still there.
- if (portFile.markedForStop()) {
- // Time to quit because another process touched the file
- // server.port.stop to signal that the server should stop.
- // This is necessary on some operating systems that lock
- // the port file hard!
- log("Quitting because a portfile.stop file was found!");
- portFile.delete();
- flushLog();
- break;
- }
- // Does the portfile still point to me?
- if (!portFile.stillMyValues()) {
- // Time to quit because another build has started.
- log("Quitting because portfile is now owned by another javac server!");
- flushLog();
- break;
- }
-
- // Check how long since the last request finished.
- long diff = System.currentTimeMillis() - compilerPool.lastRequestFinished();
- if (diff < keepalive * 1000) {
- // Do not quit if we have waited less than 120 seconds.
- continue;
- }
- // Ok, time to quit because of inactivity. Perhaps the build
- // was killed and the portfile not cleaned up properly.
- portFile.delete();
- fileDeleted = true;
- log("" + keepalive + " seconds of inactivity quitting in "
- + CHECK_PORTFILE_INTERVAL + " seconds!");
- flushLog();
- // Now we have a second 5 second grace
- // period where javac remote requests
- // that have loaded the data from the
- // recently deleted portfile can connect
- // and complete their requests.
- }
- }
- } catch (Exception e) {
- e.printStackTrace(err);
- e.printStackTrace(theLog);
- flushLog();
- } finally {
- compilerPool.shutdown();
- }
- long realTime = System.currentTimeMillis() - serverStart;
- log("Shutting down.");
- log("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms");
- flushLog();
- }
-
- public static void cleanup(String... args) {
- String settings = Util.findServerSettings(args);
- if (settings == null) return;
- String portfile = Util.extractStringOption("portfile", settings);
- String background = Util.extractStringOption("background", settings);
- if (background != null && background.equals("false")) {
- // If the server runs within this jvm, then delete the portfile,
- // since this jvm is about to exit soon.
- File f = new File(portfile);
- f.delete();
- }
- }
-}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java
deleted file mode 100644
index f1e8a74..0000000
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacServiceClient.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.sjavac.server;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.sun.tools.sjavac.Util;
-
-import static com.sun.tools.sjavac.server.CompilationResult.ERROR_BUT_TRY_AGAIN;
-import static com.sun.tools.sjavac.server.CompilationResult.ERROR_FATAL;
-
-public class JavacServiceClient implements JavacService {
-
-
- // The id can perhaps be used in the future by the javac server to reuse the
- // JavaCompiler instance for several compiles using the same id.
- private final String id;
- private final String portfile;
- private final String logfile;
- private final String stdouterrfile;
- private final boolean background;
-
- // Default keepalive for server is 120 seconds.
- // I.e. it will accept 120 seconds of inactivity before quitting.
- private final int keepalive;
- private final int poolsize;
-
- // The sjavac option specifies how the server part of sjavac is spawned.
- // If you have the experimental sjavac in your path, you are done. If not, you have
- // to point to a com.sun.tools.sjavac.Main that supports --startserver
- // for example by setting: sjavac=java%20-jar%20...javac.jar%com.sun.tools.sjavac.Main
- private final String sjavac;
-
- public JavacServiceClient(String settings) {
- id = Util.extractStringOption("id", settings);
- portfile = Util.extractStringOption("portfile", settings);
- logfile = Util.extractStringOption("logfile", settings, portfile + ".javaclog");
- stdouterrfile = Util.extractStringOption("stdouterrfile", settings, portfile + ".stdouterr");
- background = Util.extractBooleanOption("background", settings, true);
- sjavac = Util.extractStringOption("sjavac", settings, "sjavac");
- int poolsize = Util.extractIntOption("poolsize", settings);
- keepalive = Util.extractIntOption("keepalive", settings, 120);
-
- this.poolsize = poolsize > 0 ? poolsize : Runtime.getRuntime().availableProcessors();
- }
-
-
- /**
- * Make a request to the server only to get the maximum possible heap size to use for compilations.
- *
- * @param port_file The port file used to synchronize creation of this server.
- * @param id The identify of the compilation.
- * @param out Standard out information.
- * @param err Standard err information.
- * @return The maximum heap size in bytes.
- */
- @Override
- public SysInfo getSysInfo() {
- try {
- CompilationResult cr = useServer(new String[0],
- Collections.<URI>emptySet(),
- Collections.<URI>emptySet(),
- Collections.<URI, Set<String>>emptyMap());
- return cr.sysinfo;
- } catch (Exception e) {
- return new SysInfo(-1, -1);
- }
- }
-
- @Override
- public CompilationResult compile(String protocolId,
- String invocationId,
- String[] args,
- List<File> explicitSources,
- Set<URI> sourcesToCompile,
- Set<URI> visibleSources) {
- // Delegate to useServer, which delegates to compileHelper
- return useServer(args, sourcesToCompile, visibleSources, null);
- }
-
- /**
- * Connect and compile using the javac server settings and the args. When using more advanced features, the sources_to_compile and visible_sources are
- * supplied to the server and meta data is returned in package_artifacts, package_dependencies and package_pubapis.
- */
- public CompilationResult compileHelper(String id,
- String[] args,
- Set<URI> sourcesToCompile,
- Set<URI> visibleSources) {
-
- CompilationResult rc = new CompilationResult(-3);
-
- try {
- PortFile portFile = JavacServer.getPortFile(this.portfile);
-
- int port = portFile.containsPortInfo() ? portFile.getPort() : 0;
- if (port == 0) {
- return new CompilationResult(ERROR_BUT_TRY_AGAIN);
- }
- long cookie = portFile.getCookie();
- // Acquire the localhost/127.0.0.1 address.
- InetAddress addr = InetAddress.getByName(null);
- SocketAddress sockaddr = new InetSocketAddress(addr, port);
- Socket sock = new Socket();
- int timeoutMs = JavacServer.CONNECTION_TIMEOUT * 1000;
- try {
- sock.connect(sockaddr, timeoutMs);
- } catch (java.net.ConnectException e) {
- rc.setReturnCode(ERROR_BUT_TRY_AGAIN);
- rc.stderr = "Could not connect to javac server found in portfile: " + portFile.getFilename() + " " + e;
- return rc;
- }
- if (!sock.isConnected()) {
- rc.setReturnCode(ERROR_BUT_TRY_AGAIN);
- rc.stderr = "Could not connect to javac server found in portfile: " + portFile.getFilename();
- return rc;
- }
-
- //
- // Send arguments
- //
- BufferedReader in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
- PrintWriter sockout = new PrintWriter(sock.getOutputStream());
-
- sockout.println(JavacServer.PROTOCOL_COOKIE_VERSION);
- sockout.println("" + cookie);
- sockout.println(JavacServer.PROTOCOL_CWD);
- sockout.println(System.getProperty("user.dir"));
- sockout.println(JavacServer.PROTOCOL_ID);
- sockout.println(id);
- sockout.println(JavacServer.PROTOCOL_ARGS);
- for (String s : args) {
- StringBuffer buf = new StringBuffer();
- String[] paths = s.split(File.pathSeparator);
- int c = 0;
- for (String path : paths) {
- File f = new File(path);
- if (f.isFile() || f.isDirectory()) {
- buf.append(f.getAbsolutePath());
- c++;
- if (c < paths.length) {
- buf.append(File.pathSeparator);
- }
- } else {
- buf = new StringBuffer(s);
- break;
- }
- }
- sockout.println(buf.toString());
- }
- sockout.println(JavacServer.PROTOCOL_SOURCES_TO_COMPILE);
- for (URI uri : sourcesToCompile) {
- sockout.println(uri.toString());
- }
- sockout.println(JavacServer.PROTOCOL_VISIBLE_SOURCES);
- for (URI uri : visibleSources) {
- sockout.println(uri.toString());
- }
- sockout.println(JavacServer.PROTOCOL_END);
- sockout.flush();
-
- //
- // Receive result
- //
- StringBuffer stdout = new StringBuffer();
- StringBuffer stderr = new StringBuffer();
-
- if (!JavacServiceClient.expect(in, JavacServer.PROTOCOL_STDOUT)) {
- return new CompilationResult(ERROR_FATAL);
- }
- // Load stdout
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- return new CompilationResult(ERROR_FATAL);
- }
- if (l.equals(JavacServer.PROTOCOL_STDERR)) {
- break;
- }
- stdout.append(l);
- stdout.append('\n');
- }
- // Load stderr
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- return new CompilationResult(ERROR_FATAL);
- }
- if (l.equals(JavacServer.PROTOCOL_PACKAGE_ARTIFACTS)) {
- break;
- }
- stderr.append(l);
- stderr.append('\n');
- }
- // Load the package artifacts
- Set<URI> lastUriSet = null;
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- return new CompilationResult(ERROR_FATAL);
- }
- if (l.equals(JavacServer.PROTOCOL_PACKAGE_DEPENDENCIES)) {
- break;
- }
- if (l.length() > 1 && l.charAt(0) == '+') {
- String pkg = l.substring(1);
- lastUriSet = new HashSet<>();
- rc.packageArtifacts.put(pkg, lastUriSet);
- } else if (l.length() > 1 && lastUriSet != null) {
- lastUriSet.add(new URI(l.substring(1)));
- }
- }
- // Load package dependencies
- Set<String> lastPackageSet = null;
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- return new CompilationResult(ERROR_FATAL);
- }
- if (l.equals(JavacServer.PROTOCOL_PACKAGE_PUBLIC_APIS)) {
- break;
- }
- if (l.length() > 1 && l.charAt(0) == '+') {
- String pkg = l.substring(1);
- lastPackageSet = new HashSet<>();
- rc.packageDependencies.put(pkg, lastPackageSet);
- } else if (l.length() > 1 && lastPackageSet != null) {
- lastPackageSet.add(l.substring(1));
- }
- }
- // Load package pubapis
- Map<String, StringBuffer> tmp = new HashMap<>();
- StringBuffer lastPublicApi = null;
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- return new CompilationResult(ERROR_FATAL);
- }
- if (l.equals(JavacServer.PROTOCOL_SYSINFO)) {
- break;
- }
- if (l.length() > 1 && l.charAt(0) == '+') {
- String pkg = l.substring(1);
- lastPublicApi = new StringBuffer();
- tmp.put(pkg, lastPublicApi);
- } else if (l.length() > 1 && lastPublicApi != null) {
- lastPublicApi.append(l.substring(1));
- lastPublicApi.append("\n");
- }
- }
- for (String p : tmp.keySet()) {
- //assert (packagePublicApis.get(p) == null);
- String api = tmp.get(p).toString();
- rc.packagePubapis.put(p, api);
- }
- // Now reading the max memory possible.
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- return new CompilationResult(ERROR_FATAL);
- }
- if (l.equals(JavacServer.PROTOCOL_RETURN_CODE)) {
- break;
- }
- if (l.startsWith("num_cores=")) {
- rc.sysinfo.numCores = Integer.parseInt(l.substring(10));
- }
- if (l.startsWith("max_memory=")) {
- rc.sysinfo.maxMemory = Long.parseLong(l.substring(11));
- }
- }
- String l = in.readLine();
- if (l == null) {
- rc.setReturnCode(ERROR_FATAL);
- rc.stderr = "No return value from the server!";
- return rc;
- }
- rc.setReturnCode(Integer.parseInt(l));
- rc.stdout = stdout.toString();
- rc.stderr = stderr.toString();
- } catch (Exception e) {
- StringWriter sw = new StringWriter();
- e.printStackTrace(new PrintWriter(sw));
- rc.stderr = sw.toString();
- }
- return rc;
- }
-
- /**
- * Dispatch a compilation request to a javac server.
- *
- * @param args are the command line args to javac and is allowed to contain source files, @file and other command line options to javac.
- *
- * The generated classes, h files and other artifacts from the javac invocation are stored by the javac server to disk.
- *
- * @param sources_to_compile The sources to compile.
- *
- * @param visibleSources If visible sources has a non zero size, then visible_sources are the only files in the file system that the javac server can see!
- * (Sources to compile are always visible.) The visible sources are those supplied by the (filtered) -sourcepath
- *
- * @param visibleClasses If visible classes for a specific root/jar has a non zero size, then visible_classes are the only class files that the javac server
- * can see, in that root/jar. It maps from a classpath root or a jar file to the set of visible classes for that root/jar.
- *
- * The server return meta data about the build in the following parameters.
- * @param package_artifacts, map from package name to set of created artifacts for that package.
- * @param package_dependencies, map from package name to set of packages that it depends upon.
- * @param package_pubapis, map from package name to unique string identifying its pub api.
- */
- public CompilationResult useServer(String[] args,
- Set<URI> sourcesToCompile,
- Set<URI> visibleSources,
- Map<URI, Set<String>> visibleClasses) {
- try {
- if (portfile == null) {
- CompilationResult cr = new CompilationResult(CompilationResult.ERROR_FATAL);
- cr.stderr = "No portfile was specified!";
- return cr;
- }
-
- int attempts = 0;
- CompilationResult rc;
- do {
- PortFile port_file = JavacServer.getPortFile(portfile);
- synchronized (port_file) {
- port_file.lock();
- port_file.getValues();
- port_file.unlock();
- }
- if (!port_file.containsPortInfo()) {
- String cmd = JavacServer.fork(sjavac, port_file.getFilename(), logfile, poolsize, keepalive, System.err, stdouterrfile, background);
-
- if (background && !port_file.waitForValidValues()) {
- // Ouch the server did not start! Lets print its stdouterrfile and the command used.
- StringWriter sw = new StringWriter();
- JavacServiceClient.printFailedAttempt(cmd, stdouterrfile, new PrintWriter(sw));
- // And give up.
- CompilationResult cr = new CompilationResult(ERROR_FATAL);
- cr.stderr = sw.toString();
- return cr;
- }
- }
- rc = compileHelper(id, args, sourcesToCompile, visibleSources);
- // Try again until we manage to connect. Any error after that
- // will cause the compilation to fail.
- if (rc.returnCode == CompilationResult.ERROR_BUT_TRY_AGAIN) {
- // We could not connect to the server. Try again.
- attempts++;
- try {
- Thread.sleep(JavacServer.WAIT_BETWEEN_CONNECT_ATTEMPTS * 1000);
- } catch (InterruptedException e) {
- }
- }
- } while (rc.returnCode == ERROR_BUT_TRY_AGAIN && attempts < JavacServer.MAX_NUM_CONNECT_ATTEMPTS);
- return rc;
- } catch (Exception e) {
- StringWriter sw = new StringWriter();
- e.printStackTrace(new PrintWriter(sw));
- CompilationResult cr = new CompilationResult(ERROR_FATAL);
- cr.stderr = sw.toString();
- return cr;
- }
- }
-
- public static void printFailedAttempt(String cmd, String f, PrintWriter err) {
- err.println("---- Failed to start javac server with this command -----");
- err.println(cmd);
- try {
- BufferedReader in = new BufferedReader(new FileReader(f));
- err.println("---- stdout/stderr output from attempt to start javac server -----");
- for (;;) {
- String l = in.readLine();
- if (l == null) {
- break;
- }
- err.println(l);
- }
- err.println("------------------------------------------------------------------");
- } catch (Exception e) {
- err.println("The stdout/stderr output in file " + f + " does not exist and the server did not start.");
- }
- }
-
- /**
- * Expect this key on the next line read from the reader.
- */
- public static boolean expect(BufferedReader in, String key) throws IOException {
- String s = in.readLine();
- if (s != null && s.equals(key)) {
- return true;
- }
- return false;
- }
-}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java
index f2540a2..8375c52 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFile.java
@@ -33,6 +33,7 @@
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.FileLockInterruptionException;
+import com.sun.tools.javac.util.Assert;
import com.sun.tools.sjavac.Log;
/**
@@ -41,12 +42,12 @@
* primitives to avoid race conditions when several javac clients are started at the same. Note that file
* system locking is not always supported on a all operating systems and/or file systems.
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
*/
-class PortFile {
+public class PortFile {
// Port file format:
// byte ordering: high byte first = big endian
@@ -72,8 +73,7 @@
* Create a new portfile.
* @param filename is the path to the file.
*/
- public PortFile(String fn) throws FileNotFoundException
- {
+ public PortFile(String fn) throws FileNotFoundException {
filename = fn;
file = new File(filename);
stopFile = new File(filename+".stop");
@@ -88,7 +88,7 @@
/**
* Lock the port file.
*/
- void lock() throws IOException {
+ public void lock() throws IOException {
lock = channel.lock();
}
@@ -115,7 +115,7 @@
containsPortInfo = false;
}
}
- } catch (Exception e) {
+ } catch (IOException e) {
containsPortInfo = false;
}
}
@@ -131,7 +131,7 @@
* If so, then we can acquire the tcp/ip port on localhost.
*/
public int getPort() {
- assert(containsPortInfo);
+ Assert.check(containsPortInfo);
return serverPort;
}
@@ -139,7 +139,7 @@
* If so, then we can acquire the server cookie.
*/
public long getCookie() {
- assert(containsPortInfo);
+ Assert.check(containsPortInfo);
return serverCookie;
}
@@ -147,7 +147,7 @@
* Store the values into the locked port file.
*/
public void setValues(int port, long cookie) throws IOException {
- assert(lock != null);
+ Assert.check(lock != null);
rwfile.seek(0);
// Write the magic nr that identifes a port file.
rwfile.writeInt(magicNr);
@@ -192,7 +192,7 @@
* Unlock the port file.
*/
public void unlock() throws IOException {
- assert(lock != null);
+ Assert.check(lock != null);
lock.release();
lock = null;
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java
new file mode 100644
index 0000000..1a170ca
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.server;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Monitors the presence of a port file and shuts down the given SjavacServer
+ * whenever the port file is deleted or invalidated.
+ *
+ * TODO: JDK-8046882
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class PortFileMonitor {
+
+ // Check if the portfile is gone, every 5 seconds.
+ private final static int CHECK_PORTFILE_INTERVAL = 5000;
+
+ final private Timer timer = new Timer();
+ final private PortFile portFile;
+ final private SjavacServer server;
+
+ public PortFileMonitor(PortFile portFile,
+ SjavacServer server) {
+ this.portFile = portFile;
+ this.server = server;
+ }
+
+ public void start() {
+ TimerTask shutdownCheck = new TimerTask() {
+ public void run() {
+ try {
+ if (!portFile.exists()) {
+ // Time to quit because the portfile was deleted by another
+ // process, probably by the makefile that is done building.
+ server.shutdown("Quitting because portfile was deleted!");
+ } else if (portFile.markedForStop()) {
+ // Time to quit because another process touched the file
+ // server.port.stop to signal that the server should stop.
+ // This is necessary on some operating systems that lock
+ // the port file hard!
+ server.shutdown("Quitting because a portfile.stop file was found!");
+ } else if (!portFile.stillMyValues()) {
+ // Time to quit because another build has started.
+ server.shutdown("Quitting because portfile is now owned by another javac server!");
+ }
+ } catch (IOException e) {
+ e.printStackTrace(server.theLog);
+ server.flushLog();
+ }
+ }
+ };
+
+ timer.schedule(shutdownCheck, 0, CHECK_PORTFILE_INTERVAL);
+ }
+
+ public void shutdown() {
+ timer.cancel();
+ }
+}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java
new file mode 100644
index 0000000..8329f03
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.server;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.Socket;
+import java.net.URI;
+import java.util.List;
+import java.util.Set;
+
+import com.sun.tools.sjavac.Log;
+
+/**
+ * A RequestHandler handles requests performed over a socket. Specifically it
+ * - Reads the command string specifying which method is to be invoked
+ * - Reads the appropriate arguments
+ * - Delegates the actual invocation to the given sjavac implementation
+ * - Writes the result back to the socket output stream
+ *
+ * None of the work performed by this class is really bound by the CPU. It
+ * should be completely fine to have a large number of RequestHandlers active.
+ * To limit the number of concurrent compilations, use PooledSjavac.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class RequestHandler implements Runnable {
+
+ private final Socket socket;
+ private final Sjavac sjavac;
+
+ public RequestHandler(Socket socket, Sjavac sjavac) {
+ this.socket = socket;
+ this.sjavac = sjavac;
+ }
+
+ @Override
+ public void run() {
+ try (ObjectOutputStream oout = new ObjectOutputStream(socket.getOutputStream());
+ ObjectInputStream oin = new ObjectInputStream(socket.getInputStream())) {
+ String id = (String) oin.readObject();
+ String cmd = (String) oin.readObject();
+ Log.info("Handling request, id: " + id + " cmd: " + cmd);
+ switch (cmd) {
+ case SjavacServer.CMD_SYS_INFO: handleSysInfoRequest(oin, oout); break;
+ case SjavacServer.CMD_COMPILE: handleCompileRequest(oin, oout); break;
+ default: Log.error("Unknown command: " + cmd);
+ }
+ } catch (Exception ex) {
+ // Not much to be done at this point. The client side request
+ // code will most likely throw an IOException and the
+ // compilation will fail.
+ StringWriter sw = new StringWriter();
+ ex.printStackTrace(new PrintWriter(sw));
+ Log.error(sw.toString());
+ }
+ }
+
+ private void handleSysInfoRequest(ObjectInputStream oin,
+ ObjectOutputStream oout) throws IOException {
+ oout.writeObject(sjavac.getSysInfo());
+ oout.flush();
+ }
+
+ @SuppressWarnings("unchecked")
+ private void handleCompileRequest(ObjectInputStream oin,
+ ObjectOutputStream oout) throws IOException {
+ try {
+ // Read request arguments
+ String protocolId = (String) oin.readObject();
+ String invocationId = (String) oin.readObject();
+ String[] args = (String[]) oin.readObject();
+ List<File> explicitSources = (List<File>) oin.readObject();
+ Set<URI> sourcesToCompile = (Set<URI>) oin.readObject();
+ Set<URI> visibleSources = (Set<URI>) oin.readObject();
+
+ // Perform compilation
+ CompilationResult cr = sjavac.compile(protocolId,
+ invocationId,
+ args,
+ explicitSources,
+ sourcesToCompile,
+ visibleSources);
+ // Write request response
+ oout.writeObject(cr);
+ oout.flush();
+ } catch (ClassNotFoundException cnfe) {
+ throw new IOException(cnfe);
+ }
+ }
+}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java
similarity index 80%
rename from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
rename to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java
index 91f7230..7827f05 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java
@@ -22,7 +22,6 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package com.sun.tools.sjavac.server;
import java.io.File;
@@ -30,7 +29,16 @@
import java.util.List;
import java.util.Set;
-public interface JavacService {
+/**
+ * Interface of the SjavacImpl, the sjavac client and all wrappers such as
+ * PooledSjavac etc.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public interface Sjavac {
SysInfo getSysInfo();
@@ -40,4 +48,7 @@
List<File> explicitSources,
Set<URI> sourcesToCompile,
Set<URI> visibleSources);
+
+ void shutdown();
+ String serverSettings();
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java
new file mode 100644
index 0000000..c96c75d
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.server;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.sun.tools.sjavac.ProblemException;
+import com.sun.tools.sjavac.Util;
+import com.sun.tools.sjavac.comp.SjavacImpl;
+import com.sun.tools.sjavac.comp.PooledSjavac;
+
+/**
+ * The JavacServer class contains methods both to setup a server that responds to requests and methods to connect to this server.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class SjavacServer implements Terminable {
+
+ // Used in protocol to indicate which method to invoke
+ public final static String CMD_COMPILE = "compile";
+ public final static String CMD_SYS_INFO = "sys-info";
+
+ final private String portfilename;
+ final private String logfile;
+ final private String stdouterrfile;
+ final private int poolsize;
+ final private int keepalive;
+ final private PrintStream err;
+
+ // The secret cookie shared between server and client through the port file.
+ // Used to prevent clients from believing that they are communicating with
+ // an old server when a new server has started and reused the same port as
+ // an old server.
+ private final long myCookie;
+
+ // Accumulated build time, not counting idle time, used for logging purposes
+ private long totalBuildTime;
+
+ // The javac server specific log file.
+ PrintWriter theLog;
+
+ // The sjavac implementation to delegate requests to
+ Sjavac sjavac;
+
+ private ServerSocket serverSocket;
+
+ private PortFile portFile;
+ private PortFileMonitor portFileMonitor;
+
+ // Set to false break accept loop
+ final AtomicBoolean keepAcceptingRequests = new AtomicBoolean();
+
+ // For the client, all port files fetched, one per started javac server.
+ // Though usually only one javac server is started by a client.
+ private static Map<String, PortFile> allPortFiles;
+ private static Map<String, Long> maxServerMemory;
+
+ public SjavacServer(String settings, PrintStream err) throws FileNotFoundException {
+ // Extract options. TODO: Change to proper constructor args
+ portfilename = Util.extractStringOption("portfile", settings);
+ logfile = Util.extractStringOption("logfile", settings);
+ stdouterrfile = Util.extractStringOption("stdouterrfile", settings);
+ keepalive = Util.extractIntOption("keepalive", settings, 120);
+ poolsize = Util.extractIntOption("poolsize", settings,
+ Runtime.getRuntime().availableProcessors());
+ this.err = err;
+
+ myCookie = new Random().nextLong();
+ theLog = new PrintWriter(logfile);
+ }
+
+
+ /**
+ * Acquire the port file. Synchronized since several threads inside an smart javac wrapper client acquires the same port file at the same time.
+ */
+ public static synchronized PortFile getPortFile(String filename) throws FileNotFoundException {
+ if (allPortFiles == null) {
+ allPortFiles = new HashMap<>();
+ }
+ PortFile pf = allPortFiles.get(filename);
+
+ // Port file known. Does it still exist?
+ if (pf != null) {
+ try {
+ if (!pf.exists())
+ pf = null;
+ } catch (IOException ioex) {
+ ioex.printStackTrace();
+ }
+ }
+
+ if (pf == null) {
+ pf = new PortFile(filename);
+ allPortFiles.put(filename, pf);
+ }
+ return pf;
+ }
+
+ /**
+ * Get the cookie used for this server.
+ */
+ long getCookie() {
+ return myCookie;
+ }
+
+ /**
+ * Get the port used for this server.
+ */
+ int getPort() {
+ return serverSocket.getLocalPort();
+ }
+
+ /**
+ * Sum up the total build time for this javac server.
+ */
+ public void addBuildTime(long inc) {
+ totalBuildTime += inc;
+ }
+
+ /**
+ * Log this message.
+ */
+ public void log(String msg) {
+ if (theLog != null) {
+ theLog.println(msg);
+ } else {
+ System.err.println(msg);
+ }
+ }
+
+ /**
+ * Make sure the log is flushed.
+ */
+ public void flushLog() {
+ if (theLog != null) {
+ theLog.flush();
+ }
+ }
+
+ /**
+ * Start a server using a settings string. Typically: "--startserver:portfile=/tmp/myserver,poolsize=3" and the string "portfile=/tmp/myserver,poolsize=3"
+ * is sent as the settings parameter. Returns 0 on success, -1 on failure.
+ */
+ public int startServer() throws IOException {
+ long serverStart = System.currentTimeMillis();
+
+ // The port file is locked and the server port and cookie is written into it.
+ portFile = getPortFile(portfilename);
+
+ synchronized (portFile) {
+ portFile.lock();
+ portFile.getValues();
+ if (portFile.containsPortInfo()) {
+ err.println("Javac server not started because portfile exists!");
+ portFile.unlock();
+ return -1;
+ }
+
+ // .-----------. .--------. .------.
+ // socket -->| IdleReset |-->| Pooled |-->| Impl |--> javac
+ // '-----------' '--------' '------'
+ sjavac = new SjavacImpl();
+ sjavac = new PooledSjavac(sjavac, poolsize);
+ sjavac = new IdleResetSjavac(sjavac,
+ this,
+ keepalive * 1000);
+
+ serverSocket = new ServerSocket();
+ InetAddress localhost = InetAddress.getByName(null);
+ serverSocket.bind(new InetSocketAddress(localhost, 0));
+
+ // At this point the server accepts connections, so it is now safe
+ // to publish the port / cookie information
+ portFile.setValues(getPort(), getCookie());
+ portFile.unlock();
+ }
+
+ portFileMonitor = new PortFileMonitor(portFile, this);
+ portFileMonitor.start();
+
+ log("Sjavac server started. Accepting connections...");
+ log(" port: " + getPort());
+ log(" time: " + new java.util.Date());
+ log(" poolsize: " + poolsize);
+ flushLog();
+
+ keepAcceptingRequests.set(true);
+ do {
+ try {
+ Socket socket = serverSocket.accept();
+ new Thread(new RequestHandler(socket, sjavac)).start();
+ } catch (SocketException se) {
+ // Caused by serverSocket.close() and indicates shutdown
+ }
+ } while (keepAcceptingRequests.get());
+
+ log("Shutting down.");
+
+ // No more connections accepted. If any client managed to connect after
+ // the accept() was interrupted but before the server socket is closed
+ // here, any attempt to read or write to the socket will result in an
+ // IOException on the client side.
+
+ long realTime = System.currentTimeMillis() - serverStart;
+ log("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms");
+ flushLog();
+
+ // Shut down
+ sjavac.shutdown();
+
+ return 0;
+ }
+
+ /**
+ * Fork a background process. Returns the command line used that can be printed if something failed.
+ */
+ public static String fork(String sjavac, String portfile, String logfile, int poolsize, int keepalive,
+ final PrintStream err, String stdouterrfile, boolean background)
+ throws IOException, ProblemException {
+ if (stdouterrfile != null && stdouterrfile.trim().equals("")) {
+ stdouterrfile = null;
+ }
+ final String startserver = "--startserver:portfile=" + portfile + ",logfile=" + logfile + ",stdouterrfile=" + stdouterrfile + ",poolsize=" + poolsize + ",keepalive="+ keepalive;
+
+ if (background) {
+ sjavac += "%20" + startserver;
+ sjavac = sjavac.replaceAll("%20", " ");
+ sjavac = sjavac.replaceAll("%2C", ",");
+ // If the java/sh/cmd launcher fails the failure will be captured by stdouterr because of the redirection here.
+ String[] cmd = {"/bin/sh", "-c", sjavac + " >> " + stdouterrfile + " 2>&1"};
+ if (!(new File("/bin/sh")).canExecute()) {
+ ArrayList<String> wincmd = new ArrayList<>();
+ wincmd.add("cmd");
+ wincmd.add("/c");
+ wincmd.add("start");
+ wincmd.add("cmd");
+ wincmd.add("/c");
+ wincmd.add(sjavac + " >> " + stdouterrfile + " 2>&1");
+ cmd = wincmd.toArray(new String[wincmd.size()]);
+ }
+ Process pp = null;
+ try {
+ pp = Runtime.getRuntime().exec(cmd);
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ e.printStackTrace(new PrintWriter(stdouterrfile));
+ }
+ StringBuilder rs = new StringBuilder();
+ for (String s : cmd) {
+ rs.append(s + " ");
+ }
+ return rs.toString();
+ }
+
+ // Do not spawn a background server, instead run it within the same JVM.
+ Thread t = new Thread() {
+ @Override
+ public void run() {
+ try {
+ SjavacServer server = new SjavacServer(startserver, err);
+ server.startServer();
+ } catch (Throwable t) {
+ t.printStackTrace(err);
+ }
+ }
+ };
+ t.setDaemon(true);
+ t.start();
+ return "";
+ }
+
+ @Override
+ public void shutdown(String quitMsg) {
+ if (!keepAcceptingRequests.compareAndSet(false, true)) {
+ // Already stopped, no need to shut down again
+ return;
+ }
+
+ log("Quitting: " + quitMsg);
+ flushLog();
+
+ portFileMonitor.shutdown(); // No longer any need to monitor port file
+
+ // Unpublish port before shutting down socket to minimize the number of
+ // failed connection attempts
+ try {
+ portFile.delete();
+ } catch (IOException e) {
+ e.printStackTrace(theLog);
+ }
+ try {
+ serverSocket.close();
+ } catch (IOException e) {
+ e.printStackTrace(theLog);
+ }
+ }
+
+ public static void cleanup(String... args) {
+ String settings = Util.findServerSettings(args);
+ if (settings == null) return;
+ String portfile = Util.extractStringOption("portfile", settings);
+ String background = Util.extractStringOption("background", settings);
+ if (background != null && background.equals("false")) {
+ // If the server runs within this jvm, then delete the portfile,
+ // since this jvm is about to exit soon.
+ File f = new File(portfile);
+ f.delete();
+ }
+ }
+}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java
index 065021c..8b2997f 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SysInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,18 @@
*/
package com.sun.tools.sjavac.server;
-public class SysInfo {
+import java.io.Serializable;
+
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class SysInfo implements Serializable {
+
+ static final long serialVersionUID = -3096346807579L;
+
public int numCores;
public long maxMemory;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java
similarity index 72%
copy from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
copy to langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java
index 91f7230..0b5e51c 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java
@@ -22,22 +22,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package com.sun.tools.sjavac.server;
-import java.io.File;
-import java.net.URI;
-import java.util.List;
-import java.util.Set;
-
-public interface JavacService {
-
- SysInfo getSysInfo();
-
- CompilationResult compile(String protocolId,
- String invocationId,
- String[] args,
- List<File> explicitSources,
- Set<URI> sourcesToCompile,
- Set<URI> visibleSources);
+/**
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public interface Terminable {
+ void shutdown(String quitMsg);
}
diff --git a/langtools/test/com/sun/javadoc/lib/JavadocTester.java b/langtools/test/com/sun/javadoc/lib/JavadocTester.java
index aa12176..91d1ae9 100644
--- a/langtools/test/com/sun/javadoc/lib/JavadocTester.java
+++ b/langtools/test/com/sun/javadoc/lib/JavadocTester.java
@@ -38,6 +38,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.file.Files;
+import java.util.Arrays;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
@@ -290,6 +291,7 @@
break;
}
}
+ out.println("args: " + Arrays.toString(args));
// log.setOutDir(outputDir);
outputDirectoryCheck.check(outputDir);
diff --git a/langtools/test/tools/apt/Basics/CheckAptIsRemovedTest.java b/langtools/test/tools/apt/Basics/CheckAptIsRemovedTest.java
index 5972f5c..35bb8aa 100644
--- a/langtools/test/tools/apt/Basics/CheckAptIsRemovedTest.java
+++ b/langtools/test/tools/apt/Basics/CheckAptIsRemovedTest.java
@@ -25,7 +25,7 @@
* @test
* @bug 4908512 5024825 4957203 4993280 4996963 6174696 6177059 7041249
* @summary Make sure apt is removed and doesn't come back
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main CheckAptIsRemovedTest
*/
@@ -34,7 +34,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
-//original test: test/tools/apt/Basics/apt.sh
+// Original test: test/tools/apt/Basics/apt.sh
public class CheckAptIsRemovedTest {
//I think this class can be let with the imports only and that should be enough for as test's purpose
private static final String NullAPFSrc =
@@ -77,20 +77,18 @@
Path aptLin = Paths.get(testJDK, "bin", "apt");
Path aptWin = Paths.get(testJDK, "bin", "apt.exe");
-// if [ -f "${TESTJAVA}/bin/apt" -o -f "${TESTJAVA}/bin/apt.exe" ];then
if (Files.exists(aptLin) || Files.exists(aptWin)) {
throw new AssertionError("apt executable should not exist");
}
-// JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
-// $JAVAC ${TESTSRC}/NullAPF.java
Path classpath = Paths.get(testJDK, "lib", "tools.jar");
- ToolBox.JavaToolArgs javacArgs =
- new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
- .setOptions("-sourcepath", ".",
- "-classpath", classpath.toString())
- .setSources(NullAPFSrc);
- ToolBox.javac(javacArgs);
+ ToolBox tb = new ToolBox();
+ tb.new JavacTask()
+ .classpath(classpath.toString()) // TODO: add overload
+ .sourcepath(".")
+ .sources(NullAPFSrc)
+ .run(ToolBox.Expect.FAIL)
+ .writeAll();
}
}
diff --git a/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java b/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java
index 6dd2179..005a060 100644
--- a/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java
+++ b/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,17 @@
* @test
* @bug 4846262
* @summary check that javac operates correctly in EBCDIC locale
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main CheckEBCDICLocaleTest
*/
import java.io.File;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
+import java.util.List;
public class CheckEBCDICLocaleTest {
@@ -58,39 +60,32 @@
}
public void test() throws Exception {
- String native2asciiBinary = Paths.get(
- System.getProperty("test.jdk"),"bin", "native2ascii").toString();
+ ToolBox tb = new ToolBox();
+ Path native2asciiBinary = tb.getJDKTool("native2ascii");
- ToolBox.createJavaFileFromSource(TestSrc);
- Files.createDirectory(Paths.get("output"));
+ tb.writeFile("Test.java", TestSrc);
+ tb.createDirectories("output");
- ToolBox.AnyToolArgs nativeCmdParams =
- new ToolBox.AnyToolArgs()
- .appendArgs(native2asciiBinary)
- .appendArgs(ToolBox.testToolVMOpts)
- .appendArgs("-reverse", "-encoding", "IBM1047", "Test.java",
- "output/Test.java");
- ToolBox.executeCommand(nativeCmdParams);
+ tb.new ExecTask(native2asciiBinary)
+ .args("-reverse", "-encoding", "IBM1047", "Test.java", "output/Test.java")
+ .run();
- ToolBox.AnyToolArgs javacParams =
- new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(ToolBox.javacBinary)
- .appendArgs(ToolBox.testToolVMOpts)
- .appendArgs("-J-Duser.language=en",
- "-J-Duser.region=US", "-J-Dfile.encoding=IBM1047",
- "output/Test.java")
- .setErrOutput(new File("Test.tmp"));
- ToolBox.executeCommand(javacParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .redirect(ToolBox.OutputKind.STDERR, "Test.tmp")
+ .options("-J-Duser.language=en",
+ "-J-Duser.region=US",
+ "-J-Dfile.encoding=IBM1047")
+ .files("output/Test.java")
+ .run(ToolBox.Expect.FAIL);
- nativeCmdParams = new ToolBox.AnyToolArgs()
- .appendArgs(native2asciiBinary)
- .appendArgs(ToolBox.testToolVMOpts)
- .appendArgs("-encoding", "IBM1047", "Test.tmp", "Test.out");
- ToolBox.executeCommand(nativeCmdParams);
+ tb.new ExecTask(native2asciiBinary)
+ .args("-encoding", "IBM1047", "Test.tmp", "Test.out")
+ .run();
- String goldenFile = String.format(TestOutTemplate, File.separator);
- ToolBox.compareLines(Paths.get("Test.out"),
- Arrays.asList(goldenFile.split("\n")), null, true);
+ List<String> expectLines = Arrays.asList(
+ String.format(TestOutTemplate, File.separator).split("\n"));
+ List<String> actualLines = Files.readAllLines(Paths.get("Test.out"));
+ tb.checkEqual(expectLines, actualLines);
}
}
diff --git a/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java b/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java
index 0bfffaa..8a7ad08 100644
--- a/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java
+++ b/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 6302184 6350124 6357979
* @summary javac hidden options that generate source should use the given
* encoding, if available
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run compile -encoding iso-8859-1 -XD-printsource T6302184.java
* @run main HiddenOptionsShouldUseGivenEncodingTest
@@ -34,16 +34,19 @@
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.List;
-//original test: test/tools/javac/6302184/T6302184.sh
+// Original test: test/tools/javac/6302184/T6302184.sh
public class HiddenOptionsShouldUseGivenEncodingTest {
public static void main(String[] args) throws Exception {
-//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
-//diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
- Path path1 = Paths.get(System.getProperty("test.classes"), "T6302184.java");
- Path path2 = Paths.get(System.getProperty("test.src"), "T6302184.out");
- ToolBox.compareLines(path1, path2, "iso-8859-1");
+ ToolBox tb = new ToolBox();
+ String encoding = "iso-8859-1";
+ Path path1 = Paths.get(ToolBox.testClasses, "T6302184.java");
+ List<String> file1 = tb.readAllLines(path1, encoding);
+ Path path2 = Paths.get(ToolBox.testSrc, "T6302184.out");
+ List<String> file2 = tb.readAllLines(path2, encoding);
+ tb.checkEqual(file1, file2);
}
}
diff --git a/langtools/test/tools/javac/AnonymousSubclassTest.java b/langtools/test/tools/javac/AnonymousSubclassTest.java
index 6545c75..4227630 100644
--- a/langtools/test/tools/javac/AnonymousSubclassTest.java
+++ b/langtools/test/tools/javac/AnonymousSubclassTest.java
@@ -25,19 +25,18 @@
* @test
* @bug 8023945
* @summary javac wrongly allows a subclass of an anonymous class
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main AnonymousSubclassTest
*/
-import java.util.ArrayList;
-import java.io.IOException;
-
public class AnonymousSubclassTest {
public static void main(String... args) throws Exception {
new AnonymousSubclassTest().run();
}
+ ToolBox tb = new ToolBox();
+
// To trigger the error we want, first we need to compile
// a class with an anonymous inner class: Foo$1.
final String foo =
@@ -65,20 +64,21 @@
"}";
void compOk(String code) throws Exception {
- ToolBox.javac(new ToolBox.JavaToolArgs().setSources(code));
+ tb.new JavacTask()
+ .sources(code)
+ .run();
}
void compFail(String code) throws Exception {
- ArrayList<String> errors = new ArrayList<>();
- ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
- args.setSources(code)
- .appendArgs("-cp", ".", "-XDrawDiagnostics")
- .set(ToolBox.Expect.FAIL)
- .setErrOutput(errors);
- ToolBox.javac(args);
+ String errs = tb.new JavacTask()
+ .sources(code)
+ .classpath(".")
+ .options("-XDrawDiagnostics")
+ .run(ToolBox.Expect.FAIL)
+ .writeAll()
+ .getOutput(ToolBox.OutputKind.DIRECT);
- if (!errors.get(0).contains("cant.inherit.from.anon")) {
- System.out.println(errors.get(0));
+ if (!errs.contains("cant.inherit.from.anon")) {
throw new Exception("test failed");
}
}
diff --git a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java
index de4f73f..4f423cd 100644
--- a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java
+++ b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,14 @@
* @test
* @bug 4241229 4785453
* @summary Test -classpath option and classpath defaults.
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ClassPathTest
*/
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-//original test: test/tools/javac/ClassPathTest/ClassPathTest.sh
+// Original test: test/tools/javac/ClassPathTest/ClassPathTest.sh
public class ClassPathTest {
private static final String ClassPathTest1Src =
@@ -70,12 +65,12 @@
"package pkg;\n" +
"public class ClassPathTestAux3 {}";
- ProcessBuilder pb = null;
-
public static void main(String[] args) throws Exception {
new ClassPathTest().test();
}
+ ToolBox tb = new ToolBox();
+
public void test() throws Exception {
createOutputDirAndSourceFiles();
checkCompileCommands();
@@ -83,14 +78,16 @@
void createOutputDirAndSourceFiles() throws Exception {
//dirs and files creation
- ToolBox.createJavaFileFromSource(ClassPathTest1Src);
- ToolBox.createJavaFileFromSource(ClassPathTest2Src);
- ToolBox.createJavaFileFromSource(ClassPathTest3Src);
- ToolBox.createJavaFileFromSource(Paths.get("foo"),
+ tb.writeJavaFiles(Paths.get("."),
+ ClassPathTest1Src,
+ ClassPathTest2Src,
+ ClassPathTest3Src);
+ tb.writeJavaFiles(Paths.get("foo"),
fooPkgClassPathTestAux1Src);
- ToolBox.createJavaFileFromSource(Paths.get("bar"),
+ tb.writeJavaFiles(Paths.get("bar"),
barPkgClassPathTestAux2Src);
- ToolBox.createJavaFileFromSource(pkgClassPathTestAux3Src);
+ tb.writeJavaFiles(Paths.get("."),
+ pkgClassPathTestAux3Src);
}
void checkCompileCommands() throws Exception {
@@ -99,80 +96,55 @@
// automatically but this is not happening when called using ProcessBuilder
// testJavac success ClassPathTest3.java
- List<String> mainArgs = new ArrayList<>();
- mainArgs.add(ToolBox.javacBinary.toString());
- if (ToolBox.testToolVMOpts != null) {
- mainArgs.addAll(ToolBox.testToolVMOpts);
- }
-
- List<String> commonArgs = new ArrayList<>();
- commonArgs.addAll(mainArgs);
- commonArgs.addAll(Arrays.asList("-cp", "."));
-
- ToolBox.AnyToolArgs successParams = new ToolBox.AnyToolArgs()
- .appendArgs(commonArgs)
- .appendArgs("ClassPathTest3.java");
- ToolBox.executeCommand(successParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .classpath(".")
+ .files("ClassPathTest3.java")
+ .run();
// testJavac failure ClassPathTest1.java
- ToolBox.AnyToolArgs failParams =
- new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(commonArgs)
- .appendArgs("ClassPathTest1.java");
- ToolBox.executeCommand(failParams);
-
-// This is done inside the executeCommand method
-// CLASSPATH=bar; export CLASSPATH
-
- Map<String, String> extVars = new TreeMap<>();
- extVars.put("CLASSPATH", "bar");
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .classpath(".")
+ .files("ClassPathTest1.java")
+ .run(ToolBox.Expect.FAIL);
// testJavac success ClassPathTest2.java
- successParams = new ToolBox.AnyToolArgs()
- .appendArgs(mainArgs)
- .appendArgs("ClassPathTest2.java")
- .set(extVars);
- ToolBox.executeCommand(successParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .envVar("CLASSPATH", "bar")
+ .files("ClassPathTest2.java")
+ .run();
// testJavac failure ClassPathTest1.java
- failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(mainArgs)
- .appendArgs("ClassPathTest1.java")
- .set(extVars);
- ToolBox.executeCommand(failParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .envVar("CLASSPATH", "bar")
+ .files("ClassPathTest1.java")
+ .run(ToolBox.Expect.FAIL);
// testJavac failure ClassPathTest3.java
- failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(mainArgs)
- .appendArgs("ClassPathTest3.java")
- .set(extVars);
- ToolBox.executeCommand(failParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .envVar("CLASSPATH", "bar")
+ .files("ClassPathTest3.java")
+ .run(ToolBox.Expect.FAIL);
// testJavac success -classpath foo ClassPathTest1.java
-
- commonArgs.clear();
- commonArgs.addAll(mainArgs);
- commonArgs.addAll(Arrays.asList("-cp", "foo"));
-
- successParams = new ToolBox.AnyToolArgs()
- .appendArgs(commonArgs)
- .appendArgs("ClassPathTest1.java")
- .set(extVars);
- ToolBox.executeCommand(successParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .envVar("CLASSPATH", "bar")
+ .classpath("foo")
+ .files("ClassPathTest1.java")
+ .run();
// testJavac failure -classpath foo ClassPathTest2.java
- failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(commonArgs)
- .appendArgs("ClassPathTest2.java")
- .set(extVars);
- ToolBox.executeCommand(failParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .envVar("CLASSPATH", "bar")
+ .classpath("foo")
+ .files("ClassPathTest2.java")
+ .run(ToolBox.Expect.FAIL);
// testJavac failure -classpath foo ClassPathTest3.java
- failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(commonArgs)
- .appendArgs("ClassPathTest3.java")
- .set(extVars);
- ToolBox.executeCommand(failParams);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .envVar("CLASSPATH", "bar")
+ .classpath("foo")
+ .files("ClassPathTest3.java")
+ .run(ToolBox.Expect.FAIL);
}
}
diff --git a/langtools/test/tools/javac/ConstFoldTest.java b/langtools/test/tools/javac/ConstFoldTest.java
index c9865f3..e9b6c11 100644
--- a/langtools/test/tools/javac/ConstFoldTest.java
+++ b/langtools/test/tools/javac/ConstFoldTest.java
@@ -25,7 +25,7 @@
* @test
* @bug 8025505
* @summary Constant folding deficiency
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ConstFoldTest
*/
@@ -45,23 +45,23 @@
int x;
if (1 != 2) x=1; else x=0;
if (1 == 2) x=1; else x=0;
- if ("" != null) x=1; else x=0;
- if ("" == null) x=1; else x=0;
+ if ("" != null) x=1; else x=0;
+ if ("" == null) x=1; else x=0;
if (null == null) x=1; else x=0;
if (null != null) x=1; else x=0;
x = 1 != 2 ? 1 : 0;
x = 1 == 2 ? 1 : 0;
- x = "" != null ? 1 : 0;
- x = "" == null ? 1 : 0;
+ x = "" != null ? 1 : 0;
+ x = "" == null ? 1 : 0;
x = null == null ? 1 : 0;
x = null != null ? 1 : 0;
boolean b;
b = 1 != 2 && true;
b = 1 == 2 || true;
- b = ("" != null) && true;
- b = ("" == null) || true;
+ b = ("" != null) && true;
+ b = ("" == null) || true;
b = (null == null) && true;
b = (null != null) || true;
}
@@ -72,11 +72,17 @@
final String regex = "\\sif(?:null|nonnull|eq|ne){1}\\s";
void run() throws Exception {
- URL url = ConstFoldTest.class.getResource("ConstFoldTest$CFTest.class");
- String result = ToolBox.javap(new ToolBox.JavaToolArgs().setAllArgs("-c", url.getFile()));
- System.out.println(result);
+ ToolBox tb = new ToolBox();
- List<String> bad_codes = ToolBox.grep(regex, result, "\n");
+ URL url = ConstFoldTest.class.getResource("ConstFoldTest$CFTest.class");
+ List<String> result = tb.new JavapTask()
+ .options("-c")
+ .classes(url.getFile())
+ .run()
+ .write(ToolBox.OutputKind.DIRECT)
+ .getOutputLines(ToolBox.OutputKind.DIRECT);
+
+ List<String> bad_codes = tb.grep(regex, result);
if (!bad_codes.isEmpty()) {
for (String code : bad_codes)
System.out.println("Bad OpCode Found: " + code);
diff --git a/langtools/test/tools/javac/ExtDirs/ExtDirTest.java b/langtools/test/tools/javac/ExtDirs/ExtDirTest.java
index d33592f..989ec0d 100644
--- a/langtools/test/tools/javac/ExtDirs/ExtDirTest.java
+++ b/langtools/test/tools/javac/ExtDirs/ExtDirTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,14 @@
* @test
* @bug 4204897 4256097 4785453 4863609
* @summary Test that '.jar' files in -extdirs are found.
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ExtDirTest
*/
import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-//original test: test/tools/javac/ExtDirs/ExtDirs.sh
+// Original test: test/tools/javac/ExtDirs/ExtDirs.sh
public class ExtDirTest {
private static final String ExtDirTestClass1Src =
@@ -100,72 +96,73 @@
"SHA-Digest: ILJOhwHg5US+yuw1Sc1d+Avu628=\n" +
"MD5-Digest: j8wnz8wneEcuJ/gjXBBQNA==\n";
- List<String> ouputDirParam = Arrays.asList("-d", ".");
-
public static void main(String args[]) throws Exception {
new ExtDirTest().run();
}
+ private final ToolBox tb = new ToolBox();
+
void run() throws Exception {
createJars();
compileWithExtDirs();
}
void createJars() throws Exception {
- sun.tools.jar.Main jarGenerator =
- new sun.tools.jar.Main(System.out, System.err, "jar");
+ tb.new JavacTask()
+ .outdir(".")
+ .sources(ExtDirTestClass1Src)
+ .run();
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs()
- .setOptions(ouputDirParam)
- .setSources(ExtDirTestClass1Src);
- ToolBox.javac(javacParams);
+ tb.new JarTask("pkg1.jar")
+ .manifest(jar1Manifest)
+ .files("pkg1/ExtDirTestClass1.class")
+ .run();
- ToolBox.writeFile(Paths.get("pkg1", "MANIFEST.MF"), jar1Manifest);
- jarGenerator.run(new String[] {"cfm", "pkg1.jar", "pkg1/MANIFEST.MF",
- "pkg1/ExtDirTestClass1.class"});
+ tb.new JavacTask()
+ .outdir(".")
+ .sources(ExtDirTestClass2Src)
+ .run();
- javacParams.setSources(ExtDirTestClass2Src);
- ToolBox.javac(javacParams);
+ tb.new JarTask("pkg2.jar")
+ .manifest(jar2Manifest)
+ .files("pkg2/ExtDirTestClass2.class")
+ .run();
- ToolBox.writeFile(Paths.get("pkg2", "MANIFEST.MF"), jar2Manifest);
- jarGenerator.run(new String[] {"cfm", "pkg2.jar", "pkg2/MANIFEST.MF",
- "pkg2/ExtDirTestClass2.class"});
+ tb.createDirectories("ext1", "ext2", "ext3");
+ tb.copyFile("pkg1.jar", "ext1");
+ tb.copyFile("pkg2.jar", "ext2");
+ tb.copyFile("pkg1.jar", "ext3");
+ tb.copyFile("pkg2.jar", "ext3");
- ToolBox.copyFile(Paths.get("ext1", "pkg1.jar"), Paths.get("pkg1.jar"));
- ToolBox.copyFile(Paths.get("ext2", "pkg2.jar"), Paths.get("pkg2.jar"));
- ToolBox.copyFile(Paths.get("ext3", "pkg1.jar"), Paths.get("pkg1.jar"));
- ToolBox.copyFile(Paths.get("ext3", "pkg2.jar"), Paths.get("pkg2.jar"));
-
- Files.delete(Paths.get("pkg1.jar"));
- Files.delete(Paths.get("pkg2.jar"));
-
- Files.delete(Paths.get("pkg1", "ExtDirTestClass1.class"));
- Files.delete(Paths.get("pkg1", "MANIFEST.MF"));
- Files.delete(Paths.get("pkg1"));
- Files.delete(Paths.get("pkg2", "ExtDirTestClass2.class"));
- Files.delete(Paths.get("pkg2", "MANIFEST.MF"));
- Files.delete(Paths.get("pkg2"));
+ tb.deleteFiles(
+ "pkg1.jar",
+ "pkg2.jar",
+ "pkg1/ExtDirTestClass1.class",
+ "pkg1",
+ "pkg2/ExtDirTestClass2.class",
+ "pkg2"
+ );
}
void compileWithExtDirs() throws Exception {
+ tb.new JavacTask()
+ .outdir(".")
+ .options("-extdirs", "ext1")
+ .sources(ExtDirTest_1Src)
+ .run()
+ .writeAll();
-//javac -extdirs ext1 ExtDirTest_1.java
- ToolBox.JavaToolArgs params =
- new ToolBox.JavaToolArgs()
- .setOptions("-d", ".", "-extdirs", "ext1")
- .setSources(ExtDirTest_1Src);
- ToolBox.javac(params);
+ tb.new JavacTask()
+ .outdir(".")
+ .options("-extdirs", "ext1" + File.pathSeparator + "ext2")
+ .sources(ExtDirTest_2Src)
+ .run();
-//javac -extdirs ext1:ext2 ExtDirTest_2.java
- params.setOptions("-d", ".", "-extdirs", "ext1" + File.pathSeparator + "ext2")
- .setSources(ExtDirTest_2Src);
- ToolBox.javac(params);
-
-//javac -extdirs ext3 ExtDirTest_3.java
- params.setOptions("-d", ".", "-extdirs", "ext3")
- .setSources(ExtDirTest_3Src);
- ToolBox.javac(params);
+ tb.new JavacTask()
+ .outdir(".")
+ .options("-extdirs", "ext3")
+ .sources(ExtDirTest_3Src)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java b/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java
index a447d22..cb24ea6 100644
--- a/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java
+++ b/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java
@@ -25,7 +25,7 @@
* @test
* @bug 8034924
* @summary Incorrect inheritance of inaccessible static method
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main IncorrectInheritanceTest
*/
@@ -59,10 +59,11 @@
}
public void test() throws Exception {
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs()
- .setSources(ASrc, BSrc, CSrc);
- ToolBox.javac(javacParams);
+ ToolBox tb = new ToolBox();
+
+ tb.new JavacTask()
+ .sources(ASrc, BSrc, CSrc)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java b/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java
index 98f5bc0..318374c 100644
--- a/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java
+++ b/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,26 @@
* @bug 4509051 4785453
* @summary javac <AT>sourcefiles should catch Exception, when sourcefiles
* doesn't exist.
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main MissingIncludeTest
*/
-//original test: test/tools/javac/MissingInclude.sh
+// Original test: test/tools/javac/MissingInclude.sh
public class MissingIncludeTest {
- private static final String MissingIncludeSrc =
- "class MissingInclude {}";
+ private static final String MissingIncludeFile = "MissingInclude.java";
+ private static final String MissingIncludeSrc = "class MissingInclude {}";
public static void main(String[] args) throws Exception {
- ToolBox.createJavaFileFromSource(MissingIncludeSrc);
+ ToolBox tb = new ToolBox();
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} @/nonexistent_file MissingInclude.java 2> ${TMP1}
- ToolBox.JavaToolArgs params =
- new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
- .setAllArgs("@/nonexistent_file", "MissingInclude.java");
- ToolBox.javac(params);
+ tb.writeFile(MissingIncludeFile, MissingIncludeSrc);
+
+ tb.new JavacTask(ToolBox.Mode.CMDLINE)
+ .options("@/nonexistent_file")
+ .files(MissingIncludeFile)
+ .run(ToolBox.Expect.FAIL);
}
}
diff --git a/langtools/test/tools/javac/Paths/AbsolutePathTest.java b/langtools/test/tools/javac/Paths/AbsolutePathTest.java
index f3a1b40..e0e41a8 100644
--- a/langtools/test/tools/javac/Paths/AbsolutePathTest.java
+++ b/langtools/test/tools/javac/Paths/AbsolutePathTest.java
@@ -23,36 +23,49 @@
/*
* @test
+ * @ignore 8055500 [javac] fix for 8030046 is incorrect
* @bug 8030046
* @summary javac incorrectly handles absolute paths in manifest classpath
* @author govereau
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main AbsolutePathTest
*/
import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
public class AbsolutePathTest {
public static void main(String... cmdline) throws Exception {
+ ToolBox tb = new ToolBox();
+
// compile test.Test
- ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
- args.appendArgs("-d", "."); // this is needed to get the classfiles in test
- ToolBox.javac(args.setSources("package test; public class Test{}"));
+ tb.new JavacTask()
+ .outdir(".") // this is needed to get the classfiles in test
+ .sources("package test; public class Test{}")
+ .run();
// build test.jar containing test.Test
// we need the jars in a directory different from the working
- // directory to trigger the bug. I will reuse test/
- ToolBox.jar("cf", "test/test.jar", "test/Test.class");
+ // directory to trigger the bug.
+ Files.createDirectory(Paths.get("jars"));
+ tb.new JarTask("jars/test.jar")
+ .files("test/Test.class")
+ .run();
- // build second jar in test directory using
+ // build second jar in jars directory using
// an absolute path reference to the first jar
- String path = new File("test/test.jar").getAbsolutePath();
- ToolBox.mkManifestWithClassPath(null, path);
- ToolBox.jar("cfm", "test/test2.jar", "MANIFEST.MF");
+ tb.new JarTask("jars/test2.jar")
+ .classpath(new File("jars/test.jar").getAbsolutePath())
+ .run();
// this should not fail
- args.appendArgs("-cp", ".");
- ToolBox.javac(args.setSources("import test.Test; class Test2 {}"));
+ tb.new JavacTask()
+ .outdir(".")
+ .classpath("jars/test2.jar")
+ .sources("import test.Test; class Test2 {}")
+ .run()
+ .writeAll();
}
}
diff --git a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java
index cbe4c33..a667a5f 100644
--- a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java
+++ b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
* @test
* @bug 4087314 4800342 4307565
* @summary Verify allowed access to protected class from another package
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ProtectedInnerClassesTest
*/
-//original tests: test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
-//and test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java
+// Original tests: test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
+// and test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java
public class ProtectedInnerClassesTest {
private static final String protectedInnerClass1Src =
@@ -74,45 +74,36 @@
new ProtectedInnerClassesTest().run();
}
+ ToolBox tb = new ToolBox();
+
void run() throws Exception {
compileAndExecute();
compileOnly();
}
void compileAndExecute() throws Exception {
-//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}${FS}p1${FS}ProtectedInnerClass1.java" "${TESTSRC}${FS}p2${FS}ProtectedInnerClass2.java"
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs()
- .setOptions("-d", ".")
- .setSources(protectedInnerClass1Src, protectedInnerClass2Src);
+ tb.new JavacTask()
+ .outdir(".")
+ .sources(protectedInnerClass1Src, protectedInnerClass2Src)
+ .run();
- ToolBox.javac(javacParams);
-
-//"${TESTJAVA}${FS}bin${FS}java" ${TESTVMOPTS} -classpath "${CLASSPATH}${PS}${TESTCLASSES}" p2.ProtectedInnerClass2
- ToolBox.AnyToolArgs javaParams =
- new ToolBox.AnyToolArgs()
- .appendArgs(ToolBox.javaBinary)
- .appendArgs(ToolBox.testVMOpts)
- .appendArgs("-classpath", System.getProperty("user.dir"),
- "p2.ProtectedInnerClass2");
- ToolBox.executeCommand(javaParams);
+ tb.new JavaTask()
+ .classpath(System.getProperty("user.dir"))
+ .className("p2.ProtectedInnerClass2")
+ .run();
}
//from test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java
void compileOnly() throws Exception {
-//@run compile p1/ProtectedInnerClass1.java
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs()
- .appendArgs("-d", ".")
- .setSources(protectedInnerClass1Src);
+ tb.new JavacTask()
+ .outdir(".")
+ .sources(protectedInnerClass1Src)
+ .run();
- ToolBox.javac(javacParams);
-
-//@run compile/fail p2/ProtectedInnerClass3.java
- javacParams = new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
- .appendArgs("-d", ".")
- .setSources(protectedInnerClass3Src);
- ToolBox.javac(javacParams);
+ tb.new JavacTask()
+ .outdir(".")
+ .sources(protectedInnerClass3Src)
+ .run(ToolBox.Expect.FAIL);
}
}
diff --git a/langtools/test/tools/javac/T5090006/AssertionFailureTest.java b/langtools/test/tools/javac/T5090006/AssertionFailureTest.java
index c722676..8fad45e 100644
--- a/langtools/test/tools/javac/T5090006/AssertionFailureTest.java
+++ b/langtools/test/tools/javac/T5090006/AssertionFailureTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 5090006
* @summary javac fails with assertion error
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main AssertionFailureTest
*/
@@ -33,7 +33,7 @@
import java.io.File;
import java.nio.file.Paths;
-//original test: test/tools/javac/T5090006/compiler.sh
+// Original test: test/tools/javac/T5090006/compiler.sh
public class AssertionFailureTest {
private static final String testSrc =
@@ -54,16 +54,14 @@
"}";
public static void main(String args[]) throws Exception {
- String classpath = Paths.get(System.getProperty("test.src"), "broken.jar")
- .toString();
- classpath = new StringBuilder(classpath)
- .append(File.pathSeparator).append(".").toString();
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
- ToolBox.JavaToolArgs params =
- new ToolBox.JavaToolArgs()
- .setOptions("-cp", classpath)
- .setSources(testSrc);
- ToolBox.javac(params);
+ ToolBox tb = new ToolBox();
+ String classpath = Paths.get(tb.testSrc, "broken.jar")
+ + File.pathSeparator
+ + ".";
+ tb.new JavacTask()
+ .classpath(classpath)
+ .sources(testSrc)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java b/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
index a66f7ca..0922430 100644
--- a/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
+++ b/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 6970173
* @summary Debug pointer at bad position
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main DebugPointerAtBadPositionTest
*/
@@ -75,9 +75,10 @@
}
void compileTestClass() throws Exception {
- ToolBox.JavaToolArgs javacSuccessArgs =
- new ToolBox.JavaToolArgs().setSources(testSource);
- ToolBox.javac(javacSuccessArgs);
+ ToolBox tb = new ToolBox();
+ tb.new JavacTask()
+ .sources(testSource)
+ .run();
}
void checkClassFile(final File cfile, String methodToFind) throws Exception {
diff --git a/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java b/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
index 8557f99..103961d 100644
--- a/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
+++ b/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 7008643
* @summary inlined finally clauses confuse debuggers
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main InlinedFinallyConfuseDebuggersTest
*/
@@ -73,6 +73,8 @@
new InlinedFinallyConfuseDebuggersTest().run();
}
+ ToolBox tb = new ToolBox();
+
void run() throws Exception {
compileTestClass();
checkClassFile(new File(Paths.get(System.getProperty("user.dir"),
@@ -80,9 +82,9 @@
}
void compileTestClass() throws Exception {
- ToolBox.JavaToolArgs javacSuccessArgs =
- new ToolBox.JavaToolArgs().setSources(testSource);
- ToolBox.javac(javacSuccessArgs);
+ tb.new JavacTask()
+ .sources(testSource)
+ .run();
}
void checkClassFile(final File cfile, String methodToFind) throws Exception {
diff --git a/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java b/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
index 186774a..5cdcf1e 100644
--- a/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
+++ b/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,13 @@
* @test
* @bug 8009640
* @summary -profile <compact> does not work when -bootclasspath specified
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main CheckRejectProfileBCPOptionsIfUsedTogetherTest
*/
import com.sun.tools.javac.util.Assert;
-import java.util.ArrayList;
-import java.util.List;
+import java.nio.file.Paths;
public class CheckRejectProfileBCPOptionsIfUsedTogetherTest {
@@ -44,21 +43,16 @@
"}";
public static void main(String args[]) throws Exception {
- List<String> errOutput = new ArrayList<>();
- String testJDK = ToolBox.jdkUnderTest;
- ToolBox.createJavaFileFromSource(TestSrc);
+ ToolBox tb = new ToolBox();
- ToolBox.AnyToolArgs javacParams =
- new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(ToolBox.javacBinary)
- .appendArgs(ToolBox.testToolVMOpts)
- .appendArgs("-profile", "compact1", "-bootclasspath",
- testJDK + "/jre/lib/rt.jar", "Test.java")
- .setErrOutput(errOutput);
+ ToolBox.Result result = tb.new JavacTask(ToolBox.Mode.CMDLINE)
+ .options("-profile", "compact1",
+ "-bootclasspath", Paths.get(ToolBox.testJDK, "jre/lib/rt.jar").toString())
+ .sources(TestSrc)
+ .run(ToolBox.Expect.FAIL);
- ToolBox.executeCommand(javacParams);
-
- Assert.check(errOutput.get(0).startsWith(
+ String out = result.getOutput(ToolBox.OutputKind.DIRECT);
+ Assert.check(out.startsWith(
"javac: profile and bootclasspath options cannot be used together"),
"Incorrect javac error output");
}
diff --git a/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java b/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java
index bfce546..344c65e 100644
--- a/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java
+++ b/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @test
* @bug 8010659
* @summary Javac Crashes while building OpenJFX
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main CompilerCrashWhenMixingBinariesAndSourcesTest
*/
@@ -48,19 +48,18 @@
" Object m(int i) {return null;}\n" +
"}";
- public static void main (String[] args) throws Exception{
- ToolBox.JavaToolArgs javacParams = new ToolBox.JavaToolArgs()
- .setSources(ASource, BSource, CSource, DSource);
- ToolBox.javac(javacParams);
+ public static void main(String[] args) throws Exception {
+ ToolBox tb = new ToolBox();
- ToolBox.rm("A.class");
- ToolBox.rm("A$1.class");
- ToolBox.rm("C.class");
- ToolBox.rm("D.class");
+ tb.new JavacTask()
+ .sources(ASource, BSource, CSource, DSource)
+ .run();
- javacParams = new ToolBox.JavaToolArgs()
- .setOptions("-cp", ".")
- .setSources(ASource, CSource, DSource);
- ToolBox.javac(javacParams);
+ tb.deleteFiles("A.class", "A$1.class", "C.class", "D.class");
+
+ tb.new JavacTask()
+ .classpath(".")
+ .sources(ASource, CSource, DSource)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java b/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java
index 78d97ca..092268d 100644
--- a/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java
+++ b/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @test
* @bug 8013394
* @summary compile of iterator use fails with error "defined in an inaccessible class or interface"
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main CompileErrorWithIteratorTest
*/
@@ -71,15 +71,16 @@
new CompileErrorWithIteratorTest().run();
}
+ ToolBox tb = new ToolBox();
+
void run() throws Exception {
compile();
}
void compile() throws Exception {
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs()
- .setSources(TestCollectionSrc, TestSrc);
- ToolBox.javac(javacParams);
+ tb.new JavacTask()
+ .sources(TestCollectionSrc, TestSrc)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java b/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java
index 3074de4..341d59e 100644
--- a/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java
+++ b/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @test
* @bug 8019486 8026861 8027142
* @summary javac, generates erroneous LVT for a test case with lambda code
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main WrongLNTForLambdaTest
*/
@@ -125,6 +125,8 @@
new WrongLNTForLambdaTest().run();
}
+ ToolBox tb = new ToolBox();
+
void run() throws Exception {
compileTestClass();
checkClassFile(new File(Paths.get(System.getProperty("user.dir"),
@@ -146,9 +148,9 @@
}
void compileTestClass() throws Exception {
- ToolBox.JavaToolArgs javacSuccessArgs =
- new ToolBox.JavaToolArgs().setSources(testSource);
- ToolBox.javac(javacSuccessArgs);
+ tb.new JavacTask()
+ .sources(testSource)
+ .run();
}
void checkClassFile(final File cfile, String methodToFind, int[][] expectedLNT) throws Exception {
diff --git a/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java b/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java
index 4e9eaf2..18d03a8 100644
--- a/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java
+++ b/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,11 @@
* @test
* @bug 8022162
* @summary Incorrect signature determination for certain inner class generics
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main IncorrectSignatureDeterminationForInnerClassesTest
*/
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
public class IncorrectSignatureDeterminationForInnerClassesTest {
private static final String DSrc =
@@ -69,21 +66,20 @@
}
void compile() throws Exception {
- Files.createDirectory(Paths.get("classes"));
+ ToolBox tb = new ToolBox();
+ tb.createDirectories("classes");
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs()
- .appendArgs("-d", "classes")
- .setSources(DSrc);
-
- ToolBox.javac(javacParams);
+ tb.new JavacTask()
+ .outdir("classes")
+ .sources(DSrc)
+ .run();
// compile class H against the class files for classes D and Q
- javacParams =
- new ToolBox.JavaToolArgs()
- .appendArgs("-d", "classes", "-cp", "classes")
- .setSources(HSrc);
- ToolBox.javac(javacParams);
+ tb.new JavacTask()
+ .outdir("classes")
+ .classpath("classes")
+ .sources(HSrc)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java b/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
index 9b69b07..9753138 100644
--- a/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
+++ b/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @test
* @bug 8024039
* @summary javac, previous solution for JDK-8022186 was incorrect
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main NoDeadCodeGenerationOnTrySmtTest
*/
@@ -76,6 +76,8 @@
static final String[] methodsToLookFor = {"m1", "m2"};
+ ToolBox tb = new ToolBox();
+
public static void main(String[] args) throws Exception {
new NoDeadCodeGenerationOnTrySmtTest().run();
}
@@ -87,9 +89,9 @@
}
void compileTestClass() throws Exception {
- ToolBox.JavaToolArgs javacSuccessArgs =
- new ToolBox.JavaToolArgs().setSources(testSource);
- ToolBox.javac(javacSuccessArgs);
+ tb.new JavacTask()
+ .sources(testSource)
+ .run();
}
void checkClassFile(final File cfile, String[] methodsToFind) throws Exception {
diff --git a/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java b/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java
index 250b18a..d2359ce 100644
--- a/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java
+++ b/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @test
* @bug 8024437
* @summary Inferring the exception thrown by a lambda: sometimes fails to compile
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ExceptionInferenceFromClassFileTest
*/
@@ -56,19 +56,19 @@
"}";
public static void main(String[] args) throws Exception {
- Files.createDirectory(Paths.get("out"));
+ ToolBox tb = new ToolBox();
+ tb.createDirectories("out");
- ToolBox.JavaToolArgs compileABParams =
- new ToolBox.JavaToolArgs()
- .setOptions("-d", "out")
- .setSources(ABSrc);
- ToolBox.javac(compileABParams);
+ tb.new JavacTask()
+ .outdir("out")
+ .sources(ABSrc)
+ .run();
- ToolBox.JavaToolArgs compileCParams =
- new ToolBox.JavaToolArgs()
- .setOptions("-d", "out", "-cp", "out")
- .setSources(CSrc);
- ToolBox.javac(compileCParams);
+ tb.new JavacTask()
+ .outdir("out")
+ .classpath("out")
+ .sources(CSrc)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.java b/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.java
new file mode 100644
index 0000000..e782154
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.java
@@ -0,0 +1,11 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8054964
+ * @summary Invalid package annotations
+ * @author sogoel
+ *
+ * @compile/fail/ref=InvalidPackageAnno.out -XDrawDiagnostics bar/package-info.java
+ */
+
+package bar;
+
diff --git a/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.out b/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.out
new file mode 100644
index 0000000..0b1fe35
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/InvalidPackageAnno.out
@@ -0,0 +1,2 @@
+package-info.java:24:1: compiler.err.annotation.type.not.applicable
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.java b/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.java
index 17883dd..e13c537 100644
--- a/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.java
+++ b/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.java
@@ -1,32 +1,9 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 6393539
* @summary no compile-time error for clone, etc. in annotation type
* @author Peter von der Ah\u00e9
- * @compile/fail NoAnnotationMethods.java
+ * @compile/fail/ref=NoAnnotationMethods.out -XDrawDiagnostics NoAnnotationMethods.java
*/
public @interface NoAnnotationMethods {
diff --git a/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.out b/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.out
new file mode 100644
index 0000000..cfd2676
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/NoAnnotationMethods.out
@@ -0,0 +1,2 @@
+NoAnnotationMethods.java:10:9: compiler.err.intf.annotation.member.clash: annotationType(), java.lang.annotation.Annotation
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/NoClone.java b/langtools/test/tools/javac/annotations/neg/NoClone.java
index 93175cc..13237fe 100644
--- a/langtools/test/tools/javac/annotations/neg/NoClone.java
+++ b/langtools/test/tools/javac/annotations/neg/NoClone.java
@@ -1,32 +1,9 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 6393539
* @summary no compile-time error for clone, etc. in annotation type
* @author Peter von der Ah\u00e9
- * @compile/fail NoClone.java
+ * @compile/fail/ref=NoClone.out -XDrawDiagnostics NoClone.java
*/
public @interface NoClone {
diff --git a/langtools/test/tools/javac/annotations/neg/NoClone.out b/langtools/test/tools/javac/annotations/neg/NoClone.out
new file mode 100644
index 0000000..a6ae4d4
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/NoClone.out
@@ -0,0 +1,3 @@
+NoClone.java:10:5: compiler.err.invalid.annotation.member.type
+NoClone.java:10:12: compiler.err.intf.annotation.member.clash: clone(), java.lang.Object
+2 errors
diff --git a/langtools/test/tools/javac/annotations/neg/NoObjectMethods.java b/langtools/test/tools/javac/annotations/neg/NoObjectMethods.java
index f0b3f99..8e4df05 100644
--- a/langtools/test/tools/javac/annotations/neg/NoObjectMethods.java
+++ b/langtools/test/tools/javac/annotations/neg/NoObjectMethods.java
@@ -1,32 +1,9 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 6393539
* @summary no compile-time error for clone, etc. in annotation type
* @author Peter von der Ah\u00e9
- * @compile/fail NoObjectMethods.java
+ * @compile/fail/ref=NoObjectMethods.out -XDrawDiagnostics NoObjectMethods.java
*/
public @interface NoObjectMethods {
diff --git a/langtools/test/tools/javac/annotations/neg/NoObjectMethods.out b/langtools/test/tools/javac/annotations/neg/NoObjectMethods.out
new file mode 100644
index 0000000..cff5378
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/NoObjectMethods.out
@@ -0,0 +1,2 @@
+NoObjectMethods.java:10:9: compiler.err.intf.annotation.member.clash: clone(), java.lang.Object
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/ObjectMembers.java b/langtools/test/tools/javac/annotations/neg/ObjectMembers.java
index 02e9fd5..bd5e3fa 100644
--- a/langtools/test/tools/javac/annotations/neg/ObjectMembers.java
+++ b/langtools/test/tools/javac/annotations/neg/ObjectMembers.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4901264
* @summary JSR175 (2): don't allow annotating members from Object
* @author gafter
*
- * @compile/fail ObjectMembers.java
+ * @compile/fail/ref=ObjectMembers.out -XDrawDiagnostics ObjectMembers.java
*/
@ObjectMembers(hashCode = 23)
diff --git a/langtools/test/tools/javac/annotations/neg/ObjectMembers.out b/langtools/test/tools/javac/annotations/neg/ObjectMembers.out
new file mode 100644
index 0000000..6304b0a
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/ObjectMembers.out
@@ -0,0 +1,2 @@
+ObjectMembers.java:10:16: compiler.err.no.annotation.member: hashCode, ObjectMembers
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/OverrideNo.java b/langtools/test/tools/javac/annotations/neg/OverrideNo.java
index c3d4f05..2cfa541 100644
--- a/langtools/test/tools/javac/annotations/neg/OverrideNo.java
+++ b/langtools/test/tools/javac/annotations/neg/OverrideNo.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4901275 4989669
* @summary JSR175 (7): implement <at>Overrides
* @author gafter
*
- * @compile/fail OverrideNo.java
+ * @compile/fail/ref=OverrideNo.out -XDrawDiagnostics OverrideNo.java
*/
package overrideNo;
diff --git a/langtools/test/tools/javac/annotations/neg/OverrideNo.out b/langtools/test/tools/javac/annotations/neg/OverrideNo.out
new file mode 100644
index 0000000..2af05a1
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/OverrideNo.out
@@ -0,0 +1,2 @@
+OverrideNo.java:16:5: compiler.err.method.does.not.override.superclass
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Package.java b/langtools/test/tools/javac/annotations/neg/Package.java
index f826b99..3a800a9 100644
--- a/langtools/test/tools/javac/annotations/neg/Package.java
+++ b/langtools/test/tools/javac/annotations/neg/Package.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4901290
* @summary Package annotations
* @author gafter
*
- * @compile/fail Package.java
+ * @compile/fail/ref=Package.out -XDrawDiagnostics Package.java
*/
@java.lang.annotation.Documented
diff --git a/langtools/test/tools/javac/annotations/neg/Package.out b/langtools/test/tools/javac/annotations/neg/Package.out
new file mode 100644
index 0000000..e5e4c22
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Package.out
@@ -0,0 +1,2 @@
+Package.java:10:1: compiler.err.pkg.annotations.sb.in.package-info.java
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Recovery.java b/langtools/test/tools/javac/annotations/neg/Recovery.java
index f896245..51e2d29 100644
--- a/langtools/test/tools/javac/annotations/neg/Recovery.java
+++ b/langtools/test/tools/javac/annotations/neg/Recovery.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4993451
* @summary compiler crash with malformed annotations
* @author gafter
*
- * @compile/fail Recovery.java
+ * @compile/fail/ref=Recovery.out -XDrawDiagnostics Recovery.java
*/
import java.lang.annotation.*;
diff --git a/langtools/test/tools/javac/annotations/neg/Recovery.out b/langtools/test/tools/javac/annotations/neg/Recovery.out
new file mode 100644
index 0000000..05361b2
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Recovery.out
@@ -0,0 +1,2 @@
+Recovery.java:12:2: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.annotation.RetentionPolicy, java.lang.annotation.Annotation)
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Recovery1.java b/langtools/test/tools/javac/annotations/neg/Recovery1.java
index a2a5c10..278f825 100644
--- a/langtools/test/tools/javac/annotations/neg/Recovery1.java
+++ b/langtools/test/tools/javac/annotations/neg/Recovery1.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4963450
* @summary Assertion error is thrown when an annotation class cannot be found.
* @author gafter
*
- * @compile/fail Recovery1.java
+ * @compile/fail/ref=Recovery1.out -XDrawDiagnostics Recovery1.java
*/
package recovery1;
diff --git a/langtools/test/tools/javac/annotations/neg/Recovery1.out b/langtools/test/tools/javac/annotations/neg/Recovery1.out
new file mode 100644
index 0000000..1f7ec2d
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Recovery1.out
@@ -0,0 +1,4 @@
+Recovery1.java:14:5: compiler.err.cant.resolve.location: kindname.class, Marker, , , (compiler.misc.location: kindname.annotation, recovery1.MyAnnotation, null)
+Recovery1.java:14:30: compiler.err.cant.resolve.location: kindname.class, Marker, , , (compiler.misc.location: kindname.annotation, recovery1.MyAnnotation, null)
+Recovery1.java:18:43: compiler.err.cant.resolve.location.args: kindname.method, markerToo, , , (compiler.misc.location: kindname.annotation, recovery1.MyAnnotation, null)
+3 errors
diff --git a/langtools/test/tools/javac/annotations/neg/Scope.java b/langtools/test/tools/javac/annotations/neg/Scope.java
index f08fef1..36bd6d3 100644
--- a/langtools/test/tools/javac/annotations/neg/Scope.java
+++ b/langtools/test/tools/javac/annotations/neg/Scope.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4901280
* @summary name lookup scope for annotations
* @author gafter
*
- * @compile/fail Scope.java
+ * @compile/fail/ref=Scope.out -XDrawDiagnostics Scope.java
*/
package annotation.scope;
diff --git a/langtools/test/tools/javac/annotations/neg/Scope.out b/langtools/test/tools/javac/annotations/neg/Scope.out
new file mode 100644
index 0000000..1374bbd
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Scope.out
@@ -0,0 +1,2 @@
+Scope.java:12:4: compiler.err.cant.resolve: kindname.variable, red, ,
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Syntax1.java b/langtools/test/tools/javac/annotations/neg/Syntax1.java
index 32cf883..18dbbc6 100644
--- a/langtools/test/tools/javac/annotations/neg/Syntax1.java
+++ b/langtools/test/tools/javac/annotations/neg/Syntax1.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4974524
* @summary compiler crash with ill-formed annotation
* @author gafter
*
- * @compile/fail Syntax1.java
+ * @compile/fail/ref=Syntax1.out -XDrawDiagnostics Syntax1.java
*/
package syntax1;
diff --git a/langtools/test/tools/javac/annotations/neg/Syntax1.out b/langtools/test/tools/javac/annotations/neg/Syntax1.out
new file mode 100644
index 0000000..0c62c16
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Syntax1.out
@@ -0,0 +1,4 @@
+Syntax1.java:17:20: compiler.err.annotation.value.must.be.name.value
+Syntax1.java:17:40: compiler.err.annotation.value.must.be.name.value
+Syntax1.java:17:1: compiler.err.annotation.missing.default.value: java.lang.annotation.Target, value
+3 errors
diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget.java b/langtools/test/tools/javac/annotations/neg/WrongTarget.java
index 021a475..c326a1d 100644
--- a/langtools/test/tools/javac/annotations/neg/WrongTarget.java
+++ b/langtools/test/tools/javac/annotations/neg/WrongTarget.java
@@ -1,35 +1,14 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4901271
* @summary java.lang.annotation.Target
* @author gafter
*
- * @compile/fail WrongTarget.java
+ * @compile/fail/ref=WrongTarget.out -XDrawDiagnostics WrongTarget.java
*/
+import static java.lang.annotation.ElementType.*;
+
@java.lang.annotation.Target({FIELD})
@interface foo {
}
diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget.out b/langtools/test/tools/javac/annotations/neg/WrongTarget.out
new file mode 100644
index 0000000..e60bdd2
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/WrongTarget.out
@@ -0,0 +1,2 @@
+WrongTarget.java:16:1: compiler.err.annotation.type.not.applicable
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget2.java b/langtools/test/tools/javac/annotations/neg/WrongTarget2.java
index 64e63ac..534f5e2 100644
--- a/langtools/test/tools/javac/annotations/neg/WrongTarget2.java
+++ b/langtools/test/tools/javac/annotations/neg/WrongTarget2.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4973504
* @summary Compiler allows Inherited meta-attribute on local variable declaration.
* @author gafter
*
- * @compile/fail WrongTarget2.java
+ * @compile/fail/ref=WrongTarget2.out -XDrawDiagnostics WrongTarget2.java
*/
import java.lang.annotation.Inherited;
diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget2.out b/langtools/test/tools/javac/annotations/neg/WrongTarget2.out
new file mode 100644
index 0000000..10c45b5
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/WrongTarget2.out
@@ -0,0 +1,2 @@
+WrongTarget2.java:12:6: compiler.err.annotation.type.not.applicable
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/WrongValue.java b/langtools/test/tools/javac/annotations/neg/WrongValue.java
index 486d2cb..8b968b3 100644
--- a/langtools/test/tools/javac/annotations/neg/WrongValue.java
+++ b/langtools/test/tools/javac/annotations/neg/WrongValue.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4951298
* @summary compiler: crashes when attributes with same elements are used in place of other
* @author gafter
*
- * @compile/fail WrongValue.java
+ * @compile/fail/ref=WrongValue.out -XDrawDiagnostics WrongValue.java
*/
@interface TestM2 {
diff --git a/langtools/test/tools/javac/annotations/neg/WrongValue.out b/langtools/test/tools/javac/annotations/neg/WrongValue.out
new file mode 100644
index 0000000..b9e1575
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/WrongValue.out
@@ -0,0 +1,2 @@
+WrongValue.java:25:5: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: TestM3, TestM2)
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z1.java b/langtools/test/tools/javac/annotations/neg/Z1.java
index 6c2d335..4b080ff 100644
--- a/langtools/test/tools/javac/annotations/neg/Z1.java
+++ b/langtools/test/tools/javac/annotations/neg/Z1.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z1.java
+ * @compile/fail/ref=Z1.out -XDrawDiagnostics Z1.java
*/
enum Color { red, green, blue }
diff --git a/langtools/test/tools/javac/annotations/neg/Z1.out b/langtools/test/tools/javac/annotations/neg/Z1.out
new file mode 100644
index 0000000..4451685
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z1.out
@@ -0,0 +1,2 @@
+Z1.java:16:10: compiler.err.cant.resolve: kindname.variable, teal, ,
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z10.java b/langtools/test/tools/javac/annotations/neg/Z10.java
index 9a66d0e..450affa 100644
--- a/langtools/test/tools/javac/annotations/neg/Z10.java
+++ b/langtools/test/tools/javac/annotations/neg/Z10.java
@@ -1,37 +1,12 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z10.java
+ * @compile/fail/ref=Z10.out -XDrawDiagnostics Z10.java
*/
-enum Color { red, green, blue }
-
@interface An {
int[][] a();
}
diff --git a/langtools/test/tools/javac/annotations/neg/Z10.out b/langtools/test/tools/javac/annotations/neg/Z10.out
new file mode 100644
index 0000000..546a993
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z10.out
@@ -0,0 +1,2 @@
+Z10.java:11:8: compiler.err.invalid.annotation.member.type
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z11.java b/langtools/test/tools/javac/annotations/neg/Z11.java
index 732a2ca..f71d040 100644
--- a/langtools/test/tools/javac/annotations/neg/Z11.java
+++ b/langtools/test/tools/javac/annotations/neg/Z11.java
@@ -1,37 +1,12 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z11.java
+ * @compile/fail/ref=Z11.out -XDrawDiagnostics Z11.java
*/
-enum Color { red, green, blue }
-
class X {}
@interface An {
diff --git a/langtools/test/tools/javac/annotations/neg/Z11.out b/langtools/test/tools/javac/annotations/neg/Z11.out
new file mode 100644
index 0000000..3daad61
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z11.out
@@ -0,0 +1,2 @@
+Z11.java:13:5: compiler.err.invalid.annotation.member.type
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z12.java b/langtools/test/tools/javac/annotations/neg/Z12.java
index 74ba241..6d80f65 100644
--- a/langtools/test/tools/javac/annotations/neg/Z12.java
+++ b/langtools/test/tools/javac/annotations/neg/Z12.java
@@ -1,37 +1,12 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z12.java
+ * @compile/fail/ref=Z12.out -XDrawDiagnostics Z12.java
*/
-enum Color { red, green, blue }
-
@interface An {
void a();
}
diff --git a/langtools/test/tools/javac/annotations/neg/Z12.out b/langtools/test/tools/javac/annotations/neg/Z12.out
new file mode 100644
index 0000000..a5a9c64
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z12.out
@@ -0,0 +1,2 @@
+Z12.java:11:5: compiler.err.invalid.annotation.member.type
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z13.java b/langtools/test/tools/javac/annotations/neg/Z13.java
index 4aca6b5..f71a31d 100644
--- a/langtools/test/tools/javac/annotations/neg/Z13.java
+++ b/langtools/test/tools/javac/annotations/neg/Z13.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z13.java
+ * @compile/fail/ref=Z13.out -XDrawDiagnostics Z13.java
*/
@interface An {
diff --git a/langtools/test/tools/javac/annotations/neg/Z13.out b/langtools/test/tools/javac/annotations/neg/Z13.out
new file mode 100644
index 0000000..074cbf7
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z13.out
@@ -0,0 +1,2 @@
+Z13.java:11:20: compiler.err.throws.not.allowed.in.intf.annotation
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z14.java b/langtools/test/tools/javac/annotations/neg/Z14.java
index 63206c4..dbc708b 100644
--- a/langtools/test/tools/javac/annotations/neg/Z14.java
+++ b/langtools/test/tools/javac/annotations/neg/Z14.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z14.java
+ * @compile/fail/ref=Z14.out -XDrawDiagnostics Z14.java
*/
@interface An<T> {
diff --git a/langtools/test/tools/javac/annotations/neg/Z14.out b/langtools/test/tools/javac/annotations/neg/Z14.out
new file mode 100644
index 0000000..e0136bf
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z14.out
@@ -0,0 +1,2 @@
+Z14.java:10:15: compiler.err.intf.annotation.cant.have.type.params
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z15.java b/langtools/test/tools/javac/annotations/neg/Z15.java
index 79a4bc4..2459f85 100644
--- a/langtools/test/tools/javac/annotations/neg/Z15.java
+++ b/langtools/test/tools/javac/annotations/neg/Z15.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z15.java
+ * @compile/fail/ref=Z15.out -XDrawDiagnostics Z15.java
*/
@interface An {
diff --git a/langtools/test/tools/javac/annotations/neg/Z15.out b/langtools/test/tools/javac/annotations/neg/Z15.out
new file mode 100644
index 0000000..587b6b6
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z15.out
@@ -0,0 +1,2 @@
+Z15.java:11:36: compiler.err.attribute.value.must.be.constant
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z16.java b/langtools/test/tools/javac/annotations/neg/Z16.java
index b780794..2d13b6f 100644
--- a/langtools/test/tools/javac/annotations/neg/Z16.java
+++ b/langtools/test/tools/javac/annotations/neg/Z16.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z16.java
+ * @compile/fail/ref=Z16.out -XDrawDiagnostics Z16.java
*/
enum Color { red, green, blue }
diff --git a/langtools/test/tools/javac/annotations/neg/Z16.out b/langtools/test/tools/javac/annotations/neg/Z16.out
new file mode 100644
index 0000000..83b6374
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z16.out
@@ -0,0 +1,2 @@
+Z16.java:13:27: compiler.err.cant.resolve.location: kindname.variable, redx, , , (compiler.misc.location: kindname.annotation, Colored, null)
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z2.java b/langtools/test/tools/javac/annotations/neg/Z2.java
index f14a611..5051319 100644
--- a/langtools/test/tools/javac/annotations/neg/Z2.java
+++ b/langtools/test/tools/javac/annotations/neg/Z2.java
@@ -1,37 +1,14 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z2.java
+ * @compile/fail/ref=Z2.out -XDrawDiagnostics Z2.java
*/
enum Color { red, green, blue }
interface Colored {
- Color value() default red;
+ Color value() default Color.red;
}
diff --git a/langtools/test/tools/javac/annotations/neg/Z2.out b/langtools/test/tools/javac/annotations/neg/Z2.out
new file mode 100644
index 0000000..9c291a3
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z2.out
@@ -0,0 +1,2 @@
+Z2.java:13:11: compiler.err.default.allowed.in.intf.annotation.member
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z3.java b/langtools/test/tools/javac/annotations/neg/Z3.java
index 1ede92bb..9210b2f 100644
--- a/langtools/test/tools/javac/annotations/neg/Z3.java
+++ b/langtools/test/tools/javac/annotations/neg/Z3.java
@@ -1,37 +1,14 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4865660
+ * @test /nodynamiccopyright/
+ * @bug 4865660 8054556
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z3.java
+ * @compile/fail/ref=Z3.out -XDrawDiagnostics Z3.java
*/
enum Color { red, green, blue }
class Colored {
- Color value() default red;
+ Color value() default Color.red;
}
diff --git a/langtools/test/tools/javac/annotations/neg/Z3.out b/langtools/test/tools/javac/annotations/neg/Z3.out
new file mode 100644
index 0000000..e2ecc0e
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z3.out
@@ -0,0 +1,2 @@
+Z3.java:13:11: compiler.err.default.allowed.in.intf.annotation.member
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z4.java b/langtools/test/tools/javac/annotations/neg/Z4.java
index c82b6d5..0aa44d0 100644
--- a/langtools/test/tools/javac/annotations/neg/Z4.java
+++ b/langtools/test/tools/javac/annotations/neg/Z4.java
@@ -1,37 +1,14 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z4.java
+ * @compile/fail/ref=Z4.out -XDrawDiagnostics Z4.java
*/
enum Color { red, green, blue }
@interface Colored {
- Color value() default teal;
+ Color value() default Color.teal;
}
diff --git a/langtools/test/tools/javac/annotations/neg/Z4.out b/langtools/test/tools/javac/annotations/neg/Z4.out
new file mode 100644
index 0000000..c6e2051
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z4.out
@@ -0,0 +1,2 @@
+Z4.java:13:32: compiler.err.cant.resolve.location: kindname.variable, teal, , , (compiler.misc.location: kindname.class, Color, null)
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z5.java b/langtools/test/tools/javac/annotations/neg/Z5.java
index 7e4b10bc..0fd5516 100644
--- a/langtools/test/tools/javac/annotations/neg/Z5.java
+++ b/langtools/test/tools/javac/annotations/neg/Z5.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z5.java
+ * @compile/fail/ref=Z5.out -XDrawDiagnostics Z5.java
*/
interface Foo {}
diff --git a/langtools/test/tools/javac/annotations/neg/Z5.out b/langtools/test/tools/javac/annotations/neg/Z5.out
new file mode 100644
index 0000000..f6e6f4d
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z5.out
@@ -0,0 +1,2 @@
+Z5.java:12:28: compiler.err.cant.extend.intf.annotation
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z8.java b/langtools/test/tools/javac/annotations/neg/Z8.java
index 5cf7faa..7d06ea9 100644
--- a/langtools/test/tools/javac/annotations/neg/Z8.java
+++ b/langtools/test/tools/javac/annotations/neg/Z8.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z8.java
+ * @compile/fail/ref=Z8.out -XDrawDiagnostics Z8.java
*/
@interface An {
diff --git a/langtools/test/tools/javac/annotations/neg/Z8.out b/langtools/test/tools/javac/annotations/neg/Z8.out
new file mode 100644
index 0000000..6d52665
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z8.out
@@ -0,0 +1,2 @@
+Z8.java:11:15: compiler.err.intf.annotation.members.cant.have.params
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/Z9.java b/langtools/test/tools/javac/annotations/neg/Z9.java
index 0b4f317..86c170e 100644
--- a/langtools/test/tools/javac/annotations/neg/Z9.java
+++ b/langtools/test/tools/javac/annotations/neg/Z9.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 4865660
* @summary implement "metadata" (attribute interfaces and program annotations)
* @author gafter
*
- * @compile/fail Z9.java
+ * @compile/fail/ref=Z9.out -XDrawDiagnostics Z9.java
*/
@interface An {
diff --git a/langtools/test/tools/javac/annotations/neg/Z9.out b/langtools/test/tools/javac/annotations/neg/Z9.out
new file mode 100644
index 0000000..570b0f7
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/Z9.out
@@ -0,0 +1,2 @@
+Z9.java:11:6: compiler.err.intf.annotation.members.cant.have.type.params
+1 error
diff --git a/langtools/test/tools/javac/annotations/neg/bar/package-info.java b/langtools/test/tools/javac/annotations/neg/bar/package-info.java
new file mode 100644
index 0000000..12dbf23
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/neg/bar/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+@java.lang.annotation.Documented
+package bar;
diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java
index 62bc29f..2485fdd 100644
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java
@@ -1,30 +1,7 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
+ * @test /nodynamiccopyright/
* @summary Smoke test for repeating annotations
- * @compile/fail RepeatingAndContainerPresent.java
+ * @compile/fail/ref=RepeatingAndContainerPresent.out -XDrawDiagnostics RepeatingAndContainerPresent.java
* @bug 7151010
*/
diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out
new file mode 100644
index 0000000..3e5b57e
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.out
@@ -0,0 +1,2 @@
+RepeatingAndContainerPresent.java:20:1: compiler.err.invalid.repeatable.annotation.repeated.and.container.present: Foos
+1 error
diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java
index 8d4b37f..ccf3c1d 100644
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java
@@ -1,30 +1,7 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
+ * @test /nodynamiccopyright/
* @summary Smoke test for repeating annotations
- * @compile/fail UseWrongRepeatable.java
+ * @compile/fail/ref=UseWrongRepeatable.out -XDrawDiagnostics UseWrongRepeatable.java
* @bug 7151010
*/
diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out b/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out
new file mode 100644
index 0000000..b437d3d
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.out
@@ -0,0 +1,4 @@
+UseWrongRepeatable.java:17:1: compiler.err.invalid.repeatable.annotation.value.return: java.lang.annotation.Target, java.lang.annotation.ElementType[], UseWrongRepeatable[]
+UseWrongRepeatable.java:17:21: compiler.err.invalid.repeatable.annotation.value.return: java.lang.annotation.Target, java.lang.annotation.ElementType[], UseWrongRepeatable[]
+UseWrongRepeatable.java:14:1: compiler.err.invalid.repeatable.annotation.value.return: java.lang.annotation.Target, java.lang.annotation.ElementType[], UseWrongRepeatable[]
+3 errors
diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java b/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java
index 3650d11..37a9bc2 100644
--- a/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java
@@ -1,35 +1,12 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.lang.annotation.*;
-
-/*
- * @test
+ * @test /nodynamiccopyright/
* @bug 6843077 8006775
* @summary test type annotation on void generic methods
* @author Mahmood Ali
- * @compile/fail VoidGenericMethod.java
+ * @compile/fail/ref=VoidGenericMethod.out -XDrawDiagnostics VoidGenericMethod.java
*/
+
+import java.lang.annotation.*;
class VoidGenericMethod {
public @A <T> void method() { }
}
diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out b/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out
new file mode 100644
index 0000000..a747637
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.out
@@ -0,0 +1,2 @@
+VoidGenericMethod.java:11:10: compiler.err.annotation.type.not.applicable
+1 error
diff --git a/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java b/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java
index 022a9d8..d42c017 100644
--- a/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java
+++ b/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,19 @@
* @test
* @bug 6604599
* @summary ToolProvider should be less compiler-specific
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main HelloWorldTest
*/
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
// verify that running a simple program, such as this one, does not trigger
// the loading of ToolProvider or any com.sun.tools.javac class
public class HelloWorldTest {
public static void main(String... args) throws Exception {
if (args.length > 0) {
- System.err.println(Arrays.asList(args));
+ System.err.println(Arrays.toString(args));
return;
}
@@ -47,27 +45,26 @@
}
void run() throws Exception {
+ ToolBox tb = new ToolBox();
+
String classpath = System.getProperty("java.class.path");
- List<String> output = new ArrayList<>();
- ToolBox.AnyToolArgs javaParams =
- new ToolBox.AnyToolArgs()
- .appendArgs(ToolBox.javaBinary)
- .appendArgs(ToolBox.testVMOpts)
- .appendArgs(ToolBox.testJavaOpts)
- .appendArgs("-verbose:class",
- "-classpath", classpath,
- HelloWorldTest.class.getName(),
- "Hello", "World")
- .setErrOutput(output)
- .setStdOutput(output);
+ ToolBox.Result tr = tb.new JavaTask()
+ .vmOptions("-verbose:class")
+ .classpath(classpath)
+ .className(HelloWorldTest.class.getName())
+ .classArgs("Hello", "World")
+ .run();
- ToolBox.executeCommand(javaParams);
-
- for (String line : output) {
- System.err.println(line);
- if (line.contains("javax.tools.ToolProvider") || line.contains("com.sun.tools.javac."))
- error(">>> " + line);
+ if (tr.getOutput(ToolBox.OutputKind.STDOUT).contains("java.lang.Object")) {
+ for (String line : tr.getOutputLines(ToolBox.OutputKind.STDOUT)) {
+ System.err.println(line);
+ if (line.contains("javax.tools.ToolProvider") || line.contains("com.sun.tools.javac."))
+ error(">>> " + line);
+ }
+ } else {
+ tr.writeAll();
+ error("verbose output not as expected");
}
if (errors > 0)
diff --git a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java
index 8699fed..1b9af7c 100644
--- a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java
+++ b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
* @test
* @bug 6604599
* @summary ToolProvider should be less compiler-specific
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ToolProviderTest1
*/
-import java.util.ArrayList;
import java.util.List;
// verify that running accessing ToolProvider by itself does not
@@ -46,24 +45,18 @@
}
void run() throws Exception {
+ ToolBox tb = new ToolBox();
String classpath = System.getProperty("java.class.path");
- List<String> output = new ArrayList<>();
- ToolBox.AnyToolArgs javaParams =
- new ToolBox.AnyToolArgs()
- .appendArgs(ToolBox.javaBinary)
- .appendArgs(ToolBox.testVMOpts)
- .appendArgs(ToolBox.testJavaOpts)
- .appendArgs("-verbose:class",
- "-classpath", classpath,
- ToolProviderTest1.class.getName(),
- "javax.tools.ToolProvider")
- .setErrOutput(output)
- .setStdOutput(output);
+ List<String> lines = tb.new JavaTask()
+ .vmOptions("-verbose:class")
+ .classpath(classpath)
+ .className(getClass().getName())
+ .classArgs("javax.tools.ToolProvider")
+ .run()
+ .getOutputLines(ToolBox.OutputKind.STDOUT);
- ToolBox.executeCommand(javaParams);
-
- for (String line : output) {
+ for (String line : lines) {
System.err.println(line);
if (line.contains("com.sun.tools.javac."))
error(">>> " + line);
diff --git a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java
index cd46766..0702725 100644
--- a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java
+++ b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,12 @@
* @test
* @bug 6604599
* @summary ToolProvider should be less compiler-specific
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ToolProviderTest2
*/
import javax.tools.ToolProvider;
-import java.util.ArrayList;
import java.util.List;
// control for ToolProviderTest1 -- verify that using ToolProvider to
@@ -47,25 +46,19 @@
}
void run() throws Exception {
+ ToolBox tb = new ToolBox();
String classpath = System.getProperty("java.class.path");
- List<String> output = new ArrayList<>();
- ToolBox.AnyToolArgs javaParams =
- new ToolBox.AnyToolArgs()
- .appendArgs(ToolBox.javaBinary)
- .appendArgs(ToolBox.testVMOpts)
- .appendArgs(ToolBox.testJavaOpts)
- .appendArgs( "-verbose:class",
- "-classpath", classpath,
- ToolProviderTest2.class.getName(),
- "javax.tools.ToolProvider")
- .setErrOutput(output)
- .setStdOutput(output);
-
- ToolBox.executeCommand(javaParams);
+ List<String> lines = tb.new JavaTask()
+ .vmOptions("-verbose:class")
+ .classpath(classpath)
+ .className(getClass().getName())
+ .classArgs("javax.tools.ToolProvider")
+ .run()
+ .getOutputLines(ToolBox.OutputKind.STDOUT);
boolean found = false;
- for (String line : output) {
+ for (String line : lines) {
System.err.println(line);
if (line.contains("com.sun.tools.javac."))
found = true;
diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
index 9093dea..ab6cc8b 100644
--- a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
@@ -25,8 +25,8 @@
* @test
* @summary local variable table attribute test.
* @bug 8040097
- * @library /tools/javac/lib ../lib
- * @build LocalVariableTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox LocalVariableTestBase TestBase InMemoryFileManager
* @compile -g LocalVariableTableTest.java
* @run main LocalVariableTableTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
index 4a783a5..d702f3e 100644
--- a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
@@ -25,8 +25,8 @@
* @test
* @summary local variable type table attribute test.
* @bug 8040097
- * @library /tools/javac/lib ../lib
- * @build LocalVariableTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox LocalVariableTestBase TestBase InMemoryFileManager
* @compile -g LocalVariableTypeTableTest.java
* @run main LocalVariableTypeTableTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
index 5a1c3a6..dcd5f56 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for anonymous class.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @run main AnonymousClassTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
index 891ea1c..a9f704a 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for inner class.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @run main InnerClassTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
index 027bae6..24203ff 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for local class.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @run main LocalClassTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java
index 30e7320..164489d 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for complex structure of nested classes and other types.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @run main MixTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
index 90321ed..d88e86c 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for file compiled without debug information.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @compile -g:none NoSourceFileAttribute.java
* @run main NoSourceFileAttribute
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
index d3d81d9..01e6257 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for synthetic class.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @run main SyntheticClassTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java b/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
index 04d0293..794d3ab 100644
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
@@ -25,8 +25,8 @@
* @test
* @summary sourcefile attribute test for two type in one file.
* @bug 8040129
- * @library /tools/javac/lib ../lib
- * @build SourceFileTestBase TestBase InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
* @run main TopLevelClassesOneFileTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java b/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
index 5f6d139..77728aa 100644
--- a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
@@ -25,8 +25,8 @@
* @test
* @bug 8042261
* @summary Checking that deprecated attribute does not apply to classes of deprecated package.
- * @library /tools/javac/lib ../lib
- * @build DeprecatedPackageTest TestBase TestResult InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox TestBase TestResult InMemoryFileManager
* @run main DeprecatedPackageTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java b/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
index 5788520..0efa807 100644
--- a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
@@ -26,8 +26,8 @@
* @bug 8042261
* @summary Checking what attribute is generated by annotation Deprecated
* or javadoc deprecated for field, method, class(inner/local), interface.
- * @library /tools/javac/lib ../lib
- * @build DeprecatedTest TestBase TestResult InMemoryFileManager ToolBox
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build ToolBox TestBase TestResult InMemoryFileManager
* @run main DeprecatedTest
*/
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
new file mode 100644
index 0000000..40b5a4a
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner annotations in inner annotation.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerAnnotationsInInnerAnnotationTest
+ */
+
+public class InnerAnnotationsInInnerAnnotationTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerAnnotationsInInnerAnnotationTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setOuterClassType(ClassType.ANNOTATION);
+ setInnerClassType(ClassType.ANNOTATION);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
new file mode 100644
index 0000000..5466ae1
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner annotations in inner class.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerAnnotationsInInnerClassTest
+ */
+
+public class InnerAnnotationsInInnerClassTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerAnnotationsInInnerClassTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setForbiddenWithoutStaticInOuterMods(true);
+ setOuterClassType(ClassType.CLASS);
+ setInnerClassType(ClassType.ANNOTATION);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
new file mode 100644
index 0000000..866d96f
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner annotations in inner enum.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerAnnotationsInInnerEnumTest
+ */
+
+public class InnerAnnotationsInInnerEnumTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerAnnotationsInInnerEnumTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.STATIC, Modifier.ABSTRACT);
+ setOuterClassType(ClassType.ENUM);
+ setInnerClassType(ClassType.ANNOTATION);
+ setPrefix("Inner {;");
+ setSuffix("}");
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
new file mode 100644
index 0000000..d4e541a
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner annotations in inner interface.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerAnnotationsInInnerInterfaceTest
+ */
+
+public class InnerAnnotationsInInnerInterfaceTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerAnnotationsInInnerInterfaceTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setOuterClassType(ClassType.INTERFACE);
+ setInnerClassType(ClassType.ANNOTATION);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
new file mode 100644
index 0000000..fad39d2
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Test that inner classes have in its inner classes attribute enclosing classes and its immediate members.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesHierarchyTest
+ */
+
+import com.sun.tools.classfile.*;
+import com.sun.tools.classfile.InnerClasses_attribute.Info;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class InnerClassesHierarchyTest extends TestResult {
+
+ private final Map<String, Set<String>> innerClasses;
+ private final String outerClassName;
+
+ public InnerClassesHierarchyTest() throws IOException, ConstantPoolException {
+ innerClasses = new HashMap<>();
+ outerClassName = InnerClassesHierarchyTest.class.getSimpleName();
+ File classDir = getClassDir();
+ FilenameFilter filter =
+ (dir, name) -> name.matches(outerClassName + ".*\\.class");
+ for (File file : Arrays.asList(classDir.listFiles(filter))) {
+ ClassFile classFile = readClassFile(file);
+ String className = classFile.getName();
+ for (ConstantPool.CPInfo info : classFile.constant_pool.entries()) {
+ if (info instanceof ConstantPool.CONSTANT_Class_info) {
+ ConstantPool.CONSTANT_Class_info classInfo =
+ (ConstantPool.CONSTANT_Class_info) info;
+ String cpClassName = classInfo.getBaseName();
+ if (isInnerClass(cpClassName)) {
+ get(className).add(cpClassName);
+ }
+ }
+ }
+ }
+ }
+
+ private boolean isInnerClass(String cpClassName) {
+ return cpClassName.contains("$");
+ }
+
+ private Set<String> get(String className) {
+ if (!innerClasses.containsKey(className)) {
+ innerClasses.put(className, new HashSet<>());
+ }
+ return innerClasses.get(className);
+ }
+
+ public static void main(String[] args) throws IOException, ConstantPoolException, TestFailedException {
+ new InnerClassesHierarchyTest().test();
+ }
+
+ private void test() throws TestFailedException {
+ addTestCase("Source file is InnerClassesHierarchyTest.java");
+ try {
+ Queue<String> queue = new LinkedList<>();
+ Set<String> visitedClasses = new HashSet<>();
+ queue.add(outerClassName);
+ while (!queue.isEmpty()) {
+ String currentClassName = queue.poll();
+ if (!currentClassName.startsWith(outerClassName)) {
+ continue;
+ }
+ ClassFile cf = readClassFile(currentClassName);
+ InnerClasses_attribute attr = (InnerClasses_attribute)
+ cf.getAttribute(Attribute.InnerClasses);
+ assertNotNull(attr, "Class should not contain "
+ + "inner classes attribute : " + currentClassName);
+ assertTrue(innerClasses.containsKey(currentClassName),
+ "map contains class name : " + currentClassName);
+ Set<String> setClasses = innerClasses.get(currentClassName);
+ if (setClasses == null) {
+ continue;
+ }
+ assertEquals(attr.number_of_classes,
+ setClasses.size(),
+ "Check number of inner classes : " + setClasses);
+ for (Info info : attr.classes) {
+ String innerClassName = info
+ .getInnerClassInfo(cf.constant_pool).getBaseName();
+ assertTrue(setClasses.contains(innerClassName),
+ currentClassName + " contains inner class : "
+ + innerClassName);
+ if (visitedClasses.add(innerClassName)) {
+ queue.add(innerClassName);
+ }
+ }
+ }
+ Set<String> allClasses = innerClasses.entrySet().stream()
+ .flatMap(entry -> entry.getValue().stream())
+ .collect(Collectors.toSet());
+
+ Set<String> a_b = removeAll(visitedClasses, allClasses);
+ Set<String> b_a = removeAll(allClasses, visitedClasses);
+ assertEquals(visitedClasses, allClasses,
+ "All classes are found\n"
+ + "visited - all classes : " + a_b
+ + "\nall classes - visited : " + b_a);
+ } catch (Exception e) {
+ addFailure(e);
+ } finally {
+ checkStatus();
+ }
+ }
+
+ private Set<String> removeAll(Set<String> set1, Set<String> set2) {
+ Set<String> set = new HashSet<>(set1);
+ set.removeAll(set2);
+ return set;
+ }
+
+ public static class A1 {
+
+ public class B1 {
+ }
+
+ public enum B2 {
+ }
+
+ public interface B3 {
+ }
+
+ public @interface B4 {
+ }
+
+ public void f() {
+ new B1() {
+ };
+ new B3() {
+ };
+ new B4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ }
+
+ Runnable r = () -> {
+ new B1() {
+ };
+ new B3() {
+ };
+ new B4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ };
+ }
+
+ public enum A2 {;
+
+ public class B1 {
+ }
+
+ public enum B2 {
+ }
+
+ public interface B3 {
+ }
+
+ public @interface B4 {
+ }
+
+ public void a2() {
+ new B1() {
+ };
+ new B3() {
+ };
+ new B4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ }
+
+ Runnable r = () -> {
+ new B1() {
+ };
+ new B3() {
+ };
+ new B4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ };
+ }
+
+ public interface A3 {
+
+ public class B1 {
+ }
+
+ public enum B2 {
+ }
+
+ public interface B3 {
+ }
+
+ public @interface B4 {
+ }
+
+ default void a1() {
+ new B1() {
+ };
+ new B3() {
+ };
+ new B4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ }
+
+ static void a2() {
+ new B1() {
+ };
+ new B3() {
+ };
+ new B4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ }
+ }
+
+ public @interface A4 {
+
+ public class B1 {
+ }
+
+ public enum B2 {
+ }
+
+ public interface B3 {
+ }
+
+ public @interface B4 {
+ }
+ }
+
+ {
+ new A1() {
+ class B1 {
+ }
+
+ public void a2() {
+ new B1() {
+ };
+ class B5 {
+ }
+ }
+ };
+ new A3() {
+ class B1 {
+ }
+
+ public void a3() {
+ new B1() {
+ };
+ class B5 {
+ }
+ }
+ };
+ new A4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+
+ class B1 {
+ }
+
+ public void a4() {
+ new B1() {
+ };
+ class B5 {
+ }
+ }
+ };
+ Runnable r = () -> {
+ new A1() {
+ };
+ new A3() {
+ };
+ new A4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ };
+ }
+
+ static {
+ new A1() {
+ class B1 {
+ }
+
+ public void a2() {
+ new B1() {
+ };
+ class B5 {
+ }
+ }
+ };
+ new A3() {
+ class B1 {
+ }
+
+ public void a3() {
+ new B1() {
+ };
+ class B5 {
+ }
+ }
+ };
+ new A4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+
+ class B1 {
+ }
+
+ public void a4() {
+ new B1() {
+ };
+ class B5 {
+ }
+ }
+ };
+ Runnable r = () -> {
+ new A1() {
+ };
+ new A3() {
+ };
+ new A4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ };
+ }
+
+ public void a5() {
+ class A5 {
+
+ class B1 {
+ }
+
+ public void a5() {
+ new B1() {
+ };
+
+ class B5 {
+ }
+ }
+ }
+ Runnable r = () -> {
+ new A1() {
+ };
+ new A3() {
+ };
+ new A4() {
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return null;
+ }
+ };
+ class B5 {
+ }
+ };
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
new file mode 100644
index 0000000..78a5287
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner classes in anonymous class.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesInAnonymousClassTest
+ */
+
+import java.util.*;
+
+public class InnerClassesInAnonymousClassTest extends InnerClassesTestBase {
+
+ private ClassType currentClassType;
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerClassesInAnonymousClassTest();
+ test.test("InnerClassesSrc$1", "Anonymous", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.FINAL);
+ setOuterClassType(ClassType.OTHER);
+ setInnerClassType(ClassType.CLASS);
+ setSuffix("};}");
+ }
+
+ @Override
+ public List<TestCase> generateTestCases() {
+ currentClassType = ClassType.CLASS;
+ setPrefix("class Anonymous {} {new Anonymous() {");
+ List<TestCase> sources = super.generateTestCases();
+
+ currentClassType = ClassType.INTERFACE;
+ setPrefix("interface Anonymous {} {new Anonymous() {");
+ sources.addAll(super.generateTestCases());
+
+ currentClassType = ClassType.ANNOTATION;
+ setPrefix("@interface Anonymous {} {new Anonymous() {@Override public "
+ + "Class<? extends java.lang.annotation.Annotation> "
+ + "annotationType() {return null;}");
+ sources.addAll(super.generateTestCases());
+ return sources;
+ }
+
+ @Override
+ public void getAdditionalFlags(Map<String, Set<String>> class2Flags, ClassType type, Modifier... flags) {
+ super.getAdditionalFlags(class2Flags, type, flags);
+ class2Flags.put("Anonymous", getFlags(currentClassType, Arrays.asList(flags)));
+ class2Flags.put("1", new HashSet<>());
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
new file mode 100644
index 0000000..145bff5
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner classes in inner annotation.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesInInnerAnnotationTest
+ */
+
+public class InnerClassesInInnerAnnotationTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerClassesInInnerAnnotationTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setOuterClassType(ClassType.ANNOTATION);
+ setInnerClassType(ClassType.CLASS);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
new file mode 100644
index 0000000..3af19ff
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8034854 8042251
+ * @summary Testing InnerClasses_attribute of inner classes in inner class.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesInInnerClassTest
+ */
+
+import java.util.List;
+
+public class InnerClassesInInnerClassTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerClassesInInnerClassTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setHasSyntheticClass(true);
+ setOuterClassType(ClassType.CLASS);
+ setInnerClassType(ClassType.CLASS);
+ }
+
+ @Override
+ public List<TestCase> generateTestCases() {
+ setForbiddenWithoutStaticInOuterMods(true);
+ List<TestCase> sources = super.generateTestCases();
+
+ setForbiddenWithoutStaticInOuterMods(false);
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.FINAL);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.FINAL);
+ sources.addAll(super.generateTestCases());
+
+ return sources;
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java
new file mode 100644
index 0000000..d5b3d6f
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTestBase.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ *
+ * Base class for tests that check inner classes in inner class.
+ *
+ * @author Andrei Eremeev
+ */
+public abstract class InnerClassesInInnerClassTestBase extends InnerClassesTestBase {
+
+ public InnerClassesInInnerClassTestBase() {
+ setPrefix("Inner {");
+ setSuffix("}");
+ }
+
+ @Override
+ public void getAdditionalFlags(
+ Map<String, Set<String>> class2Flags, ClassType type, Modifier...flags) {
+ super.getAdditionalFlags(class2Flags, type, flags);
+ class2Flags.put("Inner", getFlags(type, Arrays.asList(flags)));
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
new file mode 100644
index 0000000..884465b
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8034854 8042251
+ * @summary Testing InnerClasses_attribute of inner classes in inner enum.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesInInnerEnumTest
+ */
+
+public class InnerClassesInInnerEnumTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerClassesInInnerEnumTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setOuterClassType(ClassType.ENUM);
+ setInnerClassType(ClassType.CLASS);
+ setHasSyntheticClass(true);
+ setPrefix("Inner {;");
+ setSuffix("}");
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
new file mode 100644
index 0000000..c34c65a
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner classes in inner interface.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesInInnerInterfaceTest
+ */
+
+public class InnerClassesInInnerInterfaceTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerClassesInInnerInterfaceTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setOuterClassType(ClassType.INTERFACE);
+ setInnerClassType(ClassType.CLASS);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
new file mode 100644
index 0000000..29ee0dc
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner classes in local class.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
+ * @run main InnerClassesInLocalClassTest
+ */
+
+import java.util.*;
+
+public class InnerClassesInLocalClassTest extends InnerClassesTestBase {
+
+ private final static Modifier[] LOCAL_CLASS_MODIFIERS =
+ new Modifier[]{Modifier.EMPTY, Modifier.ABSTRACT, Modifier.FINAL};
+ private final static String CLASS_TEMPLATE =
+ "public %CLASS% OuterClass {\n" +
+ "%SOURCE%\n" +
+ "}";
+
+ private final List<Data> innerClassesData;
+
+ public InnerClassesInLocalClassTest() {
+ innerClassesData = new ArrayList<>();
+ for (Modifier outerModifier : LOCAL_CLASS_MODIFIERS) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(outerModifier.getString()).append(' ');
+ sb.append("class Local {");
+ Map<String, Set<String>> class2Flags = new HashMap<>();
+ for (int i = 0; i < LOCAL_CLASS_MODIFIERS.length; ++i) {
+ Modifier innerModifier = LOCAL_CLASS_MODIFIERS[i];
+ sb.append(innerModifier.getString()).append(' ')
+ .append("class").append(' ')
+ .append('A').append(i).append("{}\n");
+ class2Flags.put("A" + i, getFlags(innerModifier));
+ }
+ sb.append("};");
+ class2Flags.put("1Local", getFlags(outerModifier));
+ innerClassesData.add(new Data(sb.toString(), class2Flags));
+ }
+ }
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerClassesInLocalClassTest();
+ test.test("OuterClass$1Local", "1Local");
+ }
+
+ @Override
+ public void setProperties() {
+ }
+
+ @Override
+ public List<TestCase> generateTestCases() {
+ List<TestCase> testCases = new ArrayList<>();
+ testCases.addAll(localClassInClassMethod());
+ testCases.addAll(localClassInInterfaceMethod());
+ return testCases;
+ }
+
+ private List<TestCase> localClassInClassMethod() {
+ List<TestCase> list = new ArrayList<>();
+ String template = CLASS_TEMPLATE.replace("%CLASS%", "class");
+ list.addAll(lambda(template));
+ list.addAll(constructor(template));
+ list.addAll(method(template,
+ new Modifier[]{Modifier.EMPTY, Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC},
+ new Modifier[]{Modifier.EMPTY, Modifier.FINAL, Modifier.STATIC}));
+ list.addAll(staticAndInstanceInitializer(template));
+ return list;
+ }
+
+ private List<TestCase> localClassInInterfaceMethod() {
+ String template = CLASS_TEMPLATE.replace("%CLASS%", "interface");
+ return method(template,
+ new Modifier[]{Modifier.EMPTY, Modifier.PUBLIC},
+ new Modifier[]{Modifier.DEFAULT, Modifier.STATIC});
+ }
+
+ private List<TestCase> generate(String template, String prefix, String suffix) {
+ List<TestCase> list = new ArrayList<>();
+ for (Data data : innerClassesData) {
+ list.add(new TestCase(template.replace("%SOURCE%",
+ prefix + data.sources + suffix),
+ data.class2Flags));
+ }
+ return list;
+ }
+
+ private List<TestCase> lambda(String template) {
+ return generate(template, "Runnable run = () -> {", "};");
+ }
+
+ private List<TestCase> constructor(String template) {
+ List<TestCase> list = new ArrayList<>();
+ for (Modifier modifier :
+ new Modifier[]{Modifier.EMPTY, Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC}) {
+ list.addAll(generate(template, modifier.getString() + " OuterClass() {", "}"));
+ }
+ return list;
+ }
+
+ private List<TestCase> method(String template, Modifier[] mods, Modifier[] otherMods) {
+ List<TestCase> list = new ArrayList<>();
+ for (Modifier modifier : mods) {
+ for (Modifier otherMod : otherMods) {
+ list.addAll(generate(template,
+ String.format("%s %s void method() {",
+ modifier.getString(),
+ otherMod.getString()),
+ "}"));
+ }
+ }
+ return list;
+ }
+
+ private List<TestCase> staticAndInstanceInitializer(String template) {
+ List<TestCase> list = new ArrayList<>();
+ for (Modifier modifier : new Modifier[]{Modifier.EMPTY, Modifier.STATIC}) {
+ list.addAll(generate(template, modifier.getString() + "{", "}"));
+ }
+ return list;
+ }
+
+ private Set<String> getFlags(Modifier modifier) {
+ HashSet<String> set = new HashSet<>();
+ if (modifier != Modifier.EMPTY) {
+ set.add("ACC_" + modifier.getString().toUpperCase());
+ }
+ return set;
+ }
+
+ /**
+ * Class represents part of sources which is inserted in other code.
+ */
+ private static class Data {
+ public final String sources;
+ public final Map<String, Set<String>> class2Flags;
+
+ public Data(String sources, Map<String, Set<String>> class2Flags) {
+ this.sources = sources;
+ this.class2Flags = class2Flags;
+ }
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
new file mode 100644
index 0000000..2eab4bd
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Test that outer_class_info_index of local and anonymous class is zero.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerClassesIndexTest
+ */
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.InnerClasses_attribute;
+import com.sun.tools.classfile.InnerClasses_attribute.Info;
+
+public class InnerClassesIndexTest extends TestResult {
+
+ public static void main(String[] args) throws TestFailedException {
+ new InnerClassesIndexTest().test();
+ }
+
+ private boolean isExcluded(String className) {
+ return !className.startsWith(InnerClassesIndexTest.class.getName())
+ || "InnerClassesIndexTest$Inner".equals(className);
+ }
+
+ private Set<String> getInnerClasses() {
+ FilenameFilter filter = (dir, name) -> name.matches("InnerClassesIndexTest\\$.*\\.class");
+ return Stream.of(getClassDir().listFiles(filter))
+ .map(File::getName)
+ .map(s -> s.replace(".class", ""))
+ .collect(Collectors.toSet());
+ }
+
+ public void test() throws TestFailedException {
+ try {
+ addTestCase("Source is InnerClassesIndexTest.java");
+ ClassFile classFile = readClassFile(InnerClassesIndexTest.class);
+ InnerClasses_attribute attr = (InnerClasses_attribute)
+ classFile.getAttribute(Attribute.InnerClasses);
+
+ Set<String> foundClasses = new HashSet<>();
+ for (Info info : attr.classes) {
+ String innerName = classFile.constant_pool.
+ getClassInfo(info.inner_class_info_index).getBaseName();
+ echo("Testing class : " + innerName);
+ if (isExcluded(innerName)) {
+ echo("Ignored : " + innerName);
+ continue;
+ }
+ foundClasses.add(innerName);
+ assertEquals(info.outer_class_info_index, 0,
+ "outer_class_info_index of " + innerName);
+ if (innerName.matches("\\$\\d+")) {
+ assertEquals(info.inner_name_index, 0,
+ "inner_name_index of anonymous class");
+ }
+ }
+ Set<String> expectedClasses = getInnerClasses();
+ expectedClasses.remove("InnerClassesIndexTest$Inner");
+ assertEquals(foundClasses, expectedClasses, "All classes are found");
+ } catch (Exception e) {
+ addFailure(e);
+ } finally {
+ checkStatus();
+ }
+ }
+
+ static class Inner {
+ }
+
+ Inner inner1 = new Inner() {
+ };
+
+ static Inner inner2 = new Inner() {
+ };
+
+ Runnable r = () -> {
+ class Local {
+ }
+ new Local() {
+ };
+ };
+
+ public void local() {
+ class Local {
+ }
+ new Local() {
+ };
+ }
+
+ public InnerClassesIndexTest() {
+ class Local {
+ }
+ new Local() {
+ };
+ }
+
+ {
+ class Local {
+ }
+ new Local() {
+ };
+ }
+
+ static {
+ class Local {
+ }
+ new Local() {
+ };
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
new file mode 100644
index 0000000..4212db6
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8034854 8042251
+ * @summary Testing inner classes attributes.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerClassesTest
+ */
+
+import java.util.List;
+
+public class InnerClassesTest extends InnerClassesTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ new InnerClassesTest().test("InnerClassesSrc");
+ }
+
+ private List<TestCase> generateClasses() {
+ setInnerClassType(ClassType.CLASS);
+ setHasSyntheticClass(true);
+ return super.generateTestCases();
+ }
+
+ private List<TestCase> generateEnums() {
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setInnerClassType(ClassType.ENUM);
+ setHasSyntheticClass(false);
+ return super.generateTestCases();
+ }
+
+ private List<TestCase> generateInterfaces() {
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerClassType(ClassType.INTERFACE);
+ return super.generateTestCases();
+ }
+
+ private List<TestCase> generateAnnotations() {
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerClassType(ClassType.ANNOTATION);
+ return super.generateTestCases();
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterAccessModifiers(Modifier.EMPTY);
+ setOuterOtherModifiers(Modifier.EMPTY);
+ setOuterClassType(ClassType.OTHER);
+ }
+
+ @Override
+ public List<TestCase> generateTestCases() {
+ List<TestCase> sources = generateClasses();
+ sources.addAll(generateEnums());
+ sources.addAll(generateInterfaces());
+ sources.addAll(generateAnnotations());
+ return sources;
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java
new file mode 100644
index 0000000..48bdbfd
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTestBase.java
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.InnerClasses_attribute;
+import com.sun.tools.classfile.InnerClasses_attribute.Info;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Base class for tests of inner classes attribute.
+ * The scenario of tests:
+ * 1. set possible values of class modifiers.
+ * 2. according to set class modifiers, a test generates sources
+ * and golden data with {@code generateTestCases}.
+ * 3. a test loops through all test cases and checks InnerClasses
+ * attribute with {@code test}.
+ *
+ * Example, possible flags for outer class are {@code Modifier.PRIVATE and Modifier.PUBLIC},
+ * possible flags for inner class are {@code Modifier.EMPTY}.
+ * At the second step the test generates two test cases:
+ * 1. public class A {
+ * public class B {
+ * class C {}
+ * }
+ * }
+ * 2. public class A {
+ * private class B {
+ * class C {}
+ * }
+ * }
+ */
+public abstract class InnerClassesTestBase extends TestResult {
+
+ private Modifier[] outerAccessModifiers = {Modifier.EMPTY, Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC};
+ private Modifier[] outerOtherModifiers = {Modifier.EMPTY, Modifier.STATIC, Modifier.FINAL, Modifier.ABSTRACT};
+ private Modifier[] innerAccessModifiers = outerAccessModifiers;
+ private Modifier[] innerOtherModifiers = outerOtherModifiers;
+ private boolean isForbiddenWithoutStaticInOuterMods = false;
+
+ private ClassType outerClassType;
+ private ClassType innerClassType;
+ private boolean hasSyntheticClass;
+ private String prefix = "";
+ private String suffix = "";
+
+ /**
+ * Sets properties.
+ *
+ * Returns generated list of test cases. Method is called in {@code test()}.
+ */
+ public abstract void setProperties();
+
+ /**
+ * Runs the test.
+ *
+ * @param classToTest expected name of outer class
+ * @param skipClasses classes that names should not be checked
+ */
+ public void test(String classToTest, String...skipClasses) throws TestFailedException {
+ try {
+ for (TestCase test : generateTestCases()) {
+ addTestCase(test.getSource());
+ test(classToTest, test, skipClasses);
+ }
+ } catch (Exception e) {
+ addFailure(e);
+ } finally {
+ checkStatus();
+ }
+ }
+
+ /**
+ * If {@code flag} is {@code true} an outer class can not have static modifier.
+ *
+ * @param flag if {@code true} the outer class can not have static modifier
+ */
+ public void setForbiddenWithoutStaticInOuterMods(boolean flag) {
+ isForbiddenWithoutStaticInOuterMods = flag;
+ }
+
+ /**
+ * Sets the possible access flags of an outer class.
+ *
+ * @param mods the possible access flags of an outer class
+ */
+ public void setOuterAccessModifiers(Modifier...mods) {
+ outerAccessModifiers = mods;
+ }
+
+ /**
+ * Sets the possible flags of an outer class.
+ *
+ * @param mods the possible flags of an outer class
+ */
+ public void setOuterOtherModifiers(Modifier...mods) {
+ outerOtherModifiers = mods;
+ }
+
+ /**
+ * Sets the possible access flags of an inner class.
+ *
+ * @param mods the possible access flags of an inner class
+ */
+ public void setInnerAccessModifiers(Modifier...mods) {
+ innerAccessModifiers = mods;
+ }
+
+ /**
+ * Sets the possible flags of an inner class.
+ *
+ * @param mods the possible flags of an inner class
+ */
+ public void setInnerOtherModifiers(Modifier...mods) {
+ innerOtherModifiers = mods;
+ }
+
+ /**
+ * Sets the suffix for the generated source.
+ *
+ * @param suffix a suffix
+ */
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
+ /**
+ * Sets the prefix for the generated source.
+ *
+ * @param prefix a prefix
+ */
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ /**
+ * If {@code true} synthetic class is generated.
+ *
+ * @param hasSyntheticClass if {@code true} synthetic class is generated
+ */
+ public void setHasSyntheticClass(boolean hasSyntheticClass) {
+ this.hasSyntheticClass = hasSyntheticClass;
+ }
+
+ /**
+ * Sets the inner class type.
+ *
+ * @param innerClassType the inner class type
+ */
+ public void setInnerClassType(ClassType innerClassType) {
+ this.innerClassType = innerClassType;
+ }
+
+ /**
+ * Sets the outer class type.
+ *
+ * @param outerClassType the outer class type
+ */
+ public void setOuterClassType(ClassType outerClassType) {
+ this.outerClassType = outerClassType;
+ }
+
+ private void test(String classToTest, TestCase test, String...skipClasses) {
+ printf("Testing :\n%s\n", test.getSource());
+ try {
+ Map<String, Set<String>> class2Flags = test.getFlags();
+ ClassFile cf = readClassFile(compile(test.getSource())
+ .getClasses().get(classToTest));
+ InnerClasses_attribute innerClasses = (InnerClasses_attribute)
+ cf.getAttribute(Attribute.InnerClasses);
+ int count = 0;
+ for (Attribute a : cf.attributes.attrs) {
+ if (a instanceof InnerClasses_attribute) {
+ ++count;
+ }
+ }
+ assertEquals(1, count, "Number of inner classes attribute");
+ if (innerClasses == null) {
+ return;
+ }
+ assertEquals(cf.constant_pool.
+ getUTF8Info(innerClasses.attribute_name_index).value, "InnerClasses",
+ "innerClasses.attribute_name_index");
+ // Inner Classes attribute consists of length (2 bytes)
+ // and 8 bytes for each inner class's entry.
+ assertEquals(innerClasses.attribute_length,
+ 2 + 8 * class2Flags.size(), "innerClasses.attribute_length");
+ assertEquals(innerClasses.number_of_classes,
+ class2Flags.size(), "innerClasses.number_of_classes");
+ Set<String> visitedClasses = new HashSet<>();
+ for (Info e : innerClasses.classes) {
+ String baseName = cf.constant_pool.getClassInfo(
+ e.inner_class_info_index).getBaseName();
+ if (cf.major_version >= 51 && e.inner_name_index == 0) {
+ assertEquals(e.outer_class_info_index, 0,
+ "outer_class_info_index "
+ + "in case of inner_name_index is zero : "
+ + baseName);
+ }
+ String className = baseName.replaceFirst(".*\\$", "");
+ assertTrue(class2Flags.containsKey(className),
+ className);
+ assertTrue(visitedClasses.add(className),
+ "there are no duplicates in attribute : " + className);
+ assertEquals(e.inner_class_access_flags.getInnerClassFlags(),
+ class2Flags.get(className),
+ "inner_class_access_flags " + className);
+ if (!Arrays.asList(skipClasses).contains(className)) {
+ assertEquals(
+ cf.constant_pool.getClassInfo(e.inner_class_info_index).getBaseName(),
+ classToTest + "$" + className,
+ "inner_class_info_index of " + className);
+ if (e.outer_class_info_index > 0) {
+ assertEquals(
+ cf.constant_pool.getClassInfo(e.outer_class_info_index).getName(),
+ classToTest,
+ "outer_class_info_index of " + className);
+ }
+ }
+ }
+ } catch (Exception e) {
+ addFailure(e);
+ }
+ }
+
+ /**
+ * Methods generates list of test cases. Method generates all possible combinations
+ * of acceptable flags for nested inner classes.
+ *
+ * @return generated list of test cases
+ */
+ protected List<TestCase> generateTestCases() {
+ setProperties();
+ List<TestCase> list = new ArrayList<>();
+
+ List<List<Modifier>> outerMods = getAllCombinations(outerAccessModifiers, outerOtherModifiers);
+ List<List<Modifier>> innerMods = getAllCombinations(innerAccessModifiers, innerOtherModifiers);
+
+ for (List<Modifier> outerMod : outerMods) {
+ if (isForbiddenWithoutStaticInOuterMods && !outerMod.contains(Modifier.STATIC)) {
+ continue;
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append("public class InnerClassesSrc {")
+ .append(toString(outerMod)).append(' ')
+ .append(outerClassType).append(' ')
+ .append(prefix).append(' ').append('\n');
+ int count = 0;
+ Map<String, Set<String>> class2Flags = new HashMap<>();
+ List<String> syntheticClasses = new ArrayList<>();
+ for (List<Modifier> innerMod : innerMods) {
+ ++count;
+ String privateConstructor = "";
+ if (hasSyntheticClass && !innerMod.contains(Modifier.ABSTRACT)) {
+ privateConstructor = "private A" + count + "() {}";
+ syntheticClasses.add("new A" + count + "();");
+ }
+ sb.append(toString(innerMod)).append(' ');
+ sb.append(String.format("%s A%d {%s}\n", innerClassType, count, privateConstructor));
+ Set<String> flags = getFlags(innerClassType, innerMod);
+ class2Flags.put("A" + count, flags);
+ }
+ if (hasSyntheticClass) {
+ // Source to generate synthetic classes
+ sb.append(syntheticClasses.stream().collect(Collectors.joining(" ", "{", "}")));
+ class2Flags.put("1", new HashSet<>(Arrays.asList("ACC_STATIC", "ACC_SYNTHETIC")));
+ }
+ sb.append(suffix).append("\n}");
+ getAdditionalFlags(class2Flags, outerClassType, outerMod.toArray(new Modifier[outerMod.size()]));
+ list.add(new TestCase(sb.toString(), class2Flags));
+ }
+ return list;
+ }
+
+ /**
+ * Methods returns flags which must have type.
+ *
+ * @param type class, interface, enum or annotation
+ * @param mods modifiers
+ * @return set of access flags
+ */
+ protected Set<String> getFlags(ClassType type, List<Modifier> mods) {
+ Set<String> flags = mods.stream()
+ .map(Modifier::getString)
+ .filter(str -> !str.isEmpty())
+ .map(str -> "ACC_" + str.toUpperCase())
+ .collect(Collectors.toSet());
+ type.addSpecificFlags(flags);
+ return flags;
+ }
+
+ private List<List<Modifier>> getAllCombinations(Modifier[] accessModifiers, Modifier[] otherModifiers) {
+ List<List<Modifier>> list = new ArrayList<>();
+ for (Modifier access : accessModifiers) {
+ for (int i = 0; i < otherModifiers.length; ++i) {
+ Modifier mod1 = otherModifiers[i];
+ for (int j = i + 1; j < otherModifiers.length; ++j) {
+ Modifier mod2 = otherModifiers[j];
+ if (isForbidden(mod1, mod2)) {
+ continue;
+ }
+ list.add(Arrays.asList(access, mod1, mod2));
+ }
+ if (mod1 == Modifier.EMPTY) {
+ list.add(Arrays.asList(access));
+ }
+ }
+ }
+ return list;
+ }
+
+ private boolean isForbidden(Modifier mod1, Modifier mod2) {
+ return mod1 == Modifier.FINAL && mod2 == Modifier.ABSTRACT
+ || mod1 == Modifier.ABSTRACT && mod2 == Modifier.FINAL;
+ }
+
+ private String toString(List<Modifier> mods) {
+ return mods.stream()
+ .map(Modifier::getString)
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.joining(" "));
+ }
+
+ /**
+ * Method is called in generateTestCases().
+ * If you need to add additional access flags, you should override this method.
+ *
+ *
+ * @param class2Flags map with flags
+ * @param type class, interface, enum or @annotation
+ * @param mods modifiers
+ */
+ public void getAdditionalFlags(Map<String, Set<String>> class2Flags, ClassType type, Modifier...mods) {
+ class2Flags.values().forEach(type::addFlags);
+ }
+
+ public enum ClassType {
+ CLASS("class") {
+ @Override
+ public void addSpecificFlags(Set<String> flags) {
+ }
+ },
+ INTERFACE("interface") {
+ @Override
+ public void addFlags(Set<String> flags) {
+ flags.add("ACC_STATIC");
+ flags.add("ACC_PUBLIC");
+ }
+
+ @Override
+ public void addSpecificFlags(Set<String> flags) {
+ flags.add("ACC_INTERFACE");
+ flags.add("ACC_ABSTRACT");
+ flags.add("ACC_STATIC");
+ }
+ },
+ ANNOTATION("@interface") {
+ @Override
+ public void addFlags(Set<String> flags) {
+ flags.add("ACC_STATIC");
+ flags.add("ACC_PUBLIC");
+ }
+
+ @Override
+ public void addSpecificFlags(Set<String> flags) {
+ flags.add("ACC_INTERFACE");
+ flags.add("ACC_ABSTRACT");
+ flags.add("ACC_STATIC");
+ flags.add("ACC_ANNOTATION");
+ }
+ },
+ ENUM("enum") {
+ @Override
+ public void addSpecificFlags(Set<String> flags) {
+ flags.add("ACC_ENUM");
+ flags.add("ACC_FINAL");
+ flags.add("ACC_STATIC");
+ }
+ },
+ OTHER("") {
+ @Override
+ public void addSpecificFlags(Set<String> flags) {
+ }
+ };
+
+ private final String classType;
+
+ private ClassType(String clazz) {
+ this.classType = clazz;
+ }
+
+ public abstract void addSpecificFlags(Set<String> flags);
+
+ public String toString() {
+ return classType;
+ }
+
+ public void addFlags(Set<String> set) {
+ }
+ }
+
+ public enum Modifier {
+ PUBLIC("public"), PRIVATE("private"),
+ PROTECTED("protected"), DEFAULT("default"),
+ FINAL("final"), ABSTRACT("abstract"),
+ STATIC("static"), EMPTY("");
+
+ private final String str;
+
+ private Modifier(String str) {
+ this.str = str;
+ }
+
+ public String getString() {
+ return str;
+ }
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
new file mode 100644
index 0000000..a15dae0
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner enums in inner annotation.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerEnumInInnerAnnotationTest
+ */
+
+public class InnerEnumInInnerAnnotationTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerEnumInInnerAnnotationTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setOuterClassType(ClassType.ANNOTATION);
+ setInnerClassType(ClassType.ENUM);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
new file mode 100644
index 0000000..96e5440
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner enums in inner enum.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerEnumInInnerEnumTest
+ */
+
+public class InnerEnumInInnerEnumTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerEnumInInnerEnumTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setOuterClassType(ClassType.ENUM);
+ setInnerClassType(ClassType.ENUM);
+ setPrefix("Inner {;");
+ setSuffix("}");
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
new file mode 100644
index 0000000..418931b
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner enums in inner interface.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerEnumInInnerInterfaceTest
+ */
+
+public class InnerEnumInInnerInterfaceTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerEnumInInnerInterfaceTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setOuterClassType(ClassType.INTERFACE);
+ setInnerClassType(ClassType.ENUM);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
new file mode 100644
index 0000000..a962d59
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner enums in inner class.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerEnumsInInnerClassTest
+ */
+
+public class InnerEnumsInInnerClassTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerEnumsInInnerClassTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setForbiddenWithoutStaticInOuterMods(true);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setOuterClassType(ClassType.CLASS);
+ setInnerClassType(ClassType.ENUM);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
new file mode 100644
index 0000000..ffbb7b7
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner interfaces in inner annotation.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerInterfacesInInnerAnnotationTest
+ */
+
+public class InnerInterfacesInInnerAnnotationTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerInterfacesInInnerAnnotationTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setOuterClassType(ClassType.ANNOTATION);
+ setInnerClassType(ClassType.INTERFACE);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
new file mode 100644
index 0000000..92ac7ef
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Testing InnerClasses_attribute of inner interfaces in inner class.
+ * @author aeremeev
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerInterfacesInInnerClassTest
+ */
+
+public class InnerInterfacesInInnerClassTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerInterfacesInInnerClassTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setForbiddenWithoutStaticInOuterMods(true);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setOuterClassType(ClassType.CLASS);
+ setInnerClassType(ClassType.INTERFACE);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
new file mode 100644
index 0000000..f49e071
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner interfaces in inner enum.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerInterfacesInInnerEnumTest
+ */
+
+public class InnerInterfacesInInnerEnumTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerInterfacesInInnerEnumTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.STATIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setOuterClassType(ClassType.ENUM);
+ setInnerClassType(ClassType.INTERFACE);
+ setPrefix("Inner {;");
+ setSuffix("}");
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
new file mode 100644
index 0000000..7bd95b3
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Testing InnerClasses_attribute of inner interfaces in inner interface.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
+ * @run main InnerInterfacesInInnerInterfaceTest
+ */
+
+import java.util.List;
+
+public class InnerInterfacesInInnerInterfaceTest extends InnerClassesInInnerClassTestBase {
+
+ public static void main(String[] args) throws TestFailedException {
+ InnerClassesTestBase test = new InnerInterfacesInInnerInterfaceTest();
+ test.test("InnerClassesSrc$Inner", "Inner", "1");
+ }
+
+ @Override
+ public void setProperties() {
+ setOuterOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setInnerAccessModifiers(Modifier.EMPTY, Modifier.PUBLIC);
+ setInnerOtherModifiers(Modifier.EMPTY, Modifier.ABSTRACT, Modifier.STATIC);
+ setOuterClassType(ClassType.INTERFACE);
+ setInnerClassType(ClassType.INTERFACE);
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
new file mode 100644
index 0000000..258bef0
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8042251
+ * @summary Test that there are no inner classes attributes in case of there are no inner classes.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase InMemoryFileManager ToolBox
+ * @run main NoInnerClassesTest
+ */
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPoolException;
+
+import java.io.IOException;
+
+public class NoInnerClassesTest extends TestBase {
+
+ public static void main(String[] args) throws IOException, ConstantPoolException {
+ new NoInnerClassesTest().test();
+ }
+
+ public void test() throws IOException, ConstantPoolException {
+ ClassFile classFile = readClassFile("NoInnerClassesTest");
+ assertNull(classFile.getAttribute(Attribute.InnerClasses), "Found inner class attribute");
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/README.txt b/langtools/test/tools/javac/classfiles/attributes/innerclasses/README.txt
new file mode 100644
index 0000000..29fe787
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/README.txt
@@ -0,0 +1,92 @@
+The description of the tests for the InnerClasses attribute.
+
+InnerClassesTestBase is the base class for tests of inner classes attribute.
+Each tests extends the base class.
+The scenario of tests:
+ 1. set possible values of class modifiers, outer/inner class types.
+ 2. according to set class modifiers, a test generates sources
+ and golden data with generateTestCases.
+ 3. a test loops through all test cases and checks InnerClasses attribute in method test().
+
+Example, possible flags for outer class are Modifier.PRIVATE and Modifier.PUBLIC,
+possible flags for inner class are Modifier.EMPTY, outer class type is CLASS
+and inner class type is CLASS.
+At the second step the test generates two test cases:
+ 1. public class A {
+ public class B {
+ class C {}
+ }
+ }
+ 2. public class A {
+ private class B {
+ class C {}
+ }
+ }
+
+The list of tests.
+
+Test: test if there is not inner class, the InnerClasses attribute
+is not generated (NoInnerClasses.java).
+
+Test: inner classes in anonymous class (InnerClassesInAnonymousClassTest.java).
+Possible access flags of the inner class: abstract and final.
+
+Test: inner classes in local class (InnerClassesInLocalClassTest.java).
+Locations of local class: static and instance initializer, constructor, method, lambda,
+default and static methods of interface.
+
+Test: test the outer_class_info_index and inner_name_index of
+local and anonymous classes (InnerClassesIndexTest.java).
+
+List of test cases for Inner*InInner*Test:
+ * InnerClassesInInnerClassTest
+ outer flags: all possible flags
+ inner flags: all possible flags
+ * InnerClassesInInnerEnumTest
+ outer flags: all access flags, abstract
+ inner flags: all possible flags
+ * InnerClassesInInnerAnnotationTest
+ outer flags: all access flags, abstract
+ inner flags: all flags, except private and protected
+ * InnerClassesInInnerInterfaceTest
+ outer flags: all access flags, abstract
+ inner flags: all flags, except private and protected
+
+ * InnerEnumsInInnerClassTest
+ outer flags: all possible flags
+ inner flags: all possible flags
+ * InnerEnumsInInnerEnumTest
+ outer flags: all possible flags
+ inner flags: all possible flags
+ * InnerEnumsInInnerAnnotationTest
+ outer flags: all access flags, abstract, static
+ inner flags: public, static
+ * InnerEnumsInInnerInterfaceTest
+ outer flags: all access flags, abstract, static
+ inner flags: public, static
+
+ * InnerAnnotationInInnerClassTest
+ outer flags: all possible flags, except static
+ inner flags: all access flags, abstract and static
+ * InnerAnnotationInInnerEnumTest
+ outer flags: all access flags, static
+ inner flags: all access flags, abstract and static
+ * InnerAnnotationInInnerAnnotation
+ outer flags: all access flags, static and abstract
+ inner flags: public, abstract, static
+ * InnerAnnotationInInnerInterface
+ outer flags: all access flags, static and abstract
+ inner flags: public, abstract, static
+
+ * InnerInterfaceInInnerClassTest
+ outer flags: all possible flags, except static
+ inner flags: all access flags, abstract and static
+ * InnerInterfaceInInnerEnumTest
+ outer flags: all access flags, static
+ inner flags: all access flags, abstract and static
+ * InnerInterfaceInInnerAnnotation
+ outer flags: all access flags, static and abstract
+ inner flags: public, abstract, static
+ * InnerInterfaceInInnerInterface
+ outer flags: all access flags, static and abstract
+ inner flags: public, abstract, static
\ No newline at end of file
diff --git a/langtools/test/tools/javac/classfiles/attributes/innerclasses/TestCase.java b/langtools/test/tools/javac/classfiles/attributes/innerclasses/TestCase.java
new file mode 100644
index 0000000..cae2079
--- /dev/null
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/TestCase.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Class represents test cases. This class contains source code and
+ * access flags for each inner class in source code.
+ */
+public class TestCase {
+
+ private final String sourceCode;
+ private final Map<String, Set<String>> class2Flags;
+
+ public TestCase(String sourceCode, Map<String, Set<String>> class2Flags) {
+ this.sourceCode = sourceCode;
+ this.class2Flags = class2Flags;
+ }
+
+ /**
+ * Returns source code.
+ *
+ * @return source code
+ */
+ public String getSource() {
+ return sourceCode;
+ }
+
+ /**
+ * Returns map with entries (ClassName, set of access flags for the ClassName).
+ *
+ * @return map with entries (ClassName, set of access flags for the ClassName)
+ */
+ public Map<String, Set<String>> getFlags() {
+ return class2Flags;
+ }
+}
diff --git a/langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java b/langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java
index 17ff2b7..e49cd6c 100644
--- a/langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java
+++ b/langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java
@@ -22,22 +22,23 @@
*/
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
-import java.util.stream.Stream;
+import java.util.stream.Collectors;
+
import javax.tools.DiagnosticCollector;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.ToolProvider;
-import static java.lang.String.format;
-import static java.lang.System.lineSeparator;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPoolException;
/**
* Base class for class file attribute tests.
@@ -46,7 +47,7 @@
*/
public class TestBase {
- public static final String LINE_SEPARATOR = lineSeparator();
+ public static final String LINE_SEPARATOR = System.lineSeparator();
private <S> InMemoryFileManager compile(
List<String> options,
@@ -57,7 +58,7 @@
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
List<? extends JavaFileObject> src = sources.stream()
.map(src2JavaFileObject)
- .collect(toList());
+ .collect(Collectors.toList());
DiagnosticCollector<? super JavaFileObject> dc = new DiagnosticCollector<>();
try (InMemoryFileManager fileManager
@@ -67,7 +68,7 @@
if (!success) {
String errorMessage = dc.getDiagnostics().stream()
.map(Object::toString)
- .collect(joining("\n"));
+ .collect(Collectors.joining("\n"));
throw new CompilationException("Compilation Error\n\n" + errorMessage);
}
return fileManager;
@@ -82,7 +83,7 @@
*/
public InMemoryFileManager compile(String... sources)
throws IOException, CompilationException {
- return compile(emptyList(), sources);
+ return compile(Collections.emptyList(), sources);
}
/**
@@ -94,7 +95,7 @@
*/
public InMemoryFileManager compile(List<String> options, String... sources)
throws IOException, CompilationException {
- return compile(options, ToolBox.JavaSource::new, asList(sources));
+ return compile(options, ToolBox.JavaSource::new, Arrays.asList(sources));
}
/**
@@ -105,7 +106,7 @@
*/
public InMemoryFileManager compile(String[]... sources) throws IOException,
CompilationException {
- return compile(emptyList(), sources);
+ return compile(Collections.emptyList(), sources);
}
/**
@@ -117,12 +118,73 @@
*/
public InMemoryFileManager compile(List<String> options, String[]... sources)
throws IOException, CompilationException {
- return compile(options, src -> new ToolBox.JavaSource(src[0], src[1]), asList(sources));
+ return compile(options, src -> new ToolBox.JavaSource(src[0], src[1]), Arrays.asList(sources));
+ }
+
+ /**
+ * Returns class file that is read from {@code is}.
+ *
+ * @param is an input stream
+ * @return class file that is read from {@code is}
+ * @throws IOException if I/O error occurs
+ * @throws ConstantPoolException if constant pool error occurs
+ */
+ public ClassFile readClassFile(InputStream is) throws IOException, ConstantPoolException {
+ return ClassFile.read(is);
+ }
+
+ /**
+ * Returns class file that is read from {@code fileObject}.
+ *
+ * @param fileObject a file object
+ * @return class file that is read from {@code fileObject}
+ * @throws IOException if I/O error occurs
+ * @throws ConstantPoolException if constant pool error occurs
+ */
+ public ClassFile readClassFile(JavaFileObject fileObject) throws IOException, ConstantPoolException {
+ return readClassFile(fileObject.openInputStream());
+ }
+
+ /**
+ * Returns class file that corresponds to {@code clazz}.
+ *
+ * @param clazz a class
+ * @return class file that is read from {@code clazz}
+ * @throws IOException if I/O error occurs
+ * @throws ConstantPoolException if constant pool error occurs
+ */
+ public ClassFile readClassFile(Class<?> clazz) throws IOException, ConstantPoolException {
+ return readClassFile(getClassFile(clazz));
+ }
+
+ /**
+ * Returns class file that corresponds to {@code className}.
+ *
+ * @param className a class name
+ * @return class file that is read from {@code className}
+ * @throws IOException if I/O error occurs
+ * @throws ConstantPoolException if constant pool error occurs
+ */
+ public ClassFile readClassFile(String className) throws IOException, ConstantPoolException {
+ return readClassFile(getClassFile(className + ".class"));
+ }
+
+ /**
+ * Returns class file that is read from {@code file}.
+ *
+ * @param file a file
+ * @return class file that is read from {@code file}
+ * @throws IOException if I/O error occurs
+ * @throws ConstantPoolException if constant pool error occurs
+ */
+ public ClassFile readClassFile(File file) throws IOException, ConstantPoolException {
+ return readClassFile(new FileInputStream(file));
}
public void assertEquals(Object actual, Object expected, String message) {
if (!Objects.equals(actual, expected))
- throw new AssertionFailedException(format("%s%nGot: %s, Expected: %s", message, actual, expected));
+ throw new AssertionFailedException(String.format("%s%nGot: %s, Expected: %s",
+ message, actual, expected));
}
public void assertNull(Object actual, String message) {
@@ -169,22 +231,18 @@
* @param message string to print.
*/
public void echo(String message) {
- System.err.println(message.replace("\n", LINE_SEPARATOR));
+ printf(message + "\n");
}
/**
- * Substitutes args in template and prints result to standard error. New lines are converted to system dependent NL.
+ * Substitutes args in template and prints result to standard error.
+ * New lines are converted to system dependent NL.
*
* @param template template in standard String.format(...) format.
* @param args arguments to substitute in template.
*/
public void printf(String template, Object... args) {
- System.err.printf(template, Stream.of(args)
- .map(Objects::toString)
- .map(m -> m.replace("\n", LINE_SEPARATOR))
- .collect(toList())
- .toArray());
-
+ System.err.printf(String.format(template, args).replace("\n", LINE_SEPARATOR));
}
public static class CompilationException extends Exception {
diff --git a/langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java b/langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java
index fede897..7c65eb3 100644
--- a/langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java
+++ b/langtools/test/tools/javac/classfiles/attributes/lib/TestResult.java
@@ -23,13 +23,15 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Stream;
import static java.lang.String.format;
import static java.util.stream.Collectors.joining;
+/**
+ * This class accumulates test results. Test results can be checked with method @{code checkStatus}.
+ */
public class TestResult extends TestBase {
private final List<Info> testCases;
@@ -39,15 +41,18 @@
testCases.add(new Info("Global test info"));
}
- public void addTestCase(String src) {
- testCases.add(new Info(src));
+ /**
+ * Adds new test case info.
+ *
+ * @param info the information about test case
+ */
+ public void addTestCase(String info) {
+ testCases.add(new Info(info));
}
- public String errorMessage() {
+ private String errorMessage() {
return testCases.stream().filter(Info::isFailed)
- .map(tc -> format("Failure in test case:\n%s\n%s", tc.info(),
- (tc.asserts.size() > 0 ? tc.getAssertMessage() + "\n" : "")
- + tc.getErrorMessage()))
+ .map(tc -> format("Failure in test case:\n%s\n%s", tc.info(), tc.getMessage()))
.collect(joining("\n"));
}
@@ -76,8 +81,14 @@
getLastTestCase().assertEquals(actual, true, message);
}
+ public void assertContains(Set<?> found, Set<?> expected, String message) {
+ Set<?> copy = new HashSet<>(expected);
+ copy.removeAll(found);
+ assertTrue(found.containsAll(expected), message + " : " + copy);
+ }
+
public void addFailure(Throwable th) {
- getLastTestCase().addFailure(th);
+ testCases.get(testCases.size() - 1).addFailure(th);
}
private Info getLastTestCase() {
@@ -87,6 +98,13 @@
return testCases.get(testCases.size() - 1);
}
+ /**
+ * Throws {@code TestFailedException} if one of the asserts are failed
+ * or an exception occurs. Prints error message of failed test cases.
+ *
+ * @throws TestFailedException if one of the asserts are failed
+ * or an exception occurs
+ */
public void checkStatus() throws TestFailedException {
if (testCases.stream().anyMatch(Info::isFailed)) {
echo(errorMessage());
@@ -120,7 +138,13 @@
}
public void addFailure(String message) {
- asserts.add(message);
+ String stackTrace = Stream.of(Thread.currentThread().getStackTrace())
+ // just to get stack trace without TestResult and Thread
+ .filter(e -> !"TestResult.java".equals(e.getFileName()) &&
+ !"java.lang.Thread".equals(e.getClassName()))
+ .map(e -> "\tat " + e)
+ .collect(joining("\n"));
+ asserts.add(format("%s\n%s", message, stackTrace));
printf("[ASSERT] : %s\n", message);
}
@@ -138,6 +162,10 @@
}
}
+ public String getMessage() {
+ return (asserts.size() > 0 ? getAssertMessage() + "\n" : "") + getErrorMessage();
+ }
+
public String getAssertMessage() {
return asserts.stream()
.map(failure -> "[ASSERT] : " + failure)
@@ -146,8 +174,7 @@
public String getErrorMessage() {
return errors.stream()
- .map(throwable ->
- format("[ERROR] : %s", getStackTrace(throwable)))
+ .map(throwable -> format("[ERROR] : %s", getStackTrace(throwable)))
.collect(joining("\n"));
}
diff --git a/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java b/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java
index 436f02b..acc5887 100644
--- a/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java
+++ b/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java
@@ -26,7 +26,7 @@
* @bug 8029240 8030855
* @summary Default methods not always visible under -source 7
* Default methods should be visible under source previous to 8
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main DefaultMethodsNotVisibleForSourceLessThan8Test
*/
@@ -111,6 +111,7 @@
String outDir;
String source;
+ ToolBox tb = new ToolBox();
void run(String source) throws Exception {
this.source = source;
@@ -127,50 +128,53 @@
/* as an extra check let's make sure that interface 'I' can't be compiled
* with source < 8
*/
- ToolBox.JavaToolArgs javacArgs =
- new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
- .setOptions("-d", outDir, "-source", source)
- .setSources(ISrc);
- ToolBox.javac(javacArgs);
+ tb.new JavacTask()
+ .outdir(outDir)
+ .options("-source", source)
+ .sources(ISrc)
+ .run(ToolBox.Expect.FAIL);
//but it should compile with source >= 8
- javacArgs =
- new ToolBox.JavaToolArgs()
- .setOptions("-d", outDir)
- .setSources(ISrc);
- ToolBox.javac(javacArgs);
+ tb.new JavacTask()
+ .outdir(outDir)
+ .sources(ISrc)
+ .run();
- javacArgs =
- new ToolBox.JavaToolArgs()
- .setOptions("-cp", outDir, "-d", outDir, "-source", source)
- .setSources(JSrc, ASrc, BSrc);
- ToolBox.javac(javacArgs);
+ tb.new JavacTask()
+ .outdir(outDir)
+ .classpath(outDir)
+ .options("-source", source)
+ .sources(JSrc, ASrc, BSrc)
+ .run();
}
void testLegacyImplementations() throws Exception {
//compile C1-4
- ToolBox.JavaToolArgs javacArgs =
- new ToolBox.JavaToolArgs()
- .setOptions("-cp", outDir, "-d", outDir, "-source", source)
- .setSources(C1Src, C2Src, C3Src, C4Src);
- ToolBox.javac(javacArgs);
+ tb.new JavacTask()
+ .outdir(outDir)
+ .classpath(outDir)
+ .options("-source", source)
+ .sources(C1Src, C2Src, C3Src, C4Src)
+ .run();
}
void testLegacyInvocations() throws Exception {
//compile LegacyInvocation
- ToolBox.JavaToolArgs javacArgs =
- new ToolBox.JavaToolArgs()
- .setOptions("-cp", outDir, "-d", outDir, "-source", source)
- .setSources(LegacyInvocationSrc);
- ToolBox.javac(javacArgs);
+ tb.new JavacTask()
+ .outdir(outDir)
+ .classpath(outDir)
+ .options("-source", source)
+ .sources(LegacyInvocationSrc)
+ .run();
}
void testSuperInvocations() throws Exception {
//compile SubA, SubB
- ToolBox.JavaToolArgs javacArgs =
- new ToolBox.JavaToolArgs()
- .setOptions("-cp", outDir, "-d", outDir, "-source", source)
- .setSources(SubASrc, SubBSrc);
- ToolBox.javac(javacArgs);
+ tb.new JavacTask()
+ .outdir(outDir)
+ .classpath(outDir)
+ .options("-source", source)
+ .sources(SubASrc, SubBSrc)
+ .run();
}
}
diff --git a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java b/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java
index 6a1c7b8..0e54a69 100644
--- a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java
+++ b/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,12 @@
* @test
* @bug 4263768 4785453
* @summary Verify that the compiler does not crash when java.lang is not
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main NoJavaLangTest
*/
-import java.util.ArrayList;
-import java.util.List;
-
-//original test: test/tools/javac/fatalErrors/NoJavaLang.sh
+// Original test: test/tools/javac/fatalErrors/NoJavaLang.sh
public class NoJavaLangTest {
private static final String noJavaLangSrc =
@@ -49,26 +46,20 @@
"Fatal Error: Unable to find package java.lang in classpath or bootclasspath";
public static void main(String[] args) throws Exception {
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} NoJavaLang.java 2> "${TMP1}"
- ToolBox.JavaToolArgs javacSuccessArgs =
- new ToolBox.JavaToolArgs().setSources(noJavaLangSrc);
- ToolBox.javac(javacSuccessArgs);
+ ToolBox tb = new ToolBox();
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -bootclasspath . NoJavaLang.java 2> "${TMP1}"
- List<String> output = new ArrayList<>();
- ToolBox.JavaToolArgs javacFailArgs =
- new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
- .setOptions("-bootclasspath", ".")
- .setSources(noJavaLangSrc)
- .setErrOutput(output);
+ tb.new JavacTask()
+ .sources(noJavaLangSrc)
+ .run();
- int cr = ToolBox.javac(javacFailArgs);
- if (cr != 3) {
- throw new AssertionError("Compiler exit result should be 3");
- }
+ String out = tb.new JavacTask()
+ .options("-bootclasspath", ".")
+ .sources(noJavaLangSrc)
+ .run(ToolBox.Expect.FAIL, 3)
+ .writeAll()
+ .getOutput(ToolBox.OutputKind.DIRECT);
-// diff ${DIFFOPTS} -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
- if (!(output.size() == 1 && output.get(0).equals(compilerErrorMessage))) {
+ if (!out.trim().equals(compilerErrorMessage)) {
throw new AssertionError("javac generated error output is not correct");
}
}
diff --git a/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java b/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java
index 6c1e5ed..c48af2d 100644
--- a/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java
+++ b/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,15 @@
* @test
* @bug 4491755 4785453
* @summary Prob w/static inner class with same name as a regular class
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main InnerClassFileTest
*/
+import java.nio.file.Path;
import java.nio.file.Paths;
-//original test: test/tools/javac/innerClassFile/Driver.sh
+// Original test: test/tools/javac/innerClassFile/Driver.sh
public class InnerClassFileTest {
private static final String BSrc =
@@ -90,38 +91,37 @@
new InnerClassFileTest().run();
}
+ private final ToolBox tb = new ToolBox();
+
void run() throws Exception {
createFiles();
compileFiles();
}
void createFiles() throws Exception {
-// mkdir src
-// cp -r ${TESTSRC}${FS}* src
- ToolBox.createJavaFileFromSource(Paths.get("src"), BSrc);
- ToolBox.createJavaFileFromSource(Paths.get("src"), CSrc);
- ToolBox.createJavaFileFromSource(Paths.get("src"), MainSrc);
- ToolBox.createJavaFileFromSource(Paths.get("src"), R1Src);
- ToolBox.createJavaFileFromSource(Paths.get("src"), R2Src);
- ToolBox.createJavaFileFromSource(Paths.get("src"), R3Src);
+ Path srcDir = Paths.get("src");
+ tb.writeJavaFiles(srcDir, BSrc, CSrc, MainSrc, R1Src, R2Src, R3Src);
}
void compileFiles() throws Exception {
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath .
-// -sourcepath src src/x/B.java src/x/C.java src/y/Main.java
- ToolBox.JavaToolArgs args =
- new ToolBox.JavaToolArgs()
- .setAllArgs("-d", ".", "-cp" , ".", "-sourcepath", "src",
- "src/x/B.java", "src/x/C.java", "src/y/Main.java");
- ToolBox.javac(args);
+ tb.new JavacTask()
+ .outdir(".")
+ .classpath(".")
+ .sourcepath("src")
+ .files("src/x/B.java", "src/x/C.java", "src/y/Main.java")
+ .run()
+ .writeAll();
-// rm y/R3.class
- ToolBox.rm(Paths.get("y", "R3.class"));
+ tb.deleteFiles("y/R3.class");
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath .
-// -sourcepath src src/y/Main.java
- args.setAllArgs("-d", ".", "-cp", ".", "-sourcepath", "src", "src/y/Main.java");
- ToolBox.javac(args);
+ tb.new JavacTask()
+ .outdir(".")
+ .classpath(".")
+ .sourcepath("src")
+ .files("src/y/Main.java")
+ .run()
+ .writeAll();
+
}
}
diff --git a/langtools/test/tools/javac/javazip/JavaZipTest.java b/langtools/test/tools/javac/javazip/JavaZipTest.java
index e800881..0ae1f7e 100644
--- a/langtools/test/tools/javac/javazip/JavaZipTest.java
+++ b/langtools/test/tools/javac/javazip/JavaZipTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
* @test
* @bug 4098712 6304984 6388453
* @summary check that source files inside zip files on the class path are ignored
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main JavaZipTest
*/
-import java.io.File;
+import java.nio.file.Files;
import java.nio.file.Paths;
+import java.util.Arrays;
-//original test: test/tools/javac/javazip/Test.sh
+// Original test: test/tools/javac/javazip/Test.sh
public class JavaZipTest {
private static final String ASrc =
@@ -62,7 +63,7 @@
{"-d", "output", "-cp", "good.jar", "A.java"},
};
- private static final String[][] unSuccessfulCompilationArgs = {
+ private static final String[][] unsuccessfulCompilationArgs = {
{"-d", "output", "A.java", "bad/B.java"},
{"-d", "output", "-cp", "bad", "A.java"},
{"-d", "output", "-sourcepath", "bad", "A.java"},
@@ -74,53 +75,57 @@
new JavaZipTest().test();
}
+ private final ToolBox tb = new ToolBox();
+
public void test() throws Exception {
createOutputDirAndSourceFiles();
createZipsAndJars();
check(ToolBox.Expect.SUCCESS, successfulCompilationArgs);
- check(ToolBox.Expect.FAIL, unSuccessfulCompilationArgs);
+ check(ToolBox.Expect.FAIL, unsuccessfulCompilationArgs);
}
void createOutputDirAndSourceFiles() throws Exception {
//create output dir
- new File("output").mkdir();
+ Files.createDirectory(Paths.get("output"));
//source file creation
- ToolBox.createJavaFileFromSource(Paths.get("good"), BGoodSrc);
- ToolBox.createJavaFileFromSource(Paths.get("bad"), BBadSrc);
- ToolBox.createJavaFileFromSource(ASrc);
+ tb.writeJavaFiles(Paths.get("good"), BGoodSrc);
+ tb.writeJavaFiles(Paths.get("bad"), BBadSrc);
+ tb.writeJavaFiles(ToolBox.currDir, ASrc);
}
void createZipsAndJars() throws Exception {
//jar and zip creation
-// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}good.jar" -C "${TESTSRC}${FS}good" B.java
-// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}good.zip" -C "${TESTSRC}${FS}good" B.java
-// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}bad.jar" -C "${TESTSRC}${FS}bad" B.java
-// check ok "${TESTJAVA}${FS}bin${FS}jar" cf "${SCR}${FS}bad.zip" -C "${TESTSRC}${FS}bad" B.java
for (String[] args: jarArgs) {
- ToolBox.jar(args);
+ tb.new JarTask().run(args).writeAll();
}
}
- void check(ToolBox.Expect whatToExpect, String[][] theArgs) throws Exception {
-// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} "${TESTSRC}${FS}A.java" "${TESTSRC}${FS}good${FS}B.java"
-// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${TESTSRC}${FS}good" "${TESTSRC}${FS}A.java"
-// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${TESTSRC}${FS}good" "${TESTSRC}${FS}A.java"
-// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${SCR}${FS}good.zip" "${TESTSRC}${FS}A.java"
-// check ok "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${SCR}${FS}good.jar" "${TESTSRC}${FS}A.java"
+ void check(ToolBox.Expect expectedStatus, String[][] theArgs) throws Exception {
-// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} "${TESTSRC}${FS}A.java" "${TESTSRC}${FS}bad${FS}B.java"
-// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -classpath "${TESTSRC}${FS}bad" "${TESTSRC}${FS}A.java"
-// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${TESTSRC}${FS}bad" "${TESTSRC}${FS}A.java"
-// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${SCR}${FS}bad.zip" "${TESTSRC}${FS}A.java"
-// check err "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -sourcepath "${SCR}${FS}bad.jar" "${TESTSRC}${FS}A.java"
- ToolBox.JavaToolArgs args =
- new ToolBox.JavaToolArgs(whatToExpect);
for (String[] allArgs: theArgs) {
- args.setAllArgs(allArgs);
- ToolBox.javac(args);
+ tb.new JavacTask()
+ .options(opts(allArgs))
+ .files(files(allArgs))
+ .run(expectedStatus)
+ .writeAll();
+
}
}
+ private String[] opts(String... allArgs) {
+ int i = allArgs.length;
+ while (allArgs[i - 1].endsWith(".java"))
+ i--;
+ return Arrays.copyOfRange(allArgs, 0, i);
+ }
+
+ private String[] files(String... allArgs) {
+ int i = allArgs.length;
+ while (allArgs[i - 1].endsWith(".java"))
+ i--;
+ return Arrays.copyOfRange(allArgs, i, allArgs.length);
+ }
+
}
diff --git a/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java b/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java
index 55302b0..c1e5a24 100644
--- a/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java
+++ b/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 8023668
* @summary Desugar serializable lambda bodies using more robust naming scheme
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main TestSerializedLambdaNameStability
*/
@@ -125,6 +125,7 @@
static final String compiledDir = System.getProperty("user.dir");
static final String sourceBaseDir = System.getProperty("test.src");
+ final ToolBox tb = new ToolBox();
final String context;
public TestClassLoader(String context) {
@@ -154,10 +155,10 @@
else
throw new Exception("Did not expect to load " + name);
Path srcFile = Paths.get(sourceBaseDir, context, srcName + ".java");
- String testSource = new String(Files.readAllBytes(srcFile));
- ToolBox.JavaToolArgs javacSuccessArgs =
- new ToolBox.JavaToolArgs().setSources(testSource);
- ToolBox.javac(javacSuccessArgs);
+ tb.new JavacTask()
+ .outdir(compiledDir)
+ .files(srcFile)
+ .run();
Path cfFile = Paths.get(compiledDir, name + ".class");
byte[] bytes = Files.readAllBytes(cfFile);
return bytes;
diff --git a/langtools/test/tools/javac/lib/ToolBox.java b/langtools/test/tools/javac/lib/ToolBox.java
deleted file mode 100644
index 961465d..0000000
--- a/langtools/test/tools/javac/lib/ToolBox.java
+++ /dev/null
@@ -1,1080 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.tools.FileObject;
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileManager.Location;
-import javax.tools.JavaFileObject;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
-
-import com.sun.source.util.JavacTask;
-import com.sun.tools.javac.api.JavacTaskImpl;
-
-import sun.tools.jar.Main;
-
-import static java.nio.file.StandardCopyOption.*;
-
-/**
- * Toolbox for jtreg tests.
- */
-
-public class ToolBox {
-
- public static final String lineSeparator = System.getProperty("line.separator");
- public static final String jdkUnderTest = System.getProperty("test.jdk");
- public static final Path javaBinary = Paths.get(jdkUnderTest, "bin", "java");
- public static final Path javacBinary = Paths.get(jdkUnderTest, "bin", "javac");
-
- public static final List<String> testVMOpts = readOptions("test.vm.opts");
- public static final List<String> testToolVMOpts = readOptions("test.tool.vm.opts");
- public static final List<String> testJavaOpts = readOptions("test.java.opts");
-
- private static final Charset defaultCharset = Charset.defaultCharset();
-
- static final JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
-
- private static List<String> readOptions(String property) {
- String options = System.getProperty(property, "");
- return options.length() > 0 ? Arrays.asList(options.split("\\s+")) : Collections.<String>emptyList();
- }
-
- /**
- * The expected result of command-like method execution.
- */
- public enum Expect {SUCCESS, FAIL}
-
- enum AcceptedParams {
- EXPECT,
- SOURCES,
- OPTIONS,
- STD_OUTPUT,
- ERR_OUTPUT,
- EXTRA_ENV,
- }
-
- enum OutputKind {STD, ERR}
-
- /**
- * Helper class to abstract the processing of command's output.
- */
- static abstract class WriterHelper {
- OutputKind kind;
- public abstract void pipeOutput(ProcessBuilder pb);
- public abstract void readFromStream(Process p) throws IOException;
- public abstract void addAll(Collection<? extends String> c) throws IOException;
- }
-
- /**
- * Helper class for redirecting command's output to a file.
- */
- static class FileWriterHelper extends WriterHelper {
- File file;
-
- FileWriterHelper(File file, OutputKind kind) {
- this.file = file;
- this.kind = kind;
- }
-
- @Override
- public void pipeOutput(ProcessBuilder pb) {
- if (file != null) {
- switch (kind) {
- case STD:
- pb.redirectInput(file);
- break;
- case ERR:
- pb.redirectError(file);
- break;
- }
- }
- }
-
- @Override
- public void readFromStream(Process p) throws IOException {}
-
- @Override
- public void addAll(Collection<? extends String> c) throws IOException {
- if (file.exists())
- Files.write(file.toPath(), c, defaultCharset,
- StandardOpenOption.WRITE, StandardOpenOption.APPEND);
- else
- Files.write(file.toPath(), c, defaultCharset);
- }
- }
-
- /**
- * Helper class for redirecting command's output to a String list.
- */
- static class ListWriterHelper extends WriterHelper {
- List<String> list;
-
- public ListWriterHelper(List<String> list, OutputKind kind) {
- this.kind = kind;
- this.list = list;
- }
-
- @Override
- public void pipeOutput(ProcessBuilder pb) {}
-
- @Override
- public void readFromStream(Process p) throws IOException {
- BufferedReader br = null;
- switch (kind) {
- case STD:
- br = new BufferedReader(new InputStreamReader(p.getInputStream()));
- break;
- case ERR:
- br = new BufferedReader(new InputStreamReader(p.getErrorStream()));
- break;
- }
- String line;
- while ((line = br.readLine()) != null) {
- list.add(line);
- }
- }
-
- public void addAll(Collection<? extends String> c) {
- list.addAll(c);
- }
- }
-
- /**
- * Simple factory class for creating a WriterHelper instance.
- */
- static class WriterHelperFactory {
- static WriterHelper make(File file, OutputKind kind) {
- return new FileWriterHelper(file, kind);
- }
-
- static WriterHelper make(List<String> list, OutputKind kind) {
- return new ListWriterHelper(list, kind);
- }
- }
-
- /**
- * A generic class for holding command's arguments.
- */
- public static abstract class GenericArgs <T extends GenericArgs> {
- protected static List<Set<AcceptedParams>> minAcceptedParams;
-
- protected Set<AcceptedParams> currentParams =
- EnumSet.<AcceptedParams>noneOf(AcceptedParams.class);
-
- protected Expect whatToExpect;
- protected WriterHelper stdOutput;
- protected WriterHelper errOutput;
- protected List<String> args = new ArrayList<>();
- protected String[] argsArr;
-
- protected GenericArgs() {
- set(Expect.SUCCESS);
- }
-
- public T set(Expect whatToExpt) {
- currentParams.add(AcceptedParams.EXPECT);
- this.whatToExpect = whatToExpt;
- return (T)this;
- }
-
- public T setStdOutput(List<String> stdOutput) {
- currentParams.add(AcceptedParams.STD_OUTPUT);
- this.stdOutput = WriterHelperFactory.make(stdOutput, OutputKind.STD);
- return (T)this;
- }
-
- public T setStdOutput(File output) {
- currentParams.add(AcceptedParams.STD_OUTPUT);
- this.stdOutput = WriterHelperFactory.make(output, OutputKind.STD);
- return (T)this;
- }
-
- public T setErrOutput(List<String> errOutput) {
- currentParams.add(AcceptedParams.ERR_OUTPUT);
- this.errOutput = WriterHelperFactory.make(errOutput, OutputKind.ERR);
- return (T)this;
- }
-
- public T setErrOutput(File errOutput) {
- currentParams.add(AcceptedParams.ERR_OUTPUT);
- this.errOutput = WriterHelperFactory.make(errOutput, OutputKind.ERR);
- return (T)this;
- }
-
- public T setAllArgs(String... args) {
- currentParams.add(AcceptedParams.OPTIONS);
- this.argsArr = args;
- return (T) this;
- }
-
-
- public T appendArgs(String... args) {
- appendArgs(Arrays.asList(args));
- return (T)this;
- }
-
- public T appendArgs(Path... args) {
- if (args != null) {
- List<String> list = new ArrayList<>();
- for (int i = 0; i < args.length; i++) {
- if (args[i] != null) {
- list.add(args[i].toString());
- }
- }
- appendArgs(list);
- }
- return (T)this;
- }
-
- public T appendArgs(List<String> args) {
- if (args != null && args.size() > 0) {
- currentParams.add(AcceptedParams.OPTIONS);
- for (int i = 0; i < args.size(); i++) {
- if (args.get(i) != null) {
- this.args.add(args.get(i));
- }
- }
- }
- return (T)this;
- }
-
- public T setOptions(List<String> options) {
- currentParams.add(AcceptedParams.OPTIONS);
- this.args = options;
- return (T)this;
- }
-
- public T setOptions(String... options) {
- currentParams.add(AcceptedParams.OPTIONS);
- this.args = Arrays.asList(options);
- return (T)this;
- }
-
- public boolean hasMinParams() {
- for (Set<AcceptedParams> minSet : minAcceptedParams) {
- if (currentParams.containsAll(minSet)) {
- return true;
- }
- }
- return false;
- }
- }
-
- /**
- * A more specific class for holding javac-like command's arguments.
- */
- public static class JavaToolArgs extends GenericArgs<JavaToolArgs> {
-
- static {
- minAcceptedParams = new ArrayList<>();
- minAcceptedParams.add(EnumSet.<AcceptedParams>of(
- AcceptedParams.EXPECT, AcceptedParams.OPTIONS));
- minAcceptedParams.add(EnumSet.<AcceptedParams>of(
- AcceptedParams.EXPECT, AcceptedParams.SOURCES));
- }
-
- protected List<? extends JavaFileObject> sources;
-
- public JavaToolArgs() {
- super();
- }
-
- public JavaToolArgs(Expect whatToExpt) {
- super.set(whatToExpt);
- }
-
- public JavaToolArgs setSources(List<? extends JavaFileObject> sources) {
- currentParams.add(AcceptedParams.SOURCES);
- this.sources = sources;
- return this;
- }
-
- public JavaToolArgs setSources(JavaSource... sources) {
- return setSources(Arrays.asList(sources));
- }
-
- public JavaToolArgs setSources(String... sources) {
- List<JavaSource> javaSrcs = new ArrayList<>();
- for (String source : sources) {
- javaSrcs.add(new JavaSource(source));
- }
- return setSources(javaSrcs);
- }
- }
-
- /**
- * A more specific class for holding any command's arguments.
- */
- public static class AnyToolArgs extends GenericArgs<AnyToolArgs> {
-
- static {
- minAcceptedParams = new ArrayList<>();
- minAcceptedParams.add(EnumSet.<AcceptedParams>of(
- AcceptedParams.EXPECT, AcceptedParams.OPTIONS));
- }
-
- Map<String, String> extraEnv;
-
- public AnyToolArgs() {
- super();
- }
-
- public AnyToolArgs(Expect whatToExpt) {
- set(whatToExpt);
- }
-
- public AnyToolArgs set(Map<String, String> extraEnv) {
- currentParams.add(AcceptedParams.EXTRA_ENV);
- this.extraEnv = extraEnv;
- return this;
- }
- }
-
- /**
- * Custom exception for bad command execution.
- */
- public static class CommandExecutionException extends Exception {
- CommandExecutionException(List<String> command, Expect whatToExpt) {
- super(createMessage(command, whatToExpt));
- }
-
- CommandExecutionException(Expect whatToExpt, String... command) {
- this(Arrays.asList(command), whatToExpt);
- }
-
- private static String createMessage(List<String> command, Expect whatToExpt) {
- StringBuilder sb = new StringBuilder().append("Command : ");
- sb.append(command.toString()).append(lineSeparator);
- switch (whatToExpt) {
- case SUCCESS:
- sb.append(" has unexpectedly failed");
- break;
- case FAIL:
- sb.append(" has been unexpectedly successful");
- break;
- }
- return sb.toString();
- }
- }
-
- /**
- * Custom exception for not equal resources.
- */
- public static class ResourcesNotEqualException extends Exception {
- public ResourcesNotEqualException(List<String> res1, List<String> res2) {
- super(createMessage(res1, res2));
- }
-
- public ResourcesNotEqualException(String line1, String line2) {
- super(createMessage(line1, line2));
- }
-
- public ResourcesNotEqualException(Path path1, Path path2) {
- super(createMessage(path1, path2));
- }
-
- private static String createMessage(Path path1, Path path2) {
- return new StringBuilder()
- .append("The resources provided for comparison in paths \n")
- .append(path1.toString()).append(" and \n")
- .append(path2.toString()).append("are different").toString();
- }
-
- private static String createMessage(String line1, String line2) {
- return new StringBuilder()
- .append("The resources provided for comparison are different at lines: \n")
- .append(line1).append(" and \n")
- .append(line2).toString();
- }
-
- private static String createMessage(List<String> res1, List<String> res2) {
- return new StringBuilder()
- .append("The resources provided for comparison are different: \n")
- .append("Resource 1 is: ").append(res1).append("\n and \n")
- .append("Resource 2 is: ").append(res2).append("\n").toString();
- }
- }
-
- /**
- * A javac compiler caller method.
- */
- public static int javac(JavaToolArgs params)
- throws CommandExecutionException, IOException {
- if (params.hasMinParams()) {
- if (params.argsArr != null) {
- return genericJavaCMD(JavaCMD.JAVAC, params);
- } else {
- return genericJavaCMD(JavaCMD.JAVAC_API, params);
- }
- }
- throw new AssertionError("javac command has been invoked with less parameters than needed");
- }
-
- /**
- * Run javac and return the resulting classfiles.
- */
- public static Map<String, byte[]> compile(JavaToolArgs params)
- throws CommandExecutionException, IOException {
- if (params.hasMinParams()) {
- if (params.argsArr != null) {
- throw new AssertionError("setAllArgs is not supported for compile");
- }
-
- StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
- MemoryFileManager mfm = new MemoryFileManager(fm);
- StringWriter sw = null;
- boolean rc;
-
- try (PrintWriter pw = (params.errOutput == null) ?
- null : new PrintWriter(sw = new StringWriter())) {
- JavacTask ct = (JavacTask)comp.getTask(pw, mfm, null,
- params.args, null, params.sources);
- rc = ct.call();
- }
-
- String out = (sw == null) ? null : sw.toString();
-
- if (params.errOutput != null && (out != null) && !out.isEmpty()) {
- params.errOutput.addAll(splitLines(out, lineSeparator));
- }
-
- if ( ( rc && params.whatToExpect == Expect.SUCCESS) ||
- (!rc && params.whatToExpect == Expect.FAIL) ) {
- return mfm.classes;
- }
-
- throw new CommandExecutionException(JavaCMD.JAVAC_API.getExceptionMsgContent(params),
- params.whatToExpect);
- }
- throw new AssertionError("compile command has been invoked with less parameters than needed");
- }
-
- /**
- * A javap calling method.
- */
- public static String javap(JavaToolArgs params)
- throws CommandExecutionException, IOException {
- if (params.hasMinParams()) {
- List<String> list = new ArrayList<>();
- params.setErrOutput(list);
- genericJavaCMD(JavaCMD.JAVAP, params);
- return listToString(list);
- }
- throw new AssertionError("javap command has been invoked with less parameters than needed");
- }
-
- /**
- * A javah calling method.
- */
- public static int javah(JavaToolArgs params)
- throws CommandExecutionException, IOException {
- if (params.hasMinParams()) {
- return genericJavaCMD(JavaCMD.JAVAH, params);
- }
- throw new AssertionError("javah command has been invoked with less parameters than needed");
- }
-
- /**
- * A enum class for langtools commands.
- */
- enum JavaCMD {
- JAVAC {
- @Override
- int run(JavaToolArgs params, PrintWriter pw) {
- return com.sun.tools.javac.Main.compile(params.argsArr, pw);
- }
- },
- JAVAC_API {
- @Override
- int run(JavaToolArgs params, PrintWriter pw) {
- JavacTask ct = (JavacTask)comp.getTask(pw, null, null,
- params.args, null, params.sources);
- return ((JavacTaskImpl)ct).doCall().exitCode;
- }
-
- @Override
- String getName() {
- return "javac";
- }
-
- @Override
- List<String> getExceptionMsgContent(JavaToolArgs params) {
- List<String> result = super.getExceptionMsgContent(params);
- for (JavaFileObject source : params.sources) {
- if (source instanceof JavaSource) {
- result.add(((JavaSource)source).name);
- }
- }
- return result;
- }
- },
- JAVAH {
- @Override
- int run(JavaToolArgs params, PrintWriter pw) {
- return com.sun.tools.javah.Main.run(params.argsArr, pw);
- }
- },
- JAVAP {
- @Override
- int run(JavaToolArgs params, PrintWriter pw) {
- return com.sun.tools.javap.Main.run(params.argsArr, pw);
- }
- };
-
- abstract int run(JavaToolArgs params, PrintWriter pw);
-
- String getName() {
- return this.name().toLowerCase();
- }
-
- List<String> getExceptionMsgContent(JavaToolArgs params) {
- List<String> result = new ArrayList<>();
- result.add(getName());
- result.addAll(params.argsArr != null ?
- Arrays.asList(params.argsArr) :
- params.args);
- return result;
- }
- }
-
- /**
- * A helper method for executing langtools commands.
- */
- private static int genericJavaCMD(
- JavaCMD cmd,
- JavaToolArgs params)
- throws CommandExecutionException, IOException {
- int rc = 0;
- StringWriter sw = null;
- try (PrintWriter pw = (params.errOutput == null) ?
- null : new PrintWriter(sw = new StringWriter())) {
- rc = cmd.run(params, pw);
- }
- String out = (sw == null) ? null : sw.toString();
-
- if (params.errOutput != null && (out != null) && !out.isEmpty()) {
- params.errOutput.addAll(splitLines(out, lineSeparator));
- }
-
- if ( (rc == 0 && params.whatToExpect == Expect.SUCCESS) ||
- (rc != 0 && params.whatToExpect == Expect.FAIL) ) {
- return rc;
- }
-
- throw new CommandExecutionException(cmd.getExceptionMsgContent(params),
- params.whatToExpect);
- }
-
- /**
- * A jar calling method.
- */
- public static boolean jar(String... params) throws CommandExecutionException {
- Main jarGenerator = new Main(System.out, System.err, "jar");
- boolean result = jarGenerator.run(params);
- if (!result) {
- List<String> command = new ArrayList<>();
- command.add("jar");
- command.addAll(Arrays.asList(params));
- throw new CommandExecutionException(command, Expect.SUCCESS);
- }
- return result;
- }
-
- /**
- * A general command calling method.
- */
- public static int executeCommand(AnyToolArgs params)
- throws CommandExecutionException, IOException, InterruptedException {
- if (params.hasMinParams()) {
- List<String> cmd = (params.args != null) ?
- params.args :
- Arrays.asList(params.argsArr);
- return executeCommand(cmd, params.extraEnv, params.stdOutput,
- params.errOutput, params.whatToExpect);
- }
- throw new AssertionError("command has been invoked with less parameters than needed");
- }
-
- /**
- * A helper method for calling a general command.
- */
- private static int executeCommand(
- List<String> command,
- Map<String, String> extraEnv,
- WriterHelper stdOutput,
- WriterHelper errOutput,
- Expect whatToExpt)
- throws IOException, InterruptedException, CommandExecutionException {
- ProcessBuilder pb = new ProcessBuilder(command);
-
- if (stdOutput != null) stdOutput.pipeOutput(pb);
- if (errOutput != null) errOutput.pipeOutput(pb);
-
- if (extraEnv != null) {
- pb.environment().putAll(extraEnv);
- }
-
- Process p = pb.start();
-
- if (stdOutput != null) stdOutput.readFromStream(p);
- if (errOutput != null) errOutput.readFromStream(p);
-
- int result = p.waitFor();
- if ( (result == 0 && whatToExpt == Expect.SUCCESS) ||
- (result != 0 && whatToExpt == Expect.FAIL) ) {
- return result;
- }
-
- throw new CommandExecutionException(command, whatToExpt);
- }
-
- /**
- * This set of methods can be used instead of diff when the only needed
- * result is the equality or inequality of the two given resources.
- *
- * A resource can be a file or a String list.
- */
- public static void compareLines(Path aPath, Path otherPath, String encoding)
- throws FileNotFoundException, IOException, ResourcesNotEqualException {
- compareLines(aPath, otherPath, encoding, false);
- }
-
- public static void compareLines(
- Path aPath, Path otherPath, String encoding, boolean trim)
- throws FileNotFoundException, IOException, ResourcesNotEqualException {
- Charset charset = encoding != null ?
- Charset.forName(encoding) :
- defaultCharset;
- List<String> list1 = Files.readAllLines(aPath, charset);
- List<String> list2 = Files.readAllLines(otherPath, charset);
- compareLines(list1, list2, trim);
- }
-
- public static void compareLines(Path path, List<String> strings, String encoding)
- throws FileNotFoundException, IOException, ResourcesNotEqualException {
- compareLines(path, strings, encoding, false);
- }
-
- public static void compareLines(Path path, List<String> strings,
- String encoding, boolean trim)
- throws FileNotFoundException, IOException, ResourcesNotEqualException {
- Charset charset = encoding != null ?
- Charset.forName(encoding) :
- defaultCharset;
- List<String> list = Files.readAllLines(path, charset);
- compareLines(list, strings, trim);
- }
-
- public static void compareLines(List<String> list1, List<String> list2)
- throws ResourcesNotEqualException {
- compareLines(list1, list2, false);
- }
-
- public static void compareLines(List<String> list1,
- List<String> list2, boolean trim) throws ResourcesNotEqualException {
- if ((list1 == list2) || (list1 == null && list2 == null)) return;
- if (list1.size() != list2.size())
- throw new ResourcesNotEqualException(list1, list2);
- int i = 0;
- int j = 0;
- while (i < list1.size() &&
- j < list2.size() &&
- equals(list1.get(i), list2.get(j), trim)) {
- i++; j++;
- }
- if (!(i == list1.size() && j == list2.size()))
- throw new ResourcesNotEqualException(list1, list2);
- }
-
- private static boolean equals(String s1, String s2, boolean trim) {
- return (trim ? s1.trim().equals(s2.trim()) : s1.equals(s2));
- }
-
- /**
- * A set of simple grep-like methods, looks for regExpr in text.
- * The content of text is split using the new line character as a pattern
- * and later the regExpr is seek in every split line. If a match is found,
- * the whole line is added to the result.
- */
- public static List<String> grep(String regExpr, String text, String sep) {
- return grep(regExpr, splitLines(text, sep));
- }
-
- public static List<String> grep(String regExpr, List<String> text) {
- List<String> result = new ArrayList<>();
- Pattern pattern = Pattern.compile(regExpr);
- for (String s : text) {
- if (pattern.matcher(s).find()) {
- result.add(s);
- }
- }
- return result;
- }
-
- public static List<String> grep(String regExpr, File f)
- throws IOException {
- List<String> lines = Files.readAllLines(f.toPath(), defaultCharset);
- return grep(regExpr, lines);
- }
-
- /**
- * A touch-like method.
- */
- public static boolean touch(String fileName) {
- File file = new File(fileName);
- return touch(file);
- }
-
- public static boolean touch(File file) {
- if (file.exists()) {
- file.setLastModified(System.currentTimeMillis());
- return true;
- }
- return false;
- }
-
- public static void createJavaFile(File outFile) throws IOException {
- createJavaFile(outFile, null);
- }
-
- /**
- * A method for creating a valid but very simple java file.
- */
- public static void createJavaFile(File outFile, File superClass)
- throws IOException {
- String srcStr = "public class " + getSimpleName(outFile) + " ";
- if (superClass != null) {
- srcStr = srcStr.concat("extends " + getSimpleName(superClass) + " ");
- }
- srcStr = srcStr.concat("{}");
- try (PrintWriter ps = new PrintWriter(new FileWriter(outFile))) {
- ps.println(srcStr);
- }
- }
-
- /**
- * Creates a java file name given its source.
- * The file is created in the working directory, creating a directory
- * tree if there is a package declaration.
- */
- public static void createJavaFileFromSource(String source) throws IOException {
- createJavaFileFromSource(null, source);
- }
-
- /**
- * Creates a java file name given its source.
- * The file is created in the working directory, creating a directory
- * tree if there is a package declaration or the argument initialPath
- * has a valid path.
- *
- * e.i. if initialPath is foo/ and the source is:
- * package bar;
- *
- * public class bazz {}
- *
- * this method will create the file foo/bar/bazz.java in the working
- * directory.
- */
- public static void createJavaFileFromSource(Path initialPath,
- String source) throws IOException {
- String fileName = getJavaFileNameFromSource(source);
- String dirTree = getDirTreeFromSource(source);
- Path path = (dirTree != null) ?
- Paths.get(dirTree, fileName) :
- Paths.get(fileName);
- path = (initialPath != null) ?
- initialPath.resolve(path):
- path;
- writeFile(path, source);
- }
-
- static Pattern publicClassPattern =
- Pattern.compile("public\\s+(?:class|enum|interface){1}\\s+(\\w+)");
- static Pattern packageClassPattern =
- Pattern.compile("(?:class|enum|interface){1}\\s+(\\w+)");
-
- /**
- * Extracts the java file name from the class declaration.
- * This method is intended for simple files and uses regular expressions,
- * so comments matching the pattern can make the method fail.
- */
- static String getJavaFileNameFromSource(String source) {
- String className = null;
- Matcher matcher = publicClassPattern.matcher(source);
- if (matcher.find()) {
- className = matcher.group(1) + ".java";
- } else {
- matcher = packageClassPattern.matcher(source);
- if (matcher.find()) {
- className = matcher.group(1) + ".java";
- } else {
- throw new AssertionError("Could not extract the java class " +
- "name from the provided source");
- }
- }
- return className;
- }
-
- static Pattern packagePattern =
- Pattern.compile("package\\s+(((?:\\w+\\.)*)(?:\\w+))");
-
- /**
- * Extracts the path from the package declaration if present.
- * This method is intended for simple files and uses regular expressions,
- * so comments matching the pattern can make the method fail.
- */
- private static String getDirTreeFromSource(String source) {
- Matcher matcher = packagePattern.matcher(source);
- return matcher.find() ?
- matcher.group(1).replace(".", File.separator) :
- null;
- }
-
- /**
- * A method for creating a jar's manifest file with supplied data.
- */
- public static void mkManifestWithClassPath(String mainClass,
- String... classes) throws IOException {
- List <String> lines = new ArrayList<>();
-
- StringBuilder sb = new StringBuilder("Class-Path: ".length() +
- classes[0].length()).append("Class-Path: ").append(classes[0]);
- for (int i = 1; i < classes.length; i++) {
- sb.append(" ").append(classes[i]);
- }
- lines.add(sb.toString());
- if (mainClass != null) {
- lines.add(new StringBuilder("Main-Class: ".length() +
- mainClass.length())
- .append("Main-Class: ")
- .append(mainClass).toString());
- }
- Files.write(Paths.get("MANIFEST.MF"), lines,
- StandardOpenOption.CREATE, StandardOpenOption.WRITE,
- StandardOpenOption.TRUNCATE_EXISTING);
- }
-
- /**
- * A utility method to obtain the file name.
- */
- static String getSimpleName(File inFile) {
- return inFile.toPath().getFileName().toString();
- }
-
- /**
- * A method to write to a file, the directory tree is created if needed.
- */
- public static File writeFile(Path path, String body) throws IOException {
- File result;
- if (path.getParent() != null) {
- Files.createDirectories(path.getParent());
- }
- try (FileWriter out = new FileWriter(result = path.toAbsolutePath().toFile())) {
- out.write(body);
- }
- return result;
- }
-
- public static File writeFile(String path, String body) throws IOException {
- return writeFile(Paths.get(path), body);
- }
-
- /**
- * A rm-like method, the file is deleted only if it exists.
- */
- public static void rm(Path path) throws Exception {
- Files.deleteIfExists(path);
- }
-
- public static void rm(String filename) throws Exception {
- rm(Paths.get(filename));
- }
-
- public static void rm(File f) throws Exception {
- rm(f.toPath());
- }
-
- /**
- * Copy source file to destination file.
- */
- public static void copyFile(File destfile, File srcfile)
- throws IOException {
- copyFile(destfile.toPath(), srcfile.toPath());
- }
-
- public static void copyFile(Path destPath, Path srcPath)
- throws IOException {
- Files.createDirectories(destPath);
- Files.copy(srcPath, destPath, REPLACE_EXISTING);
- }
-
- /**
- * Splits a String using the System's line separator character as splitting point.
- */
- public static List<String> splitLines(String lines, String sep) {
- return Arrays.asList(lines.split(sep));
- }
-
- /**
- * Converts a String list into one String by appending the System's line separator
- * character after each component.
- */
- private static String listToString(List<String> lines) {
- StringBuilder sb = new StringBuilder();
- for (String s : lines) {
- sb.append(s).append(lineSeparator);
- }
- return sb.toString();
- }
-
- /**
- * Returns true if the OS is a Windows version.
- */
- public static boolean isWindows() {
- String osName = System.getProperty("os.name");
- return osName.toUpperCase().startsWith("WINDOWS");
- }
-
- /**
- * Class representing an in-memory java source file. It is able to extract
- * the file name from simple source codes using regular expressions.
- */
- public static class JavaSource extends SimpleJavaFileObject {
- String source;
- String name;
-
- public JavaSource(String className, String source) {
- super(URI.create(className),
- JavaFileObject.Kind.SOURCE);
- this.name = className;
- this.source = source;
- }
-
- public JavaSource(String source) {
- super(URI.create(getJavaFileNameFromSource(source)),
- JavaFileObject.Kind.SOURCE);
- this.name = getJavaFileNameFromSource(source);
- this.source = source;
- }
-
- @Override
- public CharSequence getCharContent(boolean ignoreEncodingErrors) {
- return source;
- }
- }
-
- /**
- * A file manager for compiling strings to byte arrays.
- * This file manager delegates to another file manager
- * to lookup classes on boot class path.
- */
- public static final class MemoryFileManager extends ForwardingJavaFileManager {
- /**
- * Maps binary class names to class files stored as byte arrays.
- */
- private final Map<String, byte[]> classes;
-
- /**
- * Construct a memory file manager which delegates to the specified
- * file manager for unknown sources.
- * @param fileManager a file manager used to look up class files on class path, etc.
- */
- public MemoryFileManager(JavaFileManager fileManager) {
- super(fileManager);
- classes = new HashMap<>();
- }
-
- @java.lang.Override
- public JavaFileObject getJavaFileForOutput(Location location,
- String name,
- Kind kind,
- FileObject sibling)
- throws UnsupportedOperationException
- {
- return new JavaClassInArray(name);
- }
-
- /**
- * A file object representing a Java class file stored in a byte array.
- */
- private class JavaClassInArray extends SimpleJavaFileObject {
-
- private final String name;
-
- /**
- * Constructs a JavaClassInArray object.
- * @param name binary name of the class to be stored in this file object
- */
- JavaClassInArray(String name) {
- super(URI.create("mfm:///" + name.replace('.','/') + Kind.CLASS.extension),
- Kind.CLASS);
- this.name = name;
- }
-
- public OutputStream openOutputStream() {
- return new FilterOutputStream(new ByteArrayOutputStream()) {
- public void close() throws IOException {
- out.close();
- ByteArrayOutputStream bos = (ByteArrayOutputStream)out;
- classes.put(name, bos.toByteArray());
- }
- };
- }
- }
-
- }
-
-}
diff --git a/langtools/test/tools/javac/links/LinksTest.java b/langtools/test/tools/javac/links/LinksTest.java
index 6cdebb0..890ffa6 100644
--- a/langtools/test/tools/javac/links/LinksTest.java
+++ b/langtools/test/tools/javac/links/LinksTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4266026
* @summary javac no longer follows symlinks
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main LinksTest
*/
@@ -33,7 +33,7 @@
import java.nio.file.Files;
import java.nio.file.Paths;
-//original test: test/tools/javac/links/links.sh
+// Original test: test/tools/javac/links/links.sh
public class LinksTest {
private static final String BSrc =
@@ -44,20 +44,18 @@
private static final String TSrc =
"class T extends a.B {}";
- public static void main(String args[])
- throws Exception {
-// mkdir tmp
-// cp ${TESTSRC}/b/B.java tmp
- ToolBox.writeFile(Paths.get("tmp", "B.java"), BSrc);
+ public static void main(String... args) throws Exception {
+ ToolBox tb = new ToolBox();
+ tb.writeFile("tmp/B.java", BSrc);
try {
-// ln -s `pwd`/tmp "${TESTCLASSES}/a"
Files.createSymbolicLink(Paths.get("a"), Paths.get("tmp"));
- ////"${TESTJAVA}/bin/javac" ${TESTTOOLVMOPTS} -sourcepath "${TESTCLASSES}" -d "${TESTCLASSES}/classes" "${TESTSRC}/T.java" 2>&1
- ToolBox.JavaToolArgs javacArgs =
- new ToolBox.JavaToolArgs()
- .setOptions("-sourcepath", ".", "-d", ".").setSources(TSrc);
- ToolBox.javac(javacArgs);
+
+ tb.new JavacTask()
+ .sourcepath(".")
+ .outdir(".")
+ .sources(TSrc)
+ .run();
} catch (UnsupportedOperationException e) {
System.err.println("Symbolic links not supported on this system. The test can't finish");
}
diff --git a/langtools/test/tools/javac/newlines/NewLineTest.java b/langtools/test/tools/javac/newlines/NewLineTest.java
index 27392f2..aa6fa79 100644
--- a/langtools/test/tools/javac/newlines/NewLineTest.java
+++ b/langtools/test/tools/javac/newlines/NewLineTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4110560 4785453
* @summary portability : javac.properties
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main NewLineTest
*/
@@ -39,18 +39,13 @@
public class NewLineTest {
public static void main(String args[]) throws Exception {
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -J-Dline.separator='@' > ${TMP1} 2>&1
+ ToolBox tb = new ToolBox();
File javacErrOutput = new File("output.txt");
- ToolBox.AnyToolArgs cmdArgs =
- new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
- .appendArgs(ToolBox.javacBinary)
- .appendArgs(ToolBox.testToolVMOpts)
- .appendArgs("-J-Dline.separator='@'")
- .setErrOutput(javacErrOutput);
- ToolBox.executeCommand(cmdArgs);
+ tb.new JavacTask(ToolBox.Mode.EXEC)
+ .redirect(ToolBox.OutputKind.STDERR, javacErrOutput.getPath())
+ .options("-J-Dline.separator='@'")
+ .run(ToolBox.Expect.FAIL);
-// result=`cat ${TMP1} | wc -l`
-// if [ "$result" -eq 0 ] passed
List<String> lines = Files.readAllLines(javacErrOutput.toPath(),
Charset.defaultCharset());
if (lines.size() != 1) {
diff --git a/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java b/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java
index 5de980774..bc6ab6f 100644
--- a/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java
+++ b/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java
@@ -26,8 +26,8 @@
* @bug 8038455
* @summary Ensure that formatting diagnostics with an already closed JavaCompiler won't crash
* the compiler.
- * @library /tools/javac/lib
- * @build CompleteOnClosed ToolBox JavacTestingAbstractProcessor
+ * @library /tools/lib /tools/javac/lib
+ * @build ToolBox JavacTestingAbstractProcessor
* @run main CompleteOnClosed
*/
diff --git a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java b/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
index e2bde26..3d6fb21 100644
--- a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
+++ b/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
@@ -26,7 +26,7 @@
* @bug 8038455
* @summary Verify that annotation processor can overwrite source and class files it generated
* during previous compilations, and that the Symbols are updated appropriatelly.
- * @library /tools/javac/lib/
+ * @library /tools/lib /tools/javac/lib/
* @clean *
* @build OverwriteBetweenCompilations ToolBox JavacTestingAbstractProcessor
* @compile/ref=OverwriteBetweenCompilations_1.out -processor OverwriteBetweenCompilations -Apass=1 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
@@ -49,6 +49,7 @@
@SupportedOptions("pass")
public class OverwriteBetweenCompilations extends JavacTestingAbstractProcessor {
int round = 1;
+ @Override
public boolean process(Set<? extends TypeElement> annotations,
RoundEnvironment roundEnv) {
Log log = Log.instance(((JavacProcessingEnvironment) processingEnv).getContext());
@@ -85,11 +86,17 @@
try (OutputStream out = filer.createClassFile("GeneratedClass").openOutputStream()) {
String code = pass != 2 ? GENERATED_INIT : GENERATED_UPDATE;
code = code.replace("NAME", "GeneratedClass");
- ToolBox.JavaToolArgs args =
- new ToolBox.JavaToolArgs().appendArgs("-parameters").setSources(code);
- Map<String, byte[]> codeMap = ToolBox.compile(args);
- out.write(codeMap.get("GeneratedClass"));
- } catch (IOException | ToolBox.CommandExecutionException e) {
+
+ ToolBox tb = new ToolBox();
+ ToolBox.MemoryFileManager mfm = new ToolBox.MemoryFileManager();
+ tb.new JavacTask()
+ .fileManager(mfm)
+ .options("-parameters")
+ .sources(code)
+ .run();
+
+ out.write(mfm.getFileBytes(StandardLocation.CLASS_OUTPUT, "GeneratedClass"));
+ } catch (IOException e) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, e.toString());
}
}
diff --git a/langtools/test/tools/javac/stackmap/StackMapTest.java b/langtools/test/tools/javac/stackmap/StackMapTest.java
index fbe40c9..4807835 100644
--- a/langtools/test/tools/javac/stackmap/StackMapTest.java
+++ b/langtools/test/tools/javac/stackmap/StackMapTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
* @test
* @bug 4955930
* @summary The "method0" StackMap attribute should have two entries instead of three
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run compile StackMapTest.java
* @run main StackMapTest
@@ -34,7 +34,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
-//original test: test/tools/javac/stackmap/T4955930.sh
+// Original test: test/tools/javac/stackmap/T4955930.sh
public class StackMapTest {
class Test {
@@ -48,16 +48,15 @@
}
public static void main(String args[]) throws Exception {
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} T4955930.java
+ ToolBox tb = new ToolBox();
+ Path pathToClass = Paths.get(ToolBox.testClasses, "StackMapTest$Test.class");
+ String javapOut = tb.new JavapTask()
+ .options("-v")
+ .classes(pathToClass.toString())
+ .run()
+ .getOutput(ToolBox.OutputKind.DIRECT);
-// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -verbose T4955930 > ${TMP1}
- Path pathToClass = Paths.get(System.getProperty("test.classes"),
- "StackMapTest$Test.class");
- ToolBox.JavaToolArgs javapArgs =
- new ToolBox.JavaToolArgs().setAllArgs("-v", pathToClass.toString());
-
-// grep "StackMapTable: number_of_entries = 2" ${TMP1}
- if (!ToolBox.javap(javapArgs).contains("StackMapTable: number_of_entries = 2"))
+ if (!javapOut.contains("StackMapTable: number_of_entries = 2"))
throw new AssertionError("The number of entries of the stack map "
+ "table should be equal to 2");
}
diff --git a/langtools/test/tools/javah/6257087/T6257087.java b/langtools/test/tools/javah/6257087/T6257087.java
index 27b538f..1dc353f 100644
--- a/langtools/test/tools/javah/6257087/T6257087.java
+++ b/langtools/test/tools/javah/6257087/T6257087.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
* @test
* @bug 6257087
* @summary javah doesn't produce proper signatures for inner class native methods
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main T6257087
*/
-import java.nio.file.Paths;
+import java.util.List;
public class T6257087 {
@@ -58,13 +58,14 @@
"#endif";
public static void main(String[] args) throws Exception {
- ToolBox.JavaToolArgs javahArgs =
- new ToolBox.JavaToolArgs()
- .setAllArgs("-cp", System.getProperty("test.classes"), "foo");
- ToolBox.javah(javahArgs);
+ ToolBox tb = new ToolBox();
+ tb.new JavahTask()
+ .classpath(ToolBox.testClasses)
+ .classes("foo")
+ .run();
- ToolBox.compareLines(Paths.get("foo_bar.h"),
- ToolBox.splitLines(fooBarGoldenFile, "\n"), null, true);
+ List<String> fooBarFile = tb.readAllLines("foo_bar.h");
+ tb.checkEqual(fooBarFile, tb.split(fooBarGoldenFile, "\n"));
}
}
diff --git a/langtools/test/tools/javah/T4942232/MissingParamClassTest.java b/langtools/test/tools/javah/T4942232/MissingParamClassTest.java
index 5315e3b..233755f 100644
--- a/langtools/test/tools/javah/T4942232/MissingParamClassTest.java
+++ b/langtools/test/tools/javah/T4942232/MissingParamClassTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Verifies that javah won't attempt to generate a header file if a
* native method in a supplied class contains a parameter type whose corresponding
* class is missing or not in the classpath
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run compile MissingParamClassTest.java
* @clean MissingParamClassException
@@ -39,32 +39,21 @@
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-//original test: test/tools/javah/MissingParamClassTest.sh
+// Original test: test/tools/javah/MissingParamClassTest.sh
public class MissingParamClassTest {
public static void main(String[] args) throws Exception {
- //first steps done now by jtreg
-//"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java"
-//rm -f MissingParamClassException.class
+ ToolBox tb = new ToolBox();
-//"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1}
- List<String> errOutput = new ArrayList<>();
- ToolBox.JavaToolArgs javahParams =
- new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
- .setAllArgs("-classpath", System.getProperty("test.classes"), "ParamClassTest")
- .setErrOutput(errOutput);
- ToolBox.javah(javahParams);
+ String out = tb.new JavahTask()
+ .classpath(ToolBox.testClasses)
+ .classes("ParamClassTest")
+ .run(ToolBox.Expect.FAIL)
+ .getOutput(ToolBox.OutputKind.DIRECT);
-//if [ -f $GENERATED_HEADER_FILE ]; then fail
-//if [ ! -s ${TMP1} ]; then fail
- if (Files.exists(Paths.get("ParamClassTest.h")) || errOutput.size() == 0)
+ if (Files.exists(Paths.get("ParamClassTest.h")) || out.isEmpty())
throw new AssertionError("The only output generated by javah must be an error message");
- //jtreg again
-//rm -f MissingParamClassException.class ParamClassTest.class
-//rm -f $GENERATED_HEADER_FILE $TMP1
}
}
diff --git a/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java b/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java
index 88b31f6..fefc93f 100644
--- a/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java
+++ b/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,15 @@
* @summary Validates rewritten javah handling of class defined constants and
* ensures that the appropriate macro definitions are placed in the generated
* header file.
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main ConstMacroTest
*/
import java.io.*;
-import java.nio.file.Paths;
+import java.util.List;
-//original test: test/tools/javah/ConstMacroTest.sh
+// Original test: test/tools/javah/ConstMacroTest.sh
public class ConstMacroTest {
private static final String subClassConstsGoldenFileTemplate =
@@ -71,27 +71,21 @@
"#endif\n" +
"#endif";
- private static final String serialVersionUIDSuffix =
- ToolBox.isWindows() ? "i64" : "LL"; ;
-
public static void main(String[] args) throws Exception {
- //first steps are now done by jtreg
-// cp "${TESTSRC}${FS}SuperClassConsts.java" .
-// cp "${TESTSRC}${FS}SubClassConsts.java" .
+ ToolBox tb = new ToolBox();
-// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java"
+ tb.new JavahTask()
+ .classpath(ToolBox.testClasses)
+ .classes("SubClassConsts")
+ .run();
-// "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts
- ToolBox.JavaToolArgs successParams =
- new ToolBox.JavaToolArgs()
- .setAllArgs("-cp", System.getProperty("test.classes"), "SubClassConsts");
- ToolBox.javah(successParams);
+ String longSuffix = tb.isWindows() ? "i64" : "LL";
+ List<String> subClassConstsGoldenFile = tb.split(
+ String.format(subClassConstsGoldenFileTemplate, longSuffix), "\n");
-// diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}"
- String subClassConstGoldenFile = String.format(subClassConstsGoldenFileTemplate,
- serialVersionUIDSuffix);
- ToolBox.compareLines(Paths.get("SubClassConsts.h"),
- ToolBox.splitLines(subClassConstGoldenFile, "\n"), null, true);
+ List<String> subClassConstsFile = tb.readAllLines("SubClassConsts.h");
+
+ tb.checkEqual(subClassConstsFile, subClassConstsGoldenFile);
}
}
diff --git a/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java b/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java
index 33c823a..e2c2655 100644
--- a/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java
+++ b/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,23 @@
/*
* @test
* @bug 4798312
- * @summary In Windows, javap doesnt load classes from rt.jar
- * @library /tools/javac/lib
+ * @summary In Windows, javap doesn't load classes from rt.jar
+ * @library /tools/lib
* @build ToolBox
* @run main JavapShouldLoadClassesFromRTJarTest
*/
+
public class JavapShouldLoadClassesFromRTJarTest {
public static void main(String[] args) throws Exception {
-// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} java.lang.String
- ToolBox.JavaToolArgs params =
- new ToolBox.JavaToolArgs().
- setAllArgs("-v", "java.lang.String");
- if (ToolBox.javap(params).isEmpty())
+ ToolBox tb = new ToolBox();
+ String out = tb.new JavapTask()
+ .options("-v")
+ .classes("java.lang.String")
+ .run()
+ .getOutput(ToolBox.OutputKind.DIRECT);
+
+ if (out.isEmpty())
throw new AssertionError("javap generated no output");
}
diff --git a/langtools/test/tools/javap/4866831/PublicInterfaceTest.java b/langtools/test/tools/javap/4866831/PublicInterfaceTest.java
index d9021b4..d134712 100644
--- a/langtools/test/tools/javap/4866831/PublicInterfaceTest.java
+++ b/langtools/test/tools/javap/4866831/PublicInterfaceTest.java
@@ -1,9 +1,5 @@
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,23 +25,29 @@
* @test
* @bug 4866831
* @summary Verify that javap marks public interfaces as public
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main PublicInterfaceTest
*/
-//original test: test/tools/javap/PublicInterfaceTest.sh
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+// Original test: test/tools/javap/PublicInterfaceTest.sh
public class PublicInterfaceTest {
public interface Test {}
public static void main(String[] args) throws Exception {
-// "$JAVAP" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" NotPackagePrivateInterface | grep public
- Path pathToClass = Paths.get(System.getProperty("test.classes"),
- "PublicInterfaceTest$Test.class");
- ToolBox.JavaToolArgs javapParams =
- new ToolBox.JavaToolArgs()
- .setAllArgs(pathToClass.toString());
- if (!ToolBox.javap(javapParams).contains("public"))
+ ToolBox tb = new ToolBox();
+
+ Path pathToClass = Paths.get(ToolBox.testClasses, "PublicInterfaceTest$Test.class");
+
+ String out = tb.new JavapTask()
+ .classes(pathToClass.toString())
+ .run()
+ .getOutput(ToolBox.OutputKind.DIRECT);
+
+ if (!out.contains("public"))
throw new AssertionError("The javap output does not contain \"public\"");
}
diff --git a/langtools/test/tools/javap/stackmap/StackmapTest.java b/langtools/test/tools/javap/stackmap/StackmapTest.java
index 81664be..83c4592 100644
--- a/langtools/test/tools/javap/stackmap/StackmapTest.java
+++ b/langtools/test/tools/javap/stackmap/StackmapTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,15 @@
* @test
* @bug 6271292
* @summary Verify that javap prints StackMapTable attribute contents
- * @library /tools/javac/lib
+ * @library /tools/lib
* @build ToolBox
* @run main StackmapTest
*/
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.List;
-//original test: test/tools/javap/stackmap/T6271292.sh
+// Original test: test/tools/javap/stackmap/T6271292.sh
public class StackmapTest {
private static final String TestSrc =
@@ -58,41 +58,42 @@
"}\n";
private static final String goldenOut =
- "frame_type = 255 /* full_frame */\n" +
- "frame_type = 255 /* full_frame */\n" +
- "frame_type = 73 /* same_locals_1_stack_item */\n" +
- "frame_type = 255 /* full_frame */\n" +
- "offset_delta = 19\n" +
- "offset_delta = 0\n" +
- "offset_delta = 2\n" +
- "stack = [ uninitialized 0, uninitialized 0 ]\n" +
- "stack = [ uninitialized 0, uninitialized 0, double ]\n" +
- "stack = [ this ]\n" +
- "stack = [ this, double ]\n" +
- "locals = [ class \"[Ljava/lang/String;\" ]\n" +
- "locals = [ class \"[Ljava/lang/String;\" ]\n" +
- "locals = [ this, int ]\n";
+ " frame_type = 255 /* full_frame */\n" +
+ " frame_type = 255 /* full_frame */\n" +
+ " frame_type = 73 /* same_locals_1_stack_item */\n" +
+ " frame_type = 255 /* full_frame */\n" +
+ " offset_delta = 19\n" +
+ " offset_delta = 0\n" +
+ " offset_delta = 2\n" +
+ " stack = [ uninitialized 0, uninitialized 0 ]\n" +
+ " stack = [ uninitialized 0, uninitialized 0, double ]\n" +
+ " stack = [ this ]\n" +
+ " stack = [ this, double ]\n" +
+ " locals = [ class \"[Ljava/lang/String;\" ]\n" +
+ " locals = [ class \"[Ljava/lang/String;\" ]\n" +
+ " locals = [ this, int ]\n";
public static void main(String[] args) throws Exception {
- // @compile T6271292.java
- ToolBox.JavaToolArgs javacParams =
- new ToolBox.JavaToolArgs().setSources(TestSrc);
- ToolBox.javac(javacParams);
+ ToolBox tb = new ToolBox();
-// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" -verbose T6271292 > "${JAVAPFILE}"
- ToolBox.JavaToolArgs javapParams =
- new ToolBox.JavaToolArgs()
- .setAllArgs("-v", "Test.class");
- String out = ToolBox.javap(javapParams);
- List<String> grepResult = ToolBox.grep("frame_type", out,
- ToolBox.lineSeparator);
- grepResult.addAll(ToolBox.grep("offset_delta", out, ToolBox.lineSeparator));
- grepResult.addAll(ToolBox.grep("stack = ", out, ToolBox.lineSeparator));
- grepResult.addAll(ToolBox.grep("locals = ", out, ToolBox.lineSeparator));
- List<String> goldenList = Arrays.asList(goldenOut.split("\n"));
+ tb.new JavacTask()
+ .sources(TestSrc)
+ .run();
-// diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"
- ToolBox.compareLines(goldenList, grepResult, true);
+ List<String> out = tb.new JavapTask()
+ .options("-v")
+ .classes("Test.class")
+ .run()
+ .getOutputLines(ToolBox.OutputKind.DIRECT);
+
+ List<String> grepResult = new ArrayList<>();
+ grepResult.addAll(tb.grep("frame_type", out));
+ grepResult.addAll(tb.grep("offset_delta", out));
+ grepResult.addAll(tb.grep("stack = ", out));
+ grepResult.addAll(tb.grep("locals = ", out));
+
+ List<String> goldenList = tb.split(goldenOut, "\n");
+ tb.checkEqual(goldenList, grepResult);
}
}
diff --git a/langtools/test/tools/lib/ToolBox.java b/langtools/test/tools/lib/ToolBox.java
new file mode 100644
index 0000000..a923a33
--- /dev/null
+++ b/langtools/test/tools/lib/ToolBox.java
@@ -0,0 +1,1920 @@
+/*
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FilterOutputStream;
+import java.io.FilterWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+
+import com.sun.tools.javac.api.JavacTaskImpl;
+import com.sun.tools.javac.api.JavacTool;
+import java.io.IOError;
+
+/**
+ * Utility methods and classes for writing jtreg tests for
+ * javac, javah, javap, and sjavac. (For javadoc support,
+ * see JavadocTester.)
+ *
+ * <p>There is support for common file operations similar to
+ * shell commands like cat, cp, diff, mv, rm, grep.
+ *
+ * <p>There is also support for invoking various tools, like
+ * javac, javah, javap, jar, java and other JDK tools.
+ *
+ * <p><em>File separators</em>: for convenience, many operations accept strings
+ * to represent filenames. On all platforms on which JDK is supported,
+ * "/" is a legal filename component separator. In particular, even
+ * on Windows, where the official file separator is "\", "/" is a legal
+ * alternative. It is therefore recommended that any client code using
+ * strings to specify filenames should use "/".
+ *
+ * @author Vicente Romero (original)
+ * @author Jonathan Gibbons (revised)
+ */
+public class ToolBox {
+ /** The platform line separator. */
+ public static final String lineSeparator = System.getProperty("line.separator");
+ /** The platform OS name. */
+ public static final String osName = System.getProperty("os.name");
+
+ /** The location of the class files for this test, or null if not set. */
+ public static final String testClasses = System.getProperty("test.classes");
+ /** The location of the source files for this test, or null if not set. */
+ public static final String testSrc = System.getProperty("test.src");
+ /** The location of the test JDK for this test, or null if not set. */
+ public static final String testJDK = System.getProperty("test.jdk");
+
+ /** The current directory. */
+ public static final Path currDir = Paths.get(".");
+
+ /** The stream used for logging output. */
+ public PrintStream out = System.err;
+
+ JavaCompiler compiler;
+ StandardJavaFileManager standardJavaFileManager;
+
+ /**
+ * Checks if the host OS is some version of Windows.
+ * @return true if the host OS is some version of Windows
+ */
+ public boolean isWindows() {
+ return osName.toLowerCase(Locale.ENGLISH).startsWith("windows");
+ }
+
+ /**
+ * Splits a string around matches of the given regular expression.
+ * If the string is empty, an empty list will be returned.
+ * @param text the string to be split
+ * @param sep the delimiting regular expression
+ * @return the strings between the separators
+ */
+ public List<String> split(String text, String sep) {
+ if (text.isEmpty())
+ return Collections.emptyList();
+ return Arrays.asList(text.split(sep));
+ }
+
+ /**
+ * Checks if two lists of strings are equal.
+ * @param l1 the first list of strings to be compared
+ * @param l2 the second list of strings to be compared
+ * @throws Error if the lists are not equal
+ */
+ public void checkEqual(List<String> l1, List<String> l2) throws Error {
+ if (!Objects.equals(l1, l2)) {
+ // l1 and l2 cannot both be null
+ if (l1 == null)
+ throw new Error("comparison failed: l1 is null");
+ if (l2 == null)
+ throw new Error("comparison failed: l2 is null");
+ // report first difference
+ for (int i = 0; i < Math.min(l1.size(), l2.size()); i++) {
+ String s1 = l1.get(i);
+ String s2 = l1.get(i);
+ if (!Objects.equals(s1, s2)) {
+ throw new Error("comparison failed, index " + i +
+ ", (" + s1 + ":" + s2 + ")");
+ }
+ }
+ throw new Error("comparison failed: l1.size=" + l1.size() + ", l2.size=" + l2.size());
+ }
+ }
+
+ /**
+ * Filters a list of strings according to the given regular expression.
+ * @param regex the regular expression
+ * @param lines the strings to be filtered
+ * @return the strings matching the regular expression
+ */
+ public List<String> grep(String regex, List<String> lines) {
+ return grep(Pattern.compile(regex), lines);
+ }
+
+ /**
+ * Filters a list of strings according to the given regular expression.
+ * @param pattern the regular expression
+ * @param lines the strings to be filtered
+ * @return the strings matching the regular expression
+ */
+ public List<String> grep(Pattern pattern, List<String> lines) {
+ return lines.stream()
+ .filter(s -> pattern.matcher(s).find())
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Copies a file.
+ * If the given destination exists and is a directory, the copy is created
+ * in that directory. Otherwise, the copy will be placed at the destination,
+ * possibly overwriting any existing file.
+ * <p>Similar to the shell "cp" command: {@code cp from to}.
+ * @param from the file to be copied
+ * @param to where to copy the file
+ * @throws IOException if any error occurred while copying the file
+ */
+ public void copyFile(String from, String to) throws IOException {
+ copyFile(Paths.get(from), Paths.get(to));
+ }
+
+ /**
+ * Copies a file.
+ * If the given destination exists and is a directory, the copy is created
+ * in that directory. Otherwise, the copy will be placed at the destination,
+ * possibly overwriting any existing file.
+ * <p>Similar to the shell "cp" command: {@code cp from to}.
+ * @param from the file to be copied
+ * @param to where to copy the file
+ * @throws IOException if an error occurred while copying the file
+ */
+ public void copyFile(Path from, Path to) throws IOException {
+ if (Files.isDirectory(to)) {
+ to = to.resolve(from.getFileName());
+ } else {
+ Files.createDirectories(to.getParent());
+ }
+ Files.copy(from, to, StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ /**
+ * Creates one of more directories.
+ * For each of the series of paths, a directory will be created,
+ * including any necessary parent directories.
+ * <p>Similar to the shell command: {@code mkdir -p paths}.
+ * @param paths the directories to be created
+ * @throws IOException if an error occurred while creating the directories
+ */
+ public void createDirectories(String... paths) throws IOException {
+ if (paths.length == 0)
+ throw new IllegalArgumentException("no directories specified");
+ for (String p: paths)
+ Files.createDirectories(Paths.get(p));
+ }
+
+ /**
+ * Creates one or more directories.
+ * For each of the series of paths, a directory will be created,
+ * including any necessary parent directories.
+ * <p>Similar to the shell command: {@code mkdir -p paths}.
+ * @param paths the directories to be created
+ * @throws IOException if an error occurred while creating the directories
+ */
+ public void createDirectories(Path... paths) throws IOException {
+ if (paths.length == 0)
+ throw new IllegalArgumentException("no directories specified");
+ for (Path p: paths)
+ Files.createDirectories(p);
+ }
+
+ /**
+ * Deletes one or more files.
+ * Any directories to be deleted must be empty.
+ * <p>Similar to the shell command: {@code rm files}.
+ * @param files the files to be deleted
+ * @throws IOException if an error occurred while deleting the files
+ */
+ public void deleteFiles(String... files) throws IOException {
+ if (files.length == 0)
+ throw new IllegalArgumentException("no files specified");
+ for (String file: files)
+ Files.delete(Paths.get(file));
+ }
+
+ /**
+ * Moves a file.
+ * If the given destination exists and is a directory, the file will be moved
+ * to that directory. Otherwise, the file will be moved to the destination,
+ * possibly overwriting any existing file.
+ * <p>Similar to the shell "mv" command: {@code mv from to}.
+ * @param from the file to be moved
+ * @param to where to move the file
+ * @throws IOException if an error occurred while moving the file
+ */
+ public void moveFile(String from, String to) throws IOException {
+ moveFile(Paths.get(from), Paths.get(to));
+ }
+
+ /**
+ * Moves a file.
+ * If the given destination exists and is a directory, the file will be moved
+ * to that directory. Otherwise, the file will be moved to the destination,
+ * possibly overwriting any existing file.
+ * <p>Similar to the shell "mv" command: {@code mv from to}.
+ * @param from the file to be moved
+ * @param to where to move the file
+ * @throws IOException if an error occurred while moving the file
+ */
+ public void moveFile(Path from, Path to) throws IOException {
+ if (Files.isDirectory(to)) {
+ to = to.resolve(from.getFileName());
+ } else {
+ Files.createDirectories(to.getParent());
+ }
+ Files.move(from, to, StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ /**
+ * Reads the lines of a file.
+ * The file is read using the default character encoding.
+ * @param path the file to be read
+ * @return the lines of the file.
+ * @throws IOException if an error occurred while reading the file
+ */
+ public List<String> readAllLines(String path) throws IOException {
+ return readAllLines(path, null);
+ }
+
+ /**
+ * Reads the lines of a file.
+ * The file is read using the default character encoding.
+ * @param path the file to be read
+ * @return the lines of the file.
+ * @throws IOException if an error occurred while reading the file
+ */
+ public List<String> readAllLines(Path path) throws IOException {
+ return readAllLines(path, null);
+ }
+
+ /**
+ * Reads the lines of a file using the given encoding.
+ * @param path the file to be read
+ * @param encoding the encoding to be used to read the file
+ * @return the lines of the file.
+ * @throws IOException if an error occurred while reading the file
+ */
+ public List<String> readAllLines(String path, String encoding) throws IOException {
+ return readAllLines(Paths.get(path), encoding);
+ }
+
+ /**
+ * Reads the lines of a file using the given encoding.
+ * @param path the file to be read
+ * @param encoding the encoding to be used to read the file
+ * @return the lines of the file.
+ * @throws IOException if an error occurred while reading the file
+ */
+ public List<String> readAllLines(Path path, String encoding) throws IOException {
+ return Files.readAllLines(path, getCharset(encoding));
+ }
+
+ private Charset getCharset(String encoding) {
+ return (encoding == null) ? Charset.defaultCharset() : Charset.forName(encoding);
+ }
+
+ /**
+ * Writes a file containing the given content.
+ * Any necessary directories for the file will be created.
+ * @param path where to write the file
+ * @param content the content for the file
+ * @throws IOException if an error occurred while writing the file
+ */
+ public void writeFile(String path, String content) throws IOException {
+ writeFile(Paths.get(path), content);
+ }
+
+ /**
+ * Writes a file containing the given content.
+ * Any necessary directories for the file will be created.
+ * @param path where to write the file
+ * @param content the content for the file
+ * @throws IOException if an error occurred while writing the file
+ */
+ public void writeFile(Path path, String content) throws IOException {
+ Path dir = path.getParent();
+ if (dir != null)
+ Files.createDirectories(dir);
+ try (BufferedWriter w = Files.newBufferedWriter(path)) {
+ w.write(content);
+ }
+ }
+
+ /**
+ * Writes one or more files containing Java source code.
+ * For each file to be written, the filename will be inferred from the
+ * given base directory, the package declaration (if present) and from the
+ * the name of the first class, interface or enum declared in the file.
+ * <p>For example, if the base directory is /my/dir/ and the content
+ * contains "package p; class C { }", the file will be written to
+ * /my/dir/p/C.java.
+ * <p>Note: the content is analyzed using regular expressions;
+ * errors can occur if any contents have initial comments that might trip
+ * up the analysis.
+ * @param dir the base directory
+ * @param contents the contents of the files to be written
+ * @throws IOException if an error occurred while writing any of the files.
+ */
+ public void writeJavaFiles(Path dir, String... contents) throws IOException {
+ if (contents.length == 0)
+ throw new IllegalArgumentException("no content specified for any files");
+ for (String c: contents) {
+ new JavaSource(c).write(dir);
+ }
+ }
+
+ /**
+ * Returns the path for the binary of a JDK tool within {@link testJDK}.
+ * @param tool the name of the tool
+ * @return the path of the tool
+ */
+ public Path getJDKTool(String tool) {
+ return Paths.get(testJDK, "bin", tool);
+ }
+
+ /**
+ * Returns a string representing the contents of an {@code Iterable} as a list.
+ * @param <T> the type parameter of the {@code Iterable}
+ * @param items the iterable
+ * @return the string
+ */
+ <T> String toString(Iterable<T> items) {
+ return StreamSupport.stream(items.spliterator(), false)
+ .map(Objects::toString)
+ .collect(Collectors.joining(",", "[", "]"));
+ }
+
+ /**
+ * The supertype for tasks.
+ * Complex operations are modelled by building and running a "Task" object.
+ * Tasks are typically configured in a fluent series of calls.
+ */
+ public interface Task {
+ /**
+ * Returns the name of the task.
+ * @return the name of the task
+ */
+ String name();
+
+ /**
+ * Executes the task as currently configured.
+ * @return a Result object containing the results of running the task
+ * @throws TaskError if the outcome of the task was not as expected
+ */
+ Result run() throws TaskError;
+ }
+
+ /**
+ * Exception thrown by {@code Task.run} when the outcome is not as
+ * expected.
+ */
+ public static class TaskError extends Error {
+ /**
+ * Creates a TaskError object with the given message.
+ * @param message the message
+ */
+ public TaskError(String message) {
+ super(message);
+ }
+ }
+
+ /**
+ * An enum to indicate the mode a task should use it is when executed.
+ */
+ public enum Mode {
+ /**
+ * The task should use the interface used by the command
+ * line launcher for the task.
+ * For example, for javac: com.sun.tools.javac.Main.compile
+ */
+ CMDLINE,
+ /**
+ * The task should use a publicly defined API for the task.
+ * For example, for javac: javax.tools.JavaCompiler
+ */
+ API,
+ /**
+ * The task should use the standard launcher for the task.
+ * For example, $JAVA_HOME/bin/javac
+ */
+ EXEC
+ }
+
+ /**
+ * An enum to indicate the expected success or failure of executing a task.
+ */
+ public enum Expect {
+ /** It is expected that the task will complete successfully. */
+ SUCCESS,
+ /** It is expected that the task will not complete successfully. */
+ FAIL
+ }
+
+ /**
+ * An enum to identify the streams that may be written by a {@code Task}.
+ */
+ public enum OutputKind {
+ /** Identifies output written to {@code System.out} or {@code stdout}. */
+ STDOUT,
+ /** Identifies output written to {@code System.err} or {@code stderr}. */
+ STDERR,
+ /** Identifies output written to a stream provided directly to the task. */
+ DIRECT
+ };
+
+ /**
+ * The results from running a {@link Task}.
+ * The results contain the exit code returned when the tool was invoked,
+ * and a map containing the output written to any streams during the
+ * execution of the tool.
+ * All tools support "stdout" and "stderr".
+ * Tools that take an explicit PrintWriter save output written to that
+ * stream as "main".
+ */
+ public class Result {
+
+ final Task task;
+ final int exitCode;
+ final Map<OutputKind, String> outputMap;
+
+ Result(Task task, int exitCode, Map<OutputKind, String> outputMap) {
+ this.task = task;
+ this.exitCode = exitCode;
+ this.outputMap = outputMap;
+ }
+
+ /**
+ * Returns the content of a specified stream.
+ * @param outputKind the kind of the selected stream
+ * @return the content that was written to that stream when the tool
+ * was executed.
+ */
+ public String getOutput(OutputKind outputKind) {
+ return outputMap.get(outputKind);
+ }
+
+ /**
+ * Returns the content of a named stream as a list of lines.
+ * @param outputKind the kind of the selected stream
+ * @return the content that was written to that stream when the tool
+ * was executed.
+ */
+ public List<String> getOutputLines(OutputKind outputKind) {
+ return Arrays.asList(outputMap.get(outputKind).split(lineSeparator));
+ }
+
+ /**
+ * Writes the content of the specified stream to the log.
+ * @param kind the kind of the selected stream
+ * @return this Result object
+ */
+ public Result write(OutputKind kind) {
+ String text = getOutput(kind);
+ if (text == null || text.isEmpty())
+ out.println("[" + task.name() + ":" + kind + "]: empty");
+ else {
+ out.println("[" + task.name() + ":" + kind + "]:");
+ out.print(text);
+ }
+ return this;
+ }
+
+ /**
+ * Writes the content of all streams with any content to the log.
+ * @return this Result object
+ */
+ public Result writeAll() {
+ outputMap.forEach((name, text) -> {
+ if (!text.isEmpty()) {
+ out.println("[" + name + "]:");
+ out.print(text);
+ }
+ });
+ return this;
+ }
+ }
+
+ /**
+ * A utility base class to simplify the implementation of tasks.
+ * Provides support for running the task in a process and for
+ * capturing output written by the task to stdout, stderr and
+ * other writers where applicable.
+ * @param <T> the implementing subclass
+ */
+ protected static abstract class AbstractTask<T extends AbstractTask<T>> implements Task {
+ protected final Mode mode;
+ private final Map<OutputKind, String> redirects = new EnumMap<>(OutputKind.class);
+ private final Map<String, String> envVars = new HashMap<>();
+ private Expect expect = Expect.SUCCESS;
+ int expectedExitCode = 0;
+
+ /**
+ * Create a task that will execute in the specified mode.
+ * @param mode the mode
+ */
+ protected AbstractTask(Mode mode) {
+ this.mode = mode;
+ }
+
+ /**
+ * Sets the expected outcome of the task and calls {@code run()}.
+ * @param expect the expected outcome
+ * @return the result of calling {@code run()}
+ */
+ public Result run(Expect expect) {
+ expect(expect, Integer.MIN_VALUE);
+ return run();
+ }
+
+ /**
+ * Sets the expected outcome of the task and calls {@code run()}.
+ * @param expect the expected outcome
+ * @param exitCode the expected exit code if the expected outcome
+ * is {@code FAIL}
+ * @return the result of calling {@code run()}
+ */
+ public Result run(Expect expect, int exitCode) {
+ expect(expect, exitCode);
+ return run();
+ }
+
+ /**
+ * Sets the expected outcome and expected exit code of the task.
+ * The exit code will not be checked if the outcome is
+ * {@code Expect.SUCCESS} or if the exit code is set to
+ * {@code Integer.MIN_VALUE}.
+ * @param expect the expected outcome
+ * @param exitCode the expected exit code
+ */
+ protected void expect(Expect expect, int exitCode) {
+ this.expect = expect;
+ this.expectedExitCode = exitCode;
+ }
+
+ /**
+ * Checks the exit code contained in a {@code Result} against the
+ * expected outcome and exit value
+ * @param result the result object
+ * @return the result object
+ * @throws TaskError if the exit code stored in the result object
+ * does not match the expected outcome and exit code.
+ */
+ protected Result checkExit(Result result) throws TaskError {
+ switch (expect) {
+ case SUCCESS:
+ if (result.exitCode != 0) {
+ result.writeAll();
+ throw new TaskError("Task " + name() + " failed: rc=" + result.exitCode);
+ }
+ break;
+
+ case FAIL:
+ if (result.exitCode == 0) {
+ result.writeAll();
+ throw new TaskError("Task " + name() + " succeeded unexpectedly");
+ }
+
+ if (expectedExitCode != Integer.MIN_VALUE
+ && result.exitCode != expectedExitCode) {
+ result.writeAll();
+ throw new TaskError("Task " + name() + "failed with unexpected exit code "
+ + result.exitCode + ", expected " + expectedExitCode);
+ }
+ break;
+ }
+ return result;
+ }
+
+ /**
+ * Sets an environment variable to be used by this task.
+ * @param name the name of the environment variable
+ * @param value the value for the environment variable
+ * @return this task object
+ * @throws IllegalStateException if the task mode is not {@code EXEC}
+ */
+ protected T envVar(String name, String value) {
+ if (mode != Mode.EXEC)
+ throw new IllegalStateException();
+ envVars.put(name, value);
+ return (T) this;
+ }
+
+ /**
+ * Redirects output from an output stream to a file.
+ * @param outputKind the name of the stream to be redirected.
+ * @param path the file
+ * @return this task object
+ * @throws IllegalStateException if the task mode is not {@code EXEC}
+ */
+ protected T redirect(OutputKind outputKind, String path) {
+ if (mode != Mode.EXEC)
+ throw new IllegalStateException();
+ redirects.put(outputKind, path);
+ return (T) this;
+ }
+
+ /**
+ * Returns a {@code ProcessBuilder} initialized with any
+ * redirects and environment variables that have been set.
+ * @return a {@code ProcessBuilder}
+ */
+ protected ProcessBuilder getProcessBuilder() {
+ if (mode != Mode.EXEC)
+ throw new IllegalStateException();
+ ProcessBuilder pb = new ProcessBuilder();
+ if (redirects.get(OutputKind.STDOUT) != null)
+ pb.redirectOutput(new File(redirects.get(OutputKind.STDOUT)));
+ if (redirects.get(OutputKind.STDERR) != null)
+ pb.redirectError(new File(redirects.get(OutputKind.STDERR)));
+ pb.environment().putAll(envVars);
+ return pb;
+ }
+
+ /**
+ * Collects the output from a process and saves it in a {@code Result}.
+ * @param tb the {@code ToolBox} containing the task {@code t}
+ * @param t the task initiating the process
+ * @param p the process
+ * @return a Result object containing the output from the process and its
+ * exit value.
+ * @throws InterruptedException if the thread is interrupted
+ */
+ protected Result runProcess(ToolBox tb, Task t, Process p) throws InterruptedException {
+ if (mode != Mode.EXEC)
+ throw new IllegalStateException();
+ ProcessOutput sysOut = new ProcessOutput(p.getInputStream()).start();
+ ProcessOutput sysErr = new ProcessOutput(p.getErrorStream()).start();
+ sysOut.waitUntilDone();
+ sysErr.waitUntilDone();
+ int rc = p.waitFor();
+ Map<OutputKind, String> outputMap = new EnumMap<>(OutputKind.class);
+ outputMap.put(OutputKind.STDOUT, sysOut.getOutput());
+ outputMap.put(OutputKind.STDERR, sysErr.getOutput());
+ return checkExit(tb.new Result(t, rc, outputMap));
+ }
+
+ /**
+ * Thread-friendly class to read the output from a process until the stream
+ * is exhausted.
+ */
+ static class ProcessOutput implements Runnable {
+ ProcessOutput(InputStream from) {
+ in = new BufferedReader(new InputStreamReader(from));
+ out = new StringBuilder();
+ }
+
+ ProcessOutput start() {
+ new Thread(this).start();
+ return this;
+ }
+
+ @Override
+ public void run() {
+ try {
+ String line;
+ while ((line = in.readLine()) != null) {
+ out.append(line).append("\n");
+ }
+ } catch (IOException e) {
+ }
+ synchronized (this) {
+ done = true;
+ notifyAll();
+ }
+ }
+
+ synchronized void waitUntilDone() throws InterruptedException {
+ boolean interrupted = false;
+
+ // poll interrupted flag, while waiting for copy to complete
+ while (!(interrupted = Thread.interrupted()) && !done)
+ wait(1000);
+
+ if (interrupted)
+ throw new InterruptedException();
+ }
+
+ String getOutput() {
+ return out.toString();
+ }
+
+ private BufferedReader in;
+ private final StringBuilder out;
+ private boolean done;
+ }
+
+ /**
+ * Utility class to simplify the handling of temporarily setting a
+ * new stream for System.out or System.err.
+ */
+ static class StreamOutput {
+ // Functional interface to set a stream.
+ // Expected use: System::setOut, System::setErr
+ private interface Initializer {
+ void set(PrintStream s);
+ }
+
+ private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ private final PrintStream ps = new PrintStream(baos);
+ private final PrintStream prev;
+ private final Initializer init;
+
+ StreamOutput(PrintStream s, Initializer init) {
+ prev = s;
+ init.set(ps);
+ this.init = init;
+ }
+
+ /**
+ * Closes the stream and returns the contents that were written to it.
+ * @return the contents that were written to it.
+ */
+ String close() {
+ init.set(prev);
+ ps.close();
+ return baos.toString();
+ }
+ }
+
+ /**
+ * Utility class to simplify the handling of creating an in-memory PrintWriter.
+ */
+ static class WriterOutput {
+ private final StringWriter sw = new StringWriter();
+ final PrintWriter pw = new PrintWriter(sw);
+
+ /**
+ * Closes the stream and returns the contents that were written to it.
+ * @return the contents that were written to it.
+ */
+ String close() {
+ pw.close();
+ return sw.toString();
+ }
+ }
+ }
+
+ /**
+ * A task to configure and run the Java compiler, javac.
+ */
+ public class JavacTask extends AbstractTask<JavacTask> {
+ private boolean includeStandardOptions;
+ private String classpath;
+ private String sourcepath;
+ private String outdir;
+ private List<String> options;
+ private List<String> classes;
+ private List<String> files;
+ private List<JavaFileObject> fileObjects;
+ private JavaFileManager fileManager;
+
+ /**
+ * Creates a task to execute {@code javac} using API mode.
+ */
+ public JavacTask() {
+ super(Mode.API);
+ }
+
+ /**
+ * Creates a task to execute {@code javac} in a specified mode.
+ * @param mode the mode to be used
+ */
+ public JavacTask(Mode mode) {
+ super(mode);
+ }
+
+ /**
+ * Sets the classpath.
+ * @param classpath the classpath
+ * @return this task object
+ */
+ public JavacTask classpath(String classpath) {
+ this.classpath = classpath;
+ return this;
+ }
+
+ /**
+ * Sets the sourcepath.
+ * @param sourcepath the sourcepath
+ * @return this task object
+ */
+ public JavacTask sourcepath(String sourcepath) {
+ this.sourcepath = sourcepath;
+ return this;
+ }
+
+ /**
+ * Sets the output directory.
+ * @param outdir the output directory
+ * @return this task object
+ */
+ public JavacTask outdir(String outdir) {
+ this.outdir = outdir;
+ return this;
+ }
+
+ /**
+ * Sets the options.
+ * @param options the options
+ * @return this task object
+ */
+ public JavacTask options(String... options) {
+ this.options = Arrays.asList(options);
+ return this;
+ }
+
+ /**
+ * Sets the classes to be analyzed.
+ * @param classes the classes
+ * @return this task object
+ */
+ public JavacTask classes(String... classes) {
+ this.classes = Arrays.asList(classes);
+ return this;
+ }
+
+ /**
+ * Sets the files to be compiled or analyzed.
+ * @param files the files
+ * @return this task object
+ */
+ public JavacTask files(String... files) {
+ this.files = Arrays.asList(files);
+ return this;
+ }
+
+ /**
+ * Sets the files to be compiled or analyzed.
+ * @param files the files
+ * @return this task object
+ */
+ public JavacTask files(Path... files) {
+ this.files = Stream.of(files)
+ .map(Path::toString)
+ .collect(Collectors.toList());
+ return this;
+ }
+
+ /**
+ * Sets the sources to be compiled or analyzed.
+ * Each source string is converted into an in-memory object that
+ * can be passed directly to the compiler.
+ * @param sources the sources
+ * @return this task object
+ */
+ public JavacTask sources(String... sources) {
+ fileObjects = Stream.of(sources)
+ .map(s -> new JavaSource(s))
+ .collect(Collectors.toList());
+ return this;
+ }
+
+ /**
+ * Sets the file manager to be used by this task.
+ * @param fileManager the file manager
+ * @return this task object
+ */
+ public JavacTask fileManager(JavaFileManager fileManager) {
+ this.fileManager = fileManager;
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @return the name "javac"
+ */
+ @Override
+ public String name() {
+ return "javac";
+ }
+
+ /**
+ * Calls the compiler with the arguments as currently configured.
+ * @return a Result object indicating the outcome of the compilation
+ * and the content of any output written to stdout, stderr, or the
+ * main stream by the compiler.
+ * @throws TaskError if the outcome of the task is not as expected.
+ */
+ @Override
+ public Result run() {
+ if (mode == Mode.EXEC)
+ return runExec();
+
+ WriterOutput direct = new WriterOutput();
+ // The following are to catch output to System.out and System.err,
+ // in case these are used instead of the primary (main) stream
+ StreamOutput sysOut = new StreamOutput(System.out, System::setOut);
+ StreamOutput sysErr = new StreamOutput(System.err, System::setErr);
+ int rc;
+ Map<OutputKind, String> outputMap = new HashMap<>();
+ try {
+ switch (mode == null ? Mode.API : mode) {
+ case API:
+ rc = runAPI(direct.pw);
+ break;
+ case CMDLINE:
+ rc = runCommand(direct.pw);
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ } catch (IOException e) {
+ out.println("Exception occurred: " + e);
+ rc = 99;
+ } finally {
+ outputMap.put(OutputKind.STDOUT, sysOut.close());
+ outputMap.put(OutputKind.STDERR, sysErr.close());
+ outputMap.put(OutputKind.DIRECT, direct.close());
+ }
+ return checkExit(new Result(this, rc, outputMap));
+ }
+
+ private int runAPI(PrintWriter pw) throws IOException {
+// if (compiler == null) {
+ // TODO: allow this to be set externally
+// compiler = ToolProvider.getSystemJavaCompiler();
+ compiler = JavacTool.create();
+// }
+
+ if (fileManager == null)
+ fileManager = compiler.getStandardFileManager(null, null, null);
+ if (outdir != null)
+ setLocation(StandardLocation.CLASS_OUTPUT, toFiles(outdir));
+ if (classpath != null)
+ setLocation(StandardLocation.CLASS_PATH, toFiles(classpath));
+ if (sourcepath != null)
+ setLocation(StandardLocation.SOURCE_PATH, toFiles(sourcepath));
+ List<String> allOpts = new ArrayList<>();
+ if (options != null)
+ allOpts.addAll(options);
+
+ Iterable<? extends JavaFileObject> allFiles = joinFiles(files, fileObjects);
+ JavaCompiler.CompilationTask task = compiler.getTask(pw,
+ fileManager,
+ null, // diagnostic listener; should optionally collect diags
+ allOpts,
+ classes,
+ allFiles);
+ return ((JavacTaskImpl) task).doCall().exitCode;
+ }
+
+ private void setLocation(StandardLocation location, List<File> files) throws IOException {
+ if (!(fileManager instanceof StandardJavaFileManager))
+ throw new IllegalStateException("not a StandardJavaFileManager");
+ ((StandardJavaFileManager) fileManager).setLocation(location, files);
+ }
+
+ private int runCommand(PrintWriter pw) {
+ List<String> args = getAllArgs();
+ String[] argsArray = args.toArray(new String[args.size()]);
+ return com.sun.tools.javac.Main.compile(argsArray, pw);
+ }
+
+ private Result runExec() {
+ List<String> args = new ArrayList<>();
+ Path javac = getJDKTool("javac");
+ args.add(javac.toString());
+ if (includeStandardOptions) {
+ args.addAll(split(System.getProperty("test.tool.vm.opts"), " +"));
+ args.addAll(split(System.getProperty("test.compiler.opts"), " +"));
+ }
+ args.addAll(getAllArgs());
+
+ String[] argsArray = args.toArray(new String[args.size()]);
+ ProcessBuilder pb = getProcessBuilder();
+ pb.command(argsArray);
+ try {
+ return runProcess(ToolBox.this, this, pb.start());
+ } catch (IOException | InterruptedException e) {
+ throw new Error(e);
+ }
+ }
+
+ private List<String> getAllArgs() {
+ List<String> args = new ArrayList<>();
+ if (options != null)
+ args.addAll(options);
+ if (outdir != null) {
+ args.add("-d");
+ args.add(outdir);
+ }
+ if (classpath != null) {
+ args.add("-classpath");
+ args.add(classpath);
+ }
+ if (sourcepath != null) {
+ args.add("-sourcepath");
+ args.add(sourcepath);
+ }
+ if (classes != null)
+ args.addAll(classes);
+ if (files != null)
+ args.addAll(files);
+
+ return args;
+ }
+
+ private List<File> toFiles(String path) {
+ List<File> result = new ArrayList<>();
+ for (String s: path.split(File.pathSeparator)) {
+ if (!s.isEmpty())
+ result.add(new File(s));
+ }
+ return result;
+ }
+
+ private Iterable<? extends JavaFileObject> joinFiles(
+ List<String> files, List<JavaFileObject> fileObjects) {
+ if (files == null)
+ return fileObjects;
+ if (standardJavaFileManager == null)
+ standardJavaFileManager = compiler.getStandardFileManager(null, null, null);
+ Iterable<? extends JavaFileObject> filesAsFileObjects =
+ standardJavaFileManager.getJavaFileObjectsFromStrings(files);
+ if (fileObjects == null)
+ return filesAsFileObjects;
+ List<JavaFileObject> combinedList = new ArrayList<>();
+ for (JavaFileObject o: filesAsFileObjects)
+ combinedList.add(o);
+ combinedList.addAll(fileObjects);
+ return combinedList;
+ }
+ }
+
+ /**
+ * A task to configure and run the native header tool, javah.
+ */
+ public class JavahTask extends AbstractTask<JavahTask> {
+ private String classpath;
+ private List<String> options;
+ private List<String> classes;
+
+ /**
+ * Create a task to execute {@code javah} using {@code CMDLINE} mode.
+ */
+ public JavahTask() {
+ super(Mode.CMDLINE);
+ }
+
+ /**
+ * Sets the classpath.
+ * @param classpath the classpath
+ * @return this task object
+ */
+ public JavahTask classpath(String classpath) {
+ this.classpath = classpath;
+ return this;
+ }
+
+ /**
+ * Sets the options.
+ * @param options the options
+ * @return this task object
+ */
+ public JavahTask options(String... options) {
+ this.options = Arrays.asList(options);
+ return this;
+ }
+
+ /**
+ * Sets the classes to be analyzed.
+ * @param classes the classes
+ * @return this task object
+ */
+ public JavahTask classes(String... classes) {
+ this.classes = Arrays.asList(classes);
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @return the name "javah"
+ */
+ @Override
+ public String name() {
+ return "javah";
+ }
+
+ /**
+ * Calls the javah tool with the arguments as currently configured.
+ * @return a Result object indicating the outcome of the task
+ * and the content of any output written to stdout, stderr, or the
+ * main stream provided to the task.
+ * @throws TaskError if the outcome of the task is not as expected.
+ */
+ @Override
+ public Result run() {
+ List<String> args = new ArrayList<>();
+ if (options != null)
+ args.addAll(options);
+ if (classpath != null) {
+ args.add("-classpath");
+ args.add(classpath);
+ }
+ if (classes != null)
+ args.addAll(classes);
+
+ WriterOutput direct = new WriterOutput();
+ // These are to catch output to System.out and System.err,
+ // in case these are used instead of the primary streams
+ StreamOutput sysOut = new StreamOutput(System.out, System::setOut);
+ StreamOutput sysErr = new StreamOutput(System.err, System::setErr);
+ int rc;
+ Map<OutputKind, String> outputMap = new HashMap<>();
+ try {
+ rc = com.sun.tools.javah.Main.run(args.toArray(new String[args.size()]), direct.pw);
+ } finally {
+ outputMap.put(OutputKind.STDOUT, sysOut.close());
+ outputMap.put(OutputKind.STDERR, sysErr.close());
+ outputMap.put(OutputKind.DIRECT, direct.close());
+ }
+ return checkExit(new Result(this, rc, outputMap));
+ }
+ }
+
+ /**
+ * A task to configure and run the disassembler tool, javap.
+ */
+ public class JavapTask extends AbstractTask<JavapTask> {
+ private String classpath;
+ private List<String> options;
+ private List<String> classes;
+
+ /**
+ * Create a task to execute {@code javap} using {@code CMDLINE} mode.
+ */
+ public JavapTask() {
+ super(Mode.CMDLINE);
+ }
+
+ /**
+ * Sets the classpath.
+ * @param classpath the classpath
+ * @return this task object
+ */
+ public JavapTask classpath(String classpath) {
+ this.classpath = classpath;
+ return this;
+ }
+
+ /**
+ * Sets the options.
+ * @param options the options
+ * @return this task object
+ */
+ public JavapTask options(String... options) {
+ this.options = Arrays.asList(options);
+ return this;
+ }
+
+ /**
+ * Sets the classes to be analyzed.
+ * @param classes the classes
+ * @return this task object
+ */
+ public JavapTask classes(String... classes) {
+ this.classes = Arrays.asList(classes);
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @return the name "javap"
+ */
+ @Override
+ public String name() {
+ return "javap";
+ }
+
+ /**
+ * Calls the javap tool with the arguments as currently configured.
+ * @return a Result object indicating the outcome of the task
+ * and the content of any output written to stdout, stderr, or the
+ * main stream.
+ * @throws TaskError if the outcome of the task is not as expected.
+ */
+ @Override
+ public Result run() {
+ List<String> args = new ArrayList<>();
+ if (options != null)
+ args.addAll(options);
+ if (classpath != null) {
+ args.add("-classpath");
+ args.add(classpath);
+ }
+ if (classes != null)
+ args.addAll(classes);
+
+ WriterOutput direct = new WriterOutput();
+ // These are to catch output to System.out and System.err,
+ // in case these are used instead of the primary streams
+ StreamOutput sysOut = new StreamOutput(System.out, System::setOut);
+ StreamOutput sysErr = new StreamOutput(System.err, System::setErr);
+
+ int rc;
+ Map<OutputKind, String> outputMap = new HashMap<>();
+ try {
+ rc = com.sun.tools.javap.Main.run(args.toArray(new String[args.size()]), direct.pw);
+ } finally {
+ outputMap.put(OutputKind.STDOUT, sysOut.close());
+ outputMap.put(OutputKind.STDERR, sysErr.close());
+ outputMap.put(OutputKind.DIRECT, direct.close());
+ }
+ return checkExit(new Result(this, rc, outputMap));
+ }
+ }
+
+ /**
+ * A task to configure and run the jar file utility.
+ */
+ public class JarTask extends AbstractTask<JarTask> {
+ private Path jar;
+ private Manifest manifest;
+ private String classpath;
+ private String mainClass;
+ private Path baseDir;
+ private List<Path> paths;
+
+ /**
+ * Creates a task to write jar files, using API mode.
+ */
+ public JarTask() {
+ super(Mode.API);
+ paths = Collections.emptyList();
+ }
+
+ /**
+ * Creates a JarTask for use with a given jar file.
+ * @param path the file
+ */
+ public JarTask(String path) {
+ this();
+ jar = Paths.get(path);
+ }
+
+ /**
+ * Sets a manifest for the jar file.
+ * @param manifest the manifest
+ * @return this task object
+ */
+ public JarTask manifest(Manifest manifest) {
+ this.manifest = manifest;
+ return this;
+ }
+
+ /**
+ * Sets a manifest for the jar file.
+ * @param manifest a string containing the contents of the manifest
+ * @return this task object
+ * @throws IOException if there is a problem creating the manifest
+ */
+ public JarTask manifest(String manifest) throws IOException {
+ this.manifest = new Manifest(new ByteArrayInputStream(manifest.getBytes()));
+ return this;
+ }
+
+ /**
+ * Sets the classpath to be written to the {@code Class-Path}
+ * entry in the manifest.
+ * @param classpath the classpath
+ * @return this task object
+ */
+ public JarTask classpath(String classpath) {
+ this.classpath = classpath;
+ return this;
+ }
+
+ /**
+ * Sets the class to be written to the {@code Main-Class}
+ * entry in the manifest..
+ * @param mainClass the name of the main class
+ * @return this task object
+ */
+ public JarTask mainClass(String mainClass) {
+ this.mainClass = mainClass;
+ return this;
+ }
+
+ /**
+ * Sets the base directory for files to be written into the jar file.
+ * @param baseDir the base directory
+ * @return this task object
+ */
+ public JarTask baseDir(String baseDir) {
+ this.baseDir = Paths.get(baseDir);
+ return this;
+ }
+
+ /**
+ * Sets the files to be written into the jar file.
+ * @param files the files
+ * @return this task object
+ */
+ public JarTask files(String... files) {
+ this.paths = Stream.of(files)
+ .map(file -> Paths.get(file))
+ .collect(Collectors.toList());
+ return this;
+ }
+
+ /**
+ * Provides limited jar command-like functionality.
+ * The supported commands are:
+ * <ul>
+ * <li> jar cf jarfile -C dir files...
+ * <li> jar cfm jarfile manifestfile -C dir files...
+ * </ul>
+ * Any values specified by other configuration methods will be ignored.
+ * @param args arguments in the style of those for the jar command
+ * @return a Result object containing the results of running the task
+ */
+ public Result run(String... args) {
+ if (args.length < 2)
+ throw new IllegalArgumentException();
+
+ ListIterator<String> iter = Arrays.asList(args).listIterator();
+ String first = iter.next();
+ switch (first) {
+ case "cf":
+ jar = Paths.get(iter.next());
+ break;
+ case "cfm":
+ jar = Paths.get(iter.next());
+ try (InputStream in = Files.newInputStream(Paths.get(iter.next()))) {
+ manifest = new Manifest(in);
+ } catch (IOException e) {
+ throw new IOError(e);
+ }
+ break;
+ }
+
+ if (iter.hasNext()) {
+ if (iter.next().equals("-C"))
+ baseDir = Paths.get(iter.next());
+ else
+ iter.previous();
+ }
+
+ paths = new ArrayList<>();
+ while (iter.hasNext())
+ paths.add(Paths.get(iter.next()));
+
+ return run();
+ }
+
+ /**
+ * {@inheritDoc}
+ * @return the name "jar"
+ */
+ @Override
+ public String name() {
+ return "jar";
+ }
+
+ /**
+ * Creates a jar file with the arguments as currently configured.
+ * @return a Result object indicating the outcome of the compilation
+ * and the content of any output written to stdout, stderr, or the
+ * main stream by the compiler.
+ * @throws TaskError if the outcome of the task is not as expected.
+ */
+ @Override
+ public Result run() {
+ Manifest m = (manifest == null) ? new Manifest() : manifest;
+ Attributes mainAttrs = m.getMainAttributes();
+ if (mainClass != null)
+ mainAttrs.put(Attributes.Name.MAIN_CLASS, mainClass);
+ if (classpath != null)
+ mainAttrs.put(Attributes.Name.CLASS_PATH, classpath);
+
+ StreamOutput sysOut = new StreamOutput(System.out, System::setOut);
+ StreamOutput sysErr = new StreamOutput(System.err, System::setErr);
+
+ int rc;
+ Map<OutputKind, String> outputMap = new HashMap<>();
+
+ try (OutputStream os = Files.newOutputStream(jar);
+ JarOutputStream jos = openJar(os, m)) {
+ Path base = (baseDir == null) ? currDir : baseDir;
+ for (Path path: paths) {
+ Files.walkFileTree(base.resolve(path), new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+ try {
+ JarEntry e = new JarEntry(base.relativize(file).toString());
+ jos.putNextEntry(e);
+ jos.write(Files.readAllBytes(file));
+ jos.closeEntry();
+ return FileVisitResult.CONTINUE;
+ } catch (IOException e) {
+ System.err.println("Error adding " + file + " to jar file: " + e);
+ return FileVisitResult.TERMINATE;
+ }
+ }
+ });
+ }
+ rc = 0;
+ } catch (IOException e) {
+ System.err.println("Error opening " + jar + ": " + e);
+ rc = 1;
+ } finally {
+ outputMap.put(OutputKind.STDOUT, sysOut.close());
+ outputMap.put(OutputKind.STDERR, sysErr.close());
+ }
+ return checkExit(new Result(this, rc, outputMap));
+ }
+
+ private JarOutputStream openJar(OutputStream os, Manifest m) throws IOException {
+ if (m == null || m.getMainAttributes().isEmpty() && m.getEntries().isEmpty()) {
+ return new JarOutputStream(os);
+ } else {
+ if (m.getMainAttributes().get(Attributes.Name.MANIFEST_VERSION) == null)
+ m.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ return new JarOutputStream(os, m);
+ }
+ }
+
+ }
+
+ /**
+ * A task to configure and run the Java launcher.
+ */
+ public class JavaTask extends AbstractTask<JavaTask> {
+ boolean includeStandardOptions = true;
+ private String classpath;
+ private List<String> vmOptions;
+ private String className;
+ private List<String> classArgs;
+
+ /**
+ * Create a task to run the Java launcher, using {@code EXEC} mode.
+ */
+ public JavaTask() {
+ super(Mode.EXEC);
+ }
+
+ /**
+ * Sets the classpath.
+ * @param classpath the classpath
+ * @return this task object
+ */
+ public JavaTask classpath(String classpath) {
+ this.classpath = classpath;
+ return this;
+ }
+
+ /**
+ * Sets the VM options.
+ * @param vmOptions the options
+ * @return this task object
+ */
+ public JavaTask vmOptions(String... vmOptions) {
+ this.vmOptions = Arrays.asList(vmOptions);
+ return this;
+ }
+
+ /**
+ * Sets the name of the class to be executed.
+ * @param className the name of the class
+ * @return this task object
+ */
+ public JavaTask className(String className) {
+ this.className = className;
+ return this;
+ }
+
+ /**
+ * Sets the arguments for the class to be executed.
+ * @param classArgs the arguments
+ * @return this task object
+ */
+ public JavaTask classArgs(String... classArgs) {
+ this.classArgs = Arrays.asList(classArgs);
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @return the name "java"
+ */
+ @Override
+ public String name() {
+ return "java";
+ }
+
+ /**
+ * Calls the Java launcher with the arguments as currently configured.
+ * @return a Result object indicating the outcome of the task
+ * and the content of any output written to stdout or stderr.
+ * @throws TaskError if the outcome of the task is not as expected.
+ */
+ @Override
+ public Result run() {
+ List<String> args = new ArrayList<>();
+ args.add(getJDKTool("java").toString());
+ if (includeStandardOptions) {
+ args.addAll(split(System.getProperty("test.vm.opts"), " +"));
+ args.addAll(split(System.getProperty("test.java.opts"), " +"));
+ }
+ if (classpath != null) {
+ args.add("-classpath");
+ args.add(classpath);
+ }
+ if (vmOptions != null)
+ args.addAll(vmOptions);
+ if (className != null)
+ args.add(className);
+ if (classArgs != null)
+ args.addAll(classArgs);
+ ProcessBuilder pb = getProcessBuilder();
+ pb.command(args);
+ try {
+ return runProcess(ToolBox.this, this, pb.start());
+ } catch (IOException | InterruptedException e) {
+ throw new Error(e);
+ }
+ }
+ }
+
+ /**
+ * A task to configure and run a general command.
+ */
+ public class ExecTask extends AbstractTask<ExecTask> {
+ private final String command;
+ private List<String> args;
+
+ /**
+ * Create a task to execute a given command, to be run using {@code EXEC} mode.
+ * @param command the command to be executed
+ */
+ public ExecTask(String command) {
+ super(Mode.EXEC);
+ this.command = command;
+ }
+
+ /**
+ * Create a task to execute a given command, to be run using {@code EXEC} mode.
+ * @param command the command to be executed
+ */
+ public ExecTask(Path command) {
+ super(Mode.EXEC);
+ this.command = command.toString();
+ }
+
+ /**
+ * Sets the arguments for the command to be executed
+ * @param args the arguments
+ * @return this task object
+ */
+ public ExecTask args(String... args) {
+ this.args = Arrays.asList(args);
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @return the name "exec"
+ */
+ @Override
+ public String name() {
+ return "exec";
+ }
+
+ /**
+ * Calls the command with the arguments as currently configured.
+ * @return a Result object indicating the outcome of the task
+ * and the content of any output written to stdout or stderr.
+ * @throws TaskError if the outcome of the task is not as expected.
+ */
+ @Override
+ public Result run() {
+ List<String> cmdArgs = new ArrayList<>();
+ cmdArgs.add(command);
+ if (args != null)
+ cmdArgs.addAll(args);
+ ProcessBuilder pb = getProcessBuilder();
+ pb.command(cmdArgs);
+ try {
+ return runProcess(ToolBox.this, this, pb.start());
+ } catch (IOException | InterruptedException e) {
+ throw new Error(e);
+ }
+ }
+ }
+
+ /**
+ * An in-memory Java source file.
+ * It is able to extract the file name from simple source text using
+ * regular expressions.
+ */
+ public static class JavaSource extends SimpleJavaFileObject {
+ private final String source;
+
+ /**
+ * Creates a in-memory file object for Java source code.
+ * @param className the name of the class
+ * @param source the source text
+ */
+ public JavaSource(String className, String source) {
+ super(URI.create(className), JavaFileObject.Kind.SOURCE);
+ this.source = source;
+ }
+
+ /**
+ * Creates a in-memory file object for Java source code.
+ * The name of the class will be inferred from the source code.
+ * @param source the source text
+ */
+ public JavaSource(String source) {
+ super(URI.create(getJavaFileNameFromSource(source)),
+ JavaFileObject.Kind.SOURCE);
+ this.source = source;
+ }
+
+ /**
+ * Writes the source code to a file in the current directory.
+ * @throws IOException if there is a problem writing the file
+ */
+ public void write() throws IOException {
+ write(currDir);
+ }
+
+ /**
+ * Writes the source code to a file in a specified directory.
+ * @param dir the directory
+ * @throws IOException if there is a problem writing the file
+ */
+ public void write(Path dir) throws IOException {
+ Path file = dir.resolve(getJavaFileNameFromSource(source));
+ Files.createDirectories(file.getParent());
+ try (BufferedWriter out = Files.newBufferedWriter(file)) {
+ out.write(source.replace("\n", lineSeparator));
+ }
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+
+ private static Pattern packagePattern =
+ Pattern.compile("package\\s+(((?:\\w+\\.)*)(?:\\w+))");
+ private static Pattern classPattern =
+ Pattern.compile("(?:public\\s+)?(?:class|enum|interface)\\s+(\\w+)");
+
+ /**
+ * Extracts the Java file name from the class declaration.
+ * This method is intended for simple files and uses regular expressions,
+ * so comments matching the pattern can make the method fail.
+ */
+ static String getJavaFileNameFromSource(String source) {
+ String packageName = null;
+
+ Matcher matcher = packagePattern.matcher(source);
+ if (matcher.find())
+ packageName = matcher.group(1).replace(".", "/");
+
+ matcher = classPattern.matcher(source);
+ if (matcher.find()) {
+ String className = matcher.group(1) + ".java";
+ return (packageName == null) ? className : packageName + "/" + className;
+ } else {
+ throw new Error("Could not extract the java class " +
+ "name from the provided source");
+ }
+ }
+ }
+
+ /**
+ * Extracts the Java file name from the class declaration.
+ * This method is intended for simple files and uses regular expressions,
+ * so comments matching the pattern can make the method fail.
+ * @deprecated This is a legacy method for compatibility with ToolBox v1.
+ * Use {@link JavaSource#getName JavaSource.getName} instead.
+ * @param source the source text
+ * @return the Java file name inferred from the source
+ */
+ @Deprecated
+ public static String getJavaFileNameFromSource(String source) {
+ return JavaSource.getJavaFileNameFromSource(source);
+ }
+
+ /**
+ * A memory file manager, for saving generated files in memory.
+ * The file manager delegates to a separate file manager for listing and
+ * reading input files.
+ */
+ public static class MemoryFileManager extends ForwardingJavaFileManager {
+ private interface Content {
+ byte[] getBytes();
+ String getString();
+ }
+
+ /**
+ * Maps binary class names to generated content.
+ */
+ final Map<Location, Map<String, Content>> files;
+
+ /**
+ * Construct a memory file manager which stores output files in memory,
+ * and delegates to a default file manager for input files.
+ */
+ public MemoryFileManager() {
+ this(JavacTool.create().getStandardFileManager(null, null, null));
+ }
+
+ /**
+ * Construct a memory file manager which stores output files in memory,
+ * and delegates to a specified file manager for input files.
+ * @param fileManager the file manager to be used for input files
+ */
+ public MemoryFileManager(JavaFileManager fileManager) {
+ super(fileManager);
+ files = new HashMap<>();
+ }
+
+ @Override
+ public JavaFileObject getJavaFileForOutput(Location location,
+ String name,
+ JavaFileObject.Kind kind,
+ FileObject sibling)
+ {
+ return new MemoryFileObject(location, name, kind);
+ }
+
+ /**
+ * Returns the content written to a file in a given location,
+ * or null if no such file has been written.
+ * @param location the location
+ * @param name the name of the file
+ * @return the content as an array of bytes
+ */
+ public byte[] getFileBytes(Location location, String name) {
+ Content content = getFile(location, name);
+ return (content == null) ? null : content.getBytes();
+ }
+
+ /**
+ * Returns the content written to a file in a given location,
+ * or null if no such file has been written.
+ * @param location the location
+ * @param name the name of the file
+ * @return the content as a string
+ */
+ public String getFileString(Location location, String name) {
+ Content content = getFile(location, name);
+ return (content == null) ? null : content.getString();
+ }
+
+ private Content getFile(Location location, String name) {
+ Map<String, Content> filesForLocation = files.get(location);
+ return (filesForLocation == null) ? null : filesForLocation.get(name);
+ }
+
+ private void save(Location location, String name, Content content) {
+ Map<String, Content> filesForLocation = files.get(location);
+ if (filesForLocation == null)
+ files.put(location, filesForLocation = new HashMap<>());
+ filesForLocation.put(name, content);
+ }
+
+ /**
+ * A writable file object stored in memory.
+ */
+ private class MemoryFileObject extends SimpleJavaFileObject {
+ private final Location location;
+ private final String name;
+
+ /**
+ * Constructs a memory file object.
+ * @param name binary name of the class to be stored in this file object
+ */
+ MemoryFileObject(Location location, String name, JavaFileObject.Kind kind) {
+ super(URI.create("mfm:///" + name.replace('.','/') + kind.extension),
+ Kind.CLASS);
+ this.location = location;
+ this.name = name;
+ }
+
+ @Override
+ public OutputStream openOutputStream() {
+ return new FilterOutputStream(new ByteArrayOutputStream()) {
+ @Override
+ public void close() throws IOException {
+ out.close();
+ byte[] bytes = ((ByteArrayOutputStream) out).toByteArray();
+ save(location, name, new Content() {
+ @Override
+ public byte[] getBytes() {
+ return bytes;
+ }
+ @Override
+ public String getString() {
+ return new String(bytes);
+ }
+
+ });
+ }
+ };
+ }
+
+ @Override
+ public Writer openWriter() {
+ return new FilterWriter(new StringWriter()) {
+ @Override
+ public void close() throws IOException {
+ out.close();
+ String text = ((StringWriter) out).toString();
+ save(location, name, new Content() {
+ @Override
+ public byte[] getBytes() {
+ return text.getBytes();
+ }
+ @Override
+ public String getString() {
+ return text;
+ }
+
+ });
+ }
+ };
+ }
+ }
+
+ }
+
+}
diff --git a/langtools/test/tools/sjavac/IdleShutdown.java b/langtools/test/tools/sjavac/IdleShutdown.java
new file mode 100644
index 0000000..b89e397
--- /dev/null
+++ b/langtools/test/tools/sjavac/IdleShutdown.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8044131
+ * @summary Tests the hooks used for detecting idleness of the sjavac server.
+ * @build Wrapper
+ * @run main Wrapper IdleShutdown
+ */
+import java.io.File;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.sun.tools.sjavac.server.CompilationResult;
+import com.sun.tools.sjavac.server.IdleResetSjavac;
+import com.sun.tools.sjavac.server.Sjavac;
+import com.sun.tools.sjavac.server.SysInfo;
+import com.sun.tools.sjavac.server.Terminable;
+
+
+public class IdleShutdown {
+
+ final static long TEST_START = System.currentTimeMillis();
+ final static long TIMEOUT_MS = 3000;
+
+ public static void main(String[] args) throws InterruptedException {
+
+ final AtomicLong timeoutTimestamp = new AtomicLong(-1);
+
+ log("Starting IdleCallbackJavacService with timeout: " + TIMEOUT_MS);
+ Sjavac service = new IdleResetSjavac(
+ new NoopJavacService(),
+ new Terminable() {
+ public void shutdown(String msg) {
+ // Record the idle timeout time
+ log("Timeout detected");
+ timeoutTimestamp.set(System.currentTimeMillis());
+ }
+ },
+ TIMEOUT_MS);
+
+ // Make sure it didn't timeout immediately
+ if (timeoutTimestamp.get() != -1)
+ throw new AssertionError("Premature timeout detected.");
+
+ // Call various methods and wait less than TIMEOUT_MS in between
+ Thread.sleep(TIMEOUT_MS - 1000);
+ log("Getting sys info");
+ service.getSysInfo();
+
+ Thread.sleep(TIMEOUT_MS - 1000);
+ log("Getting sys info");
+ service.getSysInfo();
+
+ if (timeoutTimestamp.get() != -1)
+ throw new AssertionError("Premature timeout detected.");
+
+ Thread.sleep(TIMEOUT_MS - 1000);
+ log("Compiling");
+ service.compile("",
+ "",
+ new String[0],
+ Collections.<File>emptyList(),
+ Collections.<URI>emptySet(),
+ Collections.<URI>emptySet());
+
+ Thread.sleep(TIMEOUT_MS - 1000);
+ log("Compiling");
+ service.compile("",
+ "",
+ new String[0],
+ Collections.<File>emptyList(),
+ Collections.<URI>emptySet(),
+ Collections.<URI>emptySet());
+
+ if (timeoutTimestamp.get() != -1)
+ throw new AssertionError("Premature timeout detected.");
+
+ long expectedTimeout = System.currentTimeMillis() + TIMEOUT_MS;
+
+ // Wait for actual timeout
+ log("Awaiting idle timeout");
+ Thread.sleep(TIMEOUT_MS + 1000);
+
+ // Check result
+ if (timeoutTimestamp.get() == -1)
+ throw new AssertionError("Timeout never occurred");
+
+ long error = Math.abs(expectedTimeout - timeoutTimestamp.get());
+ log("Timeout error: " + error + " ms");
+ if (error > TIMEOUT_MS * .1)
+ throw new AssertionError("Error too big");
+
+ log("Shutting down");
+ service.shutdown();
+ }
+
+ private static void log(String msg) {
+ long logTime = System.currentTimeMillis() - TEST_START;
+ System.out.printf("After %5d ms: %s%n", logTime, msg);
+ }
+
+ private static class NoopJavacService implements Sjavac {
+ @Override
+ public SysInfo getSysInfo() {
+ // Attempt to trigger idle timeout during a call by sleeping
+ try {
+ Thread.sleep(TIMEOUT_MS + 1000);
+ } catch (InterruptedException e) {
+ }
+ return null;
+ }
+ @Override
+ public void shutdown() {
+ }
+ @Override
+ public CompilationResult compile(String protocolId,
+ String invocationId,
+ String[] args,
+ List<File> explicitSources,
+ Set<URI> sourcesToCompile,
+ Set<URI> visibleSources) {
+ return null;
+ }
+ @Override
+ public String serverSettings() {
+ return "";
+ }
+ }
+}
diff --git a/langtools/test/tools/sjavac/OptionDecoding.java b/langtools/test/tools/sjavac/OptionDecoding.java
index 9c2f00c..ca33e6e 100644
--- a/langtools/test/tools/sjavac/OptionDecoding.java
+++ b/langtools/test/tools/sjavac/OptionDecoding.java
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 8035063
+ * @bug 8035063 8054465
* @summary Tests decoding of String[] into Options.
*
* @build Wrapper
@@ -192,13 +192,16 @@
assertEquals(17, options.getNumCores());
assertEquals("debug", options.getLogLevel());
assertEquals(false, options.isDefaultPackagePermitted());
- assertEquals(false, options.isUnidentifiedArtifactPermitted());
+ assertEquals(false, options.areUnidentifiedArtifactsPermitted());
+ assertEquals(false, options.isUnidentifiedArtifactPermitted(Paths.get("bar.txt").toFile().getAbsolutePath()));
options = Options.parseArgs("--permit-unidentified-artifacts",
+ "--permit-artifact=bar.txt",
"--permit-sources-without-package");
assertEquals("info", options.getLogLevel());
assertEquals(true, options.isDefaultPackagePermitted());
- assertEquals(true, options.isUnidentifiedArtifactPermitted());
+ assertEquals(true, options.areUnidentifiedArtifactsPermitted());
+ assertEquals(true, options.isUnidentifiedArtifactPermitted(Paths.get("bar.txt").toFile().getAbsolutePath()));
}
// Test server configuration options
diff --git a/langtools/test/tools/sjavac/PooledExecution.java b/langtools/test/tools/sjavac/PooledExecution.java
new file mode 100644
index 0000000..d14e2f8
--- /dev/null
+++ b/langtools/test/tools/sjavac/PooledExecution.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8044131
+ * @summary Makes sure sjavac poolsize option is honored.
+ * @build Wrapper
+ * @run main Wrapper PooledExecution
+ */
+import java.io.File;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.sun.tools.sjavac.comp.PooledSjavac;
+import com.sun.tools.sjavac.server.CompilationResult;
+import com.sun.tools.sjavac.server.Sjavac;
+import com.sun.tools.sjavac.server.SysInfo;
+
+
+public class PooledExecution {
+
+ public static void main(String[] args) throws InterruptedException {
+ new PooledExecutionTest().runTest();
+ }
+
+ static class PooledExecutionTest {
+
+ final int POOL_SIZE = 15;
+ final int NUM_REQUESTS = 100;
+
+ // Number of tasks that has not yet started
+ CountDownLatch leftToStart = new CountDownLatch(NUM_REQUESTS);
+
+ // Highest number of concurrently active request seen
+ int highWaterMark = 0;
+
+ public void runTest() throws InterruptedException {
+ ConcurrencyLoggingService loggingService = new ConcurrencyLoggingService();
+ final Sjavac service = new PooledSjavac(loggingService, POOL_SIZE);
+
+ // Keep track of the number of finished tasks so we can make sure all
+ // tasks finishes gracefully upon shutdown.
+ Thread[] tasks = new Thread[NUM_REQUESTS];
+ final AtomicInteger tasksFinished = new AtomicInteger(0);
+
+ for (int i = 0; i < NUM_REQUESTS; i++) {
+ tasks[i] = new Thread() {
+ public void run() {
+ service.compile("",
+ "",
+ new String[0],
+ Collections.<File>emptyList(),
+ Collections.<URI>emptySet(),
+ Collections.<URI>emptySet());
+ tasksFinished.incrementAndGet();
+ }
+ };
+ tasks[i].start();
+ }
+
+ // Wait for all tasks to start (but not necessarily run to completion)
+ leftToStart.await();
+
+ // Shutdown before all tasks are completed
+ System.out.println("Shutting down!");
+ service.shutdown();
+
+ // Wait for all tasks to complete
+ for (Thread t : tasks)
+ t.join();
+
+ if (tasksFinished.get() != NUM_REQUESTS) {
+ throw new AssertionError(tasksFinished.get() + " out of " +
+ NUM_REQUESTS + " finished. Broken shutdown?");
+ }
+
+ if (highWaterMark > POOL_SIZE) {
+ throw new AssertionError("Pool size overused: " + highWaterMark +
+ " used out of " + POOL_SIZE + " allowed.");
+ }
+
+ // Assuming more than POOL_SIZE requests can be processed within 1 sek:
+ if (highWaterMark < POOL_SIZE) {
+ throw new AssertionError("Pool size underused: " + highWaterMark +
+ " used out of " + POOL_SIZE + " allowed.");
+ }
+ }
+
+
+ private class ConcurrencyLoggingService implements Sjavac {
+
+ // Keeps track of currently active requests
+ AtomicInteger activeRequests = new AtomicInteger(0);
+
+ @Override
+ public CompilationResult compile(String protocolId,
+ String invocationId,
+ String[] args,
+ List<File> explicitSources,
+ Set<URI> sourcesToCompile,
+ Set<URI> visibleSources) {
+ leftToStart.countDown();
+ int numActiveRequests = activeRequests.incrementAndGet();
+ System.out.printf("Left to start: %2d / Currently active: %2d%n",
+ leftToStart.getCount(),
+ numActiveRequests);
+ highWaterMark = Math.max(highWaterMark, numActiveRequests);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ie) {
+ throw new RuntimeException("Interrupted", ie);
+ }
+ activeRequests.decrementAndGet();
+ System.out.println("Task completed");
+ return null;
+ }
+
+ @Override
+ public SysInfo getSysInfo() {
+ return null;
+ }
+
+ @Override
+ public void shutdown() {
+ }
+
+ @Override
+ public String serverSettings() {
+ return "";
+ }
+ }
+ }
+}
diff --git a/langtools/test/tools/sjavac/SJavac.java b/langtools/test/tools/sjavac/SJavac.java
index f17237e..e4be58a 100644
--- a/langtools/test/tools/sjavac/SJavac.java
+++ b/langtools/test/tools/sjavac/SJavac.java
@@ -25,7 +25,7 @@
/*
* @test
* @summary Test all aspects of sjavac.
- * @bug 8004658 8042441 8042699
+ * @bug 8004658 8042441 8042699 8054461 8054474 8054465
*
* @build Wrapper
* @run main Wrapper SJavac
@@ -99,6 +99,9 @@
compileCircularSources();
compileExcludingDependency();
incrementalCompileTestFullyQualifiedRef();
+ compileWithAtFile();
+ testStateDir();
+ testPermittedArtifact();
delete(gensrc);
delete(gensrc2);
@@ -463,6 +466,98 @@
"bin/javac_state");
}
+ /**
+ * Tests @atfile
+ * @throws Exception If test fails
+ */
+ void compileWithAtFile() throws Exception {
+ System.out.println("\nTest @atfile with command line content.");
+ System.out.println("---------------------------------------");
+
+ delete(gensrc);
+ delete(gensrc2);
+ delete(bin);
+
+ populate(gensrc,
+ "list.txt",
+ "-if */alfa/omega/A.java\n-if */beta/B.java\ngensrc\n-d bin\n",
+ "alfa/omega/A.java",
+ "package alfa.omega; import beta.B; public class A { B b; }",
+ "beta/B.java",
+ "package beta; public class B { }",
+ "beta/C.java",
+ "broken");
+ previous_bin_state = collectState(bin);
+ compile("@gensrc/list.txt", "--server:portfile=testserver,background=false");
+
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
+ "bin/javac_state",
+ "bin/alfa/omega/A.class",
+ "bin/beta/B.class");
+ }
+
+ /**
+ * Tests storing javac_state into another directory.
+ * @throws Exception If test fails
+ */
+ void testStateDir() throws Exception {
+ System.out.println("\nVerify that --state-dir=bar works.");
+ System.out.println("----------------------------------");
+
+ Path bar = defaultfs.getPath("bar");
+ Files.createDirectory(bar);
+
+ delete(gensrc);
+ delete(bin);
+ delete(bar);
+ previous_bin_state = collectState(bin);
+ Map<String,Long> previous_bar_state = collectState(bar);
+
+ populate(gensrc,
+ "alfa/omega/A.java",
+ "package alfa.omega; public class A { }");
+
+ compile("--state-dir=bar", "-src", "gensrc", "-d", "bin", serverArg);
+
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
+ "bin/alfa/omega/A.class");
+ Map<String,Long> new_bar_state = collectState(bar);
+ verifyThatFilesHaveBeenAdded(previous_bar_state, new_bar_state,
+ "bar/javac_state");
+ }
+
+ /**
+ * Test white listing of external artifacts inside the destination dir.
+ * @throws Exception If test fails
+ */
+ void testPermittedArtifact() throws Exception {
+ System.out.println("\nVerify that --permit-artifact=bar works.");
+ System.out.println("-------------------------------------------");
+
+ delete(gensrc);
+ delete(bin);
+
+ previous_bin_state = collectState(bin);
+
+ populate(gensrc,
+ "alfa/omega/A.java",
+ "package alfa.omega; public class A { }");
+
+ populate(bin,
+ "alfa/omega/AA.class",
+ "Ugh, a messy build system (tobefixed) wrote this class file, sjavac must not delete it.");
+
+ compile("--log=debug", "--permit-artifact=bin/alfa/omega/AA.class", "-src", "gensrc", "-d", "bin", serverArg);
+
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
+ "bin/alfa/omega/A.class",
+ "bin/alfa/omega/AA.class",
+ "bin/javac_state");
+ }
+
void removeFrom(Path dir, String... args) throws IOException {
for (String filename : args) {
Path p = dir.resolve(filename);
diff --git a/make/Main.gmk b/make/Main.gmk
index 6f2a863..4138043 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -234,7 +234,8 @@
+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk all)
# Creates the jar files (rt.jar resources.jar etc)
-main-jars:
+# this depends on all modules built
+main-jars: exploded-image
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk)
# Creates the images (j2sdk-image j2re-image etc)
diff --git a/make/common/IdlCompilation.gmk b/make/common/IdlCompilation.gmk
index d816f23..50df0df 100644
--- a/make/common/IdlCompilation.gmk
+++ b/make/common/IdlCompilation.gmk
@@ -60,7 +60,7 @@
$(RM) -rf $3/$$($4_TMPDIR)
$(MKDIR) -p $(dir $5)
$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
- $8 -td $3/$$($4_TMPDIR) \
+ LC_ALL=C $8 -td $3/$$($4_TMPDIR) \
-i $2/org/omg/CORBA \
-i $2/org/omg/PortableInterceptor \
-i $2/org/omg/PortableServer \
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index de5d630..fe82cd2 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -46,6 +46,12 @@
ARCHIVING_MSG=
endif
+ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
+ UNIX_PATH_PREFIX := /cygdrive
+else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys)
+ UNIX_PATH_PREFIX :=
+endif
+
define add_native_source
# param 1 = BUILD_MYPACKAGE
# parma 2 = the source file name (..../alfa.c or .../beta.cpp)
@@ -120,7 +126,7 @@
&& $(SED) -e '/^Note: including file:/!d' \
-e 's|Note: including file: *||' \
-e 's|\\|/|g' \
- -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
+ -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \
-e '/$(subst /,\/,$(TOPDIR))/!d' \
-e 's|$$$$| \\|g' \
$$($1_$2_DEP).raw) > $$($1_$2_DEP)
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 3671e4d..beb3654 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -260,3 +260,4 @@
49d7a2a66ae6b70fee367e2ceb29d0c20f8be01b jdk9-b24
b33633fc10c5bffd39d3492ed2602dadd8d44642 jdk9-b25
ed60a4e9dd35dcabb9b24e90434f5f615d988981 jdk9-b26
+221a84ef44c00335b563d92f470efaf8162b471e jdk9-b27
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
index 7c8439b..a855dfd 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
@@ -32,6 +32,7 @@
import java.io.PrintWriter;
import jdk.internal.org.objectweb.asm.ClassReader;
import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Opcodes;
import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
/**
@@ -39,6 +40,11 @@
*
*/
public class Main {
+ /**
+ * ASM version to be used by nasgen tool.
+ */
+ public static final int ASM_VERSION = Opcodes.ASM5;
+
private static final boolean DEBUG = Boolean.getBoolean("nasgen.debug");
private interface ErrorReporter {
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
index a8d6ae2..6f153c1 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
@@ -32,7 +32,6 @@
import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
import static jdk.internal.org.objectweb.asm.Opcodes.ANEWARRAY;
import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN;
-import static jdk.internal.org.objectweb.asm.Opcodes.ASM4;
import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE;
import static jdk.internal.org.objectweb.asm.Opcodes.BALOAD;
import static jdk.internal.org.objectweb.asm.Opcodes.BASTORE;
@@ -96,7 +95,7 @@
private final Type[] argumentTypes;
MethodGenerator(final MethodVisitor mv, final int access, final String name, final String descriptor) {
- super(ASM4, mv);
+ super(Main.ASM_VERSION, mv);
this.access = access;
this.name = name;
this.descriptor = descriptor;
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
index de2f392..10d7f3f 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
@@ -29,7 +29,6 @@
import jdk.internal.org.objectweb.asm.ClassVisitor;
import jdk.internal.org.objectweb.asm.FieldVisitor;
import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
/**
* A visitor that does nothing on visitXXX calls.
@@ -37,7 +36,7 @@
*/
public class NullVisitor extends ClassVisitor {
NullVisitor() {
- super(Opcodes.ASM4);
+ super(Main.ASM_VERSION);
}
@Override
@@ -47,7 +46,7 @@
final String desc,
final String signature,
final String[] exceptions) {
- return new MethodVisitor(Opcodes.ASM4) {
+ return new MethodVisitor(Main.ASM_VERSION) {
@Override
public AnnotationVisitor visitAnnotationDefault() {
return new NullAnnotationVisitor();
@@ -67,7 +66,7 @@
final String desc,
final String signature,
final Object value) {
- return new FieldVisitor(Opcodes.ASM4) {
+ return new FieldVisitor(Main.ASM_VERSION) {
@Override
public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
return new NullAnnotationVisitor();
@@ -82,7 +81,7 @@
private static class NullAnnotationVisitor extends AnnotationVisitor {
NullAnnotationVisitor() {
- super(Opcodes.ASM4);
+ super(Main.ASM_VERSION);
}
}
}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
index 5561cfb..a83628e 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
@@ -55,7 +55,7 @@
private String javaClassName;
ScriptClassInfoCollector(final ClassVisitor visitor) {
- super(Opcodes.ASM4, visitor);
+ super(Main.ASM_VERSION, visitor);
}
ScriptClassInfoCollector() {
@@ -80,7 +80,7 @@
public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
final AnnotationVisitor delegateAV = super.visitAnnotation(desc, visible);
if (SCRIPT_CLASS_ANNO_DESC.equals(desc)) {
- return new AnnotationVisitor(Opcodes.ASM4, delegateAV) {
+ return new AnnotationVisitor(Main.ASM_VERSION, delegateAV) {
@Override
public void visit(final String name, final Object value) {
if ("value".equals(name)) {
@@ -98,7 +98,7 @@
public FieldVisitor visitField(final int fieldAccess, final String fieldName, final String fieldDesc, final String signature, final Object value) {
final FieldVisitor delegateFV = super.visitField(fieldAccess, fieldName, fieldDesc, signature, value);
- return new FieldVisitor(Opcodes.ASM4, delegateFV) {
+ return new FieldVisitor(Main.ASM_VERSION, delegateFV) {
@Override
public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
final AnnotationVisitor delegateAV = super.visitAnnotation(descriptor, visible);
@@ -117,7 +117,7 @@
addScriptMember(memInfo);
- return new AnnotationVisitor(Opcodes.ASM4, delegateAV) {
+ return new AnnotationVisitor(Main.ASM_VERSION, delegateAV) {
// These could be "null" if values are not suppiled,
// in which case we have to use the default values.
private String name;
@@ -180,7 +180,7 @@
final MethodVisitor delegateMV = super.visitMethod(methodAccess, methodName, methodDesc,
signature, exceptions);
- return new MethodVisitor(Opcodes.ASM4, delegateMV) {
+ return new MethodVisitor(Main.ASM_VERSION, delegateMV) {
@Override
public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
@@ -201,7 +201,7 @@
addScriptMember(memInfo);
- return new AnnotationVisitor(Opcodes.ASM4, delegateAV) {
+ return new AnnotationVisitor(Main.ASM_VERSION, delegateAV) {
// These could be "null" if values are not suppiled,
// in which case we have to use the default values.
private String name;
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
index 0ec233a..784cbd3 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
@@ -73,7 +73,7 @@
private boolean staticInitFound;
ScriptClassInstrumentor(final ClassVisitor visitor, final ScriptClassInfo sci) {
- super(Opcodes.ASM4, visitor);
+ super(Main.ASM_VERSION, visitor);
if (sci == null) {
throw new IllegalArgumentException("Null ScriptClassInfo, is the class annotated?");
}
@@ -103,7 +103,7 @@
final FieldVisitor delegateFV = super.visitField(fieldAccess, fieldName, fieldDesc,
signature, value);
- return new FieldVisitor(Opcodes.ASM4, delegateFV) {
+ return new FieldVisitor(Main.ASM_VERSION, delegateFV) {
@Override
public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
if (ScriptClassInfo.annotations.containsKey(desc)) {
@@ -140,7 +140,7 @@
final MethodGenerator delegateMV = new MethodGenerator(super.visitMethod(methodAccess, methodName, methodDesc,
signature, exceptions), methodAccess, methodName, methodDesc);
- return new MethodVisitor(Opcodes.ASM4, delegateMV) {
+ return new MethodVisitor(Main.ASM_VERSION, delegateMV) {
@Override
public void visitInsn(final int opcode) {
// call $clinit$ just before return from <clinit>
diff --git a/nashorn/docs/genshelldoc.js b/nashorn/docs/genshelldoc.js
index 3d11a47..9647351 100644
--- a/nashorn/docs/genshelldoc.js
+++ b/nashorn/docs/genshelldoc.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -61,7 +61,7 @@
for each (opt in Options.validOptions) {
-var isTimezone = (opt.type == "timezone");
+var isTimezone = (opt.type == "timezone");
var defValue = opt.defaultValue;
if (defValue == null) {
defValue = "<none>";
diff --git a/nashorn/docs/source/importpackageclass.js b/nashorn/docs/source/importpackageclass.js
index afc02a9..224debd 100644
--- a/nashorn/docs/source/importpackageclass.js
+++ b/nashorn/docs/source/importpackageclass.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -32,7 +32,7 @@
// load compatibility script
load("nashorn:mozilla_compat.js");
-// Import Java packages and classes
+// Import Java packages and classes
// like import package.*; in Java
importPackage(java.awt);
// like import java.awt.Frame in Java
diff --git a/nashorn/docs/source/javaarray.js b/nashorn/docs/source/javaarray.js
index d0de912..6596191 100644
--- a/nashorn/docs/source/javaarray.js
+++ b/nashorn/docs/source/javaarray.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/docs/source/javaextend.js b/nashorn/docs/source/javaextend.js
index 408da32..f1c6256 100644
--- a/nashorn/docs/source/javaextend.js
+++ b/nashorn/docs/source/javaextend.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/docs/source/javaimporter.js b/nashorn/docs/source/javaimporter.js
index 3bd0798..5004ce8 100644
--- a/nashorn/docs/source/javaimporter.js
+++ b/nashorn/docs/source/javaimporter.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/docs/source/javatypes.js b/nashorn/docs/source/javatypes.js
index e0b6f07..82392ec 100644
--- a/nashorn/docs/source/javatypes.js
+++ b/nashorn/docs/source/javatypes.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/docs/source/overload.js b/nashorn/docs/source/overload.js
index 2407d0c..a2905f9 100644
--- a/nashorn/docs/source/overload.js
+++ b/nashorn/docs/source/overload.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,6 +31,6 @@
var out = java.lang.System.out;
-// select a particular print function
+// select a particular print function
out["println(java.lang.Object)"]("hello");
diff --git a/nashorn/docs/source/runnable.js b/nashorn/docs/source/runnable.js
index 67cd31c..346c252 100644
--- a/nashorn/docs/source/runnable.js
+++ b/nashorn/docs/source/runnable.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/docs/source/samfunc.js b/nashorn/docs/source/samfunc.js
index c870076..dbb321d 100644
--- a/nashorn/docs/source/samfunc.js
+++ b/nashorn/docs/source/samfunc.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/docs/source/test.js b/nashorn/docs/source/test.js
index 6323c38..56e96ef 100644
--- a/nashorn/docs/source/test.js
+++ b/nashorn/docs/source/test.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 35edc41..ec959c8 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -128,6 +128,7 @@
<compilerarg value="-Xlint:all"/>
<compilerarg value="-XDignore.symbol.file"/>
<compilerarg value="-Xdiags:verbose"/>
+ <compilerarg value="-parameters"/>
</javac>
<copy todir="${build.classes.dir}/META-INF/services">
<fileset dir="${meta.inf.dir}/services/"/>
@@ -519,6 +520,8 @@
<java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
<jvmarg line="${ext.class.path}"/>
<jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs} -Dbuild.dir=${build.dir}"/>
+ <!-- avoid too many typeinfo cache files. Each script is run only once anyway -->
+ <jvmarg line="-Dnashorn.typeInfo.disabled=true"/>
<classpath>
<pathelement path="${run.test.classpath}"/>
</classpath>
@@ -582,6 +585,8 @@
<!-- clone test262 git repo -->
<exec executable="${git.executable}">
<arg value="clone"/>
+ <arg value="--branch"/>
+ <arg value="es5-tests"/>
<arg value="https://github.com/tc39/test262"/>
<arg value="${test.external.dir}/test262"/>
</exec>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 642793a..a0ba00c 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -28,8 +28,8 @@
# source and target levels
build.compiler=modern
-javac.source=1.7
-javac.target=1.7
+javac.source=1.8
+javac.target=1.8
# nashorn version information
nashorn.version=0.1
@@ -202,7 +202,7 @@
# list of test262 test dirs to be excluded
test262-test-sys-prop.test.js.exclude.dir=\
${test262.suite.dir}/intl402/ \
- ${test262.suite.dir}/bestPractice/
+ ${test262.suite.dir}/bestPractice/
test262-test-sys-prop.test.failed.list.file=${build.dir}/test/failedTests
@@ -217,7 +217,7 @@
${test262.dir}/test/harness/sta.js
# testmarkdown test root
-testmarkdown-test-sys-prop.test.js.roots=${testmarkdown.dir}
+testmarkdown-test-sys-prop.test.js.roots=${testmarkdown.dir}
# execute testmarkdown tests in shared nashorn context or not?
testmarkdown-test-sys-prop.test.js.shared.context=false
@@ -227,7 +227,7 @@
${test.script.dir}${file.separator}markdown.js
# testjfx test root
-testjfx-test-sys-prop.test.js.roots=${testjfx.dir}
+testjfx-test-sys-prop.test.js.roots=${testjfx.dir}
# execute testjfx tests in shared nashorn context or not?
testjfx-test-sys-prop.test.js.shared.context=false
@@ -257,7 +257,7 @@
${nashorn.internal.tests.jar}:\
${nashorn.api.tests.jar}
-src.dir=src
+src.dir=src/jdk.scripting.nashorn/share/classes
test.src.dir=test/src
# -Xmx is used for all tests, -Xms only for octane benchmark
diff --git a/nashorn/samples/array_mapreduce.js b/nashorn/samples/array_mapreduce.js
index 5335f35..32184e9 100644
--- a/nashorn/samples/array_mapreduce.js
+++ b/nashorn/samples/array_mapreduce.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,9 +31,9 @@
// Usage: jjs array_mapreduce.js
-// Many Array.prototype functions such as map,
+// Many Array.prototype functions such as map,
// filter, reduce, reduceRight, every, some are generic.
-// These functions accept ECMAScript array as well as
+// These functions accept ECMAScript array as well as
// many array-like objects including java arrays.
// So, you can do map/filter/reduce with Java streams or
// you can also use Array.prototype functions as below.
@@ -73,6 +73,6 @@
// print sum of squares of the random numbers
print("Square sum:",
reduce.call(
- map.call(jarr, function(x) x*x),
+ map.call(jarr, function(x) x*x),
function(x, y) x + y)
);
diff --git a/nashorn/samples/astviewer.js b/nashorn/samples/astviewer.js
index 090e50e..ad70d91 100644
--- a/nashorn/samples/astviewer.js
+++ b/nashorn/samples/astviewer.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -82,7 +82,7 @@
// load parser.js from nashorn resources
load("nashorn:parser.js");
-// read the full content of the file and parse it
+// read the full content of the file and parse it
// to get AST of the script specified
var ast = parse(readFully(sourceName));
diff --git a/nashorn/samples/barchart_weather.js b/nashorn/samples/barchart_weather.js
index 8574f0a..9402682 100644
--- a/nashorn/samples/barchart_weather.js
+++ b/nashorn/samples/barchart_weather.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/call_lambda.js b/nashorn/samples/call_lambda.js
index d865164..c5a4dc6 100644
--- a/nashorn/samples/call_lambda.js
+++ b/nashorn/samples/call_lambda.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/counters.js b/nashorn/samples/counters.js
index d89ad58..4a570b0 100644
--- a/nashorn/samples/counters.js
+++ b/nashorn/samples/counters.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/dirname.js b/nashorn/samples/dirname.js
index 119d4f3..bb9279d 100644
--- a/nashorn/samples/dirname.js
+++ b/nashorn/samples/dirname.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/disassemble.js b/nashorn/samples/disassemble.js
index 654b9dd..7cf501ff 100644
--- a/nashorn/samples/disassemble.js
+++ b/nashorn/samples/disassemble.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -33,7 +33,7 @@
// Simple .class disassembler that uses bundled ObjectWeb ASM
// classes in jdk8. WARNING: Bundled ObjectWeb ASM classes are
-// not part of official jdk8 API. It can be changed/removed
+// not part of official jdk8 API. It can be changed/removed
// without notice. So, this script is brittle by design!
// This example demonstrates passing arguments to script
diff --git a/nashorn/samples/engine/accessvar.js b/nashorn/samples/engine/accessvar.js
index ae9ec7d..abd5486 100644
--- a/nashorn/samples/engine/accessvar.js
+++ b/nashorn/samples/engine/accessvar.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/engine/callfunc.js b/nashorn/samples/engine/callfunc.js
index 76108fd..e177a7b 100644
--- a/nashorn/samples/engine/callfunc.js
+++ b/nashorn/samples/engine/callfunc.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -29,7 +29,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// simple example showing how to call a global script
+// simple example showing how to call a global script
// function from caller
var ScriptEngineManager = Java.type("javax.script.ScriptEngineManager");
@@ -42,7 +42,7 @@
engine.eval("function func(name) { print('I am func, hello ' + name) }");
// invoke functions, methods of code evaluated by engine
-// from javax.script.Invocable interface. But, hey,
+// from javax.script.Invocable interface. But, hey,
// calling code is JavaScript and don't worry about types :)
engine.invokeFunction("func", "Nashorn");
diff --git a/nashorn/samples/engine/callmethod.js b/nashorn/samples/engine/callmethod.js
index 8199dcd..c8cbb300 100644
--- a/nashorn/samples/engine/callmethod.js
+++ b/nashorn/samples/engine/callmethod.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -55,7 +55,7 @@
CODE);
// invoke methods of an object in script world
-// from javax.script.Invocable interface. But, hey,
+// from javax.script.Invocable interface. But, hey,
// calling code is JavaScript and don't worry about types :)
// get that script object on which to call a method
diff --git a/nashorn/samples/engine/exposevar.js b/nashorn/samples/engine/exposevar.js
index 93f57ed..f1a309c 100644
--- a/nashorn/samples/engine/exposevar.js
+++ b/nashorn/samples/engine/exposevar.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/engine/foreignobject.js b/nashorn/samples/engine/foreignobject.js
index 3850089..930c3e8 100644
--- a/nashorn/samples/engine/foreignobject.js
+++ b/nashorn/samples/engine/foreignobject.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -54,7 +54,7 @@
// the class jdk.nashorn.api.scripting.ScriptObjectMirror
// But nashorn's dynalink linker can treat these objects
// specially to support natural script syntax to access..
-// In Java code, you need to use ScriptObjectMirror's
+// In Java code, you need to use ScriptObjectMirror's
// methods though. Once again, script world is simpler :-)
var foreignObj = engine.get("obj");
diff --git a/nashorn/samples/engine/hello.js b/nashorn/samples/engine/hello.js
index 37fabbf..72606cf 100644
--- a/nashorn/samples/engine/hello.js
+++ b/nashorn/samples/engine/hello.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/engine/interface.js b/nashorn/samples/engine/interface.js
index 75b7aa2..6461776 100644
--- a/nashorn/samples/engine/interface.js
+++ b/nashorn/samples/engine/interface.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -50,7 +50,7 @@
// create Java interface object whose methods are
// implemented by script functions. This is from
-// javax.script.Invocable. But we are in JS world,
+// javax.script.Invocable. But we are in JS world,
// don't worry about types :)
var Runnable = Java.type("java.lang.Runnable");
diff --git a/nashorn/samples/engine/interface2.js b/nashorn/samples/engine/interface2.js
index 771b110..508be3a 100644
--- a/nashorn/samples/engine/interface2.js
+++ b/nashorn/samples/engine/interface2.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/engine/lambda_as_func.js b/nashorn/samples/engine/lambda_as_func.js
index 2600f17..260eeb9 100644
--- a/nashorn/samples/engine/lambda_as_func.js
+++ b/nashorn/samples/engine/lambda_as_func.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/env.js b/nashorn/samples/env.js
index 74377eb..1febe7a 100644
--- a/nashorn/samples/env.js
+++ b/nashorn/samples/env.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,8 +31,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// In nashorn -scripting mode,
-// "$ENV" object exposes process
+// In nashorn -scripting mode,
+// "$ENV" object exposes process
// environment variables
print($ENV.PATH);
diff --git a/nashorn/samples/expression_closure.js b/nashorn/samples/expression_closure.js
index 1efb184..17189a8 100644
--- a/nashorn/samples/expression_closure.js
+++ b/nashorn/samples/expression_closure.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/filebrowser.js b/nashorn/samples/filebrowser.js
index da00553..2c36275 100644
--- a/nashorn/samples/filebrowser.js
+++ b/nashorn/samples/filebrowser.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/fileline.js b/nashorn/samples/fileline.js
index 05c9975..59d2288 100644
--- a/nashorn/samples/fileline.js
+++ b/nashorn/samples/fileline.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/find_nonfinals.js b/nashorn/samples/find_nonfinals.js
new file mode 100644
index 0000000..c1a4865
--- /dev/null
+++ b/nashorn/samples/find_nonfinals.js
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Nashorn project uses "final" modifier for method parameters
+ * (like 'val' of Scala). This tool finds method parameters that
+ * miss final modifier.
+ */
+
+// Usage: jjs -J-Djava.ext.dirs=<your_nashorn_jar_dir> find_nonfinals.js
+
+var Class = Java.type("java.lang.Class");
+var System = Java.type("java.lang.System");
+var File = Java.type("java.io.File");
+var JarFile = Java.type("java.util.jar.JarFile");
+var Modifier = Java.type("java.lang.reflect.Modifier");
+
+// locate nashorn.jar from java.ext.dirs
+function findNashorn() {
+ var paths = System.getProperty("java.ext.dirs").split(':');
+ for each (var p in paths) {
+ var nashorn = p + File.separator + "nashorn.jar";
+ if (new File(nashorn).exists()) {
+ return nashorn;
+ }
+ }
+}
+
+// analyze a single Class and print info on non-final parameters
+function analyzeClass(cls) {
+ var methods = cls.getDeclaredMethods();
+ for each (var method in methods) {
+ // this requires -parameters option when compiling java sources
+ var params = method.parameters;
+ for each (var p in params) {
+ var modifiers = p.modifiers;
+ if (!Modifier.isFinal(modifiers)) {
+ if (! method.name.startsWith("access$")) {
+ print(method);
+ print(" ->", p);
+ }
+ }
+ }
+ }
+}
+
+var jarFile = findNashorn();
+// load each class and use reflection to analyze each Class
+new JarFile(jarFile).stream().forEach(
+ function(entry) {
+ var name = entry.name;
+ if (name.endsWith(".class")) {
+ var clsName = name.substring(0, name.lastIndexOf('.class'));
+ clsName = clsName.replace(/\//g, '.');
+ var cls = Class.forName(clsName);
+ analyzeClass(cls);
+ }
+ }
+)
diff --git a/nashorn/samples/fizzbuzz.js b/nashorn/samples/fizzbuzz.js
index ba8d83d..a0fde95 100644
--- a/nashorn/samples/fizzbuzz.js
+++ b/nashorn/samples/fizzbuzz.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/for_each.js b/nashorn/samples/for_each.js
index 10fc39a..988e659 100644
--- a/nashorn/samples/for_each.js
+++ b/nashorn/samples/for_each.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -42,7 +42,7 @@
var arr = new JArray(10);
// store squares as values
-for (i in arr)
+for (i in arr)
arr[i] = i*i;
// for .. each on java arrays
@@ -57,7 +57,7 @@
print("System properties");
for each (p in System.properties.entrySet()) {
print(p.key, "=", p.value);
-}
+}
// print process environment vars as name = value pairs
print("Process environment");
diff --git a/nashorn/samples/gaussian_random.js b/nashorn/samples/gaussian_random.js
index f52f49f..235cbcb 100644
--- a/nashorn/samples/gaussian_random.js
+++ b/nashorn/samples/gaussian_random.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -37,7 +37,7 @@
var r = new Random();
// expression closure (see expression_closure.js as well)
-// passed as lambda double generator. "print" passed as
+// passed as lambda double generator. "print" passed as
// double consumer lambda to 'forEach' method.
DoubleStream
diff --git a/nashorn/samples/gaussian_random_bind.js b/nashorn/samples/gaussian_random_bind.js
index 052520c..93f2a17 100644
--- a/nashorn/samples/gaussian_random_bind.js
+++ b/nashorn/samples/gaussian_random_bind.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -34,7 +34,7 @@
var Random = Java.type("java.util.Random");
var DoubleStream = Java.type("java.util.stream.DoubleStream");
-// function as lambda double generator. "print" passed as
+// function as lambda double generator. "print" passed as
// double consumer lambda to 'forEach' method.
// Function.prototype.bind used to attach 'state' for the
// generator function.
diff --git a/nashorn/samples/gutenberg.js b/nashorn/samples/gutenberg.js
index 4d83a57..3f21b24 100644
--- a/nashorn/samples/gutenberg.js
+++ b/nashorn/samples/gutenberg.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -69,7 +69,7 @@
// capture title, description now
inItem = true;
}
-
+
if (inItem) {
switch (local) {
case 'title':
diff --git a/nashorn/samples/heredoc.js b/nashorn/samples/heredoc.js
index 0c52ca9..dd79361 100644
--- a/nashorn/samples/heredoc.js
+++ b/nashorn/samples/heredoc.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -38,14 +38,14 @@
var sender = "Buffy the Vampire Slayer";
var recipient = "Spike";
-
+
print(<<END
-
+
Dear ${recipient},
-
+
I wish you to leave Sunnydale and never return.
-
+
Not Quite Love,
${sender}
-
+
END);
diff --git a/nashorn/samples/interface_impl.js b/nashorn/samples/interface_impl.js
index 5e49816..f219766 100644
--- a/nashorn/samples/interface_impl.js
+++ b/nashorn/samples/interface_impl.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/javaastviewer.js b/nashorn/samples/javaastviewer.js
index c446abe..e8285c0 100644
--- a/nashorn/samples/javaastviewer.js
+++ b/nashorn/samples/javaastviewer.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -56,8 +56,8 @@
// may not be exhaustive - any getAbc would become "abc" property or
// public field becomes a property of same name.
var ignoredProps = new HashSet();
- for each (var word in
- ['extending', 'implementing', 'init', 'mods', 'clazz', 'defs',
+ for each (var word in
+ ['extending', 'implementing', 'init', 'mods', 'clazz', 'defs',
'expr', 'tag', 'preferredPosition', 'qualid', 'recvparam',
'restype', 'params', 'startPosition', 'thrown',
'tree', 'typarams', 'typetag', 'vartype']) {
@@ -83,7 +83,7 @@
var visitor = new ConverterVisitor() {
// convert java AST node to a friendly script object
- // which can be viewed. Every node ends up in defaultAction
+ // which can be viewed. Every node ends up in defaultAction
// method of SimpleTreeVisitor method.
defaultAction: function (node, p) {
diff --git a/nashorn/samples/javacastcounter.js b/nashorn/samples/javacastcounter.js
index 607b2f8..6d569a1 100644
--- a/nashorn/samples/javacastcounter.js
+++ b/nashorn/samples/javacastcounter.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -83,7 +83,7 @@
this.lineMap = node.lineMap;
this.fileName = node.sourceFile.name;
- // Using Java.super API to call super class method here
+ // Using Java.super API to call super class method here
return Java.super(counter).visitCompilationUnit(node, p);
},
diff --git a/nashorn/samples/javafoovars.js b/nashorn/samples/javafoovars.js
index 09b3718..037c2bf 100644
--- a/nashorn/samples/javafoovars.js
+++ b/nashorn/samples/javafoovars.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -30,7 +30,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+
// This example demonstrates Java subclassing by Java.extend
// and javac Compiler and Tree API. This example counts number
// of variables called "foo" in the given java source files!
@@ -38,7 +38,7 @@
print("Usage: jjs javafoovars.js -- <directory>");
exit(1);
}
-
+
// Java types used
var File = Java.type("java.io.File");
var Files = Java.type("java.nio.file.Files");
@@ -48,7 +48,7 @@
var Tree = Java.type("com.sun.source.tree.Tree");
var TreeScanner = Java.type("com.sun.source.util.TreeScanner");
var VariableTree = Java.type("com.sun.source.tree.VariableTree");
-
+
// count "foo"-s in the given .java files
function countFoo() {
// get the system compiler tool
@@ -63,7 +63,7 @@
// subclass SimpleTreeVisitor - to count variables called "foo"
var FooCounterVisitor = Java.extend(TreeScanner);
var fooCount = 0;
-
+
var visitor = new FooCounterVisitor() {
visitVariable: function (node, p) {
if (node.name.toString() == "foo") {
@@ -71,13 +71,13 @@
}
}
}
-
+
for each (var cu in task.parse()) {
cu.accept(visitor, null);
}
return fooCount;
}
-
+
// for each ".java" file in directory (recursively) count "foo".
function main(dir) {
var totalCount = 0;
@@ -99,5 +99,5 @@
});
print("Total foo count: " + totalCount);
}
-
+
main(new File(arguments[0]));
diff --git a/nashorn/samples/javaimporter.js b/nashorn/samples/javaimporter.js
index dd487ec..3e3cb1b 100644
--- a/nashorn/samples/javaimporter.js
+++ b/nashorn/samples/javaimporter.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -34,14 +34,14 @@
function readTextFromURL(url) {
- // equivalent to
- //
+ // equivalent to
+ //
// import java.io.*;
// import java.net.*;
// import java.lang.StringBuffer;
//
// only inside the 'with' statement
- with (new JavaImporter(java.io,
+ with (new JavaImporter(java.io,
java.net,
java.lang.StringBuilder)) {
var buf = new StringBuilder();
diff --git a/nashorn/samples/javalist.js b/nashorn/samples/javalist.js
index 8f3749b..5430dbd 100644
--- a/nashorn/samples/javalist.js
+++ b/nashorn/samples/javalist.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/javamap.js b/nashorn/samples/javamap.js
index a53d032..57da620 100644
--- a/nashorn/samples/javamap.js
+++ b/nashorn/samples/javamap.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -45,7 +45,7 @@
print(map['js']);
print(map.js);
-// also assign new key-value pair
+// also assign new key-value pair
// as 'property-value'
map['language'] = 'java';
print(map.get("language"));
diff --git a/nashorn/samples/javashell.js b/nashorn/samples/javashell.js
index 65d1a8a..4e71f75 100644
--- a/nashorn/samples/javashell.js
+++ b/nashorn/samples/javashell.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -130,7 +130,7 @@
// generate unique name
function uniqueName() {
var now = LocalDateTime.now().toString();
- // replace unsafe chars with '_'
+ // replace unsafe chars with '_'
return "JavaShell" + now.replace(/-|:|\./g, '_');
}
diff --git a/nashorn/samples/jsadapter_dom.js b/nashorn/samples/jsadapter_dom.js
index e86c6d2..cb2f8ba 100644
--- a/nashorn/samples/jsadapter_dom.js
+++ b/nashorn/samples/jsadapter_dom.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -33,7 +33,7 @@
// Simple example that demonstrates reading XML Rss feed
// to generate a HTML file from script and show it by browser
-// Uses XML DOM parser and DOM element wrapped by script
+// Uses XML DOM parser and DOM element wrapped by script
// "proxy" (JSAdapter constructor)
// Java classes used
@@ -78,7 +78,7 @@
var node = nodeList.item(i);
if (node.nodeType == TEXT_NODE) {
text += node.nodeValue;
- }
+ }
}
return text;
diff --git a/nashorn/samples/jsobj_example.js b/nashorn/samples/jsobj_example.js
index eff6696..d608876 100644
--- a/nashorn/samples/jsobj_example.js
+++ b/nashorn/samples/jsobj_example.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -33,7 +33,7 @@
var AbstractJSObject = Java.type("jdk.nashorn.api.scripting.AbstractJSObject");
-// JSObject example that uses a map for properties and
+// JSObject example that uses a map for properties and
// falls back to with methods on a java object (for missing
// properties
@@ -49,7 +49,7 @@
return function() {
var a = arguments;
switch (a.length) {
- case 0: return fallback[name]();
+ case 0: return fallback[name]();
case 1: return fallback[name](a[0]);
case 2: return fallback[name](a[0], a[1]);
case 3: return fallback[name](a[0], a[1], a[2]);
diff --git a/nashorn/samples/jsobject.js b/nashorn/samples/jsobject.js
index 48434d7..ad09b2f 100644
--- a/nashorn/samples/jsobject.js
+++ b/nashorn/samples/jsobject.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/jsobject_mapreduce.js b/nashorn/samples/jsobject_mapreduce.js
index ff34940..174ad0a 100644
--- a/nashorn/samples/jsobject_mapreduce.js
+++ b/nashorn/samples/jsobject_mapreduce.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,9 +31,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// Many Array.prototype functions such as map,
+// Many Array.prototype functions such as map,
// filter, reduce, reduceRight, every, some are generic.
-// These functions accept ECMAScript array as well as
+// These functions accept ECMAScript array as well as
// many array-like objects including JSObjects.
// See also http://en.wikipedia.org/wiki/MapReduce
@@ -57,6 +57,6 @@
// print sum of squares of the random numbers
print("Square sum:",
reduce.call(
- map.call(buf, function(x) x*x),
+ map.call(buf, function(x) x*x),
function(x, y) x + y)
);
diff --git a/nashorn/samples/jsonviewer.js b/nashorn/samples/jsonviewer.js
index 804fef5..c650ae9 100644
--- a/nashorn/samples/jsonviewer.js
+++ b/nashorn/samples/jsonviewer.js
@@ -4,22 +4,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -52,8 +52,8 @@
// read text content of a URL
function readTextFromURL(url) {
- // equivalent to
- //
+ // equivalent to
+ //
// import java.io.*;
// import java.net.*;
// import java.lang.StringBuffer;
diff --git a/nashorn/samples/letter.js b/nashorn/samples/letter.js
index 304bf1f..b5a58b8 100644
--- a/nashorn/samples/letter.js
+++ b/nashorn/samples/letter.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -43,7 +43,7 @@
// JavaScript style line comment is ok too.
print(<<EOF);
Dear ${obj.recipient},
-
+
I wish you all the best.
Regards,
diff --git a/nashorn/samples/list_mapreduce.js b/nashorn/samples/list_mapreduce.js
index 033f4d7..ac2df98 100644
--- a/nashorn/samples/list_mapreduce.js
+++ b/nashorn/samples/list_mapreduce.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,9 +31,9 @@
// Usage: jjs list_mapreduce.js
-// Many Array.prototype functions such as map,
+// Many Array.prototype functions such as map,
// filter, reduce, reduceRight, every, some are generic.
-// These functions accept ECMAScript array as well as
+// These functions accept ECMAScript array as well as
// many array-like objects including java.util.ArrayLists.
// So, you can do map/filter/reduce with Java streams or
// you can also use Array.prototype functions as below.
@@ -81,6 +81,6 @@
// print sum of squares of the random numbers
print("Square sum:",
reduce.call(
- map.call(list, function(x) x*x),
+ map.call(list, function(x) x*x),
function(x, y) x + y)
);
diff --git a/nashorn/samples/locales.js b/nashorn/samples/locales.js
index ae42f96..f16338d 100644
--- a/nashorn/samples/locales.js
+++ b/nashorn/samples/locales.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/logisticmap.js b/nashorn/samples/logisticmap.js
index 7419847..e9b0700 100644
--- a/nashorn/samples/logisticmap.js
+++ b/nashorn/samples/logisticmap.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/options.js b/nashorn/samples/options.js
index 3a10346..9c26b39 100644
--- a/nashorn/samples/options.js
+++ b/nashorn/samples/options.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/parser.js b/nashorn/samples/parser.js
index 2f172cc..16334ae 100644
--- a/nashorn/samples/parser.js
+++ b/nashorn/samples/parser.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/readLine.js b/nashorn/samples/readLine.js
index 9807d3b..d41d35c 100644
--- a/nashorn/samples/readLine.js
+++ b/nashorn/samples/readLine.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/sam_function.js b/nashorn/samples/sam_function.js
index 8406473..70aa5ab 100644
--- a/nashorn/samples/sam_function.js
+++ b/nashorn/samples/sam_function.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -46,6 +46,6 @@
}, 1000);
// wait for timer thread to print by
-// reading from stdin.
+// reading from stdin.
print("press any key to exit after message from timer...");
System.in.read();
diff --git a/nashorn/samples/shell.js b/nashorn/samples/shell.js
index 9396538..8e3195c 100644
--- a/nashorn/samples/shell.js
+++ b/nashorn/samples/shell.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/stack.js b/nashorn/samples/stack.js
index 295ad20..13b63fa 100644
--- a/nashorn/samples/stack.js
+++ b/nashorn/samples/stack.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -33,7 +33,7 @@
// error objects. This property's value is a string
// that shows script stack trace.
-function g() {
+function g() {
throw new Error("wrong");
}
@@ -44,9 +44,9 @@
// Output looks something like:
//
// Error: wrong
-// at g (stack.js:37)
-// at f (stack.js:41)
-// at <program> (stack.js:52)
+// at g (stack.js:37)
+// at f (stack.js:41)
+// at <program> (stack.js:52)
try {
f();
diff --git a/nashorn/samples/try_with_resource.js b/nashorn/samples/try_with_resource.js
new file mode 100644
index 0000000..030e74e
--- /dev/null
+++ b/nashorn/samples/try_with_resource.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* This sample implements Java-like try..with..resource construct for nashorn */
+
+if (arguments.length == 0) {
+ print("Usage: jjs try_with_resource.js -- <file name>");
+ exit(1);
+}
+
+// Object.create accepts prototype and properties object
+function With(res) {
+ return Object.create(With.prototype,
+ { res: { value: res } });
+}
+
+// reserved words can be used as property names - for example "try"
+With.prototype.try = function(callback) {
+ try {
+ callback();
+ } finally {
+ this.res.close();
+ }
+}
+
+var BufferedReader = Java.type("java.io.BufferedReader");
+var FileReader = Java.type("java.io.FileReader");
+
+var r = new BufferedReader(new FileReader(arguments[0]));
+
+// Java-like try..with..resource
+With(r).try(function() {
+ var s;
+ while ((s = r.readLine()) != null) {
+ print(s);
+ }
+})
diff --git a/nashorn/samples/uniform_random.js b/nashorn/samples/uniform_random.js
index a82cd0b..da3f26a 100644
--- a/nashorn/samples/uniform_random.js
+++ b/nashorn/samples/uniform_random.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/uniq.js b/nashorn/samples/uniq.js
index cbd2c34..f9316eb 100644
--- a/nashorn/samples/uniq.js
+++ b/nashorn/samples/uniq.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/uniqs.js b/nashorn/samples/uniqs.js
index 57eb7c5..1c36c67 100644
--- a/nashorn/samples/uniqs.js
+++ b/nashorn/samples/uniqs.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -31,7 +31,7 @@
// Usage: jjs uniqs.js -- <file>
// omit repeated lines and print unique lines
-// But this version uses Stream API
+// But this version uses Stream API
if (arguments.length < 1) {
print("Usage: jjs uniqs.js -- <file>");
diff --git a/nashorn/samples/weather.js b/nashorn/samples/weather.js
index 75c6b26..3a37bc1 100644
--- a/nashorn/samples/weather.js
+++ b/nashorn/samples/weather.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/word_histogram.js b/nashorn/samples/word_histogram.js
index 9c739ea..39f4f68 100644
--- a/nashorn/samples/word_histogram.js
+++ b/nashorn/samples/word_histogram.js
@@ -2,22 +2,22 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/nashorn/samples/zipfs.js b/nashorn/samples/zipfs.js
new file mode 100644
index 0000000..ecb6f61
--- /dev/null
+++ b/nashorn/samples/zipfs.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+if (arguments.length == 0) {
+ print("Usage: jjs zipfs.js -- <.zip/.jar file>")
+ exit(1)
+}
+
+var Files = Java.type("java.nio.file.Files")
+var FileSystems = Java.type("java.nio.file.FileSystems")
+var FileVisitOption = Java.type("java.nio.file.FileVisitOption")
+var Paths = Java.type("java.nio.file.Paths")
+
+var zipfile = Paths.get(arguments[0])
+var fs = FileSystems.newFileSystem(zipfile, null)
+var root = fs.rootDirectories[0]
+Files.walk(root, FileVisitOption.FOLLOW_LINKS).forEach(
+ function(p) (print(p), print(Files.readAttributes(p, "zip:*")))
+)
+fs.close()
diff --git a/nashorn/samples/ziplist.js b/nashorn/samples/ziplist.js
index 6de35f4..214dd35 100644
--- a/nashorn/samples/ziplist.js
+++ b/nashorn/samples/ziplist.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -30,7 +30,7 @@
*/
if (arguments.length == 0) {
- print("Usage: jjs ziplist <zip-file>");
+ print("Usage: jjs ziplist -- <zip-file>");
exit(1);
}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java
similarity index 64%
copy from langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
copy to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java
index 91f7230..ddf1bc3 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/JavacService.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java
@@ -22,22 +22,20 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+package jdk.nashorn.api.scripting;
-package com.sun.tools.sjavac.server;
-
-import java.io.File;
-import java.net.URI;
-import java.util.List;
-import java.util.Set;
-
-public interface JavacService {
-
- SysInfo getSysInfo();
-
- CompilationResult compile(String protocolId,
- String invocationId,
- String[] args,
- List<File> explicitSources,
- Set<URI> sourcesToCompile,
- Set<URI> visibleSources);
+/**
+ * Class filter (optional) to be used by nashorn script engine.
+ * jsr-223 program embedding nashorn script can set ClassFilter instance
+ * to be used when an engine instance is created.
+ */
+public interface ClassFilter {
+ /**
+ * Should the Java class of the specified name be exposed to scripts?
+ * @param className is the fully qualified name of the java class being
+ * checked. This will not be null. Only non-array class names will be
+ * passed.
+ * @return true if the java class can be exposed to scripts false otherwise
+ */
+ public boolean exposeToScripts(String className);
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
index abdb79c..bbf1eec 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -40,7 +40,6 @@
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
-
import javax.script.AbstractScriptEngine;
import javax.script.Bindings;
import javax.script.Compilable;
@@ -51,7 +50,6 @@
import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
-
import jdk.nashorn.internal.objects.Global;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ErrorManager;
@@ -95,9 +93,6 @@
// This is used as "shared" global if above option is true.
private final Global global;
- // default options passed to Nashorn Options object
- private static final String[] DEFAULT_OPTIONS = new String[] { "-doe" };
-
// Nashorn script engine error message management
private static final String MESSAGES_RESOURCE = "jdk.nashorn.api.scripting.resources.Messages";
@@ -115,11 +110,8 @@
}
}
- NashornScriptEngine(final NashornScriptEngineFactory factory, final ClassLoader appLoader) {
- this(factory, DEFAULT_OPTIONS, appLoader);
- }
-
- NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args, final ClassLoader appLoader) {
+ NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args, final ClassLoader appLoader, final ClassFilter classFilter) {
+ assert args != null : "null argument array";
this.factory = factory;
final Options options = new Options("nashorn");
options.process(args);
@@ -131,7 +123,7 @@
@Override
public Context run() {
try {
- return new Context(options, errMgr, appLoader);
+ return new Context(options, errMgr, appLoader, classFilter);
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
index 777edc9..4ddcf94 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
@@ -135,10 +135,13 @@
return sb.toString();
}
+ // default options passed to Nashorn script engine
+ private static final String[] DEFAULT_OPTIONS = new String[] { "-doe" };
+
@Override
public ScriptEngine getScriptEngine() {
try {
- return new NashornScriptEngine(this, getAppClassLoader());
+ return new NashornScriptEngine(this, DEFAULT_OPTIONS, getAppClassLoader(), null);
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
@@ -152,10 +155,27 @@
*
* @param appLoader class loader to be used as script "app" class loader.
* @return newly created script engine.
+ * @throws SecurityException
+ * if the security manager's {@code checkPermission}
+ * denies {@code RuntimePermission("nashorn.setConfig")}
*/
public ScriptEngine getScriptEngine(final ClassLoader appLoader) {
- checkConfigPermission();
- return new NashornScriptEngine(this, appLoader);
+ return newEngine(DEFAULT_OPTIONS, appLoader, null);
+ }
+
+ /**
+ * Create a new Script engine initialized by given class filter.
+ *
+ * @param classFilter class filter to use.
+ * @return newly created script engine.
+ * @throws NullPointerException if {@code classFilter} is {@code null}
+ * @throws SecurityException
+ * if the security manager's {@code checkPermission}
+ * denies {@code RuntimePermission("nashorn.setConfig")}
+ */
+ public ScriptEngine getScriptEngine(final ClassFilter classFilter) {
+ classFilter.getClass(); // null check
+ return newEngine(DEFAULT_OPTIONS, getAppClassLoader(), classFilter);
}
/**
@@ -163,10 +183,14 @@
*
* @param args arguments array passed to script engine.
* @return newly created script engine.
+ * @throws NullPointerException if {@code args} is {@code null}
+ * @throws SecurityException
+ * if the security manager's {@code checkPermission}
+ * denies {@code RuntimePermission("nashorn.setConfig")}
*/
public ScriptEngine getScriptEngine(final String... args) {
- checkConfigPermission();
- return new NashornScriptEngine(this, args, getAppClassLoader());
+ args.getClass(); // null check
+ return newEngine(args, getAppClassLoader(), null);
}
/**
@@ -175,10 +199,44 @@
* @param args arguments array passed to script engine.
* @param appLoader class loader to be used as script "app" class loader.
* @return newly created script engine.
+ * @throws NullPointerException if {@code args} is {@code null}
+ * @throws SecurityException
+ * if the security manager's {@code checkPermission}
+ * denies {@code RuntimePermission("nashorn.setConfig")}
*/
public ScriptEngine getScriptEngine(final String[] args, final ClassLoader appLoader) {
+ args.getClass(); // null check
+ return newEngine(args, appLoader, null);
+ }
+
+ /**
+ * Create a new Script engine initialized by given arguments.
+ *
+ * @param args arguments array passed to script engine.
+ * @param appLoader class loader to be used as script "app" class loader.
+ * @param classFilter class filter to use.
+ * @return newly created script engine.
+ * @throws NullPointerException if {@code args} or {@code classFilter} is {@code null}
+ * @throws SecurityException
+ * if the security manager's {@code checkPermission}
+ * denies {@code RuntimePermission("nashorn.setConfig")}
+ */
+ public ScriptEngine getScriptEngine(final String[] args, final ClassLoader appLoader, final ClassFilter classFilter) {
+ args.getClass(); // null check
+ classFilter.getClass(); // null check
+ return newEngine(args, appLoader, classFilter);
+ }
+
+ private ScriptEngine newEngine(final String[] args, final ClassLoader appLoader, final ClassFilter classFilter) {
checkConfigPermission();
- return new NashornScriptEngine(this, args, appLoader);
+ try {
+ return new NashornScriptEngine(this, args, appLoader, classFilter);
+ } catch (final RuntimeException e) {
+ if (Context.DEBUG) {
+ e.printStackTrace();
+ }
+ throw e;
+ }
}
// -- Internals only below this point
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index 8763c22..b261a1b 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -715,6 +715,23 @@
return newArgs;
}
+ /**
+ * Are the given objects mirrors to same underlying object?
+ *
+ * @param obj1 first object
+ * @param obj2 second object
+ * @return true if obj1 and obj2 are identical script objects or mirrors of it.
+ */
+ public static boolean identical(final Object obj1, final Object obj2) {
+ final Object o1 = (obj1 instanceof ScriptObjectMirror)?
+ ((ScriptObjectMirror)obj1).sobj : obj1;
+
+ final Object o2 = (obj2 instanceof ScriptObjectMirror)?
+ ((ScriptObjectMirror)obj2).sobj : obj2;
+
+ return o1 == o2;
+ }
+
// package-privates below this.
ScriptObjectMirror(final ScriptObject sobj, final Global global) {
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
index 0659e3f..91a022d 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
@@ -382,10 +382,6 @@
symbol.setFlags(flags);
}
- if((isVar || isParam) && compiler.useOptimisticTypes() && compiler.isOnDemandCompilation()) {
- compiler.declareLocalSymbol(name);
- }
-
return symbol;
}
@@ -688,6 +684,22 @@
}
@Override
+ public Node leaveBlock(final Block block) {
+ // It's not necessary to guard the marking of symbols as locals with this "if"condition for correctness, it's
+ // just an optimization -- runtime type calculation is not used when the compilation is not an on-demand
+ // optimistic compilation, so we can skip locals marking then.
+ if (compiler.useOptimisticTypes() && compiler.isOnDemandCompilation()) {
+ for (final Symbol symbol: block.getSymbols()) {
+ if (!symbol.isScope()) {
+ assert symbol.isVar() || symbol.isParam();
+ compiler.declareLocalSymbol(symbol.getName());
+ }
+ }
+ }
+ return block;
+ }
+
+ @Override
public Node leaveDELETE(final UnaryNode unaryNode) {
final FunctionNode currentFunctionNode = lc.getCurrentFunction();
final boolean strictMode = currentFunctionNode.isStrict();
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
index 5b7bf91..0266e5d 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -56,7 +56,6 @@
import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_SCOPE;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
import java.io.PrintWriter;
import java.util.ArrayDeque;
@@ -250,8 +249,6 @@
private final Deque<Label> scopeEntryLabels = new ArrayDeque<>();
- private final Set<Integer> initializedFunctionIds = new HashSet<>();
-
private static final Label METHOD_BOUNDARY = new Label("");
private final Deque<Label> catchLabels = new ArrayDeque<>();
// Number of live locals on entry to (and thus also break from) labeled blocks.
@@ -291,7 +288,7 @@
* @return the correct flags for a call site in the current function
*/
int getCallSiteFlags() {
- return lc.getCurrentFunction().isStrict() ? callSiteFlags | CALLSITE_STRICT : callSiteFlags;
+ return lc.getCurrentFunction().getCallSiteFlags() | callSiteFlags;
}
/**
@@ -1766,7 +1763,7 @@
}
// Debugging: print symbols? @see --print-symbols flag
- printSymbols(block, (isFunctionBody ? "Function " : "Block in ") + (function.getIdent() == null ? "<anonymous>" : function.getIdent().getName()));
+ printSymbols(block, function, (isFunctionBody ? "Function " : "Block in ") + (function.getIdent() == null ? "<anonymous>" : function.getIdent().getName()));
}
/**
@@ -1872,6 +1869,7 @@
// lingers around. Also, currently loading previously persisted optimistic types information only works if
// we're on-demand compiling a function, so with this strategy the :program method can also have the warmup
// benefit of using previously persisted types.
+ //
// NOTE that this means the first compiled class will effectively just have a :createProgramFunction method, and
// the RecompilableScriptFunctionData (RSFD) object in its constants array. It won't even have the :program
// method. This is by design. It does mean that we're wasting one compiler execution (and we could minimize this
@@ -1879,11 +1877,7 @@
// We could emit an initial separate compile unit with the initial version of :program in it to better utilize
// the compilation pipeline, but that would need more invasive changes, as currently the assumption that
// :program is emitted into the first compilation unit of the function lives in many places.
- if(!onDemand && lazy && env._optimistic_types && functionNode.isProgram()) {
- return true;
- }
-
- return false;
+ return !onDemand && lazy && env._optimistic_types && functionNode.isProgram();
}
@Override
@@ -4111,19 +4105,18 @@
* Debug code used to print symbols
*
* @param block the block we are in
+ * @param function the function we are in
* @param ident identifier for block or function where applicable
*/
- private void printSymbols(final Block block, final String ident) {
- if (!compiler.getScriptEnvironment()._print_symbols) {
- return;
+ private void printSymbols(final Block block, final FunctionNode function, final String ident) {
+ if (compiler.getScriptEnvironment()._print_symbols || function.getFlag(FunctionNode.IS_PRINT_SYMBOLS)) {
+ final PrintWriter out = compiler.getScriptEnvironment().getErr();
+ out.println("[BLOCK in '" + ident + "']");
+ if (!block.printSymbols(out)) {
+ out.println("<no symbols>");
+ }
+ out.println();
}
-
- final PrintWriter out = compiler.getScriptEnvironment().getErr();
- out.println("[BLOCK in '" + ident + "']");
- if (!block.printSymbols(out)) {
- out.println("<no symbols>");
- }
- out.println();
}
@@ -4383,9 +4376,8 @@
createFunction.end();
}
- if (addInitializer && !initializedFunctionIds.contains(fnId) && !compiler.isOnDemandCompilation()) {
- functionNode.getCompileUnit().addFunctionInitializer(data, functionNode);
- initializedFunctionIds.add(fnId);
+ if (addInitializer && !compiler.isOnDemandCompilation()) {
+ compiler.addFunctionInitializer(data, functionNode);
}
// We don't emit a ScriptFunction on stack for the outermost compiled function (as there's no code being
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
index 5dea042..2ae9d1a 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -61,6 +61,7 @@
import jdk.nashorn.internal.ir.debug.PrintVisitor;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.runtime.CodeInstaller;
+import jdk.nashorn.internal.runtime.FunctionInitializer;
import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
import jdk.nashorn.internal.runtime.ScriptEnvironment;
import jdk.nashorn.internal.runtime.logging.DebugLogger;
@@ -279,12 +280,12 @@
final PrintWriter err = senv.getErr();
//TODO separate phase for the debug printouts for abstraction and clarity
- if (senv._print_lower_ast) {
+ if (senv._print_lower_ast || fn.getFlag(FunctionNode.IS_PRINT_LOWER_AST)) {
err.println("Lower AST for: " + quote(newFunctionNode.getName()));
err.println(new ASTWriter(newFunctionNode));
}
- if (senv._print_lower_parse) {
+ if (senv._print_lower_parse || fn.getFlag(FunctionNode.IS_PRINT_LOWER_PARSE)) {
err.println("Lower AST for: " + quote(newFunctionNode.getName()));
err.println(new PrintVisitor(newFunctionNode));
}
@@ -324,15 +325,15 @@
final DebugLogger log = compiler.getLogger();
log.fine("Clearing bytecode cache");
+ compiler.clearBytecode();
for (final CompileUnit oldUnit : compiler.getCompileUnits()) {
- CompileUnit newUnit = map.get(oldUnit);
assert map.get(oldUnit) == null;
final StringBuilder sb = new StringBuilder(compiler.nextCompileUnitName());
if (phases.isRestOfCompilation()) {
sb.append("$restOf");
}
- newUnit = compiler.createCompileUnit(sb.toString(), oldUnit.getWeight());
+ final CompileUnit newUnit = compiler.createCompileUnit(sb.toString(), oldUnit.getWeight());
log.fine("Creating new compile unit ", oldUnit, " => ", newUnit);
map.put(oldUnit, newUnit);
assert newUnit != null;
@@ -502,8 +503,7 @@
long length = 0L;
final CodeInstaller<ScriptEnvironment> codeInstaller = compiler.getCodeInstaller();
-
- final Map<String, byte[]> bytecode = compiler.getBytecode();
+ final Map<String, byte[]> bytecode = compiler.getBytecode();
for (final Entry<String, byte[]> entry : bytecode.entrySet()) {
final String className = entry.getKey();
@@ -536,17 +536,18 @@
// initialize function in the compile units
for (final CompileUnit unit : compiler.getCompileUnits()) {
unit.setCode(installedClasses.get(unit.getUnitClassName()));
- unit.initializeFunctionsCode();
}
if (!compiler.isOnDemandCompilation()) {
- codeInstaller.storeCompiledScript(compiler.getSource(), compiler.getFirstCompileUnit().getUnitClassName(), bytecode, constants);
- }
-
- // remove installed bytecode from table in case compiler is reused
- for (final String className : installedClasses.keySet()) {
- log.fine("Removing installed class ", quote(className), " from bytecode table...");
- compiler.removeClass(className);
+ // Initialize functions
+ final Map<Integer, FunctionInitializer> initializers = compiler.getFunctionInitializers();
+ if (initializers != null) {
+ for (final Entry<Integer, FunctionInitializer> entry : initializers.entrySet()) {
+ final FunctionInitializer initializer = entry.getValue();
+ initializer.setCode(installedClasses.get(initializer.getClassName()));
+ compiler.getScriptFunctionData(entry.getKey()).initializeCode(initializer);
+ }
+ }
}
if (log.isEnabled()) {
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
index 051b818..2859bf4 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
@@ -25,12 +25,8 @@
package jdk.nashorn.internal.codegen;
-import java.util.Collections;
-import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
/**
* Used to track split class compilation.
@@ -46,36 +42,6 @@
private Class<?> clazz;
- private Set<FunctionInitializer> functionInitializers = new LinkedHashSet<>();
-
- private static class FunctionInitializer {
- final RecompilableScriptFunctionData data;
- final FunctionNode functionNode;
-
- FunctionInitializer(final RecompilableScriptFunctionData data, final FunctionNode functionNode) {
- this.data = data;
- this.functionNode = functionNode;
- }
-
- void initializeCode() {
- data.initializeCode(functionNode);
- }
-
- @Override
- public int hashCode() {
- return data.hashCode() + 31 * functionNode.hashCode();
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (obj == null || obj.getClass() != FunctionInitializer.class) {
- return false;
- }
- final FunctionInitializer other = (FunctionInitializer)obj;
- return data == other.data && functionNode == other.functionNode;
- }
- }
-
CompileUnit(final String className, final ClassEmitter classEmitter, final long initialWeight) {
this.className = className;
this.weight = initialWeight;
@@ -108,29 +74,6 @@
this.classEmitter = null;
}
- void addFunctionInitializer(final RecompilableScriptFunctionData data, final FunctionNode functionNode) {
- functionInitializers.add(new FunctionInitializer(data, functionNode));
- }
-
- /**
- * Returns true if this compile unit is responsible for initializing the specified function data with specified
- * function node.
- * @param data the function data to check
- * @param functionNode the function node to check
- * @return true if this unit is responsible for initializing the function data with the function node, otherwise
- * false
- */
- public boolean isInitializing(final RecompilableScriptFunctionData data, final FunctionNode functionNode) {
- return functionInitializers.contains(new FunctionInitializer(data, functionNode));
- }
-
- void initializeFunctionsCode() {
- for(final FunctionInitializer init : functionInitializers) {
- init.initializeCode();
- }
- functionInitializers = Collections.emptySet();
- }
-
/**
* Add weight to this compile unit
* @param w weight to add
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
index 205c65b..aa60fdd 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
@@ -50,7 +50,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.logging.Level;
-
import jdk.internal.dynalink.support.NameCodec;
import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
import jdk.nashorn.internal.codegen.types.Type;
@@ -60,6 +59,7 @@
import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator;
import jdk.nashorn.internal.runtime.CodeInstaller;
import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.FunctionInitializer;
import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
import jdk.nashorn.internal.runtime.ScriptEnvironment;
import jdk.nashorn.internal.runtime.ScriptObject;
@@ -89,8 +89,6 @@
private final String sourceName;
- private final String sourceURL;
-
private final boolean optimistic;
private final Map<String, byte[]> bytecode;
@@ -309,21 +307,19 @@
/**
* Constructor
*
- * @param context context
- * @param env script environment
- * @param installer code installer
- * @param source source to compile
- * @param sourceURL source URL, or null if not present
- * @param isStrict is this a strict compilation
+ * @param context context
+ * @param env script environment
+ * @param installer code installer
+ * @param source source to compile
+ * @param isStrict is this a strict compilation
*/
public Compiler(
final Context context,
final ScriptEnvironment env,
final CodeInstaller<ScriptEnvironment> installer,
final Source source,
- final String sourceURL,
final boolean isStrict) {
- this(context, env, installer, source, sourceURL, isStrict, false, null, null, null, null, null, null);
+ this(context, env, installer, source, isStrict, false, null, null, null, null, null, null);
}
/**
@@ -333,7 +329,6 @@
* @param env script environment
* @param installer code installer
* @param source source to compile
- * @param sourceURL source URL, or null if not present
* @param isStrict is this a strict compilation
* @param isOnDemand is this an on demand compilation
* @param compiledFunction compiled function, if any
@@ -348,7 +343,6 @@
final ScriptEnvironment env,
final CodeInstaller<ScriptEnvironment> installer,
final Source source,
- final String sourceURL,
final boolean isStrict,
final boolean isOnDemand,
final RecompilableScriptFunctionData compiledFunction,
@@ -365,8 +359,7 @@
this.bytecode = new LinkedHashMap<>();
this.log = initLogger(context);
this.source = source;
- this.sourceURL = sourceURL;
- this.sourceName = FunctionNode.getSourceName(source, sourceURL);
+ this.sourceName = FunctionNode.getSourceName(source);
this.onDemand = isOnDemand;
this.compiledFunction = compiledFunction;
this.types = types;
@@ -411,6 +404,15 @@
sb.append(compilationId).append('$');
}
+ if (types != null && compiledFunction.getFunctionNodeId() > 0) {
+ sb.append(compiledFunction.getFunctionNodeId());
+ final Type[] paramTypes = types.getParameterTypes(compiledFunction.getFunctionNodeId());
+ for (final Type t : paramTypes) {
+ sb.append(Type.getShortSignatureDescriptor(t));
+ }
+ sb.append('$');
+ }
+
sb.append(Compiler.safeSourceName(env, installer, source));
return sb.toString();
@@ -559,8 +561,11 @@
return Collections.unmodifiableMap(bytecode);
}
- byte[] getBytecode(final String className) {
- return bytecode.get(className);
+ /**
+ * Reset bytecode cache for compiler reuse.
+ */
+ void clearBytecode() {
+ bytecode.clear();
}
CompileUnit getFirstCompileUnit() {
@@ -584,15 +589,6 @@
bytecode.put(name, code);
}
- void removeClass(final String name) {
- assert bytecode.get(name) != null;
- bytecode.remove(name);
- }
-
- String getSourceURL() {
- return sourceURL;
- }
-
String nextCompileUnitName() {
final StringBuilder sb = new StringBuilder(firstCompileUnitName);
final int cuid = nextCompileUnitId.getAndIncrement();
@@ -603,8 +599,51 @@
return sb.toString();
}
- void clearCompileUnits() {
- compileUnits.clear();
+ Map<Integer, FunctionInitializer> functionInitializers;
+
+ void addFunctionInitializer(final RecompilableScriptFunctionData functionData, final FunctionNode functionNode) {
+ if (functionInitializers == null) {
+ functionInitializers = new HashMap<>();
+ }
+ if (!functionInitializers.containsKey(functionData)) {
+ functionInitializers.put(functionData.getFunctionNodeId(), new FunctionInitializer(functionNode));
+ }
+ }
+
+ Map<Integer, FunctionInitializer> getFunctionInitializers() {
+ return functionInitializers;
+ }
+
+ /**
+ * Persist current compilation with the given {@code cacheKey}.
+ * @param cacheKey cache key
+ * @param functionNode function node
+ */
+ public void persistClassInfo(final String cacheKey, final FunctionNode functionNode) {
+ if (cacheKey != null && env._persistent_cache) {
+ Map<Integer, FunctionInitializer> initializers;
+ // If this is an on-demand compilation create a function initializer for the function being compiled.
+ // Otherwise use function initializer map generated by codegen.
+ if (functionInitializers == null) {
+ initializers = new HashMap<>();
+ final FunctionInitializer initializer = new FunctionInitializer(functionNode, getInvalidatedProgramPoints());
+ initializers.put(functionNode.getId(), initializer);
+ } else {
+ initializers = functionInitializers;
+ }
+ final String mainClassName = getFirstCompileUnit().getUnitClassName();
+ installer.storeScript(cacheKey, source, mainClassName, bytecode, initializers, constantData.toArray(), compilationId);
+ }
+ }
+
+ /**
+ * Make sure the next compilation id is greater than {@code value}.
+ * @param value compilation id value
+ */
+ public static void updateCompilationId(final int value) {
+ if (value >= COMPILATION_ID.get()) {
+ COMPILATION_ID.set(value + 1);
+ }
}
CompileUnit addCompileUnit(final long initialWeight) {
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
index d7c74ba..cd87f0f 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
@@ -30,7 +30,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import jdk.nashorn.internal.runtime.Property;
import jdk.nashorn.internal.runtime.PropertyMap;
/**
@@ -121,12 +120,7 @@
private final int hashCode;
public PropertyMapWrapper(final PropertyMap map) {
- int hash = 0;
- for (final Property property : map.getProperties()) {
- hash = hash << 7 ^ hash >> 7;
- hash ^= property.hashCode();
- }
- this.hashCode = hash;
+ this.hashCode = Arrays.hashCode(map.getProperties());
this.propertyMap = map;
}
@@ -137,14 +131,8 @@
@Override
public boolean equals(final Object other) {
- if (!(other instanceof PropertyMapWrapper)) {
- return false;
- }
-
- final Property[] ownProperties = propertyMap.getProperties();
- final Property[] otherProperties = ((PropertyMapWrapper) other).propertyMap.getProperties();
-
- return Arrays.equals(ownProperties, otherProperties);
+ return other instanceof PropertyMapWrapper &&
+ Arrays.equals(propertyMap.getProperties(), ((PropertyMapWrapper) other).propertyMap.getProperties());
}
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
index 64c40c1..0f8ea77 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
@@ -217,7 +217,6 @@
allocatorClassName,
allocatorMap,
nestedFunctions,
- compiler.getSourceURL(),
externalSymbolDepths.get(fnId),
internalSymbols.get(fnId)
);
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
index f280879..9f713e0 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
@@ -34,7 +34,6 @@
import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
-
import jdk.nashorn.internal.ir.BaseNode;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
index 3d5dc27..07093e7 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
@@ -40,8 +40,6 @@
import java.util.Base64;
import java.util.Date;
import java.util.Map;
-import java.util.TreeMap;
-
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
@@ -80,12 +78,11 @@
final StringBuilder b = new StringBuilder(48);
// Base64-encode the digest of the source, and append the function id.
b.append(source.getDigest()).append('-').append(functionId);
- // Finally, if this is a parameter-type specialized version of the function, add the parameter types to the file
- // name.
+ // Finally, if this is a parameter-type specialized version of the function, add the parameter types to the file name.
if(paramTypes != null && paramTypes.length > 0) {
b.append('-');
for(final Type t: paramTypes) {
- b.append(t.getBytecodeStackType());
+ b.append(Type.getShortSignatureDescriptor(t));
}
}
return new LocationDescriptor(new File(cacheDir, b.toString()));
@@ -108,7 +105,7 @@
*/
@SuppressWarnings("resource")
public static void store(final Object locationDescriptor, final Map<Integer, Type> optimisticTypes) {
- if(locationDescriptor == null) {
+ if(locationDescriptor == null || optimisticTypes.isEmpty()) {
return;
}
final File file = ((LocationDescriptor)locationDescriptor).file;
@@ -117,25 +114,10 @@
@Override
public Void run() {
synchronized(getFileLock(file)) {
- try (final FileOutputStream out = new FileOutputStream(file);) {
+ try (final FileOutputStream out = new FileOutputStream(file)) {
out.getChannel().lock(); // lock exclusive
final DataOutputStream dout = new DataOutputStream(new BufferedOutputStream(out));
- dout.writeInt(optimisticTypes.size());
- for(final Map.Entry<Integer, Type> e: optimisticTypes.entrySet()) {
- dout.writeInt(e.getKey());
- final byte typeChar;
- final Type type = e.getValue();
- if(type == Type.OBJECT) {
- typeChar = 'L';
- } else if(type == Type.NUMBER) {
- typeChar = 'D';
- } else if(type == Type.LONG) {
- typeChar = 'J';
- } else {
- throw new AssertionError();
- }
- dout.write(typeChar);
- }
+ Type.writeTypeMap(optimisticTypes, dout);
dout.flush();
} catch(final Exception e) {
reportError("write", file, e);
@@ -166,24 +148,10 @@
return null;
}
synchronized(getFileLock(file)) {
- try (final FileInputStream in = new FileInputStream(file);) {
+ try (final FileInputStream in = new FileInputStream(file)) {
in.getChannel().lock(0, Long.MAX_VALUE, true); // lock shared
final DataInputStream din = new DataInputStream(new BufferedInputStream(in));
- final Map<Integer, Type> map = new TreeMap<>();
- final int size = din.readInt();
- for(int i = 0; i < size; ++i) {
- final int pp = din.readInt();
- final int typeChar = din.read();
- final Type type;
- switch(typeChar) {
- case 'L': type = Type.OBJECT; break;
- case 'D': type = Type.NUMBER; break;
- case 'J': type = Type.LONG; break;
- default: throw new AssertionError();
- }
- map.put(pp, type);
- }
- return map;
+ return Type.readTypeMap(din);
}
}
} catch (final Exception e) {
@@ -276,7 +244,7 @@
private static String getVersionDirName() throws Exception {
final URL url = OptimisticTypesPersistence.class.getResource("");
final String protocol = url.getProtocol();
- if(protocol.equals("jar")) {
+ if (protocol.equals("jar")) {
// Normal deployment: nashorn.jar
final String jarUrlFile = url.getFile();
final String filePath = jarUrlFile.substring(0, jarUrlFile.indexOf('!'));
@@ -310,12 +278,12 @@
for(final File f: dir.listFiles()) {
if(f.getName().endsWith(".class")) {
final long lastModified = f.lastModified();
- if(lastModified > currentMax) {
+ if (lastModified > currentMax) {
currentMax = lastModified;
}
- } else if(f.isDirectory()) {
+ } else if (f.isDirectory()) {
final long lastModified = getLastModifiedClassFile(f, currentMax);
- if(lastModified > currentMax) {
+ if (lastModified > currentMax) {
currentMax = lastModified;
}
}
@@ -325,7 +293,7 @@
private static Object[] createLockArray() {
final Object[] lockArray = new Object[Runtime.getRuntime().availableProcessors() * 2];
- for(int i = 0; i < lockArray.length; ++i) {
+ for (int i = 0; i < lockArray.length; ++i) {
lockArray[i] = new Object();
}
return lockArray;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
index 2c90a3e..c8dd5b3 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
@@ -115,6 +115,14 @@
return Type.typeFor(JSType.unboxedFieldType(value));
}
+ /**
+ * Declares a symbol name as belonging to a non-scoped local variable during an on-demand compilation of a single
+ * function. This method will add an explicit Undefined binding for the local into the runtime scope if it's
+ * otherwise implicitly undefined so that when an expression is evaluated for the name, it won't accidentally find
+ * an unrelated value higher up the scope chain. It is only required to call this method when doing an optimistic
+ * on-demand compilation.
+ * @param symbolName the name of the symbol that is to be declared as being a non-scoped local variable.
+ */
void declareLocalSymbol(final String symbolName) {
assert
compiler.useOptimisticTypes() &&
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
index 1fc6480..a1db3b7 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
@@ -48,10 +48,15 @@
import static jdk.internal.org.objectweb.asm.Opcodes.T_LONG;
import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.lang.invoke.CallSite;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
+import java.util.Map;
+import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import jdk.internal.org.objectweb.asm.Handle;
@@ -204,6 +209,20 @@
}
/**
+ * Return a character representing {@code type} in a method signature.
+ *
+ * @param type parameter type
+ * @return descriptor character
+ */
+ public static char getShortSignatureDescriptor(final Type type) {
+ // Use 'Z' for boolean parameters as we need to distinguish from int
+ if (type instanceof BooleanType) {
+ return 'Z';
+ }
+ return type.getBytecodeStackType();
+ }
+
+ /**
* Return the type for an internal type, package private - do not use
* outside code gen
*
@@ -275,6 +294,64 @@
return types;
}
+ /**
+ * Write a map of {@code int} to {@code Type} to an output stream. This is used to store deoptimization state.
+ *
+ * @param typeMap the type map
+ * @param output data output
+ * @throws IOException
+ */
+ public static void writeTypeMap(final Map<Integer, Type> typeMap, final DataOutput output) throws IOException {
+ if (typeMap == null) {
+ output.writeInt(0);
+ } else {
+ output.writeInt(typeMap.size());
+ for(final Map.Entry<Integer, Type> e: typeMap.entrySet()) {
+ output.writeInt(e.getKey());
+ final byte typeChar;
+ final Type type = e.getValue();
+ if(type == Type.OBJECT) {
+ typeChar = 'L';
+ } else if (type == Type.NUMBER) {
+ typeChar = 'D';
+ } else if (type == Type.LONG) {
+ typeChar = 'J';
+ } else {
+ throw new AssertionError();
+ }
+ output.writeByte(typeChar);
+ }
+ }
+ }
+
+ /**
+ * Read a map of {@code int} to {@code Type} from an input stream. This is used to store deoptimization state.
+ *
+ * @param input data input
+ * @return type map
+ * @throws IOException
+ */
+ public static Map<Integer, Type> readTypeMap(final DataInput input) throws IOException {
+ final int size = input.readInt();
+ if (size == 0) {
+ return null;
+ }
+ final Map<Integer, Type> map = new TreeMap<>();
+ for(int i = 0; i < size; ++i) {
+ final int pp = input.readInt();
+ final int typeChar = input.readByte();
+ final Type type;
+ switch(typeChar) {
+ case 'L': type = Type.OBJECT; break;
+ case 'D': type = Type.NUMBER; break;
+ case 'J': type = Type.LONG; break;
+ default: throw new AssertionError();
+ }
+ map.put(pp, type);
+ }
+ return map;
+ }
+
static jdk.internal.org.objectweb.asm.Type getInternalType(final String className) {
return jdk.internal.org.objectweb.asm.Type.getType(className);
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
index be7abe3..189a419 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
@@ -30,7 +30,6 @@
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
-
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.annotations.Immutable;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
index 9481b3a..dfb6804 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
@@ -25,12 +25,18 @@
package jdk.nashorn.internal.ir;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROFILE;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_ENTEREXIT;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_VALUES;
+
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import jdk.nashorn.internal.codegen.CompileUnit;
@@ -81,7 +87,7 @@
LOWERED,
/** program points have been assigned to unique locations */
PROGRAM_POINTS_ASSIGNED,
- /** any transformations of builtins have taken place, e.g. apply=>call */
+ /** any transformations of builtins have taken place, e.g. apply=>call */
BUILTINS_TRANSFORMED,
/** method has been split */
SPLIT,
@@ -150,9 +156,6 @@
/** Function flags. */
private final int flags;
- /** //@ sourceURL or //# sourceURL for program function nodes */
- private final String sourceURL;
-
/** Line number of function start */
private final int lineNumber;
@@ -232,6 +235,37 @@
/** Is this declared in a dynamic context */
public static final int IN_DYNAMIC_CONTEXT = 1 << 17;
+ /**
+ * The following flags are derived from directive comments within this function.
+ * Note that even IS_STRICT is one such flag but that requires special handling.
+ */
+
+ // parser, lower debugging this function
+ public static final int IS_PRINT_PARSE = 1 << 18;
+ public static final int IS_PRINT_LOWER_PARSE = 1 << 19;
+ public static final int IS_PRINT_AST = 1 << 20;
+ public static final int IS_PRINT_LOWER_AST = 1 << 21;
+ public static final int IS_PRINT_SYMBOLS = 1 << 22;
+
+ /** profile callsites in this function? */
+ public static final int IS_PROFILE = 1 << 23;
+
+ // callsite tracing, profiling within this function
+ /** trace callsite enterexit in this function? */
+ public static final int IS_TRACE_ENTEREXIT = 1 << 24;
+
+ /** trace callsite misses in this function? */
+ public static final int IS_TRACE_MISSES = 1 << 25;
+
+ /** trace callsite values in this function? */
+ public static final int IS_TRACE_VALUES = 1 << 26;
+
+ /** extension callsite flags mask */
+ public static final int EXTENSION_CALLSITE_FLAGS = IS_PRINT_PARSE |
+ IS_PRINT_LOWER_PARSE | IS_PRINT_AST | IS_PRINT_LOWER_AST |
+ IS_PRINT_SYMBOLS | IS_PROFILE | IS_TRACE_ENTEREXIT |
+ IS_TRACE_MISSES | IS_TRACE_VALUES;
+
/** Does this function or any nested functions contain an eval? */
private static final int HAS_DEEP_EVAL = HAS_EVAL | HAS_NESTED_EVAL;
@@ -269,7 +303,6 @@
* @param parameters parameter list
* @param kind kind of function as in {@link FunctionNode.Kind}
* @param flags initial flags
- * @param sourceURL sourceURL specified in script (optional)
*/
public FunctionNode(
final Source source,
@@ -283,8 +316,7 @@
final String name,
final List<IdentNode> parameters,
final FunctionNode.Kind kind,
- final int flags,
- final String sourceURL) {
+ final int flags) {
super(token, finish);
this.source = source;
@@ -300,7 +332,6 @@
this.compilationState = EnumSet.of(CompilationState.INITIALIZED);
this.declaredSymbols = new HashSet<>();
this.flags = flags;
- this.sourceURL = sourceURL;
this.compileUnit = null;
this.body = null;
this.thisProperties = 0;
@@ -311,7 +342,6 @@
final FunctionNode functionNode,
final long lastToken,
final int flags,
- final String sourceURL,
final String name,
final Type returnType,
final CompileUnit compileUnit,
@@ -324,7 +354,6 @@
this.lineNumber = functionNode.lineNumber;
this.flags = flags;
- this.sourceURL = sourceURL;
this.name = name;
this.returnType = returnType;
this.compileUnit = compileUnit;
@@ -363,6 +392,41 @@
}
/**
+ * Get additional callsite flags to be used specific to this function.
+ *
+ * @return callsite flags
+ */
+ public int getCallSiteFlags() {
+ int callsiteFlags = 0;
+ if (getFlag(IS_STRICT)) {
+ callsiteFlags |= CALLSITE_STRICT;
+ }
+
+ // quick check for extension callsite flags turned on by directives.
+ if ((flags & EXTENSION_CALLSITE_FLAGS) == 0) {
+ return callsiteFlags;
+ }
+
+ if (getFlag(IS_PROFILE)) {
+ callsiteFlags |= CALLSITE_PROFILE;
+ }
+
+ if (getFlag(IS_TRACE_MISSES)) {
+ callsiteFlags |= CALLSITE_TRACE | CALLSITE_TRACE_MISSES;
+ }
+
+ if (getFlag(IS_TRACE_VALUES)) {
+ callsiteFlags |= CALLSITE_TRACE | CALLSITE_TRACE_ENTEREXIT | CALLSITE_TRACE_VALUES;
+ }
+
+ if (getFlag(IS_TRACE_ENTEREXIT)) {
+ callsiteFlags |= CALLSITE_TRACE | CALLSITE_TRACE_ENTEREXIT;
+ }
+
+ return callsiteFlags;
+ }
+
+ /**
* Get the source for this function
* @return the source
*/
@@ -384,56 +448,50 @@
* @return name for the script source
*/
public String getSourceName() {
- return getSourceName(source, sourceURL);
+ return getSourceName(source);
}
/**
* Static source name getter
*
- * @param source
- * @param sourceURL
+ * @param source the source
* @return source name
*/
- public static String getSourceName(final Source source, final String sourceURL) {
- return sourceURL != null ? sourceURL : source.getName();
+ public static String getSourceName(final Source source) {
+ final String explicitURL = source.getExplicitURL();
+ return explicitURL != null ? explicitURL : source.getName();
}
/**
- * get the sourceURL
- * @return the sourceURL
- */
- public String getSourceURL() {
- return sourceURL;
- }
-
- /**
- * Set the sourceURL
+ * Function to parse nashorn per-function extension directive comments.
*
- * @param lc lexical context
- * @param newSourceURL source url string to set
- * @return function node or a new one if state was changed
+ * @param directive nashorn extension directive string
+ * @return integer flag for the given directive.
*/
- public FunctionNode setSourceURL(final LexicalContext lc, final String newSourceURL) {
- if (Objects.equals(sourceURL, newSourceURL)) {
- return this;
+ public static int getDirectiveFlag(final String directive) {
+ switch (directive) {
+ case "nashorn callsite trace enterexit":
+ return IS_TRACE_ENTEREXIT;
+ case "nashorn callsite trace misses":
+ return IS_TRACE_MISSES;
+ case "nashorn callsite trace objects":
+ return IS_TRACE_VALUES;
+ case "nashorn callsite profile":
+ return IS_PROFILE;
+ case "nashorn print parse":
+ return IS_PRINT_PARSE;
+ case "nashorn print lower parse":
+ return IS_PRINT_LOWER_PARSE;
+ case "nashorn print ast":
+ return IS_PRINT_AST;
+ case "nashorn print lower ast":
+ return IS_PRINT_LOWER_AST;
+ case "nashorn print symbols":
+ return IS_PRINT_SYMBOLS;
+ default:
+ // unknown/unsupported directive
+ return 0;
}
-
- return Node.replaceInLexicalContext(
- lc,
- this,
- new FunctionNode(
- this,
- lastToken,
- flags,
- newSourceURL,
- name,
- returnType,
- compileUnit,
- compilationState,
- body,
- parameters,
- thisProperties,
- rootClass));
}
/**
@@ -469,11 +527,11 @@
}
/**
- * Check whether the state of this FunctionNode contains a given compilation<
+ * Check whether the state of this FunctionNode contains a given compilation
* state.
*
* A node can be in many states at once, e.g. both lowered and initialized.
- * To check for an exact state, use {FunctionNode{@link #hasState(EnumSet)}
+ * To check for an exact state, use {@link #hasState(EnumSet)}
*
* @param state state to check for
* @return true if state is present in the total compilation state of this FunctionNode
@@ -504,7 +562,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -576,7 +633,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -733,7 +789,6 @@
(body.needsScope() ?
FunctionNode.HAS_SCOPE_BLOCK :
0),
- sourceURL,
name,
returnType,
compileUnit,
@@ -829,7 +884,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -890,7 +944,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -926,7 +979,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -992,7 +1044,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -1071,7 +1122,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
type,
compileUnit,
@@ -1118,7 +1168,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
@@ -1174,7 +1223,6 @@
this,
lastToken,
flags,
- sourceURL,
name,
returnType,
compileUnit,
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
index 543dc08..ef56ae1 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
@@ -27,7 +27,6 @@
import java.io.File;
import java.util.Iterator;
import java.util.NoSuchElementException;
-
import jdk.nashorn.internal.runtime.Debug;
import jdk.nashorn.internal.runtime.Source;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
index 787aae2..8ff4f9f 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
@@ -29,7 +29,6 @@
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
-
import jdk.nashorn.internal.codegen.CompileUnit;
import jdk.nashorn.internal.codegen.types.ArrayType;
import jdk.nashorn.internal.codegen.types.Type;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
index 29feadd..f58d2a6 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.parser.Token;
import jdk.nashorn.internal.parser.TokenType;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
index 5dbf354..5cdc67d 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
@@ -39,7 +39,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import jdk.internal.org.objectweb.asm.Attribute;
import jdk.internal.org.objectweb.asm.Handle;
import jdk.internal.org.objectweb.asm.Label;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
index 8e72be7..1fe7cdb 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
@@ -46,12 +46,11 @@
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
-
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
-
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.nashorn.api.scripting.ClassFilter;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.codegen.ApplySpecialization;
import jdk.nashorn.internal.codegen.CompilerConstants.Call;
@@ -396,19 +395,19 @@
private ScriptObject builtinJavafx;
private ScriptObject builtinJavax;
private ScriptObject builtinOrg;
- private ScriptObject builtinJavaImporter;
+ private ScriptFunction builtinJavaImporter;
private ScriptObject builtinJavaApi;
- private ScriptObject builtinArrayBuffer;
- private ScriptObject builtinDataView;
- private ScriptObject builtinInt8Array;
- private ScriptObject builtinUint8Array;
- private ScriptObject builtinUint8ClampedArray;
- private ScriptObject builtinInt16Array;
- private ScriptObject builtinUint16Array;
- private ScriptObject builtinInt32Array;
- private ScriptObject builtinUint32Array;
- private ScriptObject builtinFloat32Array;
- private ScriptObject builtinFloat64Array;
+ private ScriptFunction builtinArrayBuffer;
+ private ScriptFunction builtinDataView;
+ private ScriptFunction builtinInt8Array;
+ private ScriptFunction builtinUint8Array;
+ private ScriptFunction builtinUint8ClampedArray;
+ private ScriptFunction builtinInt16Array;
+ private ScriptFunction builtinUint16Array;
+ private ScriptFunction builtinInt32Array;
+ private ScriptFunction builtinUint32Array;
+ private ScriptFunction builtinFloat32Array;
+ private ScriptFunction builtinFloat64Array;
/*
* ECMA section 13.2.3 The [[ThrowTypeError]] Function Object
@@ -545,6 +544,14 @@
// Runtime interface to Global
/**
+ * Is there a class filter in the current Context?
+ * @return class filter
+ */
+ public ClassFilter getClassFilter() {
+ return context.getClassFilter();
+ }
+
+ /**
* Is this global of the given Context?
* @param ctxt the context
* @return true if this global belongs to the given Context
@@ -1688,15 +1695,15 @@
this.quit = ScriptFunctionImpl.makeFunction("quit", EXIT);
// built-in constructors
- this.builtinArray = (ScriptFunction)initConstructor("Array");
- this.builtinBoolean = (ScriptFunction)initConstructor("Boolean");
- this.builtinDate = (ScriptFunction)initConstructor("Date");
- this.builtinJSON = initConstructor("JSON");
- this.builtinJSAdapter = (ScriptFunction)initConstructor("JSAdapter");
- this.builtinMath = initConstructor("Math");
- this.builtinNumber = (ScriptFunction)initConstructor("Number");
- this.builtinRegExp = (ScriptFunction)initConstructor("RegExp");
- this.builtinString = (ScriptFunction)initConstructor("String");
+ this.builtinArray = initConstructor("Array", ScriptFunction.class);
+ this.builtinBoolean = initConstructor("Boolean", ScriptFunction.class);
+ this.builtinDate = initConstructor("Date", ScriptFunction.class);
+ this.builtinJSON = initConstructor("JSON", ScriptObject.class);
+ this.builtinJSAdapter = initConstructor("JSAdapter", ScriptFunction.class);
+ this.builtinMath = initConstructor("Math", ScriptObject.class);
+ this.builtinNumber = initConstructor("Number", ScriptFunction.class);
+ this.builtinRegExp = initConstructor("RegExp", ScriptFunction.class);
+ this.builtinString = initConstructor("String", ScriptFunction.class);
// initialize String.prototype.length to 0
// add String.prototype.length
@@ -1777,7 +1784,7 @@
private void initErrorObjects() {
// Error objects
- this.builtinError = (ScriptFunction)initConstructor("Error");
+ this.builtinError = initConstructor("Error", ScriptFunction.class);
final ScriptObject errorProto = getErrorPrototype();
// Nashorn specific accessors on Error.prototype - stack, lineNumber, columnNumber and fileName
@@ -1810,12 +1817,12 @@
}
private ScriptFunction initErrorSubtype(final String name, final ScriptObject errorProto) {
- final ScriptObject cons = initConstructor(name);
+ final ScriptFunction cons = initConstructor(name, ScriptFunction.class);
final ScriptObject prototype = ScriptFunction.getPrototype(cons);
prototype.set(NativeError.NAME, name, false);
prototype.set(NativeError.MESSAGE, "", false);
prototype.setInitialProto(errorProto);
- return (ScriptFunction)cons;
+ return cons;
}
private void initJavaAccess() {
@@ -1827,8 +1834,8 @@
this.builtinJavafx = new NativeJavaPackage("javafx", objectProto);
this.builtinJavax = new NativeJavaPackage("javax", objectProto);
this.builtinOrg = new NativeJavaPackage("org", objectProto);
- this.builtinJavaImporter = initConstructor("JavaImporter");
- this.builtinJavaApi = initConstructor("Java");
+ this.builtinJavaImporter = initConstructor("JavaImporter", ScriptFunction.class);
+ this.builtinJavaApi = initConstructor("Java", ScriptObject.class);
}
private void initScripting(final ScriptEnvironment scriptEnv) {
@@ -1881,17 +1888,17 @@
}
private void initTypedArray() {
- this.builtinArrayBuffer = initConstructor("ArrayBuffer");
- this.builtinDataView = initConstructor("DataView");
- this.builtinInt8Array = initConstructor("Int8Array");
- this.builtinUint8Array = initConstructor("Uint8Array");
- this.builtinUint8ClampedArray = initConstructor("Uint8ClampedArray");
- this.builtinInt16Array = initConstructor("Int16Array");
- this.builtinUint16Array = initConstructor("Uint16Array");
- this.builtinInt32Array = initConstructor("Int32Array");
- this.builtinUint32Array = initConstructor("Uint32Array");
- this.builtinFloat32Array = initConstructor("Float32Array");
- this.builtinFloat64Array = initConstructor("Float64Array");
+ this.builtinArrayBuffer = initConstructor("ArrayBuffer", ScriptFunction.class);
+ this.builtinDataView = initConstructor("DataView", ScriptFunction.class);
+ this.builtinInt8Array = initConstructor("Int8Array", ScriptFunction.class);
+ this.builtinUint8Array = initConstructor("Uint8Array", ScriptFunction.class);
+ this.builtinUint8ClampedArray = initConstructor("Uint8ClampedArray", ScriptFunction.class);
+ this.builtinInt16Array = initConstructor("Int16Array", ScriptFunction.class);
+ this.builtinUint16Array = initConstructor("Uint16Array", ScriptFunction.class);
+ this.builtinInt32Array = initConstructor("Int32Array", ScriptFunction.class);
+ this.builtinUint32Array = initConstructor("Uint32Array", ScriptFunction.class);
+ this.builtinFloat32Array = initConstructor("Float32Array", ScriptFunction.class);
+ this.builtinFloat64Array = initConstructor("Float64Array", ScriptFunction.class);
}
private void copyBuiltins() {
@@ -1936,7 +1943,7 @@
}
private void initDebug() {
- this.addOwnProperty("Debug", Attribute.NOT_ENUMERABLE, initConstructor("Debug"));
+ this.addOwnProperty("Debug", Attribute.NOT_ENUMERABLE, initConstructor("Debug", ScriptObject.class));
}
private Object printImpl(final boolean newLine, final Object... objects) {
@@ -1968,7 +1975,7 @@
* These classes are generated by nasgen tool and so we have to use
* reflection to load and create new instance of these classes.
*/
- private ScriptObject initConstructor(final String name) {
+ private <T extends ScriptObject> T initConstructor(final String name, final Class<T> clazz) {
try {
// Assuming class name pattern for built-in JS constructors.
final StringBuilder sb = new StringBuilder("jdk.nashorn.internal.objects.");
@@ -1977,8 +1984,8 @@
sb.append(name);
sb.append("$Constructor");
- final Class<?> funcClass = Class.forName(sb.toString());
- final ScriptObject res = (ScriptObject)funcClass.newInstance();
+ final Class<?> funcClass = Class.forName(sb.toString());
+ final T res = clazz.cast(funcClass.newInstance());
if (res instanceof ScriptFunction) {
// All global constructor prototypes are not-writable,
@@ -1992,9 +1999,7 @@
}
res.setIsBuiltin();
-
return res;
-
} catch (final ClassNotFoundException | InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
}
@@ -2008,7 +2013,7 @@
// to play with object references carefully!!
private void initFunctionAndObject() {
// First-n-foremost is Function
- this.builtinFunction = (ScriptFunction)initConstructor("Function");
+ this.builtinFunction = initConstructor("Function", ScriptFunction.class);
// create global anonymous function
final ScriptFunction anon = ScriptFunctionImpl.newAnonymousFunction();
@@ -2030,7 +2035,7 @@
typeErrorThrower.preventExtensions();
// now initialize Object
- this.builtinObject = (ScriptFunction)initConstructor("Object");
+ this.builtinObject = initConstructor("Object", ScriptFunction.class);
final ScriptObject ObjectPrototype = getObjectPrototype();
// Object.getPrototypeOf(Function.prototype) === Object.prototype
anon.setInitialProto(ObjectPrototype);
@@ -2154,7 +2159,7 @@
/**
* Tag a reserved name as invalidated - used when someone writes
* to a property with this name - overly conservative, but link time
- * is too late to apply e.g. apply->call specialization
+ * is too late to apply e.g. apply->call specialization
* @param name property name
*/
public void invalidateReservedName(final String name) {
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
index 95de1bd..4395e08 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
@@ -45,8 +45,8 @@
import jdk.nashorn.internal.runtime.JSType;
import jdk.nashorn.internal.runtime.ListAdapter;
import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.ScriptRuntime;
import jdk.nashorn.internal.runtime.linker.Bootstrap;
import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
index 0a56d5c..5667e6a 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
@@ -39,7 +39,6 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.Callable;
-
import jdk.internal.dynalink.beans.BeansLinker;
import jdk.internal.dynalink.beans.StaticClass;
import jdk.internal.dynalink.linker.GuardedInvocation;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
index ebccf73..0ae7fdc 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
@@ -39,6 +39,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import java.util.Set;
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
@@ -391,10 +392,12 @@
/**
* return a List of own keys associated with the object.
* @param all True if to include non-enumerable keys.
+ * @param nonEnumerable set of non-enumerable properties seen already.Used
+ * to filter out shadowed, but enumerable properties from proto children.
* @return Array of keys.
*/
@Override
- public String[] getOwnKeys(final boolean all) {
+ protected String[] getOwnKeys(final boolean all, final Set<String> nonEnumerable) {
final List<Object> keys = new ArrayList<>();
// add string index keys
@@ -403,7 +406,7 @@
}
// add super class properties
- keys.addAll(Arrays.asList(super.getOwnKeys(all)));
+ keys.addAll(Arrays.asList(super.getOwnKeys(all, nonEnumerable)));
return keys.toArray(new String[keys.size()]);
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
index 390c76d..09e3b2a 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
@@ -40,7 +40,7 @@
* in NativeArray that takes an int, write
*
* <pre>
- * @SpecializedFunction @Optimistic
+ * {@literal @}SpecializedFunction {@literal @}Optimistic
* public static int push(final Object self, final int x, final int programPoint) {
* try {
* //push code assuming that this is an int array
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
index e5e83bc..4d81340 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
@@ -91,9 +91,6 @@
/** What should line numbers be counted from? */
protected final int lineOffset;
- /** //@ sourceURL or //# sourceURL */
- protected String sourceURL;
-
/**
* Construct a parser.
*
@@ -182,7 +179,7 @@
// currently only @sourceURL=foo supported
private void checkDirectiveComment() {
// if already set, ignore this one
- if (sourceURL != null) {
+ if (source.getExplicitURL() != null) {
return;
}
@@ -190,7 +187,7 @@
final int len = comment.length();
// 4 characters for directive comment marker //@\s or //#\s
if (len > 4 && comment.substring(4).startsWith(SOURCE_URL_PREFIX)) {
- sourceURL = comment.substring(4 + SOURCE_URL_PREFIX.length());
+ source.setExplicitURL(comment.substring(4 + SOURCE_URL_PREFIX.length()));
}
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
index 20efafb..3e0d1e6 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
@@ -106,6 +106,8 @@
import jdk.nashorn.internal.ir.VarNode;
import jdk.nashorn.internal.ir.WhileNode;
import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.debug.ASTWriter;
+import jdk.nashorn.internal.ir.debug.PrintVisitor;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ErrorManager;
import jdk.nashorn.internal.runtime.JSErrorType;
@@ -346,9 +348,10 @@
expect(EOF);
function.setFinish(source.getLength() - 1);
-
function = restoreFunctionNode(function, token); //commit code
function = function.setBody(lc, function.getBody().setNeedsScope(lc));
+
+ printAST(function);
return function;
} catch (final Exception e) {
handleParseException(e);
@@ -477,8 +480,7 @@
name,
parameters,
kind,
- flags,
- sourceURL);
+ flags);
lc.push(functionNode);
// Create new block, and just put it on the context stack, restoreFunctionNode() will associate it with the
@@ -702,10 +704,6 @@
script = restoreFunctionNode(script, token); //commit code
script = script.setBody(lc, script.getBody().setNeedsScope(lc));
- // user may have directive comment to set sourceURL
- if (sourceURL != null) {
- script = script.setSourceURL(lc, sourceURL);
- }
return script;
}
@@ -805,6 +803,12 @@
verifyStrictIdent(param, "function parameter");
}
}
+ } else if (Context.DEBUG) {
+ final int flag = FunctionNode.getDirectiveFlag(directive);
+ if (flag != 0) {
+ final FunctionNode function = lc.getCurrentFunction();
+ lc.setFlag(function, flag);
+ }
}
}
}
@@ -2814,14 +2818,24 @@
lastToken = token;
expect(RBRACE);
functionNode.setFinish(finish);
-
}
} finally {
functionNode = restoreFunctionNode(functionNode, lastToken);
}
+ printAST(functionNode);
return functionNode;
}
+ private void printAST(final FunctionNode functionNode) {
+ if (functionNode.getFlag(FunctionNode.IS_PRINT_AST)) {
+ env.getErr().println(new ASTWriter(functionNode));
+ }
+
+ if (functionNode.getFlag(FunctionNode.IS_PRINT_PARSE)) {
+ env.getErr().println(new PrintVisitor(functionNode, true, false));
+ }
+ }
+
private void addFunctionDeclarations(final FunctionNode functionNode) {
assert lc.peek() == lc.getFunctionBody(functionNode);
VarNode lastDecl = null;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
index f19b7a3..892c942 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -136,16 +136,16 @@
}
/** Seed getter for the primitive version of this field (in -Dnashorn.fields.dual=true mode) */
- private transient MethodHandle primitiveGetter;
+ transient MethodHandle primitiveGetter;
/** Seed setter for the primitive version of this field (in -Dnashorn.fields.dual=true mode) */
- private transient MethodHandle primitiveSetter;
+ transient MethodHandle primitiveSetter;
/** Seed getter for the Object version of this field */
- private transient MethodHandle objectGetter;
+ transient MethodHandle objectGetter;
/** Seed setter for the Object version of this field */
- private transient MethodHandle objectSetter;
+ transient MethodHandle objectSetter;
/**
* Current type of this object, in object only mode, this is an Object.class. In dual-fields mode
@@ -185,10 +185,10 @@
* @param key the property key
* @param flags the property flags
* @param slot spill slot
- * @param objectGetter
- * @param objectSetter
- * @param primitiveGetter
- * @param primitiveSetter
+ * @param primitiveGetter primitive getter
+ * @param primitiveSetter primitive setter
+ * @param objectGetter object getter
+ * @param objectSetter object setter
*/
protected AccessorProperty(
final String key,
@@ -255,7 +255,7 @@
}
/**
- * Normal ACCESS PROPERTY constructor given a structure glass.
+ * Normal ACCESS PROPERTY constructor given a structure class.
* Constructor for dual field AccessorPropertys.
*
* @param key property key
@@ -267,6 +267,7 @@
super(key, flags, slot);
initGetterSetter(structure);
+ initializeType();
}
private void initGetterSetter(final Class<?> structure) {
@@ -291,8 +292,6 @@
objectSetter = gs.objectSetters[slot];
primitiveSetter = gs.primitiveSetters[slot];
}
-
- initializeType();
}
/**
@@ -412,8 +411,8 @@
}
}
- @Override
- public long getLongValue(final ScriptObject self, final ScriptObject owner) {
+ @Override
+ public long getLongValue(final ScriptObject self, final ScriptObject owner) {
try {
return (long)getGetter(long.class).invokeExact((Object)self);
} catch (final Error | RuntimeException e) {
@@ -531,12 +530,13 @@
@Override
void initMethodHandles(final Class<?> structure) {
+ // sanity check for structure class
if (!ScriptObject.class.isAssignableFrom(structure) || !StructureLoader.isStructureClass(structure.getName())) {
throw new IllegalArgumentException();
}
- if (!isSpill()) {
- initGetterSetter(structure);
- }
+ // this method is overridden in SpillProperty
+ assert !isSpill();
+ initGetterSetter(structure);
}
@Override
@@ -712,7 +712,7 @@
private MethodHandle debug(final MethodHandle mh, final Class<?> forType, final Class<?> type, final String tag) {
- if (!Global.hasInstance()) {
+ if (!Context.DEBUG || !Global.hasInstance()) {
return mh;
}
@@ -734,7 +734,7 @@
}
private MethodHandle debugReplace(final Class<?> oldType, final Class<?> newType, final PropertyMap oldMap, final PropertyMap newMap) {
- if (!Global.hasInstance()) {
+ if (!Context.DEBUG || !Global.hasInstance()) {
return REPLACE_MAP;
}
@@ -767,7 +767,7 @@
}
private static MethodHandle debugInvalidate(final String key, final SwitchPoint sp) {
- if (!Global.hasInstance()) {
+ if (!Context.DEBUG || !Global.hasInstance()) {
return INVALIDATE_SP;
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
index 06f9d95..db42e28 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -92,5 +92,14 @@
* @param classBytes map of class names to class bytes
* @param constants constants array
*/
- public void storeCompiledScript(Source source, String mainClassName, Map<String, byte[]> classBytes, Object[] constants);
+ public void storeScript(String cacheKey, Source source, String mainClassName, Map<String, byte[]> classBytes,
+ Map<Integer, FunctionInitializer> initializers, Object[] constants, int compilationId);
+
+ /**
+ * Load a previously compiled script
+ * @param source the script source
+ * @param functionKey the function id and signature
+ * @return compiled script data
+ */
+ public StoredScript loadScript(Source source, String functionKey);
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
index 2f67ce5..8d79320 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
@@ -38,25 +38,30 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Map;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.logging.DebugLogger;
+import jdk.nashorn.internal.runtime.logging.Loggable;
+import jdk.nashorn.internal.runtime.logging.Logger;
/**
* A code cache for persistent caching of compiled scripts.
*/
-final class CodeStore {
+@Logger(name="codestore")
+final class CodeStore implements Loggable {
private final File dir;
private final int minSize;
+ private final DebugLogger log;
// Default minimum size for storing a compiled script class
private final static int DEFAULT_MIN_SIZE = 1000;
/**
* Constructor
- * @param path directory to store code in
* @throws IOException
*/
- public CodeStore(final String path) throws IOException {
- this(path, DEFAULT_MIN_SIZE);
+ public CodeStore(final Context context, final String path) throws IOException {
+ this(context, path, DEFAULT_MIN_SIZE);
}
/**
@@ -65,9 +70,20 @@
* @param minSize minimum file size for caching scripts
* @throws IOException
*/
- public CodeStore(final String path, final int minSize) throws IOException {
+ public CodeStore(final Context context, final String path, final int minSize) throws IOException {
this.dir = checkDirectory(path);
this.minSize = minSize;
+ this.log = initLogger(context);
+ }
+
+ @Override
+ public DebugLogger initLogger(final Context context) {
+ return context.getLogger(getClass());
+ }
+
+ @Override
+ public DebugLogger getLogger() {
+ return log;
}
private static File checkDirectory(final String path) throws IOException {
@@ -77,11 +93,11 @@
public File run() throws IOException {
final File dir = new File(path).getAbsoluteFile();
if (!dir.exists() && !dir.mkdirs()) {
- throw new IOException("Could not create directory: " + dir);
+ throw new IOException("Could not create directory: " + dir.getPath());
} else if (!dir.isDirectory()) {
- throw new IOException("Not a directory: " + dir);
+ throw new IOException("Not a directory: " + dir.getPath());
} else if (!dir.canRead() || !dir.canWrite()) {
- throw new IOException("Directory not readable or writable: " + dir);
+ throw new IOException("Directory not readable or writable: " + dir.getPath());
}
return dir;
}
@@ -91,69 +107,85 @@
}
}
+ private File getCacheFile(final Source source, final String functionKey) {
+ return new File(dir, source.getDigest() + '-' + functionKey);
+ }
+
+ /**
+ * Generate a string representing the function with {@code functionId} and {@code paramTypes}.
+ * @param functionId function id
+ * @param paramTypes parameter types
+ * @return a string representing the function
+ */
+ public static String getCacheKey(final int functionId, final Type[] paramTypes) {
+ final StringBuilder b = new StringBuilder().append(functionId);
+ if(paramTypes != null && paramTypes.length > 0) {
+ b.append('-');
+ for(final Type t: paramTypes) {
+ b.append(Type.getShortSignatureDescriptor(t));
+ }
+ }
+ return b.toString();
+ }
+
/**
* Return a compiled script from the cache, or null if it isn't found.
*
* @param source the source
- * @return the compiled script or null
- * @throws IOException
- * @throws ClassNotFoundException
+ * @param functionKey the function key
+ * @return the stored script or null
*/
- public CompiledScript getScript(final Source source) throws IOException, ClassNotFoundException {
+ public StoredScript loadScript(final Source source, final String functionKey) {
if (source.getLength() < minSize) {
return null;
}
- final File file = new File(dir, source.getDigest());
+ final File file = getCacheFile(source, functionKey);
try {
- return AccessController.doPrivileged(new PrivilegedExceptionAction<CompiledScript>() {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<StoredScript>() {
@Override
- public CompiledScript run() throws IOException, ClassNotFoundException {
+ public StoredScript run() throws IOException, ClassNotFoundException {
if (!file.exists()) {
return null;
}
try (ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(new FileInputStream(file)))) {
- final CompiledScript compiledScript = (CompiledScript) in.readObject();
- compiledScript.setSource(source);
- return compiledScript;
+ final StoredScript storedScript = (StoredScript) in.readObject();
+ getLogger().info("loaded ", source, "-", functionKey);
+ return storedScript;
}
}
});
} catch (final PrivilegedActionException e) {
- final Exception ex = e.getException();
- if (ex instanceof IOException) {
- throw (IOException) ex;
- } else if (ex instanceof ClassNotFoundException) {
- throw (ClassNotFoundException) ex;
- }
- throw (new RuntimeException(ex));
+ getLogger().warning("failed to load ", source, "-", functionKey, ": ", e.getException());
+ return null;
}
}
/**
* Store a compiled script in the cache.
*
+ * @param functionKey the function key
* @param source the source
* @param mainClassName the main class name
* @param classBytes a map of class bytes
* @param constants the constants array
- * @throws IOException
*/
- public void putScript(final Source source, final String mainClassName, final Map<String, byte[]> classBytes, final Object[] constants)
- throws IOException {
+ public void storeScript(final String functionKey, final Source source, final String mainClassName, final Map<String, byte[]> classBytes,
+ final Map<Integer, FunctionInitializer> initializers, final Object[] constants, final int compilationId) {
if (source.getLength() < minSize) {
return;
}
for (final Object constant : constants) {
// Make sure all constant data is serializable
if (! (constant instanceof Serializable)) {
+ getLogger().warning("cannot store ", source, " non serializable constant ", constant);
return;
}
}
- final File file = new File(dir, source.getDigest());
- final CompiledScript script = new CompiledScript(source, mainClassName, classBytes, constants);
+ final File file = getCacheFile(source, functionKey);
+ final StoredScript script = new StoredScript(compilationId, mainClassName, classBytes, initializers, constants);
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@@ -162,11 +194,12 @@
try (ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) {
out.writeObject(script);
}
+ getLogger().info("stored ", source, "-", functionKey);
return null;
}
});
} catch (final PrivilegedActionException e) {
- throw (IOException) e.getException();
+ getLogger().warning("failed to store ", script, "-", functionKey, ": ", e.getException());
}
}
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
index e6dc9bf..958b259 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
@@ -37,9 +37,12 @@
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+import java.util.function.Supplier;
import java.util.logging.Level;
+import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.nashorn.internal.codegen.Compiler;
import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
+import jdk.nashorn.internal.codegen.TypeMap;
import jdk.nashorn.internal.codegen.types.ArrayType;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.FunctionNode;
@@ -69,7 +72,8 @@
private MethodHandle invoker;
private MethodHandle constructor;
private OptimismInfo optimismInfo;
- private int flags; // from FunctionNode
+ private final int flags; // from FunctionNode
+ private final MethodType callSiteType;
CompiledFunction(final MethodHandle invoker) {
this(invoker, null);
@@ -80,19 +84,20 @@
}
CompiledFunction(final MethodHandle invoker, final MethodHandle constructor) {
- this(invoker, constructor, DebugLogger.DISABLED_LOGGER);
+ this(invoker, constructor, 0, null, DebugLogger.DISABLED_LOGGER);
}
- CompiledFunction(final MethodHandle invoker, final MethodHandle constructor, final DebugLogger log) {
+ CompiledFunction(final MethodHandle invoker, final MethodHandle constructor, final int flags, final MethodType callSiteType, final DebugLogger log) {
this.invoker = invoker;
this.constructor = constructor;
+ this.flags = flags;
+ this.callSiteType = callSiteType;
this.log = log;
}
CompiledFunction(final MethodHandle invoker, final RecompilableScriptFunctionData functionData,
- final Map<Integer, Type> invalidatedProgramPoints, final int flags) {
- this(invoker, null, functionData.getLogger());
- this.flags = flags;
+ final Map<Integer, Type> invalidatedProgramPoints, final MethodType callSiteType, final int flags) {
+ this(invoker, null, flags, callSiteType, functionData.getLogger());
if ((flags & FunctionNode.IS_DEOPTIMIZABLE) != 0) {
optimismInfo = new OptimismInfo(functionData, invalidatedProgramPoints);
} else {
@@ -125,9 +130,9 @@
* Returns an invoker method handle for this function. Note that the handle is safely composable in
* the sense that you can compose it with other handles using any combinators even if you can't affect call site
* invalidation. If this compiled function is non-optimistic, then it returns the same value as
- * {@link #getInvoker()}. However, if the function is optimistic, then this handle will incur an overhead as it will
- * add an intermediate internal call site that can relink itself when the function needs to regenerate its code to
- * always point at the latest generated code version.
+ * {@link #getInvokerOrConstructor(boolean)}. However, if the function is optimistic, then this handle will
+ * incur an overhead as it will add an intermediate internal call site that can relink itself when the function
+ * needs to regenerate its code to always point at the latest generated code version.
* @return a guaranteed composable invoker method handle for this function.
*/
MethodHandle createComposableInvoker() {
@@ -142,7 +147,7 @@
* all other cases, use {@link #createComposableConstructor()}.
* @return a direct constructor method handle for this function.
*/
- MethodHandle getConstructor() {
+ private MethodHandle getConstructor() {
if (constructor == null) {
constructor = createConstructorFromInvoker(createInvokerForPessimisticCaller());
}
@@ -163,8 +168,6 @@
* Compose a constructor from an invoker.
*
* @param invoker invoker
- * @param needsCallee do we need to pass a callee
- *
* @return the composed constructor
*/
private static MethodHandle createConstructorFromInvoker(final MethodHandle invoker) {
@@ -425,6 +428,9 @@
}
boolean matchesCallSite(final MethodType callSiteType, final boolean pickVarArg) {
+ if (callSiteType.equals(this.callSiteType)) {
+ return true;
+ }
final MethodType type = type();
final int fnParamCount = getParamCount(type);
final boolean isVarArg = fnParamCount == Integer.MAX_VALUE;
@@ -462,17 +468,7 @@
return type.parameterType(paramCount - 1).isArray() ? Integer.MAX_VALUE : paramCount;
}
- /**
- * Returns the switch point embodying the optimistic assumptions in this compiled function. It should be used to
- * guard any linking to the function's invoker or constructor.
- * @return the switch point embodying the optimistic assumptions in this compiled function. Null is returned if the
- * function has no optimistic assumptions.
- */
- SwitchPoint getOptimisticAssumptionsSwitchPoint() {
- return canBeDeoptimized() ? optimismInfo.optimisticAssumptions : null;
- }
-
- boolean canBeDeoptimized() {
+ private boolean canBeDeoptimized() {
return optimismInfo != null;
}
@@ -491,19 +487,73 @@
relinkComposableInvoker(cs, this, isConstructor);
return cs.dynamicInvoker();
}
+
+ private static class HandleAndAssumptions {
+ final MethodHandle handle;
+ final SwitchPoint assumptions;
+
+ HandleAndAssumptions(final MethodHandle handle, final SwitchPoint assumptions) {
+ this.handle = handle;
+ this.assumptions = assumptions;
+ }
+
+ GuardedInvocation createInvocation() {
+ return new GuardedInvocation(handle, assumptions);
+ }
+ }
+
+ /**
+ * Returns a pair of an invocation created with a passed-in supplier and a non-invalidated switch point for
+ * optimistic assumptions (or null for the switch point if the function can not be deoptimized). While the method
+ * makes a best effort to return a non-invalidated switch point (compensating for possible deoptimizing
+ * recompilation happening on another thread) it is still possible that by the time this method returns the
+ * switchpoint has been invalidated by a {@code RewriteException} triggered on another thread for this function.
+ * This is not a problem, though, as these switch points are always used to produce call sites that fall back to
+ * relinking when they are invalidated, and in this case the execution will end up here again. What this method
+ * basically does is minimize such busy-loop relinking while the function is being recompiled on a different thread.
+ * @param invocationSupplier the supplier that constructs the actual invocation method handle; should use the
+ * {@code CompiledFunction} method itself in some capacity.
+ * @return a tuple object containing the method handle as created by the supplier and an optimistic assumptions
+ * switch point that is guaranteed to not have been invalidated before the call to this method (or null if the
+ * function can't be further deoptimized).
+ */
+ private synchronized HandleAndAssumptions getValidOptimisticInvocation(final Supplier<MethodHandle> invocationSupplier) {
+ for(;;) {
+ final MethodHandle handle = invocationSupplier.get();
+ final SwitchPoint assumptions = canBeDeoptimized() ? optimismInfo.optimisticAssumptions : null;
+ if(assumptions != null && assumptions.hasBeenInvalidated()) {
+ // We can be in a situation where one thread is in the middle of a deoptimizing compilation when we hit
+ // this and thus, it has invalidated the old switch point, but hasn't created the new one yet. Note that
+ // the behavior of invalidating the old switch point before recompilation, and only creating the new one
+ // after recompilation is by design. If we didn't wait here for the recompilation to complete, we would
+ // be busy looping through the fallback path of the invalidated switch point, relinking the call site
+ // again with the same invalidated switch point, invoking the fallback, etc. stealing CPU cycles from
+ // the recompilation task we're dependent on. This can still happen if the switch point gets invalidated
+ // after we grabbed it here, in which case we'll indeed do one busy relink immediately.
+ try {
+ wait();
+ } catch (final InterruptedException e) {
+ // Intentionally ignored. There's nothing meaningful we can do if we're interrupted
+ }
+ } else {
+ return new HandleAndAssumptions(handle, assumptions);
+ }
+ }
+ }
+
private static void relinkComposableInvoker(final CallSite cs, final CompiledFunction inv, final boolean constructor) {
- final MethodHandle handle = inv.getInvokerOrConstructor(constructor);
- final SwitchPoint assumptions = inv.getOptimisticAssumptionsSwitchPoint();
+ final HandleAndAssumptions handleAndAssumptions = inv.getValidOptimisticInvocation(new Supplier<MethodHandle>() {
+ @Override
+ public MethodHandle get() {
+ return inv.getInvokerOrConstructor(constructor);
+ }
+ });
+ final MethodHandle handle = handleAndAssumptions.handle;
+ final SwitchPoint assumptions = handleAndAssumptions.assumptions;
final MethodHandle target;
if(assumptions == null) {
target = handle;
} else {
- // This assertion can obviously fail in a multithreaded environment, as we can be in a situation where
- // one thread is in the middle of a deoptimizing compilation when we hit this and thus, it has invalidated
- // the old switch point, but hasn't created the new one yet. Note that the behavior of invalidating the old
- // switch point before recompilation, and only creating the new one after recompilation is by design.
- // TODO: We need to think about thread safety of CompiledFunction objects.
- assert !assumptions.hasBeenInvalidated();
final MethodHandle relink = MethodHandles.insertArguments(RELINK_COMPOSABLE_INVOKER, 0, cs, inv, constructor);
target = assumptions.guardWithTest(handle, MethodHandles.foldArguments(cs.dynamicInvoker(), relink));
}
@@ -514,7 +564,41 @@
return selectCtor ? getConstructor() : createInvokerForPessimisticCaller();
}
- MethodHandle createInvoker(final Class<?> callSiteReturnType, final int callerProgramPoint) {
+ /**
+ * Returns a guarded invocation for this function when not invoked as a constructor. The guarded invocation has no
+ * guard but it potentially has an optimistic assumptions switch point. As such, it will probably not be used as a
+ * final guarded invocation, but rather as a holder for an invocation handle and switch point to be decomposed and
+ * reassembled into a different final invocation by the user of this method. Any recompositions should take care to
+ * continue to use the switch point. If that is not possible, use {@link #createComposableInvoker()} instead.
+ * @return a guarded invocation for an ordinary (non-constructor) invocation of this function.
+ */
+ GuardedInvocation createFunctionInvocation(final Class<?> callSiteReturnType, final int callerProgramPoint) {
+ return getValidOptimisticInvocation(new Supplier<MethodHandle>() {
+ @Override
+ public MethodHandle get() {
+ return createInvoker(callSiteReturnType, callerProgramPoint);
+ }
+ }).createInvocation();
+ }
+
+ /**
+ * Returns a guarded invocation for this function when invoked as a constructor. The guarded invocation has no guard
+ * but it potentially has an optimistic assumptions switch point. As such, it will probably not be used as a final
+ * guarded invocation, but rather as a holder for an invocation handle and switch point to be decomposed and
+ * reassembled into a different final invocation by the user of this method. Any recompositions should take care to
+ * continue to use the switch point. If that is not possible, use {@link #createComposableConstructor()} instead.
+ * @return a guarded invocation for invocation of this function as a constructor.
+ */
+ GuardedInvocation createConstructorInvocation() {
+ return getValidOptimisticInvocation(new Supplier<MethodHandle>() {
+ @Override
+ public MethodHandle get() {
+ return getConstructor();
+ }
+ }).createInvocation();
+ }
+
+ private MethodHandle createInvoker(final Class<?> callSiteReturnType, final int callerProgramPoint) {
final boolean isOptimistic = canBeDeoptimized();
MethodHandle handleRewriteException = isOptimistic ? createRewriteExceptionHandler() : null;
@@ -601,7 +685,7 @@
* @param re the rewrite exception that was raised
* @return the method handle for the rest-of method, for folding composition.
*/
- private MethodHandle handleRewriteException(final OptimismInfo oldOptInfo, final RewriteException re) {
+ private synchronized MethodHandle handleRewriteException(final OptimismInfo oldOptInfo, final RewriteException re) {
if (log.isEnabled()) {
log.info(new RecompilationEvent(Level.INFO, re, re.getReturnValueNonDestructive()), "RewriteException ", re.getMessageShort());
}
@@ -639,6 +723,15 @@
logRecompile("Rest-of compilation [CODE PIPELINE REUSE] ", fn, callSiteType, effectiveOptInfo.invalidatedProgramPoints);
final FunctionNode normalFn = compiler.compile(fn, CompilationPhases.COMPILE_FROM_BYTECODE);
+ if (effectiveOptInfo.data.usePersistentCodeCache()) {
+ final RecompilableScriptFunctionData data = effectiveOptInfo.data;
+ final int functionNodeId = data.getFunctionNodeId();
+ final TypeMap typeMap = data.typeMap(callSiteType);
+ final Type[] paramTypes = typeMap == null ? null : typeMap.getParameterTypes(functionNodeId);
+ final String cacheKey = CodeStore.getCacheKey(functionNodeId, paramTypes);
+ compiler.persistClassInfo(cacheKey, normalFn);
+ }
+
FunctionNode fn2 = effectiveOptInfo.reparse();
fn2 = compiler.compile(fn2, CompilationPhases.COMPILE_UPTO_BYTECODE);
log.info("Done.");
@@ -664,17 +757,18 @@
} else {
optimismInfo = null; // If we got to a point where we no longer have optimistic assumptions, let the optimism info go.
}
+ notifyAll();
return restOf;
}
private MethodHandle restOfHandle(final OptimismInfo info, final FunctionNode restOfFunction, final boolean canBeDeoptimized) {
assert info != null;
- assert restOfFunction.getCompileUnit().getUnitClassName().indexOf("restOf") != -1;
+ assert restOfFunction.getCompileUnit().getUnitClassName().contains("restOf");
final MethodHandle restOf =
changeReturnType(
- info.data.lookupWithExplicitType(
- restOfFunction,
+ info.data.lookupCodeMethod(
+ restOfFunction.getCompileUnit().getCode(),
MH.type(restOfFunction.getReturnType().getTypeClass(),
RewriteException.class)),
Object.class);
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java
deleted file mode 100644
index ec569ee..0000000
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.nashorn.internal.runtime;
-
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-
-import java.lang.invoke.MethodType;
-import java.util.LinkedList;
-
-/**
- * This is a list of code versions of a function.
- * The list is sorted in ascending order of generic descriptors
- */
-final class CompiledFunctions {
-
- private final String name;
- final LinkedList<CompiledFunction> functions = new LinkedList<>();
-
- CompiledFunctions(final String name) {
- this.name = name;
- }
-
- void add(final CompiledFunction f) {
- functions.add(f);
- }
-
- void addAll(final CompiledFunctions fs) {
- functions.addAll(fs.functions);
- }
-
- boolean isEmpty() {
- return functions.isEmpty();
- }
-
- int size() {
- return functions.size();
- }
-
- @Override
- public String toString() {
- return '\'' + name + "' code=" + functions;
- }
-
- private static MethodType widen(final MethodType cftype) {
- final Class<?>[] paramTypes = new Class<?>[cftype.parameterCount()];
- for (int i = 0; i < cftype.parameterCount(); i++) {
- paramTypes[i] = cftype.parameterType(i).isPrimitive() ? cftype.parameterType(i) : Object.class;
- }
- return MH.type(cftype.returnType(), paramTypes);
- }
-
- /**
- * Used to find an apply to call version that fits this callsite.
- * We cannot just, as in the normal matcher case, return e.g. (Object, Object, int)
- * for (Object, Object, int, int, int) or we will destroy the semantics and get
- * a function that, when padded with undefineds, behaves differently
- * @param type actual call site type
- * @return apply to call that perfectly fits this callsite or null if none found
- */
- CompiledFunction lookupExactApplyToCall(final MethodType type) {
- for (final CompiledFunction cf : functions) {
- if (!cf.isApplyToCall()) {
- continue;
- }
-
- final MethodType cftype = cf.type();
- if (cftype.parameterCount() != type.parameterCount()) {
- continue;
- }
-
- if (widen(cftype).equals(widen(type))) {
- return cf;
- }
- }
-
- return null;
- }
-
- private CompiledFunction pick(final MethodType callSiteType, final boolean canPickVarArg) {
- for (final CompiledFunction candidate : functions) {
- if (candidate.matchesCallSite(callSiteType, false)) {
- return candidate;
- }
- }
- return null;
- }
-
- /**
- * Returns the compiled function best matching the requested call site method type
- * @param callSiteType
- * @param recompilable
- * @param hasThis
- * @return
- */
- CompiledFunction best(final MethodType callSiteType, final boolean recompilable) {
- assert callSiteType.parameterCount() >= 2 : callSiteType; // Must have at least (callee, this)
- assert callSiteType.parameterType(0).isAssignableFrom(ScriptFunction.class) : callSiteType; // Callee must be assignable from script function
-
- if (recompilable) {
- final CompiledFunction candidate = pick(callSiteType, false);
- if (candidate != null) {
- return candidate;
- }
- return pick(callSiteType, true); //try vararg last
- }
-
- CompiledFunction best = null;
- for(final CompiledFunction candidate: functions) {
- if(candidate.betterThanFinal(best, callSiteType)) {
- best = candidate;
- }
- }
-
- return best;
- }
-
- /**
- * Returns true if functions managed by this {@code CompiledFunctions} require a callee. This method is only safe to
- * be invoked for a {@code CompiledFunctions} that is not empty. As such, it should only be used from
- * {@link FinalScriptFunctionData} and not from {@link RecompilableScriptFunctionData}.
- * @return true if the functions need a callee, false otherwise.
- */
- boolean needsCallee() {
- final boolean needsCallee = functions.getFirst().needsCallee();
- assert allNeedCallee(needsCallee);
- return needsCallee;
- }
-
- private boolean allNeedCallee(final boolean needCallee) {
- for (final CompiledFunction inv : functions) {
- if(inv.needsCallee() != needCallee) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * If this CompiledFunctions object belongs to a {@code FinalScriptFunctionData}, get a method type for a generic
- * invoker. It will either be a vararg type, if any of the contained functions is vararg, or a generic type of the
- * arity of the largest arity of all functions.
- * @return the method type for the generic invoker
- */
- MethodType getFinalGenericType() {
- int max = 0;
- for(final CompiledFunction fn: functions) {
- final MethodType t = fn.type();
- if(ScriptFunctionData.isVarArg(t)) {
- // 2 for (callee, this, args[])
- return MethodType.genericMethodType(2, true);
- }
- final int paramCount = t.parameterCount() - (ScriptFunctionData.needsCallee(t) ? 1 : 0);
- if(paramCount > max) {
- max = paramCount;
- }
- }
- // +1 for callee
- return MethodType.genericMethodType(max + 1);
- }
-
-}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
index 3d1979d..a181b0c 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
@@ -91,14 +91,14 @@
return new CharSequence[] { left, right };
}
- private CharSequence flattened(boolean flattenNested) {
+ private CharSequence flattened(final boolean flattenNested) {
if (state != STATE_FLATTENED) {
flatten(flattenNested);
}
return left;
}
- private synchronized void flatten(boolean flattenNested) {
+ private synchronized void flatten(final boolean flattenNested) {
// We use iterative traversal as recursion may exceed the stack size limit.
final char[] chars = new char[length];
int pos = length;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
index 0b98603..d435577 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
@@ -65,6 +65,7 @@
import javax.script.ScriptEngine;
import jdk.internal.org.objectweb.asm.ClassReader;
import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
+import jdk.nashorn.api.scripting.ClassFilter;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.codegen.Compiler;
import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
@@ -164,10 +165,13 @@
public void initialize(final Collection<Class<?>> classes, final Source source, final Object[] constants) {
// do these in parallel, this significantly reduces class installation overhead
// however - it still means that every thread needs a separate doPrivileged
+ final Global global = currentGlobal.get();
classes.parallelStream().forEach(
new Consumer<Class<?>>() {
@Override
public void accept(final Class<?> clazz) {
+ // Global threadlocal may be needed by StructureLoader during in field lookup.
+ currentGlobal.set(global);
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@Override
@@ -210,16 +214,21 @@
}
@Override
- public void storeCompiledScript(final Source source, final String mainClassName,
- final Map<String, byte[]> classBytes, final Object[] constants) {
+ public void storeScript(final String classInfoFile, final Source source, final String mainClassName,
+ final Map<String,byte[]> classBytes, final Map<Integer, FunctionInitializer> initializers,
+ final Object[] constants, final int compilationId) {
if (context.codeStore != null) {
- try {
- context.codeStore.putScript(source, mainClassName, classBytes, constants);
- } catch (final IOException e) {
- throw new RuntimeException(e);
- }
+ context.codeStore.storeScript(classInfoFile, source, mainClassName, classBytes, initializers, constants, compilationId);
}
}
+
+ @Override
+ public StoredScript loadScript(final Source source, final String functionKey) {
+ if (context.codeStore != null) {
+ return context.codeStore.loadScript(source, functionKey);
+ }
+ return null;
+ }
}
/** Is Context global debug mode enabled ? */
@@ -341,6 +350,9 @@
/** Unique id for 'eval' */
private final AtomicLong uniqueEvalId;
+ /** Optional class filter to use for Java classes. Can be null. */
+ private final ClassFilter classFilter;
+
private static final ClassLoader myLoader = Context.class.getClassLoader();
private static final StructureLoader sharedLoader;
@@ -395,7 +407,19 @@
* @param appLoader application class loader
*/
public Context(final Options options, final ErrorManager errors, final ClassLoader appLoader) {
- this(options, errors, new PrintWriter(System.out, true), new PrintWriter(System.err, true), appLoader);
+ this(options, errors, appLoader, (ClassFilter)null);
+ }
+
+ /**
+ * Constructor
+ *
+ * @param options options from command line or Context creator
+ * @param errors error manger
+ * @param appLoader application class loader
+ * @param classFilter class filter to use
+ */
+ public Context(final Options options, final ErrorManager errors, final ClassLoader appLoader, final ClassFilter classFilter) {
+ this(options, errors, new PrintWriter(System.out, true), new PrintWriter(System.err, true), appLoader, classFilter);
}
/**
@@ -408,11 +432,26 @@
* @param appLoader application class loader
*/
public Context(final Options options, final ErrorManager errors, final PrintWriter out, final PrintWriter err, final ClassLoader appLoader) {
+ this(options, errors, out, err, appLoader, (ClassFilter)null);
+ }
+
+ /**
+ * Constructor
+ *
+ * @param options options from command line or Context creator
+ * @param errors error manger
+ * @param out output writer for this Context
+ * @param err error writer for this Context
+ * @param appLoader application class loader
+ * @param classFilter class filter to use
+ */
+ public Context(final Options options, final ErrorManager errors, final PrintWriter out, final PrintWriter err, final ClassLoader appLoader, final ClassFilter classFilter) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(new RuntimePermission(NASHORN_CREATE_CONTEXT));
}
+ this.classFilter = classFilter;
this.env = new ScriptEnvironment(options, out, err);
this._strict = env._strict;
this.appLoader = appLoader;
@@ -447,7 +486,7 @@
if (env._persistent_cache) {
try {
final String cacheDir = Options.getStringProperty("nashorn.persistent.code.cache", "nashorn_code_cache");
- codeStore = new CodeStore(cacheDir);
+ codeStore = new CodeStore(this, cacheDir);
} catch (final IOException e) {
throw new RuntimeException("Error initializing code cache", e);
}
@@ -465,6 +504,15 @@
initLoggers();
}
+
+ /**
+ * Get the class filter for this context
+ * @return class filter
+ */
+ public ClassFilter getClassFilter() {
+ return classFilter;
+ }
+
/**
* Get the error manager for this context
* @return error manger
@@ -882,6 +930,11 @@
throw new ClassNotFoundException(fullName);
}
+ // give chance to ClassFilter to filter out, if present
+ if (classFilter != null && !classFilter.exposeToScripts(fullName)) {
+ throw new ClassNotFoundException(fullName);
+ }
+
// check package access as soon as possible!
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
@@ -1080,30 +1133,27 @@
return script;
}
- CompiledScript compiledScript = null;
+ StoredScript storedScript = null;
FunctionNode functionNode = null;
+ final boolean useCodeStore = env._persistent_cache && !env._parse_only && !env._optimistic_types;
+ final String cacheKey = useCodeStore ? CodeStore.getCacheKey(0, null) : null;
- if (!env._parse_only && codeStore != null) {
- try {
- compiledScript = codeStore.getScript(source);
- } catch (IOException | ClassNotFoundException e) {
- getLogger(Compiler.class).warning("Error loading ", source, " from cache: ", e);
- // Fall back to normal compilation
- }
+ if (useCodeStore) {
+ storedScript = codeStore.loadScript(source, cacheKey);
}
- if (compiledScript == null) {
+ if (storedScript == null) {
functionNode = new Parser(env, source, errMan, strict, getLogger(Parser.class)).parse();
if (errors.hasErrors()) {
return null;
}
- if (env._print_ast) {
+ if (env._print_ast || functionNode.getFlag(FunctionNode.IS_PRINT_AST)) {
getErr().println(new ASTWriter(functionNode));
}
- if (env._print_parse) {
+ if (env._print_parse || functionNode.getFlag(FunctionNode.IS_PRINT_PARSE)) {
getErr().println(new PrintVisitor(functionNode, true, false));
}
}
@@ -1117,7 +1167,7 @@
final CodeSource cs = new CodeSource(url, (CodeSigner[])null);
final CodeInstaller<ScriptEnvironment> installer = new ContextCodeInstaller(this, loader, cs);
- if (functionNode != null) {
+ if (storedScript == null) {
final CompilationPhases phases = Compiler.CompilationPhases.COMPILE_ALL;
final Compiler compiler = new Compiler(
@@ -1125,12 +1175,14 @@
env,
installer,
source,
- functionNode.getSourceURL(),
strict | functionNode.isStrict());
- script = compiler.compile(functionNode, phases).getRootClass();
+ final FunctionNode compiledFunction = compiler.compile(functionNode, phases);
+ script = compiledFunction.getRootClass();
+ compiler.persistClassInfo(cacheKey, compiledFunction);
} else {
- script = install(compiledScript, installer);
+ Compiler.updateCompilationId(storedScript.getCompilationId());
+ script = install(storedScript, source, installer);
}
cacheClass(source, script);
@@ -1155,27 +1207,26 @@
return uniqueScriptId.getAndIncrement();
}
-
/**
* Install a previously compiled class from the code cache.
*
- * @param compiledScript cached script containing class bytes and constants
+ * @param storedScript cached script containing class bytes and constants
* @return main script class
*/
- private static Class<?> install(final CompiledScript compiledScript, final CodeInstaller<ScriptEnvironment> installer) {
+ private static Class<?> install(final StoredScript storedScript, final Source source, final CodeInstaller<ScriptEnvironment> installer) {
final Map<String, Class<?>> installedClasses = new HashMap<>();
- final Source source = compiledScript.getSource();
- final Object[] constants = compiledScript.getConstants();
- final String rootClassName = compiledScript.getMainClassName();
- final byte[] rootByteCode = compiledScript.getClassBytes().get(rootClassName);
- final Class<?> rootClass = installer.install(rootClassName, rootByteCode);
+ final Object[] constants = storedScript.getConstants();
+ final String mainClassName = storedScript.getMainClassName();
+ final byte[] mainClassBytes = storedScript.getClassBytes().get(mainClassName);
+ final Class<?> mainClass = installer.install(mainClassName, mainClassBytes);
+ final Map<Integer, FunctionInitializer> initialzers = storedScript.getInitializers();
- installedClasses.put(rootClassName, rootClass);
+ installedClasses.put(mainClassName, mainClass);
- for (final Map.Entry<String, byte[]> entry : compiledScript.getClassBytes().entrySet()) {
+ for (final Map.Entry<String, byte[]> entry : storedScript.getClassBytes().entrySet()) {
final String className = entry.getKey();
- if (className.equals(rootClassName)) {
+ if (className.equals(mainClassName)) {
continue;
}
final byte[] code = entry.getValue();
@@ -1187,11 +1238,17 @@
for (final Object constant : constants) {
if (constant instanceof RecompilableScriptFunctionData) {
- ((RecompilableScriptFunctionData) constant).initTransients(source, installer);
+ final RecompilableScriptFunctionData data = (RecompilableScriptFunctionData) constant;
+ data.initTransients(source, installer);
+ if (initialzers != null) {
+ final FunctionInitializer initializer = initialzers.get(data.getFunctionNodeId());
+ initializer.setCode(installedClasses.get(initializer.getClassName()));
+ data.initializeCode(initializer);
+ }
}
}
- return rootClass;
+ return mainClass;
}
/**
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
index d7d23ea..9dbd642 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -28,7 +28,6 @@
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
-
import jdk.nashorn.internal.codegen.CompilerConstants;
import jdk.nashorn.internal.objects.Global;
import jdk.nashorn.internal.scripts.JS;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
index a9c9155..f75dc82 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
@@ -27,6 +27,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodType;
+import java.util.List;
/**
* This is a subclass that represents a script function that may not be regenerated.
@@ -44,10 +45,10 @@
* @param functions precompiled code
* @param flags {@link ScriptFunctionData} flags
*/
- FinalScriptFunctionData(final String name, final int arity, final CompiledFunctions functions, final int flags) {
+ FinalScriptFunctionData(final String name, final int arity, final List<CompiledFunction> functions, final int flags) {
super(name, arity, flags);
- assert !functions.needsCallee();
code.addAll(functions);
+ assert !needsCallee();
}
/**
@@ -76,8 +77,19 @@
}
@Override
- boolean needsCallee() {
- return code.needsCallee();
+ protected boolean needsCallee() {
+ final boolean needsCallee = code.getFirst().needsCallee();
+ assert allNeedCallee(needsCallee);
+ return needsCallee;
+ }
+
+ private boolean allNeedCallee(final boolean needCallee) {
+ for (final CompiledFunction inv : code) {
+ if(inv.needsCallee() != needCallee) {
+ return false;
+ }
+ }
+ return true;
}
@Override
@@ -86,7 +98,20 @@
// actually correct for lots of built-ins. E.g. ECMAScript 5.1 section 15.5.3.2 prescribes that
// Script.fromCharCode([char0[, char1[, ...]]]) has a declared arity of 1 even though it's a variable arity
// method.
- return code.getFinalGenericType();
+ int max = 0;
+ for(final CompiledFunction fn: code) {
+ final MethodType t = fn.type();
+ if(ScriptFunctionData.isVarArg(t)) {
+ // 2 for (callee, this, args[])
+ return MethodType.genericMethodType(2, true);
+ }
+ final int paramCount = t.parameterCount() - (ScriptFunctionData.needsCallee(t) ? 1 : 0);
+ if(paramCount > max) {
+ max = paramCount;
+ }
+ }
+ // +1 for callee
+ return MethodType.genericMethodType(max + 1);
}
private void addInvoker(final MethodHandle mh) {
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java
new file mode 100644
index 0000000..e2912a2
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.invoke.MethodType;
+import java.util.Map;
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.FunctionSignature;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+
+/**
+ * Class that contains information allowing us to look up a method handle implementing a JavaScript function
+ * from a generated class. This is used both for code coming from codegen and for persistent serialized code.
+ */
+public final class FunctionInitializer implements Serializable {
+
+ private final String className;
+ private final MethodType methodType;
+ private final int flags;
+ private transient Map<Integer, Type> invalidatedProgramPoints;
+ private transient Class<?> code;
+
+ private static final long serialVersionUID = -5420835725902966692L;
+
+ /**
+ * Constructor.
+ *
+ * @param functionNode the function node
+ */
+ public FunctionInitializer(final FunctionNode functionNode) {
+ this(functionNode, null);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param functionNode the function node
+ * @param invalidatedProgramPoints invalidated program points
+ */
+ public FunctionInitializer(final FunctionNode functionNode, final Map<Integer, Type> invalidatedProgramPoints) {
+ this.className = functionNode.getCompileUnit().getUnitClassName();
+ this.methodType = new FunctionSignature(functionNode).getMethodType();
+ this.flags = functionNode.getFlags();
+ this.invalidatedProgramPoints = invalidatedProgramPoints;
+
+ final CompileUnit cu = functionNode.getCompileUnit();
+ if (cu != null) {
+ this.code = cu.getCode();
+ }
+
+ assert className != null;
+ }
+
+ /**
+ * Returns the name of the class implementing the function.
+ *
+ * @return the class name
+ */
+ public String getClassName() {
+ return className;
+ }
+
+ /**
+ * Returns the type of the method implementing the function.
+ *
+ * @return the method type
+ */
+ public MethodType getMethodType() {
+ return methodType;
+ }
+
+ /**
+ * Returns the function flags.
+ *
+ * @return function flags
+ */
+ public int getFlags() {
+ return flags;
+ }
+
+ /**
+ * Returns the class implementing the function.
+ *
+ * @return the class
+ */
+ public Class<?> getCode() {
+ return code;
+ }
+
+ /**
+ * Set the class implementing the function
+ * @param code the class
+ */
+ public void setCode(final Class<?> code) {
+ // Make sure code has not been set and has expected class name
+ if (this.code != null) {
+ throw new IllegalStateException("code already set");
+ }
+ assert className.equals(code.getTypeName().replace('.', '/')) : "unexpected class name";
+ this.code = code;
+ }
+
+ /**
+ * Returns the map of invalidated program points.
+ *
+ * @return invalidated program points
+ */
+ public Map<Integer, Type> getInvalidatedProgramPoints() {
+ return invalidatedProgramPoints;
+ }
+
+ private void writeObject(final ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
+ Type.writeTypeMap(invalidatedProgramPoints, out);
+ }
+
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
+ invalidatedProgramPoints = Type.readTypeMap(in);
+ }
+}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
index 349b8c4..27c9bca 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -25,8 +25,8 @@
package jdk.nashorn.internal.runtime;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
index 75ddefb..4688682 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
@@ -287,17 +287,6 @@
}
/**
- * Does this property use any slots in the spill array described in
- * {@link Property#isSpill}? In that case how many. Currently a property
- * only uses max one spill slot, but this may change in future representations
- *
- * @return number of spill slots a property is using
- */
- public int getSpillCount() {
- return 0;
- }
-
- /**
* Add more property flags to the property. Properties are immutable here,
* so any property change that results in a larger flag set results in the
* property being cloned. Use only the return value
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
index 620ffa7..0246b53 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -36,6 +36,7 @@
import java.lang.invoke.SwitchPoint;
import java.lang.ref.SoftReference;
import java.util.Arrays;
+import java.util.BitSet;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -88,6 +89,8 @@
/** property listeners */
private transient PropertyListeners listeners;
+ private transient BitSet freeSlots;
+
private static final long serialVersionUID = -7041836752008732533L;
/**
@@ -129,6 +132,7 @@
this.fieldMaximum = propertyMap.fieldMaximum;
// We inherit the parent property listeners instance. It will be cloned when a new listener is added.
this.listeners = propertyMap.listeners;
+ this.freeSlots = propertyMap.freeSlots;
if (Context.DEBUG) {
count++;
@@ -350,6 +354,51 @@
return addPropertyNoHistory(new AccessorProperty(property, bindTo));
}
+ // Get a logical slot index for a property, with spill slot 0 starting at fieldMaximum.
+ private int logicalSlotIndex(final Property property) {
+ final int slot = property.getSlot();
+ if (slot < 0) {
+ return -1;
+ }
+ return property.isSpill() ? slot + fieldMaximum : slot;
+ }
+
+ // Update boundaries and flags after a property has been added
+ private void updateFlagsAndBoundaries(final Property newProperty) {
+ if(newProperty.isSpill()) {
+ spillLength = Math.max(spillLength, newProperty.getSlot() + 1);
+ } else {
+ fieldCount = Math.max(fieldCount, newProperty.getSlot() + 1);
+ }
+ if (isValidArrayIndex(getArrayIndex(newProperty.getKey()))) {
+ setContainsArrayKeys();
+ }
+ }
+
+ // Update the free slots bitmap for a property that has been deleted and/or added.
+ private void updateFreeSlots(final Property oldProperty, final Property newProperty) {
+ // Free slots bitset is possibly shared with parent map, so we must clone it before making modifications.
+ boolean freeSlotsCloned = false;
+ if (oldProperty != null) {
+ final int slotIndex = logicalSlotIndex(oldProperty);
+ if (slotIndex >= 0) {
+ final BitSet newFreeSlots = freeSlots == null ? new BitSet() : (BitSet)freeSlots.clone();
+ assert !newFreeSlots.get(slotIndex);
+ newFreeSlots.set(slotIndex);
+ freeSlots = newFreeSlots;
+ freeSlotsCloned = true;
+ }
+ }
+ if (freeSlots != null && newProperty != null) {
+ final int slotIndex = logicalSlotIndex(newProperty);
+ if (slotIndex > -1 && freeSlots.get(slotIndex)) {
+ final BitSet newFreeSlots = freeSlotsCloned ? freeSlots : ((BitSet)freeSlots.clone());
+ newFreeSlots.clear(slotIndex);
+ freeSlots = newFreeSlots.isEmpty() ? null : newFreeSlots;
+ }
+ }
+ }
+
/**
* Add a property to the map without adding it to the history. This should be used for properties that
* can't be shared such as bound properties, or properties that are expected to be added only once.
@@ -363,15 +412,9 @@
}
final PropertyHashMap newProperties = properties.immutableAdd(property);
final PropertyMap newMap = new PropertyMap(this, newProperties);
+ newMap.updateFlagsAndBoundaries(property);
+ newMap.updateFreeSlots(null, property);
- if(!property.isSpill()) {
- newMap.fieldCount = Math.max(newMap.fieldCount, property.getSlot() + 1);
- }
- if (isValidArrayIndex(getArrayIndex(property.getKey()))) {
- newMap.setContainsArrayKeys();
- }
-
- newMap.spillLength += property.getSpillCount();
return newMap;
}
@@ -392,15 +435,8 @@
final PropertyHashMap newProperties = properties.immutableAdd(property);
newMap = new PropertyMap(this, newProperties);
addToHistory(property, newMap);
-
- if (!property.isSpill()) {
- newMap.fieldCount = Math.max(newMap.fieldCount, property.getSlot() + 1);
- }
- if (isValidArrayIndex(getArrayIndex(property.getKey()))) {
- newMap.setContainsArrayKeys();
- }
-
- newMap.spillLength += property.getSpillCount();
+ newMap.updateFlagsAndBoundaries(property);
+ newMap.updateFreeSlots(null, property);
}
return newMap;
@@ -422,7 +458,20 @@
if (newMap == null && properties.containsKey(key)) {
final PropertyHashMap newProperties = properties.immutableRemove(key);
- newMap = new PropertyMap(this, newProperties);
+ final boolean isSpill = property.isSpill();
+ final int slot = property.getSlot();
+ // If deleted property was last field or spill slot we can make it reusable by reducing field/slot count.
+ // Otherwise mark it as free in free slots bitset.
+ if (isSpill && slot >= 0 && slot == spillLength - 1) {
+ newMap = new PropertyMap(newProperties, className, fieldCount, fieldMaximum, spillLength - 1, containsArrayKeys());
+ newMap.freeSlots = freeSlots;
+ } else if (!isSpill && slot >= 0 && slot == fieldCount - 1) {
+ newMap = new PropertyMap(newProperties, className, fieldCount - 1, fieldMaximum, spillLength, containsArrayKeys());
+ newMap.freeSlots = freeSlots;
+ } else {
+ newMap = new PropertyMap(this, newProperties);
+ newMap.updateFreeSlots(property, null);
+ }
addToHistory(property, newMap);
}
@@ -471,7 +520,10 @@
* spillLength remains same in case (1) and (2) because of slot reuse. Only for case (3), we need
* to add spill count of the newly added UserAccessorProperty property.
*/
- newMap.spillLength = spillLength;
+ if (!sameType) {
+ newMap.spillLength = Math.max(spillLength, newProperty.getSlot() + 1);
+ newMap.updateFreeSlots(oldProperty, newProperty);
+ }
return newMap;
}
@@ -486,7 +538,7 @@
* @return the newly created UserAccessorProperty
*/
public UserAccessorProperty newUserAccessors(final String key, final int propertyFlags) {
- return new UserAccessorProperty(key, propertyFlags, spillLength);
+ return new UserAccessorProperty(key, propertyFlags, getFreeSpillSlot());
}
/**
@@ -514,10 +566,11 @@
final PropertyMap newMap = new PropertyMap(this, newProperties);
for (final Property property : otherProperties) {
+ // This method is only safe to use with non-slotted, native getter/setter properties
+ assert property.getSlot() == -1;
if (isValidArrayIndex(getArrayIndex(property.getKey()))) {
newMap.setContainsArrayKeys();
}
- newMap.spillLength += property.getSpillCount();
}
return newMap;
@@ -790,29 +843,37 @@
boolean isFrozen() {
return !isExtensible() && allFrozen();
}
+
/**
- * Get the number of fields allocated for this {@link PropertyMap}.
+ * Return a free field slot for this map, or {@code -1} if none is available.
*
- * @return Number of fields allocated.
+ * @return free field slot or -1
*/
- int getFieldCount() {
- return fieldCount;
- }
- /**
- * Get maximum number of fields available for this {@link PropertyMap}.
- *
- * @return Number of fields available.
- */
- int getFieldMaximum() {
- return fieldMaximum;
+ int getFreeFieldSlot() {
+ if (freeSlots != null) {
+ final int freeSlot = freeSlots.nextSetBit(0);
+ if (freeSlot > -1 && freeSlot < fieldMaximum) {
+ return freeSlot;
+ }
+ }
+ if (fieldCount < fieldMaximum) {
+ return fieldCount;
+ }
+ return -1;
}
/**
- * Get length of spill area associated with this {@link PropertyMap}.
+ * Get a free spill slot for this map.
*
- * @return Length of spill area.
+ * @return free spill slot
*/
- int getSpillLength() {
+ int getFreeSpillSlot() {
+ if (freeSlots != null) {
+ final int freeSlot = freeSlots.nextSetBit(fieldMaximum);
+ if (freeSlot > -1) {
+ return freeSlot - fieldMaximum;
+ }
+ }
return spillLength;
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
index e042007..c64f5ad 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
@@ -32,13 +32,12 @@
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-
import jdk.internal.dynalink.support.NameCodec;
-import jdk.nashorn.internal.codegen.CompileUnit;
import jdk.nashorn.internal.codegen.Compiler;
import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
import jdk.nashorn.internal.codegen.CompilerConstants;
@@ -73,11 +72,6 @@
private final String functionName;
- // TODO: try to eliminate the need for this somehow, either by allowing Source to change its name, allowing a
- // function to internally replace its Source with one of a different name, or storing this additional field in the
- // Source object.
- private final String sourceURL;
-
/** The line number where this function begins. */
private final int lineNumber;
@@ -128,7 +122,6 @@
* @param allocatorClassName name of our allocator class, will be looked up dynamically if used as a constructor
* @param allocatorMap allocator map to seed instances with, when constructing
* @param nestedFunctions nested function map
- * @param sourceURL source URL
* @param externalScopeDepths external scope depths
* @param internalSymbols internal symbols to method, defined in its scope
*/
@@ -138,7 +131,6 @@
final String allocatorClassName,
final PropertyMap allocatorMap,
final Map<Integer, RecompilableScriptFunctionData> nestedFunctions,
- final String sourceURL,
final Map<String, Integer> externalScopeDepths,
final Set<String> internalSymbols) {
@@ -155,7 +147,6 @@
this.source = functionNode.getSource();
this.token = tokenFor(functionNode);
this.installer = installer;
- this.sourceURL = sourceURL;
this.allocatorClassName = allocatorClassName;
this.allocatorMap = allocatorMap;
this.nestedFunctions = nestedFunctions;
@@ -366,7 +357,7 @@
final FunctionNode program = parser.parse(CompilerConstants.PROGRAM.symbolName(), descPosition, Token.descLength(token), true);
// Parser generates a program AST even if we're recompiling a single function, so when we are only recompiling a
// single function, extract it from the program.
- return (isProgram ? program : extractFunctionFromScript(program)).setName(null, functionName).setSourceURL(null, sourceURL);
+ return (isProgram ? program : extractFunctionFromScript(program)).setName(null, functionName);
}
TypeMap typeMap(final MethodType fnCallSiteType) {
@@ -395,18 +386,18 @@
final ScriptObject runtimeScope, final Map<Integer, Type> invalidatedProgramPoints,
final int[] continuationEntryPoints) {
final TypeMap typeMap = typeMap(actualCallSiteType);
- final Object typeInformationFile = OptimisticTypesPersistence.getLocationDescriptor(source, functionNodeId, typeMap == null ? null : typeMap.getParameterTypes(functionNodeId));
+ final Type[] paramTypes = typeMap == null ? null : typeMap.getParameterTypes(functionNodeId);
+ final Object typeInformationFile = OptimisticTypesPersistence.getLocationDescriptor(source, functionNodeId, paramTypes);
final Context context = Context.getContextTrusted();
return new Compiler(
context,
context.getEnv(),
installer,
functionNode.getSource(), // source
- functionNode.getSourceURL(),
isStrict() | functionNode.isStrict(), // is strict
true, // is on demand
this, // compiledFunction, i.e. this RecompilableScriptFunctionData
- typeMap(actualCallSiteType), // type map
+ typeMap, // type map
getEffectiveInvalidatedProgramPoints(invalidatedProgramPoints, typeInformationFile), // invalidated program points
typeInformationFile,
continuationEntryPoints, // continuation entry points
@@ -431,7 +422,7 @@
return loadedProgramPoints != null ? loadedProgramPoints : new TreeMap<Integer, Type>();
}
- private TypeSpecializedFunction compileTypeSpecialization(final MethodType actualCallSiteType, final ScriptObject runtimeScope) {
+ private FunctionInitializer compileTypeSpecialization(final MethodType actualCallSiteType, final ScriptObject runtimeScope, final boolean persist) {
// We're creating an empty script object for holding local variables. AssignSymbols will populate it with
// explicit Undefined values for undefined local variables (see AssignSymbols#defineSymbol() and
// CompilationEnvironment#declareLocalSymbol()).
@@ -440,21 +431,79 @@
log.info("Type specialization of '", functionName, "' signature: ", actualCallSiteType);
}
+ final boolean persistentCache = usePersistentCodeCache() && persist;
+ String cacheKey = null;
+ if (persistentCache) {
+ final TypeMap typeMap = typeMap(actualCallSiteType);
+ final Type[] paramTypes = typeMap == null ? null : typeMap.getParameterTypes(functionNodeId);
+ cacheKey = CodeStore.getCacheKey(functionNodeId, paramTypes);
+ final StoredScript script = installer.loadScript(source, cacheKey);
+
+ if (script != null) {
+ Compiler.updateCompilationId(script.getCompilationId());
+ return install(script);
+ }
+ }
+
final FunctionNode fn = reparse();
final Compiler compiler = getCompiler(fn, actualCallSiteType, runtimeScope);
-
final FunctionNode compiledFn = compiler.compile(fn, CompilationPhases.COMPILE_ALL);
- return new TypeSpecializedFunction(compiledFn, compiler.getInvalidatedProgramPoints());
+
+ if (persist && !compiledFn.getFlag(FunctionNode.HAS_APPLY_TO_CALL_SPECIALIZATION)) {
+ compiler.persistClassInfo(cacheKey, compiledFn);
+ }
+ return new FunctionInitializer(compiledFn, compiler.getInvalidatedProgramPoints());
}
- private static class TypeSpecializedFunction {
- private final FunctionNode fn;
- private final Map<Integer, Type> invalidatedProgramPoints;
- TypeSpecializedFunction(final FunctionNode fn, final Map<Integer, Type> invalidatedProgramPoints) {
- this.fn = fn;
- this.invalidatedProgramPoints = invalidatedProgramPoints;
+ /**
+ * Install this script using the given {@code installer}.
+ *
+ * @param script the compiled script
+ * @return the function initializer
+ */
+ private FunctionInitializer install(final StoredScript script) {
+
+ final Map<String, Class<?>> installedClasses = new HashMap<>();
+ final String mainClassName = script.getMainClassName();
+ final byte[] mainClassBytes = script.getClassBytes().get(mainClassName);
+
+ final Class<?> mainClass = installer.install(mainClassName, mainClassBytes);
+
+ installedClasses.put(mainClassName, mainClass);
+
+ for (final Map.Entry<String, byte[]> entry : script.getClassBytes().entrySet()) {
+ final String className = entry.getKey();
+ final byte[] code = entry.getValue();
+
+ if (className.equals(mainClassName)) {
+ continue;
+ }
+
+ installedClasses.put(className, installer.install(className, code));
}
+
+ final Map<Integer, FunctionInitializer> initializers = script.getInitializers();
+ assert initializers != null;
+ assert initializers.size() == 1;
+ final FunctionInitializer initializer = initializers.values().iterator().next();
+
+ final Object[] constants = script.getConstants();
+ for (int i = 0; i < constants.length; i++) {
+ if (constants[i] instanceof RecompilableScriptFunctionData) {
+ // replace deserialized function data with the ones we already have
+ constants[i] = getScriptFunctionData(((RecompilableScriptFunctionData) constants[i]).getFunctionNodeId());
+ }
+ }
+
+ installer.initialize(installedClasses.values(), source, constants);
+ initializer.setCode(installedClasses.get(initializer.getClassName()));
+ return initializer;
+ }
+
+ boolean usePersistentCodeCache() {
+ final ScriptEnvironment env = installer.getOwner();
+ return env._persistent_cache && env._optimistic_types;
}
private MethodType explicitParams(final MethodType callSiteType) {
@@ -502,61 +551,57 @@
return f;
}
+ MethodHandle lookup(final FunctionInitializer fnInit) {
+ final MethodType type = fnInit.getMethodType();
+ return lookupCodeMethod(fnInit.getCode(), type);
+ }
+
MethodHandle lookup(final FunctionNode fn) {
final MethodType type = new FunctionSignature(fn).getMethodType();
- log.info("Looking up ", DebugLogger.quote(fn.getName()), " type=", type);
- return lookupWithExplicitType(fn, new FunctionSignature(fn).getMethodType());
+ return lookupCodeMethod(fn.getCompileUnit().getCode(), type);
}
- MethodHandle lookupWithExplicitType(final FunctionNode fn, final MethodType targetType) {
- return lookupCodeMethod(fn.getCompileUnit(), targetType);
- }
-
- private MethodHandle lookupCodeMethod(final CompileUnit compileUnit, final MethodType targetType) {
- return MH.findStatic(LOOKUP, compileUnit.getCode(), functionName, targetType);
+ MethodHandle lookupCodeMethod(final Class<?> code, final MethodType targetType) {
+ log.info("Looking up ", DebugLogger.quote(name), " type=", targetType);
+ return MH.findStatic(LOOKUP, code, functionName, targetType);
}
/**
* Initializes this function data with the eagerly generated version of the code. This method can only be invoked
* by the compiler internals in Nashorn and is public for implementation reasons only. Attempting to invoke it
* externally will result in an exception.
- * @param functionNode the functionNode belonging to this data
*/
- public void initializeCode(final FunctionNode functionNode) {
+ public void initializeCode(final FunctionInitializer initializer) {
// Since the method is public, we double-check that we aren't invoked with an inappropriate compile unit.
- if(!(code.isEmpty() && functionNode.getCompileUnit().isInitializing(this, functionNode))) {
- throw new IllegalStateException(functionNode.getName() + " id=" + functionNode.getId());
+ if(!code.isEmpty()) {
+ throw new IllegalStateException(name);
}
- addCode(functionNode);
+ addCode(lookup(initializer), null, null, initializer.getFlags());
}
- private CompiledFunction addCode(final MethodHandle target, final Map<Integer, Type> invalidatedProgramPoints, final int fnFlags) {
- final CompiledFunction cfn = new CompiledFunction(target, this, invalidatedProgramPoints, fnFlags);
+ private CompiledFunction addCode(final MethodHandle target, final Map<Integer, Type> invalidatedProgramPoints,
+ final MethodType callSiteType, final int fnFlags) {
+ final CompiledFunction cfn = new CompiledFunction(target, this, invalidatedProgramPoints, callSiteType, fnFlags);
code.add(cfn);
return cfn;
}
- private CompiledFunction addCode(final FunctionNode fn) {
- return addCode(lookup(fn), null, fn.getFlags());
- }
-
/**
* Add code with specific call site type. It will adapt the type of the looked up method handle to fit the call site
* type. This is necessary because even if we request a specialization that takes an "int" parameter, we might end
* up getting one that takes a "double" etc. because of internal function logic causes widening (e.g. assignment of
* a wider value to the parameter variable). However, we use the method handle type for matching subsequent lookups
* for the same specialization, so we must adapt the handle to the expected type.
- * @param tfn the function
+ * @param fnInit the function
* @param callSiteType the call site type
* @return the compiled function object, with its type matching that of the call site type.
*/
- private CompiledFunction addCode(final TypeSpecializedFunction tfn, final MethodType callSiteType) {
- final FunctionNode fn = tfn.fn;
- if (fn.isVarArg()) {
- return addCode(fn);
+ private CompiledFunction addCode(final FunctionInitializer fnInit, final MethodType callSiteType) {
+ if (isVariableArity()) {
+ return addCode(lookup(fnInit), fnInit.getInvalidatedProgramPoints(), callSiteType, fnInit.getFlags());
}
- final MethodHandle handle = lookup(fn);
+ final MethodHandle handle = lookup(fnInit);
final MethodType fromType = handle.type();
MethodType toType = needsCallee(fromType) ? callSiteType.changeParameterType(0, ScriptFunction.class) : callSiteType.dropParameterTypes(0, 1);
toType = toType.changeReturnType(fromType.returnType());
@@ -581,41 +626,39 @@
toType = toType.dropParameterTypes(fromCount, toCount);
}
- return addCode(lookup(fn).asType(toType), tfn.invalidatedProgramPoints, fn.getFlags());
+ return addCode(lookup(fnInit).asType(toType), fnInit.getInvalidatedProgramPoints(), callSiteType, fnInit.getFlags());
}
@Override
- CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope) {
- synchronized (code) {
- CompiledFunction existingBest = super.getBest(callSiteType, runtimeScope);
- if (existingBest == null) {
- existingBest = addCode(compileTypeSpecialization(callSiteType, runtimeScope), callSiteType);
- }
-
- assert existingBest != null;
- //we are calling a vararg method with real args
- boolean applyToCall = existingBest.isVarArg() && !CompiledFunction.isVarArgsType(callSiteType);
-
- //if the best one is an apply to call, it has to match the callsite exactly
- //or we need to regenerate
- if (existingBest.isApplyToCall()) {
- final CompiledFunction best = code.lookupExactApplyToCall(callSiteType);
- if (best != null) {
- return best;
- }
- applyToCall = true;
- }
-
- if (applyToCall) {
- final TypeSpecializedFunction tfn = compileTypeSpecialization(callSiteType, runtimeScope);
- if (tfn.fn.hasOptimisticApplyToCall()) { //did the specialization work
- existingBest = addCode(tfn, callSiteType);
- }
- }
-
- return existingBest;
+ synchronized CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope) {
+ CompiledFunction existingBest = super.getBest(callSiteType, runtimeScope);
+ if (existingBest == null) {
+ existingBest = addCode(compileTypeSpecialization(callSiteType, runtimeScope, true), callSiteType);
}
+
+ assert existingBest != null;
+ //we are calling a vararg method with real args
+ boolean applyToCall = existingBest.isVarArg() && !CompiledFunction.isVarArgsType(callSiteType);
+
+ //if the best one is an apply to call, it has to match the callsite exactly
+ //or we need to regenerate
+ if (existingBest.isApplyToCall()) {
+ final CompiledFunction best = lookupExactApplyToCall(callSiteType);
+ if (best != null) {
+ return best;
+ }
+ applyToCall = true;
+ }
+
+ if (applyToCall) {
+ final FunctionInitializer fnInit = compileTypeSpecialization(callSiteType, runtimeScope, false);
+ if ((fnInit.getFlags() & FunctionNode.HAS_APPLY_TO_CALL_SPECIALIZATION) != 0) { //did the specialization work
+ existingBest = addCode(fnInit, callSiteType);
+ }
+ }
+
+ return existingBest;
}
@Override
@@ -638,6 +681,18 @@
}
/**
+ * Return the function node id.
+ * @return the function node id
+ */
+ public int getFunctionNodeId() {
+ return functionNodeId;
+ }
+
+ public Source getSource() {
+ return source;
+ }
+
+ /**
* Return a script function data based on a function id, either this function if
* the id matches or a nested function based on functionId. This goes down into
* nested functions until all leaves are exhausted.
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
index ca98f40..81863bd 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -423,9 +423,9 @@
* @param constructor constructor
* @return prototype, or null if given constructor is not a ScriptFunction
*/
- public static ScriptObject getPrototype(final Object constructor) {
- if (constructor instanceof ScriptFunction) {
- final Object proto = ((ScriptFunction)constructor).getPrototype();
+ public static ScriptObject getPrototype(final ScriptFunction constructor) {
+ if (constructor != null) {
+ final Object proto = constructor.getPrototype();
if (proto instanceof ScriptObject) {
return (ScriptObject)proto;
}
@@ -465,7 +465,7 @@
final MethodType type = desc.getMethodType();
assert desc.getMethodType().returnType() == Object.class && !NashornCallSiteDescriptor.isOptimistic(desc);
final CompiledFunction cf = data.getBestConstructor(type, scope);
- final GuardedInvocation bestCtorInv = new GuardedInvocation(cf.getConstructor(), cf.getOptimisticAssumptionsSwitchPoint());
+ final GuardedInvocation bestCtorInv = cf.createConstructorInvocation();
//TODO - ClassCastException
return new GuardedInvocation(pairArguments(bestCtorInv.getInvocation(), type), getFunctionGuard(this, cf.getFlags()), bestCtorInv.getSwitchPoints(), null);
}
@@ -545,11 +545,7 @@
final int programPoint = NashornCallSiteDescriptor.isOptimistic(desc) ? NashornCallSiteDescriptor.getProgramPoint(desc) : INVALID_PROGRAM_POINT;
final CompiledFunction cf = data.getBestInvoker(type, scope);
- final GuardedInvocation bestInvoker =
- new GuardedInvocation(
- cf.createInvoker(type.returnType(), programPoint),
- cf.getOptimisticAssumptionsSwitchPoint());
-
+ final GuardedInvocation bestInvoker = cf.createFunctionInvocation(type.returnType(), programPoint);
final MethodHandle callHandle = bestInvoker.getInvocation();
if (data.needsCallee()) {
@@ -742,7 +738,7 @@
final Object[] varArgs = (Object[])args[paramCount - 1];
// -1 'cause we're not passing the vararg array itself
final int copiedArgCount = args.length - 1;
- int varArgCount = varArgs.length;
+ final int varArgCount = varArgs.length;
// Spread arguments for the delegate createApplyOrCallCall invocation.
final Object[] spreadArgs = new Object[copiedArgCount + varArgCount];
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index 455c30d..3cd292a 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -35,6 +35,8 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
+import java.util.LinkedList;
+import java.util.List;
import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
@@ -54,9 +56,10 @@
/** Name of the function or "" for anonymous functions */
protected final String name;
- /** All versions of this function that have been generated to code */
- // TODO: integrate it into ScriptFunctionData; there's not much reason for this to be in its own class.
- protected transient CompiledFunctions code;
+ /**
+ * A list of code versions of a function sorted in ascending order of generic descriptors.
+ */
+ protected transient LinkedList<CompiledFunction> code = new LinkedList<>();
/** Function flags */
protected int flags;
@@ -71,7 +74,7 @@
* multiple threads concurrently, but we still tolerate a race condition in it as all values stored into it are
* idempotent.
*/
- private volatile GenericInvokers genericInvokers;
+ private volatile transient GenericInvokers genericInvokers;
private static final MethodHandle BIND_VAR_ARGS = findOwnMH("bindVarArgs", Object[].class, Object[].class, Object[].class);
@@ -108,7 +111,6 @@
*/
ScriptFunctionData(final String name, final int arity, final int flags) {
this.name = name;
- this.code = new CompiledFunctions(name);
this.flags = flags;
setArity(arity);
}
@@ -222,8 +224,7 @@
* and not suddenly a "real" object
*
* @param callSiteType callsite type
- * @return guarded invocation with method handle to best invoker and potentially a switch point guarding optimistic
- * assumptions.
+ * @return compiled function object representing the best invoker.
*/
final CompiledFunction getBestInvoker(final MethodType callSiteType, final ScriptObject runtimeScope) {
final CompiledFunction cf = getBest(callSiteType, runtimeScope);
@@ -298,6 +299,50 @@
return lgenericInvokers;
}
+ private static MethodType widen(final MethodType cftype) {
+ final Class<?>[] paramTypes = new Class<?>[cftype.parameterCount()];
+ for (int i = 0; i < cftype.parameterCount(); i++) {
+ paramTypes[i] = cftype.parameterType(i).isPrimitive() ? cftype.parameterType(i) : Object.class;
+ }
+ return MH.type(cftype.returnType(), paramTypes);
+ }
+
+ /**
+ * Used to find an apply to call version that fits this callsite.
+ * We cannot just, as in the normal matcher case, return e.g. (Object, Object, int)
+ * for (Object, Object, int, int, int) or we will destroy the semantics and get
+ * a function that, when padded with undefineds, behaves differently
+ * @param type actual call site type
+ * @return apply to call that perfectly fits this callsite or null if none found
+ */
+ CompiledFunction lookupExactApplyToCall(final MethodType type) {
+ for (final CompiledFunction cf : code) {
+ if (!cf.isApplyToCall()) {
+ continue;
+ }
+
+ final MethodType cftype = cf.type();
+ if (cftype.parameterCount() != type.parameterCount()) {
+ continue;
+ }
+
+ if (widen(cftype).equals(widen(type))) {
+ return cf;
+ }
+ }
+
+ return null;
+ }
+
+ CompiledFunction pickFunction(final MethodType callSiteType, final boolean canPickVarArg) {
+ for (final CompiledFunction candidate : code) {
+ if (candidate.matchesCallSite(callSiteType, canPickVarArg)) {
+ return candidate;
+ }
+ }
+ return null;
+ }
+
/**
* Returns the best function for the specified call site type.
* @param callSiteType The call site type. Call site types are expected to have the form
@@ -308,16 +353,38 @@
* @return the best function for the specified call site type.
*/
CompiledFunction getBest(final MethodType callSiteType, final ScriptObject runtimeScope) {
- return code.best(callSiteType, isRecompilable());
+ assert callSiteType.parameterCount() >= 2 : callSiteType; // Must have at least (callee, this)
+ assert callSiteType.parameterType(0).isAssignableFrom(ScriptFunction.class) : callSiteType; // Callee must be assignable from script function
+
+ if (isRecompilable()) {
+ final CompiledFunction candidate = pickFunction(callSiteType, false);
+ if (candidate != null) {
+ return candidate;
+ }
+ return pickFunction(callSiteType, true); //try vararg last
+ }
+
+ CompiledFunction best = null;
+ for(final CompiledFunction candidate: code) {
+ if(candidate.betterThanFinal(best, callSiteType)) {
+ best = candidate;
+ }
+ }
+
+ return best;
}
+
abstract boolean isRecompilable();
CompiledFunction getGeneric(final ScriptObject runtimeScope) {
return getBest(getGenericType(), runtimeScope);
}
-
+ /**
+ * Get a method type for a generic invoker.
+ * @return the method type for the generic invoker
+ */
abstract MethodType getGenericType();
/**
@@ -353,7 +420,7 @@
// Clear the callee and this flags
final int boundFlags = flags & ~NEEDS_CALLEE & ~USES_THIS;
- final CompiledFunctions boundList = new CompiledFunctions(fn.getName());
+ final List<CompiledFunction> boundList = new LinkedList<>();
final ScriptObject runtimeScope = fn.getScope();
final CompiledFunction bindTarget = new CompiledFunction(getGenericInvoker(runtimeScope), getGenericConstructor(runtimeScope));
boundList.add(bind(bindTarget, fn, self, allArgs));
@@ -806,6 +873,6 @@
private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- code = new CompiledFunctions(name);
+ code = new LinkedList<>();
}
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
index fc42e86..a8bf18c 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1324,7 +1324,19 @@
* @param all True if to include non-enumerable keys.
* @return Array of keys.
*/
- public String[] getOwnKeys(final boolean all) {
+ public final String[] getOwnKeys(final boolean all) {
+ return getOwnKeys(all, null);
+ }
+
+ /**
+ * return an array of own property keys associated with the object.
+ *
+ * @param all True if to include non-enumerable keys.
+ * @param nonEnumerable set of non-enumerable properties seen already.Used
+ to filter out shadowed, but enumerable properties from proto children.
+ * @return Array of keys.
+ */
+ protected String[] getOwnKeys(final boolean all, final Set<String> nonEnumerable) {
final List<Object> keys = new ArrayList<>();
final PropertyMap selfMap = this.getMap();
@@ -1338,8 +1350,21 @@
}
for (final Property property : selfMap.getProperties()) {
- if (all || property.isEnumerable()) {
- keys.add(property.getKey());
+ final boolean enumerable = property.isEnumerable();
+ final String key = property.getKey();
+ if (all) {
+ keys.add(key);
+ } else if (enumerable) {
+ // either we don't have non-enumerable filter set or filter set
+ // does not contain the current property.
+ if (nonEnumerable == null || !nonEnumerable.contains(key)) {
+ keys.add(key);
+ }
+ } else {
+ // store this non-enumerable property for later proto walk
+ if (nonEnumerable != null) {
+ nonEnumerable.add(key);
+ }
}
}
@@ -2398,8 +2423,9 @@
@Override
protected void init() {
final Set<String> keys = new LinkedHashSet<>();
+ final Set<String> nonEnumerable = new HashSet<>();
for (ScriptObject self = object; self != null; self = self.getProto()) {
- keys.addAll(Arrays.asList(self.getOwnKeys(false)));
+ keys.addAll(Arrays.asList(self.getOwnKeys(false, nonEnumerable)));
}
this.values = keys.toArray(new String[keys.size()]);
}
@@ -2413,8 +2439,9 @@
@Override
protected void init() {
final ArrayList<Object> valueList = new ArrayList<>();
+ final Set<String> nonEnumerable = new HashSet<>();
for (ScriptObject self = object; self != null; self = self.getProto()) {
- for (final String key : self.getOwnKeys(false)) {
+ for (final String key : self.getOwnKeys(false, nonEnumerable)) {
valueList.add(self.get(key));
}
}
@@ -2430,20 +2457,19 @@
*/
private Property addSpillProperty(final String key, final int propertyFlags, final Object value, final boolean hasInitialValue) {
final PropertyMap propertyMap = getMap();
- final int fieldCount = propertyMap.getFieldCount();
- final int fieldMax = propertyMap.getFieldMaximum();
+ final int fieldSlot = propertyMap.getFreeFieldSlot();
Property property;
- if (fieldCount < fieldMax) {
+ if (fieldSlot > -1) {
property = hasInitialValue ?
- new AccessorProperty(key, propertyFlags, fieldCount, this, value) :
- new AccessorProperty(key, propertyFlags, getClass(), fieldCount);
+ new AccessorProperty(key, propertyFlags, fieldSlot, this, value) :
+ new AccessorProperty(key, propertyFlags, getClass(), fieldSlot);
property = addOwnProperty(property);
} else {
- final int spillCount = propertyMap.getSpillLength();
+ final int spillSlot = propertyMap.getFreeSpillSlot();
property = hasInitialValue ?
- new SpillProperty(key, propertyFlags, spillCount, this, value) :
- new SpillProperty(key, propertyFlags, spillCount);
+ new SpillProperty(key, propertyFlags, spillSlot, this, value) :
+ new SpillProperty(key, propertyFlags, spillSlot);
property = addOwnProperty(property);
ensureSpillSize(property.getSlot());
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
index d4350c5..6c5758c 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -702,6 +702,9 @@
if (x instanceof ScriptObject && y instanceof ScriptObject) {
return x == y;
}
+ if (x instanceof ScriptObjectMirror || y instanceof ScriptObjectMirror) {
+ return ScriptObjectMirror.identical(x, y);
+ }
return equalValues(x, y);
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
index ae8cb20..4b392ba 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -160,7 +160,7 @@
}
private SetMethod createNewPropertySetter() {
- final SetMethod sm = map.getFieldCount() < map.getFieldMaximum() ? createNewFieldSetter() : createNewSpillPropertySetter();
+ final SetMethod sm = map.getFreeFieldSlot() > -1 ? createNewFieldSetter() : createNewSpillPropertySetter();
final PropertyListeners listeners = map.getListeners();
if (listeners != null) {
listeners.propertyAdded(sm.property);
@@ -205,11 +205,11 @@
}
private SetMethod createNewFieldSetter() {
- return createNewSetter(new AccessorProperty(getName(), 0, sobj.getClass(), getMap().getFieldCount(), type));
+ return createNewSetter(new AccessorProperty(getName(), 0, sobj.getClass(), getMap().getFreeFieldSlot(), type));
}
private SetMethod createNewSpillPropertySetter() {
- return createNewSetter(new SpillProperty(getName(), 0, getMap().getSpillLength(), type));
+ return createNewSetter(new SpillProperty(getName(), 0, getMap().getFreeSpillSlot(), type));
}
private PropertyMap getNewMap(final Property property) {
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
index 2892b71..30157e1 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
@@ -87,6 +87,9 @@
/** Base64-encoded SHA1 digest of this source object */
private volatile byte[] digest;
+ /** source URL set via //@ sourceURL or //# sourceURL directive */
+ private String explicitURL;
+
// Do *not* make this public, ever! Trusts the URL and content.
private Source(final String name, final String base, final Data data) {
this.name = name;
@@ -597,6 +600,22 @@
}
/**
+ * Get explicit source URL.
+ * @return URL set vial sourceURL directive
+ */
+ public String getExplicitURL() {
+ return explicitURL;
+ }
+
+ /**
+ * Set explicit source URL.
+ * @param explicitURL URL set via sourceURL directive
+ */
+ public void setExplicitURL(final String explicitURL) {
+ this.explicitURL = explicitURL;
+ }
+
+ /**
* Returns whether this source was submitted via 'eval' call or not.
*
* @return true if this source represents code submitted via 'eval'
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
index f50e1b1..8ff1b8e 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
@@ -207,8 +207,11 @@
}
@Override
- public int getSpillCount() {
- return 1;
+ void initMethodHandles(final Class<?> structure) {
+ final int slot = getSlot();
+ primitiveGetter = primitiveGetter(slot);
+ primitiveSetter = primitiveSetter(slot);
+ objectGetter = objectGetter(slot);
+ objectSetter = objectSetter(slot);
}
-
}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java
similarity index 78%
rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java
rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java
index e0aa7ff..7a76b98 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java
@@ -30,9 +30,12 @@
import java.util.Map;
/**
- * Class representing a compiled script.
+ * Class representing a persistent compiled script.
*/
-final class CompiledScript implements Serializable {
+public final class StoredScript implements Serializable {
+
+ /** Compilation id */
+ private final int compilationId;
/** Main class name. */
private final String mainClassName;
@@ -43,8 +46,8 @@
/** Constants array. */
private final Object[] constants;
- /** The source */
- private transient Source source;
+ /** Function initializers */
+ private final Map<Integer, FunctionInitializer> initializers;
private static final long serialVersionUID = 2958227232195298340L;
@@ -55,11 +58,16 @@
* @param classBytes map of class names to class bytes
* @param constants constants array
*/
- CompiledScript(final Source source, final String mainClassName, final Map<String, byte[]> classBytes, final Object[] constants) {
- this.source = source;
+ public StoredScript(final int compilationId, final String mainClassName, final Map<String, byte[]> classBytes, final Map<Integer, FunctionInitializer> initializers, final Object[] constants) {
+ this.compilationId = compilationId;
this.mainClassName = mainClassName;
this.classBytes = classBytes;
this.constants = constants;
+ this.initializers = initializers;
+ }
+
+ public int getCompilationId() {
+ return compilationId;
}
/**
@@ -86,20 +94,8 @@
return constants;
}
- /**
- * Returns the source of this cached script.
- * @return the source
- */
- public Source getSource() {
- return source;
- }
-
- /**
- * Sets the source of this cached script.
- * @param source the source
- */
- void setSource(final Source source) {
- this.source = source;
+ Map<Integer, FunctionInitializer> getInitializers() {
+ return initializers;
}
@Override
@@ -115,11 +111,11 @@
if (obj == this) {
return true;
}
- if (!(obj instanceof CompiledScript)) {
+ if (!(obj instanceof StoredScript)) {
return false;
}
- final CompiledScript cs = (CompiledScript) obj;
+ final StoredScript cs = (StoredScript) obj;
return mainClassName.equals(cs.mainClassName)
&& classBytes.equals(cs.classBytes)
&& Arrays.equals(constants, cs.constants);
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
index ff770ed..d7b52c1 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
@@ -43,16 +43,6 @@
* Property with user defined getters/setters. Actual getter and setter
* functions are stored in underlying ScriptObject. Only the 'slot' info is
* stored in the property.
- *
- * The slots here denote either ScriptObject embed field number or spill
- * array index. For spill array index, we use slot value of
- * (index + ScriptObject.embedSize). See also ScriptObject.getEmbedOrSpill
- * method. Negative slot value means that the corresponding getter or setter
- * is null. Note that always two slots are allocated in ScriptObject - but
- * negative (less by 1) slot number is stored for null getter or setter.
- * This is done so that when the property is redefined with a different
- * getter and setter (say, both non-null), we'll have spill slots to store
- * those. When a slot is negative, (-slot - 1) is the embed/spill index.
*/
public final class UserAccessorProperty extends SpillProperty {
@@ -117,10 +107,9 @@
/**
* Constructor
*
- * @param key property key
- * @param flags property flags
- * @param getterSlot getter slot, starting at first embed
- * @param setterSlot setter slot, starting at first embed
+ * @param key property key
+ * @param flags property flags
+ * @param slot spill slot
*/
UserAccessorProperty(final String key, final int flags, final int slot) {
super(key, flags, slot);
@@ -206,17 +195,17 @@
@Override
public void setValue(final ScriptObject self, final ScriptObject owner, final int value, final boolean strict) {
- setValue(self, owner, value, strict);
+ setValue(self, owner, (Object) value, strict);
}
@Override
public void setValue(final ScriptObject self, final ScriptObject owner, final long value, final boolean strict) {
- setValue(self, owner, value, strict);
+ setValue(self, owner, (Object) value, strict);
}
@Override
public void setValue(final ScriptObject self, final ScriptObject owner, final double value, final boolean strict) {
- setValue(self, owner, value, strict);
+ setValue(self, owner, (Object) value, strict);
}
@Override
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
index 009d7b9..723b510 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
@@ -31,7 +31,6 @@
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.invoke.SwitchPoint;
-
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
index 86eed5a..44ea184 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
@@ -66,6 +66,7 @@
import jdk.internal.org.objectweb.asm.Opcodes;
import jdk.internal.org.objectweb.asm.Type;
import jdk.internal.org.objectweb.asm.commons.InstructionAdapter;
+import jdk.nashorn.api.scripting.ScriptUtils;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.JSType;
import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -134,10 +135,12 @@
* implemented securely.
*/
final class JavaAdapterBytecodeGenerator {
+ private static final Type SCRIPTUTILS_TYPE = Type.getType(ScriptUtils.class);
private static final Type OBJECT_TYPE = Type.getType(Object.class);
private static final Type CLASS_TYPE = Type.getType(Class.class);
static final String OBJECT_TYPE_NAME = OBJECT_TYPE.getInternalName();
+ static final String SCRIPTUTILS_TYPE_NAME = SCRIPTUTILS_TYPE.getInternalName();
static final String INIT = "<init>";
@@ -172,6 +175,7 @@
private static final String GET_GLOBAL_METHOD_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE);
private static final String GET_CLASS_METHOD_DESCRIPTOR = Type.getMethodDescriptor(CLASS_TYPE);
private static final String EXPORT_RETURN_VALUE_METHOD_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE, OBJECT_TYPE);
+ private static final String UNWRAP_METHOD_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE, OBJECT_TYPE);
private static final String GET_CONVERTER_METHOD_DESCRIPTOR = Type.getMethodDescriptor(METHOD_HANDLE_TYPE, CLASS_TYPE);
private static final String TO_CHAR_PRIMITIVE_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.CHAR_TYPE, OBJECT_TYPE);
private static final String TO_STRING_METHOD_DESCRIPTOR = Type.getMethodDescriptor(STRING_TYPE, OBJECT_TYPE);
@@ -927,10 +931,14 @@
invokeValueOf(mv, "Double", 'D');
break;
case Type.ARRAY:
- case Type.OBJECT:
case Type.METHOD:
// Already boxed
break;
+ case Type.OBJECT:
+ if(t.equals(OBJECT_TYPE)) {
+ mv.invokestatic(SCRIPTUTILS_TYPE_NAME, "unwrap", UNWRAP_METHOD_DESCRIPTOR, false);
+ }
+ break;
default:
// Not expecting anything else (e.g. VOID)
assert false;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
index 061783f..ef91f35 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
@@ -47,6 +47,7 @@
import jdk.internal.org.objectweb.asm.Opcodes;
import jdk.internal.org.objectweb.asm.Type;
import jdk.internal.org.objectweb.asm.commons.InstructionAdapter;
+import jdk.nashorn.api.scripting.ScriptUtils;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ScriptFunction;
import jdk.nashorn.internal.runtime.ScriptObject;
@@ -214,12 +215,12 @@
/**
* Invoked when returning Object from an adapted method to filter out internal Nashorn objects that must not be seen
- * by the callers. Currently only transforms {@code ConsString} into {@code String}.
+ * by the callers. Currently only transforms {@code ConsString} into {@code String} and transforms {@code ScriptObject} into {@code ScriptObjectMirror}.
* @param obj the return value
* @return the filtered return value.
*/
public static Object exportReturnValue(final Object obj) {
- return NashornBeansLinker.exportArgument(obj);
+ return ScriptUtils.wrap(NashornBeansLinker.exportArgument(obj));
}
/**
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
index 66720c2..10ab434 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
@@ -25,6 +25,8 @@
package jdk.nashorn.internal.runtime.linker;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
import jdk.internal.dynalink.CallSiteDescriptor;
@@ -33,7 +35,9 @@
import jdk.internal.dynalink.linker.LinkerServices;
import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+import jdk.nashorn.api.scripting.ClassFilter;
import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.objects.Global;
/**
* Check java reflection permission for java reflective and java.lang.invoke access from scripts
@@ -100,6 +104,12 @@
}
static void checkReflectionAccess(final Class<?> clazz, final boolean isStatic) {
+ final Global global = Context.getGlobal();
+ final ClassFilter cf = global.getClassFilter();
+ if (cf != null && isReflectiveCheckNeeded(clazz, isStatic)) {
+ throw typeError("no.reflection.with.classfilter");
+ }
+
final SecurityManager sm = System.getSecurityManager();
if (sm != null && isReflectiveCheckNeeded(clazz, isStatic)) {
checkReflectionPermission(sm);
@@ -107,6 +117,12 @@
}
private static void checkLinkRequest(final LinkRequest origRequest) {
+ final Global global = Context.getGlobal();
+ final ClassFilter cf = global.getClassFilter();
+ if (cf != null) {
+ throw typeError("no.reflection.with.classfilter");
+ }
+
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
final LinkRequest requestWithoutContext = origRequest.withoutRuntimeContext(); // Nashorn has no runtime context
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
index 3a486da..73445ec 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -81,6 +81,7 @@
type.error.not.a.numeric.array={0} is not a numeric array
type.error.not.a.bytebuffer={0} is not a java.nio.ByteBuffer
type.error.not.an.arraybuffer.in.dataview=First arg to DataView constructor must be an ArrayBuffer
+type.error.no.reflection.with.classfilter=Java reflection not supported when class filter is present
# operations not permitted on undefined
type.error.cant.call.undefined=Cannot call undefined
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
index e84951a..e879a7f 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
@@ -266,7 +266,6 @@
env,
null,
functionNode.getSource(),
- functionNode.getSourceURL(),
env._strict | functionNode.isStrict()).
compile(functionNode, CompilationPhases.COMPILE_ALL_NO_INSTALL);
}
@@ -443,19 +442,16 @@
continue;
}
- Object res;
try {
- res = context.eval(global, source, global, "<shell>", env._strict);
+ final Object res = context.eval(global, source, global, "<shell>", env._strict);
+ if (res != ScriptRuntime.UNDEFINED) {
+ err.println(JSType.toString(res));
+ }
} catch (final Exception e) {
err.println(e);
if (env._dump_on_error) {
e.printStackTrace(err);
}
- continue;
- }
-
- if (res != ScriptRuntime.UNDEFINED) {
- err.println(JSType.toString(res));
}
}
} finally {
diff --git a/nashorn/test/script/basic/JDK-8015969.js b/nashorn/test/script/basic/JDK-8015969.js
index 782d592..c8f8ca6 100644
--- a/nashorn/test/script/basic/JDK-8015969.js
+++ b/nashorn/test/script/basic/JDK-8015969.js
@@ -37,6 +37,24 @@
'use strict';
try {
+ context = 444;
+ print("FAILED!! context write should have thrown error");
+} catch (e) {
+ if (! (e instanceof TypeError)) {
+ print("TypeError expected but got " + e);
+ }
+}
+
+try {
+ engine = "hello";
+ print("FAILED!! engine write should have thrown error");
+} catch (e) {
+ if (! (e instanceof TypeError)) {
+ print("TypeError expected but got " + e);
+ }
+}
+
+try {
delete context;
print("FAILED!! context delete should have thrown error");
} catch (e) {
diff --git a/nashorn/test/script/basic/JDK-8038413.js b/nashorn/test/script/basic/JDK-8038413.js
index 525b58d..d7b5ed2 100644
--- a/nashorn/test/script/basic/JDK-8038413.js
+++ b/nashorn/test/script/basic/JDK-8038413.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -31,7 +31,7 @@
// When adapting a method returning Integer to an optimistic call site
// expecting int, can't forego filters because of null. That is, the
// Integer->int conversion can't be left to the automatisms present in
-// java.lang.invoke.MethodHandle.asType() because of potential null
+// java.lang.invoke.MethodHandle.asType() because of potential null
// values.
var IntegerArray = Java.type("java.lang.Integer[]");
var arr = new IntegerArray(1);
diff --git a/nashorn/test/script/basic/JDK-8043232.js b/nashorn/test/script/basic/JDK-8043232.js
index ec112b8..fa46b41 100644
--- a/nashorn/test/script/basic/JDK-8043232.js
+++ b/nashorn/test/script/basic/JDK-8043232.js
@@ -58,8 +58,8 @@
}
// constructor of a non-existent class
-checkIt(function() new (java.lang["NonExistent(String)"])());
-
+checkIt(function() new (java.lang["NonExistent(String)"])());
+
// non-existent constructor of an existing class
checkIt(function() new (java.lang["Object(String)"])());
diff --git a/nashorn/test/script/basic/JDK-8044695.js b/nashorn/test/script/basic/JDK-8044695.js
index 2e7b774..3f94ffb 100644
--- a/nashorn/test/script/basic/JDK-8044695.js
+++ b/nashorn/test/script/basic/JDK-8044695.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8044750.js b/nashorn/test/script/basic/JDK-8044750.js
index ee6fa4d..b084d57 100644
--- a/nashorn/test/script/basic/JDK-8044750.js
+++ b/nashorn/test/script/basic/JDK-8044750.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8046026.js b/nashorn/test/script/basic/JDK-8046026.js
new file mode 100644
index 0000000..585621f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8046026.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8046026: CompiledFunction.relinkComposableInvoker assert is being hit
+ * JDK-8044770: crash with jdk9-dev/nashorn during global object initialization from MT test
+ * JDK-8047770: NPE in deoptimizing recompilation in multithreaded
+ *
+ * @test
+ * @run
+ */
+
+(function() {
+var n = 1 << 25;
+var ThreadLocalRandom = java.util.concurrent.ThreadLocalRandom;
+var m = java.util.stream.IntStream.range(0, n)
+ .parallel() // this is the essence of this test. We must trigger parallel execution
+ .filter(function() {
+ var tlr = ThreadLocalRandom.current();
+
+ var x = tlr.nextDouble(-1.0, 1.0);
+ var y = tlr.nextDouble(-1.0, 1.0);
+
+ return x * x + y * y <= 1.0;
+ })
+ .count();
+var pi = (4.0 * m) / n;
+print(pi.toFixed(2));
+})()
diff --git a/nashorn/test/script/basic/JDK-8046026.js.EXPECTED b/nashorn/test/script/basic/JDK-8046026.js.EXPECTED
new file mode 100644
index 0000000..6324d40
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8046026.js.EXPECTED
@@ -0,0 +1 @@
+3.14
diff --git a/nashorn/test/script/basic/JDK-8046905.js b/nashorn/test/script/basic/JDK-8046905.js
index 231e2a1..b11a6ad 100644
--- a/nashorn/test/script/basic/JDK-8046905.js
+++ b/nashorn/test/script/basic/JDK-8046905.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -36,7 +36,7 @@
// Running three times so that we test an already linked call site too:
// i==0: linking initially with assumed optimistic returned type int.
// i==1: linking after deoptimization with returned type Object.
-// i==2: re-running code linked in previous iteration. This will
+// i==2: re-running code linked in previous iteration. This will
// properly exercise the guards too.
print("1 level of apply")
for(i = 0; i < 3; ++i) {
@@ -69,7 +69,7 @@
print(apply.apply(apply,[apply,invocation]))
// First change after i==1, so it relinks an otherwise stable linkage
if(i == 1) {
- invocation = [sort,[[8,7,6,5]]];
+ invocation = [sort,[[8,7,6,5]]];
} else if(i == 2) {
invocation = [join,[[8,7,6,5],["-"]]];
}
diff --git a/nashorn/test/script/basic/JDK-8047067.js b/nashorn/test/script/basic/JDK-8047067.js
index 2b68611..2d8f140 100644
--- a/nashorn/test/script/basic/JDK-8047067.js
+++ b/nashorn/test/script/basic/JDK-8047067.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -33,4 +33,4 @@
// program points that'd cause incorrect continuation program point in
// the rest-of, and therefore a bad stack, and therefore an AIOOBE in
// the continuation setup code.
-eval("23", ({})[/x/])
+eval("23", ({})[/x/])
diff --git a/nashorn/test/script/basic/JDK-8047166.js b/nashorn/test/script/basic/JDK-8047166.js
index 5b31dc3..74e3ae5 100644
--- a/nashorn/test/script/basic/JDK-8047166.js
+++ b/nashorn/test/script/basic/JDK-8047166.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8047357.js b/nashorn/test/script/basic/JDK-8047357.js
index 20e2bb4..17e4d13 100644
--- a/nashorn/test/script/basic/JDK-8047357.js
+++ b/nashorn/test/script/basic/JDK-8047357.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8047369.js b/nashorn/test/script/basic/JDK-8047369.js
index dec5515..e2b0984 100644
--- a/nashorn/test/script/basic/JDK-8047369.js
+++ b/nashorn/test/script/basic/JDK-8047369.js
@@ -23,7 +23,7 @@
/**
* JDK-8047369: Add regression tests for passing test cases of JDK-8024971
- *
+ *
* @test
* @run
* @option -scripting
@@ -76,14 +76,14 @@
evalExpectValue(<<CODE
var s = "(function() { return y })()";
- (function() {
+ (function() {
with({ y:1 })
eval(s)
})();
- (function() {
- with({
+ (function() {
+ with({
get y() { return "get"; }
- })
+ })
return eval(s)
})();
CODE, "get");
@@ -93,19 +93,19 @@
evalExpectValue(<<CODE
function f(o) {
- var eval=0;
+ var eval=0;
with({
get eval() { return o.eval }
- })
+ })
return eval("1+2");
- }
+ }
f(this);
CODE, 3)
evalExpectValue(<<CODE
function f() {
var a=1,e=2;
- try {
+ try {
throw 3
} catch(e) {
return + function g(){return eval('a+e')}()
@@ -125,9 +125,9 @@
// makeFuncAndCall("L1:try { return } finally { break L1 }");
evalExpectValue(<<CODE
- function f() {
+ function f() {
function g() { return 0 }
- function g() { return 1 }
+ function g() { return 1 }
function g$1() { return 2 }
return g$1()
}
@@ -139,7 +139,7 @@
function f() {
function g() {return 0 }
var h = function g() { return 1 };
- function g$1() { return 2 };
+ function g$1() { return 2 };
return h()
}
@@ -171,7 +171,7 @@
// evalExpectValue("(1000000000000000128).toFixed().toString()", "1000000000000000128");
try {
- Function("-", {
+ Function("-", {
toString: function() {
throw "err"
}
diff --git a/nashorn/test/script/basic/JDK-8047371.js b/nashorn/test/script/basic/JDK-8047371.js
index fb380c7..d8fc401 100644
--- a/nashorn/test/script/basic/JDK-8047371.js
+++ b/nashorn/test/script/basic/JDK-8047371.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8047728.js b/nashorn/test/script/basic/JDK-8047728.js
index ba36ccd..ba7b033 100644
--- a/nashorn/test/script/basic/JDK-8047728.js
+++ b/nashorn/test/script/basic/JDK-8047728.js
@@ -29,7 +29,7 @@
*/
function func(x) {
- var o = {x:0};
+ var o = {x:0};
with(o){
delete x;
}
@@ -42,7 +42,7 @@
function func2() {
var x;
- var o = {x:0};
+ var o = {x:0};
with(o){
delete x;
}
diff --git a/nashorn/test/script/basic/JDK-8047959.js b/nashorn/test/script/basic/JDK-8047959.js
index 9ad1c8d..179fb88 100644
--- a/nashorn/test/script/basic/JDK-8047959.js
+++ b/nashorn/test/script/basic/JDK-8047959.js
@@ -49,11 +49,11 @@
print("typeof foo? " + typeof foo);
print("foo = " + foo);
-var x = "global";
+var x = "global";
(function(){
eval("var x='local'");
print("x in function = "+ x);
print("delete x? = " + delete x);
print("x after delete = " + x);
})();
-print("x = " + x);
+print("x = " + x);
diff --git a/nashorn/test/script/basic/JDK-8048079_1.js b/nashorn/test/script/basic/JDK-8048079_1.js
index fcd2121..36a1fe6 100644
--- a/nashorn/test/script/basic/JDK-8048079_1.js
+++ b/nashorn/test/script/basic/JDK-8048079_1.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8048079_2.js b/nashorn/test/script/basic/JDK-8048079_2.js
index fcd2121..36a1fe6 100644
--- a/nashorn/test/script/basic/JDK-8048079_2.js
+++ b/nashorn/test/script/basic/JDK-8048079_2.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8048586.js b/nashorn/test/script/basic/JDK-8048586.js
index 0394198..a55299a 100644
--- a/nashorn/test/script/basic/JDK-8048586.js
+++ b/nashorn/test/script/basic/JDK-8048586.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/basic/JDK-8049086.js b/nashorn/test/script/basic/JDK-8049086.js
index 2fae31b..da4a962 100644
--- a/nashorn/test/script/basic/JDK-8049086.js
+++ b/nashorn/test/script/basic/JDK-8049086.js
@@ -59,7 +59,7 @@
// (c) FunctionalInterface objects (d) JSObjects that are 'functions'
print("java.awt.Color is java function? " + Java.isJavaFunction(java.awt.Color));
-print("java.lang.Runnable instance is java function? "
+print("java.lang.Runnable instance is java function? "
+ Java.isJavaFunction(new java.lang.Runnable(function() {})));
print("eval is java function? " + Java.isJavaFunction(eval));
print("println is java function? " + Java.isJavaFunction(println));
diff --git a/nashorn/test/script/basic/JDK-8051439.js b/nashorn/test/script/basic/JDK-8051439.js
index a1f017d..255803d 100644
--- a/nashorn/test/script/basic/JDK-8051439.js
+++ b/nashorn/test/script/basic/JDK-8051439.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -29,24 +29,24 @@
*/
// Test + operator
-function f1() {
- var x;
- for (var i = 0;i < 3; i++) {
- x = x + i;
+function f1() {
+ var x;
+ for (var i = 0;i < 3; i++) {
+ x = x + i;
}
- x = x + "test";
- return x;
-}
+ x = x + "test";
+ return x;
+}
// Test += operator
-function f2() {
- var x;
- for (var i = 0;i < 3; i++) {
- x += i;
+function f2() {
+ var x;
+ for (var i = 0;i < 3; i++) {
+ x += i;
}
- x += "test";
- return x;
-}
+ x += "test";
+ return x;
+}
print(f1());
print(f2());
diff --git a/nashorn/test/script/basic/JDK-8054503.js b/nashorn/test/script/basic/JDK-8054503.js
new file mode 100644
index 0000000..d11c6cd
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8054503.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * 8054503: test/script/external/test262/test/suite/ch12/12.6/12.6.4/12.6.4-2.js fails with tip
+ *
+ * @test
+ * @run
+ */
+
+function MyFunc() {}
+
+MyFunc.prototype.foo = 42;
+var obj = new MyFunc();
+Object.defineProperty(obj, "foo", {
+ value: "hello",
+ enumerable: false
+});
+
+for (var p in obj) {
+ if (p == "foo") {
+ fail("'foo' is not expected here!");
+ }
+}
+
+for each (var p in obj) {
+ if (p == "hello" || p == 42) {
+ fail("'foo' value is not expected here");
+ }
+}
diff --git a/nashorn/test/script/basic/compile-octane-normal.js b/nashorn/test/script/basic/compile-octane-normal.js
index c4dd91e..769f00b 100644
--- a/nashorn/test/script/basic/compile-octane-normal.js
+++ b/nashorn/test/script/basic/compile-octane-normal.js
@@ -29,6 +29,7 @@
* forever, so make this test future safe, we specify them explicitly
*
* @test
+ * @fork
* @runif external.octane
* @option -scripting
* @option -Dnashorn.typeInfo.disabled=true
@@ -37,5 +38,5 @@
*/
var fn = __DIR__ + 'compile-octane.js';
-var url = "file://" + fn;
+var url = "file://" + fn;
loadWithNewGlobal(new java.net.URL(url));
diff --git a/nashorn/test/script/basic/compile-octane-splitter.js b/nashorn/test/script/basic/compile-octane-splitter.js
index 2bba0e3f..5b4f0e1 100644
--- a/nashorn/test/script/basic/compile-octane-splitter.js
+++ b/nashorn/test/script/basic/compile-octane-splitter.js
@@ -29,6 +29,7 @@
* forever, so make this test future safe, we specify them explicitly
*
* @test
+ * @fork
* @option -Dnashorn.compiler.splitter.threshold=1000
* @fork
* @runif external.octane
@@ -39,5 +40,5 @@
*/
var fn = __DIR__ + 'compile-octane.js';
-var url = "file://" + fn;
+var url = "file://" + fn;
loadWithNewGlobal(new java.net.URL(url));
diff --git a/nashorn/test/script/basic/compile-octane.js b/nashorn/test/script/basic/compile-octane.js
index 7d019bb..aee105a 100644
--- a/nashorn/test/script/basic/compile-octane.js
+++ b/nashorn/test/script/basic/compile-octane.js
@@ -31,7 +31,7 @@
* This means that if you use this subtest as a compilation test
* harness, pass the arguments:
*
- * -scripting -Dnashorn.typeInfo.disabled=true --class-cache-size=0
+ * -scripting -Dnashorn.typeInfo.disabled=true --class-cache-size=0
* --persistent-code-cache=false
*
* @subtest
@@ -40,7 +40,7 @@
load(__DIR__ + 'octane-payload.js');
var DEFAULT_ITERS = 1; //default is one iteration through each benchmark
-var iters = DEFAULT_ITERS;
+var iters = DEFAULT_ITERS;
var args = [];
if (typeof $ARGS !== 'undefined') {
@@ -55,11 +55,11 @@
for (var i = 0; i < args.length; ) {
var arg = args[i];
if (arg === '--iterations') {
- iters = +args[++i];
+ iters = +args[++i];
} else if (arg === '--verbose') {
- verbose = true;
+ verbose = true;
} else {
- onlyTheseTests.push(arg);
+ onlyTheseTests.push(arg);
}
i++;
}
@@ -74,7 +74,7 @@
function print_if_verbose(x) {
if (verbose) {
- print(x);
+ print(x);
}
}
@@ -94,46 +94,46 @@
var files = tests[j].files;
if (onlyTheseTests.length > 0 && !contains(onlyTheseTests, test_name)) {
- print_if_verbose("Skipping " + test_name);
- continue;
+ print_if_verbose("Skipping " + test_name);
+ continue;
}
if (!contains(testsCompiled, test_name)) {
- testsCompiled.push(test_name);
+ testsCompiled.push(test_name);
}
var str = "Compiling '" + test_name + "'...";
if (files.length > 1) {
- str += " (" + files.length + " files)";
+ str += " (" + files.length + " files)";
}
if (iters != 1) {
- str += " (" + iters + " times)";
+ str += " (" + iters + " times)";
}
str + "...";
print(str);
for (var iteration = 0; iteration < iters; iteration++) {
- //get a new global to avoid symbol pollution and reloads of base
- //in the same namespace
- var newGlobal = loadWithNewGlobal({script:'this', name:'test'});
+ //get a new global to avoid symbol pollution and reloads of base
+ //in the same namespace
+ var newGlobal = loadWithNewGlobal({script:'this', name:'test'});
- //load base into the new global so we get BenchmarkSuite etc
- newGlobal.load(base);
+ //load base into the new global so we get BenchmarkSuite etc
+ newGlobal.load(base);
- //load all files in the single benchmark
- for (var k in files) {
- var file = files[k];
- if (iteration >= 0) { //only display message on first iteration
- var str2 = "\t";
- if (iters > 1) {
- str2 += " [iteration " + (iteration + 1) + "]";
- }
- str2 += " processing file: " + file + "...";
- print_if_verbose(str2);
- }
- newGlobal.load("file://" + path + file);
- }
+ //load all files in the single benchmark
+ for (var k in files) {
+ var file = files[k];
+ if (iteration >= 0) { //only display message on first iteration
+ var str2 = "\t";
+ if (iters > 1) {
+ str2 += " [iteration " + (iteration + 1) + "]";
+ }
+ str2 += " processing file: " + file + "...";
+ print_if_verbose(str2);
+ }
+ newGlobal.load("file://" + path + file);
+ }
}
print("Done.");
}
diff --git a/nashorn/test/script/nosecurity/JDK-8044798.js b/nashorn/test/script/nosecurity/JDK-8044798.js
index 2c94f66..c3b6d4c 100644
--- a/nashorn/test/script/nosecurity/JDK-8044798.js
+++ b/nashorn/test/script/nosecurity/JDK-8044798.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -91,7 +91,7 @@
for each (var info in infos) {
for each (var f in valueDescFields) {
print(f.name, "=", f.get(info));
- }
+ }
}
// valueInfos - user defined object
@@ -99,7 +99,7 @@
for each (var info in infos) {
for each (var f in valueDescFields) {
print(f.name, "=", f.get(info));
- }
+ }
}
// valueAsString
diff --git a/nashorn/test/script/nosecurity/JDK-8044851.js b/nashorn/test/script/nosecurity/JDK-8044851.js
new file mode 100644
index 0000000..679c349
--- /dev/null
+++ b/nashorn/test/script/nosecurity/JDK-8044851.js
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8044851: nashorn properties leak memory
+ *
+ * @test
+ * @run
+ * @option -Dnashorn.debug=true
+ * @fork
+ */
+
+function printProperty(value, property) {
+ print(value, property.getKey(), property.isSpill() ? "spill" : "field", property.getSlot());
+}
+
+var obj = {}, i, name;
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ obj[name] = 'a' + i;
+ printProperty(obj[name], Debug.map(obj).findProperty(name));
+}
+print();
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ delete obj[name];
+}
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ obj[name] = 'b' + i;
+ printProperty(obj[name], Debug.map(obj).findProperty(name));
+}
+print();
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ Object.defineProperty(obj, name, {get: function() {return i;}, set: function(v) {}, configurable: true});
+ printProperty(obj[name], Debug.map(obj).findProperty(name));
+}
+print();
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ delete obj[name];
+}
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ obj[name] = 'c' + i;
+ printProperty(obj[name], Debug.map(obj).findProperty(name));
+}
+print();
+
+for (i = 7; i > -1; --i) {
+ name = 'property' + i;
+ delete obj[name];
+}
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ obj[name] = 'd' + i;
+ printProperty(obj[name], Debug.map(obj).findProperty(name));
+}
+print();
+
+for (i = 0; i < 8; ++i) {
+ name = 'property' + i;
+ Object.defineProperty(obj, name, {get: function() {return i;}, set: function(v) {}});
+ printProperty(obj[name], Debug.map(obj).findProperty(name));
+}
diff --git a/nashorn/test/script/nosecurity/JDK-8044851.js.EXPECTED b/nashorn/test/script/nosecurity/JDK-8044851.js.EXPECTED
new file mode 100644
index 0000000..4b8ca44
--- /dev/null
+++ b/nashorn/test/script/nosecurity/JDK-8044851.js.EXPECTED
@@ -0,0 +1,53 @@
+a0 property0 field 0
+a1 property1 field 1
+a2 property2 field 2
+a3 property3 field 3
+a4 property4 spill 0
+a5 property5 spill 1
+a6 property6 spill 2
+a7 property7 spill 3
+
+b0 property0 field 0
+b1 property1 field 1
+b2 property2 field 2
+b3 property3 field 3
+b4 property4 spill 0
+b5 property5 spill 1
+b6 property6 spill 2
+b7 property7 spill 3
+
+0 property0 spill 4
+1 property1 spill 5
+2 property2 spill 6
+3 property3 spill 7
+4 property4 spill 8
+5 property5 spill 0
+6 property6 spill 1
+7 property7 spill 2
+
+c0 property0 field 0
+c1 property1 field 1
+c2 property2 field 2
+c3 property3 field 3
+c4 property4 spill 0
+c5 property5 spill 1
+c6 property6 spill 2
+c7 property7 spill 3
+
+d0 property0 field 0
+d1 property1 field 1
+d2 property2 field 2
+d3 property3 field 3
+d4 property4 spill 0
+d5 property5 spill 1
+d6 property6 spill 2
+d7 property7 spill 3
+
+0 property0 spill 4
+1 property1 spill 5
+2 property2 spill 6
+3 property3 spill 7
+4 property4 spill 8
+5 property5 spill 0
+6 property6 spill 1
+7 property7 spill 2
diff --git a/nashorn/test/script/nosecurity/JDK-8050964.js b/nashorn/test/script/nosecurity/JDK-8050964.js
index 186d627..486948a 100644
--- a/nashorn/test/script/nosecurity/JDK-8050964.js
+++ b/nashorn/test/script/nosecurity/JDK-8050964.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/nosecurity/JDK-8055034.js b/nashorn/test/script/nosecurity/JDK-8055034.js
new file mode 100644
index 0000000..76f24be
--- /dev/null
+++ b/nashorn/test/script/nosecurity/JDK-8055034.js
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8055034: jjs exits interactive mode if exception was thrown when trying to print value of last evaluated expression
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+// assume that this script is run with "nashorn.jar" System
+// property set to relative or absolute path of nashorn.jar
+
+if (typeof fail != 'function') {
+ fail = print;
+}
+
+var System = java.lang.System;
+var File = java.io.File;
+var javahome = System.getProperty("java.home");
+var nashornJar = new File(System.getProperty("nashorn.jar"));
+if (! nashornJar.isAbsolute()) {
+ nashornJar = new File(".", nashornJar);
+}
+var nashornJarDir = nashornJar.parentFile.absolutePath;
+
+// we want to use nashorn.jar passed and not the one that comes with JRE
+var jjsCmd = javahome + "/../bin/jjs";
+jjsCmd += " -J-Djava.ext.dirs=" + nashornJarDir;
+jjsCmd = jjsCmd.toString().replaceAll(/\//g, File.separater);
+
+$EXEC(jjsCmd, "var x = Object.create(null);\nx;\nprint('PASSED');\nexit(0)");
+
+// $ERR has all interactions including prompts! Just check for error substring.
+var err = $ERR.trim();
+if (! err.contains("TypeError: Cannot get default string value")) {
+ fail("Error stream does not contain expected error message");
+}
+
+// should print "PASSED"
+print($OUT.trim());
+// exit code should be 0
+print("exit code = " + $EXIT);
diff --git a/nashorn/test/script/nosecurity/JDK-8055034.js.EXPECTED b/nashorn/test/script/nosecurity/JDK-8055034.js.EXPECTED
new file mode 100644
index 0000000..416340d
--- /dev/null
+++ b/nashorn/test/script/nosecurity/JDK-8055034.js.EXPECTED
@@ -0,0 +1,2 @@
+PASSED
+exit code = 0
diff --git a/nashorn/test/script/nosecurity/JDK-8055107.js b/nashorn/test/script/nosecurity/JDK-8055107.js
new file mode 100644
index 0000000..bcc3cba
--- /dev/null
+++ b/nashorn/test/script/nosecurity/JDK-8055107.js
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8055107: Extension directives to turn on callsite profiling, tracing, AST print and other debug features locally
+ *
+ * @test
+ * @option -Dnashorn.debug=true
+ * @option -scripting
+ * @run
+ * @fork
+ */
+
+function runScriptEngine(code) {
+ var imports = new JavaImporter(
+ java.io, java.lang, java.util, javax.script);
+
+ with(imports) {
+ var m = new ScriptEngineManager();
+ // get current System.err
+ var oldErr = System.err;
+ var baos = new ByteArrayOutputStream();
+ var newErr = new PrintStream(baos);
+ try {
+ // set new standard err
+ System.setErr(newErr);
+ var engine = m.getEngineByName("nashorn");
+ engine.eval(code);
+ newErr.flush();
+ return new java.lang.String(baos.toByteArray());
+ } finally {
+ // restore System.err to old value
+ System.setErr(oldErr);
+ }
+ }
+}
+
+// nashorn callsite trace enterexit
+var str = runScriptEngine(<<CODE
+function func() {
+ "nashorn callsite trace enterexit";
+ k();
+}
+
+function k() {
+ var x = "hello";
+}
+
+func();
+CODE);
+
+if (!str.contains(" ENTER ")) {
+ fail("expected 'ENTER' in trace mode output");
+}
+
+if (!str.contains(" EXIT ")) {
+ fail("expected 'EXIT' in trace mode output");
+}
+
+// nashorn callsite trace objects
+var str = runScriptEngine(<<CODE
+"nashorn callsite trace objects";
+function func(x) {
+}
+
+func("hello");
+CODE);
+
+if (!str.contains(" ENTER ")) {
+ fail("expected 'ENTER' in trace mode output");
+}
+
+if (!str.contains(" EXIT ")) {
+ fail("expected 'EXIT' in trace mode output");
+}
+
+if (!str.contains("hello")) {
+ fail("expected argument to be traced in trace objects mode");
+}
+
+// nashorn callsite trace misses
+str = runScriptEngine(<<CODE
+function f() {
+ "nashorn callsite trace misses";
+ k();
+}
+
+function k() {}
+f();
+CODE);
+
+if (!str.contains(" MISS ")) {
+ fail("expected callsite MISS trace messages");
+}
+
+// nashorn print lower ast
+str = runScriptEngine(<<CODE
+function foo() {
+ "nashorn print lower ast";
+ var x = 'hello';
+}
+foo();
+CODE);
+
+if (!str.contains("Lower AST for: 'foo'") ||
+ !str.contains("nashorn print lower ast")) {
+ fail("expected Lower AST to be printed for 'foo'");
+}
+
+// nashorn print ast
+str = runScriptEngine(<<CODE
+function foo() {
+ "nashorn print ast";
+}
+CODE);
+if (!str.contains("[function ") ||
+ !str.contains("nashorn print ast")) {
+ fail("expected AST to be printed");
+}
+
+// nashorn print symbols
+str = runScriptEngine(<<CODE
+function bar(a) {
+ "nashorn print symbols";
+ if (a) print(a);
+}
+
+bar();
+CODE)
+
+if (!str.contains("[BLOCK in 'Function bar']")) {
+ fail("expected symbols to be printed for 'bar'");
+}
+
+// nashorn print parse
+str = runScriptEngine(<<CODE
+"nashorn print parse";
+
+function func() {}
+CODE);
+
+if (!str.contains("function func") ||
+ !str.contains("nashorn print parse")) {
+ fail("expected nashorn print parse output");
+}
+
+// nashorn print lower parse
+str = runScriptEngine(<<CODE
+"nashorn print lower parse";
+
+function func() {}
+
+func()
+CODE);
+
+if (!str.contains("function {U%}func") ||
+ !str.contains("nashorn print lower parse")) {
+ fail("expected nashorn print lower parse output");
+}
diff --git a/nashorn/test/script/nosecurity/debuggersupportapi.js b/nashorn/test/script/nosecurity/debuggersupportapi.js
index f2fa101..db4a69a 100644
--- a/nashorn/test/script/nosecurity/debuggersupportapi.js
+++ b/nashorn/test/script/nosecurity/debuggersupportapi.js
@@ -1,21 +1,21 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
- *
+ *
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
- *
+ *
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/nashorn/test/script/trusted/JDK-8006529.js
index 5ca6c44..75c4d7c 100644
--- a/nashorn/test/script/trusted/JDK-8006529.js
+++ b/nashorn/test/script/trusted/JDK-8006529.js
@@ -120,7 +120,7 @@
var sourceForMethod = Source.class.getMethod("sourceFor", java.lang.String.class, java.lang.String.class)
var ParserConstructor = Parser.class.getConstructor(ScriptEnvironment.class, Source.class, ErrorManager.class)
-var CompilerConstructor = Compiler.class.getConstructor(Context.class, ScriptEnvironment.class, CodeInstaller.class, Source.class, String.class, boolean.class);
+var CompilerConstructor = Compiler.class.getConstructor(Context.class, ScriptEnvironment.class, CodeInstaller.class, Source.class, boolean.class);
// compile(script) -- compiles a script specified as a string with its
// source code, returns a jdk.nashorn.internal.ir.FunctionNode object
@@ -134,7 +134,7 @@
var parser = ParserConstructor.newInstance(env, source, ThrowErrorManager.class.newInstance());
var func = parseMethod.invoke(parser);
- var compiler = CompilerConstructor.newInstance(ctxt, env, null, source, null, false);
+ var compiler = CompilerConstructor.newInstance(ctxt, env, null, source, false);
return compileMethod.invoke(compiler, func, phases);
};
diff --git a/nashorn/test/script/trusted/classfilter.js b/nashorn/test/script/trusted/classfilter.js
new file mode 100644
index 0000000..a50e4a2
--- /dev/null
+++ b/nashorn/test/script/trusted/classfilter.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * ClassFilter to filter out java classes in a script engine.
+ *
+ * @test
+ * @run
+ */
+
+var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
+
+var fac = new NashornScriptEngineFactory();
+// allow only "java.*" classes to be accessed
+var e = fac.getScriptEngine(
+ function(name) name.startsWith("java."));
+
+function evalIt(str) {
+ print(str + " evalutes to " + e.eval(str));
+}
+
+function evalExpectError(str) {
+ try {
+ print(e.eval(str));
+ fail("expected error for: " + str);
+ } catch(exp) {
+ print(str + " throws " + exp);
+ }
+}
+
+evalIt("typeof javax.script.ScriptContext");
+evalIt("typeof javax.script.ScriptEngine");
+evalIt("typeof java.util.Vector");
+evalIt("typeof java.util.Map");
+evalIt("typeof java.util.HashMap");
+// should be able to call methods, create objects of java.* classes
+evalIt("var m = new java.util.HashMap(); m.put('foo', 42); m");
+evalIt("java.lang.System.out.println");
+evalIt("java.lang.System.exit");
+
+evalExpectError("new javax.script.SimpleBindings");
+evalExpectError("Java.type('javax.script.ScriptContext')");
+evalExpectError("java.lang.Class.forName('javax.script.ScriptContext')");
+
+try {
+ fac["getScriptEngine(ClassFilter)"](null);
+ fail("should have thrown NPE");
+} catch (e) {
+ if (! (e instanceof java.lang.NullPointerException)) {
+ fail("NPE expected, got " + e);
+ }
+}
diff --git a/nashorn/test/script/trusted/classfilter.js.EXPECTED b/nashorn/test/script/trusted/classfilter.js.EXPECTED
new file mode 100644
index 0000000..43d6303
--- /dev/null
+++ b/nashorn/test/script/trusted/classfilter.js.EXPECTED
@@ -0,0 +1,11 @@
+typeof javax.script.ScriptContext evalutes to object
+typeof javax.script.ScriptEngine evalutes to object
+typeof java.util.Vector evalutes to function
+typeof java.util.Map evalutes to function
+typeof java.util.HashMap evalutes to function
+var m = new java.util.HashMap(); m.put('foo', 42); m evalutes to {foo=42}
+java.lang.System.out.println evalutes to [jdk.internal.dynalink.beans.OverloadedDynamicMethod java.io.PrintStream.println]
+java.lang.System.exit evalutes to [jdk.internal.dynalink.beans.SimpleDynamicMethod void java.lang.System.exit(int)]
+new javax.script.SimpleBindings throws java.lang.RuntimeException: java.lang.ClassNotFoundException: javax.script.SimpleBindings
+Java.type('javax.script.ScriptContext') throws java.lang.RuntimeException: java.lang.ClassNotFoundException: javax.script.ScriptContext
+java.lang.Class.forName('javax.script.ScriptContext') throws javax.script.ScriptException: TypeError: Java reflection not supported when class filter is present in <eval> at line number 1
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 4b524ef..dae46fd 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -623,12 +623,40 @@
final ScriptEngine e = m.getEngineByName("nashorn");
e.put(ScriptEngine.FILENAME, "test");
- Object enumerable = e.eval(
+ final Object enumerable = e.eval(
"Object.getOwnPropertyDescriptor(this, " +
" 'javax.script.filename').enumerable");
assertEquals(enumerable, Boolean.FALSE);
}
+ @Test
+ public void nashornConfigSecurityTest() {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ try {
+ fac.getScriptEngine(new ClassFilter() {
+ @Override
+ public boolean exposeToScripts(final String name) {
+ return true;
+ }
+ });
+ fail("SecurityException should have been thrown");
+ } catch (final SecurityException exp) {}
+ }
+
+ @Test
+ public void nashornConfigSecurityTest2() {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ try {
+ fac.getScriptEngine(new String[0], null, new ClassFilter() {
+ @Override
+ public boolean exposeToScripts(final String name) {
+ return true;
+ }
+ });
+ fail("SecurityException should have been thrown");
+ } catch (final SecurityException exp) {}
+ }
+
private static void checkProperty(final ScriptEngine e, final String name)
throws ScriptException {
final String value = System.getProperty(name);
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java
index 7241758..1a21dd3 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java
@@ -34,7 +34,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import javax.script.Bindings;
+import javax.script.Invocable;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
@@ -306,4 +308,57 @@
// getMember("obj.foo") - thereby getting null instead of undefined
assertEquals("undefined", engine.eval(TEST_SCRIPT, newGlobal));
}
+
+ public interface MirrorCheckExample {
+ Object test1(Object arg);
+ Object test2(Object arg);
+ boolean compare(Object o1, Object o2);
+ }
+
+ // @bug 8053910: ScriptObjectMirror causing havoc with Invocation interface
+ @Test
+ public void checkMirrorToObject() throws Exception {
+ final ScriptEngineManager engineManager = new ScriptEngineManager();
+ final ScriptEngine engine = engineManager.getEngineByName("nashorn");
+ final Invocable invocable = (Invocable)engine;
+
+ engine.eval("function test1(arg) { return { arg: arg }; }");
+ engine.eval("function test2(arg) { return arg; }");
+ engine.eval("function compare(arg1, arg2) { return arg1 == arg2; }");
+
+ final Map<String, Object> map = new HashMap<>();
+ map.put("option", true);
+
+ final MirrorCheckExample example = invocable.getInterface(MirrorCheckExample.class);
+
+ final Object value1 = invocable.invokeFunction("test1", map);
+ final Object value2 = example.test1(map);
+ final Object value3 = invocable.invokeFunction("test2", value2);
+ final Object value4 = example.test2(value2);
+
+ // check that Object type argument receives a ScriptObjectMirror
+ // when ScriptObject is passed
+ assertEquals(ScriptObjectMirror.class, value1.getClass());
+ assertEquals(ScriptObjectMirror.class, value2.getClass());
+ assertEquals(ScriptObjectMirror.class, value3.getClass());
+ assertEquals(ScriptObjectMirror.class, value4.getClass());
+ assertTrue((boolean)invocable.invokeFunction("compare", value1, value1));
+ assertTrue((boolean)example.compare(value1, value1));
+ assertTrue((boolean)invocable.invokeFunction("compare", value3, value4));
+ assertTrue((boolean)example.compare(value3, value4));
+ }
+
+ // @bug 8053910: ScriptObjectMirror causing havoc with Invocation interface
+ @Test
+ @SuppressWarnings("unchecked")
+ public void mirrorUnwrapInterfaceMethod() throws Exception {
+ final ScriptEngineManager engineManager = new ScriptEngineManager();
+ final ScriptEngine engine = engineManager.getEngineByName("nashorn");
+ final Invocable invocable = (Invocable)engine;
+ engine.eval("function apply(obj) { " +
+ " return obj instanceof Packages.jdk.nashorn.api.scripting.ScriptObjectMirror; " +
+ "}");
+ final Function<Object,Object> func = invocable.getInterface(Function.class);
+ assertFalse((boolean)func.apply(engine.eval("({ x: 2 })")));
+ }
}
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java
index b4463a0..9175ef6 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java
@@ -96,7 +96,7 @@
final String codeCache = "build/nashorn_code_cache";
final String oldUserDir = System.getProperty("user.dir");
- private static final String[] ENGINE_OPTIONS = new String[]{"--persistent-code-cache"};
+ private static final String[] ENGINE_OPTIONS = new String[]{"--persistent-code-cache", "--optimistic-types=false", "--lazy-compilation=false"};
public void checkCompiledScripts(final DirectoryStream<Path> stream, int numberOfScripts) throws IOException {
for (final Path file : stream) {
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ConsStringTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ConsStringTest.java
index 9a10ab6..16c3606 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ConsStringTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ConsStringTest.java
@@ -26,11 +26,7 @@
package jdk.nashorn.internal.runtime;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
import org.testng.annotations.Test;
/**
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java
index c487ca8..8225cc0 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java
@@ -35,6 +35,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import javax.script.SimpleScriptContext;
+import jdk.nashorn.api.scripting.ClassFilter;
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
import org.testng.annotations.Test;
@@ -220,8 +221,98 @@
assertTrue(e.eval("typeof bar").equals("function"));
}
+ @Test
+ public void classFilterTest() throws ScriptException {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ final ScriptEngine e = fac.getScriptEngine(new ClassFilter() {
+ @Override
+ public boolean exposeToScripts(final String fullName) {
+ // don't allow anything that is not "java."
+ return fullName.startsWith("java.");
+ }
+ });
- @Test public void nashornSwallowsConstKeyword() throws Exception {
+ assertEquals(e.eval("typeof javax.script.ScriptEngine"), "object");
+ assertEquals(e.eval("typeof java.util.Vector"), "function");
+
+ try {
+ e.eval("Java.type('javax.script.ScriptContext')");
+ fail("should not reach here");
+ } catch (final ScriptException | RuntimeException se) {
+ if (! (se.getCause() instanceof ClassNotFoundException)) {
+ fail("ClassNotFoundException expected");
+ }
+ }
+ }
+
+ @Test
+ public void classFilterTest2() throws ScriptException {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ final ScriptEngine e = fac.getScriptEngine(new String[0], Thread.currentThread().getContextClassLoader(),
+ new ClassFilter() {
+ @Override
+ public boolean exposeToScripts(final String fullName) {
+ // don't allow anything that is not "java."
+ return fullName.startsWith("java.");
+ }
+ });
+
+ assertEquals(e.eval("typeof javax.script.ScriptEngine"), "object");
+ assertEquals(e.eval("typeof java.util.Vector"), "function");
+
+ try {
+ e.eval("Java.type('javax.script.ScriptContext')");
+ fail("should not reach here");
+ } catch (final ScriptException | RuntimeException se) {
+ if (! (se.getCause() instanceof ClassNotFoundException)) {
+ fail("ClassNotFoundException expected");
+ }
+ }
+ }
+
+ @Test
+ public void nullClassFilterTest() {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ try {
+ fac.getScriptEngine((ClassFilter)null);
+ fail("should have thrown NPE");
+ } catch (NullPointerException npe) {}
+ }
+
+ @Test
+ public void nullClassFilterTest2() {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ try {
+ fac.getScriptEngine(new String[0], null, null);
+ fail("should have thrown NPE");
+ } catch (NullPointerException npe) {}
+ }
+
+ @Test
+ public void nullArgsTest() {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ try {
+ fac.getScriptEngine((String[])null);
+ fail("should have thrown NPE");
+ } catch (NullPointerException npe) {}
+ }
+
+ @Test
+ public void nullArgsTest2() {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ try {
+ fac.getScriptEngine(null, null, new ClassFilter() {
+ @Override
+ public boolean exposeToScripts(final String name) {
+ return true;
+ }
+ });
+ fail("should have thrown NPE");
+ } catch (NullPointerException npe) {}
+ }
+
+ @Test
+ public void nashornSwallowsConstKeyword() throws Exception {
final NashornScriptEngineFactory f = new NashornScriptEngineFactory();
final String[] args = new String[] { "--const-as-var" };
final ScriptEngine engine = f.getScriptEngine(args);
