--- a/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -196,3 +196,5 @@
6725b3961f987cf40f446d1c11cd324a3bec545f jdk8-b72
fe94b40ffd9390f6cffcdf51c0389b0e6dde0c13 jdk8-b73
f627eff819628822a0777af8062244352f2a29cf jdk8-b74
+f1478a6d25fddd311a84dcbfac50824cc1858bdd jdk8-b75
+f407160c280d1c5b00d314c535441ac26f195fee jdk8-b76
--- a/.hgtags-top-repo Tue Feb 12 09:58:21 2013 -0800
+++ b/.hgtags-top-repo Wed Feb 13 13:01:16 2013 -0800
@@ -196,3 +196,5 @@
c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72
93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73
b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
+2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75
+278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76
--- a/common/autoconf/generated-configure.sh Tue Feb 12 09:58:21 2013 -0800
+++ b/common/autoconf/generated-configure.sh Wed Feb 13 13:01:16 2013 -0800
@@ -3723,7 +3723,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1359376859
+DATE_WHEN_GENERATED=1359971740
###############################################################################
#
@@ -10778,7 +10778,8 @@
as_fn_error $? "Milestone must have a value" "$LINENO" 5
elif test "x$with_milestone" != x; then
MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
MILESTONE=internal
fi
@@ -29247,6 +29248,12 @@
fi
+# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
+# this doesn't make sense so we remove it.
+if test "x$COMPILE_TYPE" = xcross; then
+ X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'`
+fi
+
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
# Print a helpful message on how to acquire the necessary build dependency.
--- a/common/autoconf/spec.gmk.in Tue Feb 12 09:58:21 2013 -0800
+++ b/common/autoconf/spec.gmk.in Wed Feb 13 13:01:16 2013 -0800
@@ -434,6 +434,12 @@
JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner
+# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
+BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR)
+NEW_JAVAC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main
+NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main
+
# Base flags for RC
# Guarding this against resetting value. Legacy make files include spec multiple
# times.
--- a/common/makefiles/IdlCompilation.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/common/makefiles/IdlCompilation.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -71,7 +71,7 @@
$4
$(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
$(CP) -rp $3/$$($4_TMPDIR)/* $3
- ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5)
+ ($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5)
$(RM) -rf $3/$$($4_TMPDIR)
endef
--- a/common/makefiles/JavaCompilation.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/common/makefiles/JavaCompilation.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -42,8 +42,8 @@
FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
define SetupJavaCompiler
- # param 1 is for example BOOT_JAVAC or NEW_JAVAC
- # This is the name later used to decide which java compiler to use.
+ # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
+ # This is the name of the compiler setup.
# param 2-9 are named args.
# JVM:=The jvm used to run the javac/javah command
# JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
@@ -143,8 +143,8 @@
ifneq (,$2)
$1_DEPS:=$2
else
- $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\
- $$(call CacheFind $$($1_SRCS)))
+ $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)),\
+ $$(call CacheFind,$$($1_SRCS)))
ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
$1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
endif
@@ -487,10 +487,10 @@
# Using sjavac to compile.
$1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
- # Create SJAVAC variable,
- # expects $1_JAVAC to be "bootclasspathprepend -jar ...javac.jar"
- # and it is rewritten into "bootclasspathprepend com.sun.tools.sjavac.Main"
- $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main
+ # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
+ # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
+ # and javac is simply replaced with sjavac.
+ $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
# Set the $1_REMOTE to spawn a background javac server.
$1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
--- a/common/makefiles/Jprt.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/common/makefiles/Jprt.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -179,27 +179,52 @@
$(JPRT_ARCHIVE_BUNDLE): bundles
$(MKDIR) -p $(@D)
$(RM) $@
- $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@
+ $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
-# This target must be called in the context of a SPEC file
-bundles: all
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
+ SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR)
+ SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR)
+else
+ SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
+ SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
+endif
+SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
+SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
+
+# Bundle up the images
+bundles: all bundles-only
+bundles-only: start-make
@$(call TargetEnter)
$(MKDIR) -p $(BUILD_OUTPUT)/bundles
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
- $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
- $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
-else
- $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
- $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
+ $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
+ $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
$(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
fi
+ @$(call TargetExit)
+
+# Copy images to one unified location regardless of platform etc.
+final-images: all final-images-only
+final-images-only: start-make
+ @$(call TargetEnter)
+ $(RM) -r $(BUILD_OUTPUT)/final-images
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
+ $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
+ $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
+ifeq ($(OPENJDK_TARGET_OS),macosx)
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
+ $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
+ $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
endif
@$(call TargetExit)
+
# Keep track of phony targets
PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
- jprt_build_generic bundles jprt_bundle
+ jprt_build_generic bundles jprt_bundle \
+ final-images final-images-only
###########################################################################
# Phony targets
--- a/common/makefiles/Main.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/common/makefiles/Main.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -75,7 +75,14 @@
all: overlay-images
endif
-start-make:
+# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
+# is up to date after changes to configure
+$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
+ @$(ECHO) ERROR: $(SPEC) is not up to date
+ @$(ECHO) Please rerun configure!
+ @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
+
+start-make: $(SPEC)
@$(call AtMakeStart)
langtools: langtools-only
--- a/common/makefiles/javadoc/Javadoc.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/common/makefiles/javadoc/Javadoc.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -46,14 +46,11 @@
BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-BOOT_JAVA_CMD=$(JAVA)
-
-JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
-JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+JAVADOC_CMD = $(JAVA) \
-Xmx1024m \
-Djava.awt.headless=true \
- "-Xbootclasspath/p:$(JAVADOC_JAR)" \
- -jar $(JAVADOC_JAR) -bootclasspath $(JDK_OUTPUTDIR)/classes
+ $(NEW_JAVADOC) \
+ -bootclasspath $(JDK_OUTPUTDIR)/classes
# Copyright year for beginning of Java and some of the apis
# (Needed when creating the javadocs)
--- a/corba/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/corba/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -196,3 +196,5 @@
cb40427f47145b01b7e53c3e02b38ff7625efbda jdk8-b72
191afde59e7be0e1a1d76d06f2a32ff17444f0ec jdk8-b73
2132845cf5f717ff5c240a2431c0c0e03e66e3a5 jdk8-b74
+d4e68ce17795601017ac2f952baad7272942c36e jdk8-b75
+58be6ca3c0603882a1ec478724e337aac85e0da0 jdk8-b76
--- a/corba/makefiles/BuildCorba.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/corba/makefiles/BuildCorba.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -35,8 +35,6 @@
include JavaCompilation.gmk
include IdlCompilation.gmk
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
# The Corba sources are old and generates a LOT of warnings.
# Disable these using Xlint, until someone cares to fix them.
DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
@@ -46,7 +44,7 @@
# Thus we force the target bytecode to the boot jdk bytecode.
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -56,7 +54,7 @@
# cannot necessarily be run with the boot jdk.
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
--- a/hotspot/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -311,3 +311,6 @@
70c89bd6b895a10d25ca70e08093c09ff2005fda hs25-b16
1a3e54283c54aaa8b3437813e8507fbdc966e5b6 jdk8-b74
b4391649e91ea8d37f66317a03d6d2573a93d10d hs25-b17
+6778d0b1659323a506ca47600ca29a9d9f8b383d jdk8-b75
+20b605466ccb1b3725eb25314d9e8782199630c5 jdk8-b76
+412d722168bc23f8e6d98995202728678561417f hs25-b18
--- a/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c Wed Feb 13 13:01:16 2013 -0800
@@ -280,7 +280,7 @@
return (err == PS_OK)? array : 0;
}
-#if defined(i386) || defined(ia64) || defined(amd64) || defined(sparc) || defined(sparcv9)
+#if defined(i386) || defined(amd64) || defined(sparc) || defined(sparcv9)
JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLocal_getThreadIntegerRegisterSet0
(JNIEnv *env, jobject this_obj, jint lwp_id) {
@@ -299,9 +299,6 @@
#ifdef i386
#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
#endif
-#ifdef ia64
-#define NPRGREG IA64_REG_COUNT
-#endif
#ifdef amd64
#define NPRGREG sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_NPRGREG
#endif
@@ -336,13 +333,6 @@
#endif /* i386 */
-#if ia64
- regs = (*env)->GetLongArrayElements(env, array, &isCopy);
- for (i = 0; i < NPRGREG; i++ ) {
- regs[i] = 0xDEADDEAD;
- }
-#endif /* ia64 */
-
#ifdef amd64
#define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg
--- a/hotspot/agent/src/os/linux/libproc.h Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/os/linux/libproc.h Wed Feb 13 13:01:16 2013 -0800
@@ -79,14 +79,6 @@
*************************************************************************************/
-#ifdef ia64
-struct user_regs_struct {
-/* copied from user.h which doesn't define this in a struct */
-
-#define IA64_REG_COUNT (EF_SIZE/8+32) /* integer and fp regs */
-unsigned long regs[IA64_REG_COUNT]; /* integer and fp regs */
-};
-#endif
#if defined(sparc) || defined(sparcv9)
#define user_regs_struct pt_regs
--- a/hotspot/agent/src/os/win32/windbg/sawindbg.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/os/win32/windbg/sawindbg.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -27,10 +27,7 @@
#include "sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal.h"
-#ifdef _M_IA64
- #include "sun_jvm_hotspot_debugger_ia64_IA64ThreadContext.h"
- #define NPRGREG sun_jvm_hotspot_debugger_ia64_IA64ThreadContext_NPRGREG
-#elif _M_IX86
+#ifdef _M_IX86
#include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h"
#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
#elif _M_AMD64
@@ -491,92 +488,7 @@
memset(&context, 0, sizeof(CONTEXT));
#undef REG_INDEX
-#ifdef _M_IA64
- #define REG_INDEX(x) sun_jvm_hotspot_debugger_ia64_IA64ThreadContext_##x
-
- context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG;
- ptrIDebugAdvanced->GetThreadContext(&context, sizeof(CONTEXT));
-
- ptrRegs[REG_INDEX(GR0)] = 0; // always 0
- ptrRegs[REG_INDEX(GR1)] = context.IntGp; // r1
- ptrRegs[REG_INDEX(GR2)] = context.IntT0; // r2-r3
- ptrRegs[REG_INDEX(GR3)] = context.IntT1;
- ptrRegs[REG_INDEX(GR4)] = context.IntS0; // r4-r7
- ptrRegs[REG_INDEX(GR5)] = context.IntS1;
- ptrRegs[REG_INDEX(GR6)] = context.IntS2;
- ptrRegs[REG_INDEX(GR7)] = context.IntS3;
- ptrRegs[REG_INDEX(GR8)] = context.IntV0; // r8
- ptrRegs[REG_INDEX(GR9)] = context.IntT2; // r9-r11
- ptrRegs[REG_INDEX(GR10)] = context.IntT3;
- ptrRegs[REG_INDEX(GR11)] = context.IntT4;
- ptrRegs[REG_INDEX(GR12)] = context.IntSp; // r12 stack pointer
- ptrRegs[REG_INDEX(GR13)] = context.IntTeb; // r13 teb
- ptrRegs[REG_INDEX(GR14)] = context.IntT5; // r14-r31
- ptrRegs[REG_INDEX(GR15)] = context.IntT6;
- ptrRegs[REG_INDEX(GR16)] = context.IntT7;
- ptrRegs[REG_INDEX(GR17)] = context.IntT8;
- ptrRegs[REG_INDEX(GR18)] = context.IntT9;
- ptrRegs[REG_INDEX(GR19)] = context.IntT10;
- ptrRegs[REG_INDEX(GR20)] = context.IntT11;
- ptrRegs[REG_INDEX(GR21)] = context.IntT12;
- ptrRegs[REG_INDEX(GR22)] = context.IntT13;
- ptrRegs[REG_INDEX(GR23)] = context.IntT14;
- ptrRegs[REG_INDEX(GR24)] = context.IntT15;
- ptrRegs[REG_INDEX(GR25)] = context.IntT16;
- ptrRegs[REG_INDEX(GR26)] = context.IntT17;
- ptrRegs[REG_INDEX(GR27)] = context.IntT18;
- ptrRegs[REG_INDEX(GR28)] = context.IntT19;
- ptrRegs[REG_INDEX(GR29)] = context.IntT20;
- ptrRegs[REG_INDEX(GR30)] = context.IntT21;
- ptrRegs[REG_INDEX(GR31)] = context.IntT22;
-
- ptrRegs[REG_INDEX(INT_NATS)] = context.IntNats;
- ptrRegs[REG_INDEX(PREDS)] = context.Preds;
-
- ptrRegs[REG_INDEX(BR_RP)] = context.BrRp;
- ptrRegs[REG_INDEX(BR1)] = context.BrS0; // b1-b5
- ptrRegs[REG_INDEX(BR2)] = context.BrS1;
- ptrRegs[REG_INDEX(BR3)] = context.BrS2;
- ptrRegs[REG_INDEX(BR4)] = context.BrS3;
- ptrRegs[REG_INDEX(BR5)] = context.BrS4;
- ptrRegs[REG_INDEX(BR6)] = context.BrT0; // b6-b7
- ptrRegs[REG_INDEX(BR7)] = context.BrT1;
-
- ptrRegs[REG_INDEX(AP_UNAT)] = context.ApUNAT;
- ptrRegs[REG_INDEX(AP_LC)] = context.ApLC;
- ptrRegs[REG_INDEX(AP_EC)] = context.ApEC;
- ptrRegs[REG_INDEX(AP_CCV)] = context.ApCCV;
- ptrRegs[REG_INDEX(AP_DCR)] = context.ApDCR;
-
- ptrRegs[REG_INDEX(RS_PFS)] = context.RsPFS;
- ptrRegs[REG_INDEX(RS_BSP)] = context.RsBSP;
- ptrRegs[REG_INDEX(RS_BSPSTORE)] = context.RsBSPSTORE;
- ptrRegs[REG_INDEX(RS_RSC)] = context.RsRSC;
- ptrRegs[REG_INDEX(RS_RNAT)] = context.RsRNAT;
-
- ptrRegs[REG_INDEX(ST_IPSR)] = context.StIPSR;
- ptrRegs[REG_INDEX(ST_IIP)] = context.StIIP;
- ptrRegs[REG_INDEX(ST_IFS)] = context.StIFS;
-
- ptrRegs[REG_INDEX(DB_I0)] = context.DbI0;
- ptrRegs[REG_INDEX(DB_I1)] = context.DbI1;
- ptrRegs[REG_INDEX(DB_I2)] = context.DbI2;
- ptrRegs[REG_INDEX(DB_I3)] = context.DbI3;
- ptrRegs[REG_INDEX(DB_I4)] = context.DbI4;
- ptrRegs[REG_INDEX(DB_I5)] = context.DbI5;
- ptrRegs[REG_INDEX(DB_I6)] = context.DbI6;
- ptrRegs[REG_INDEX(DB_I7)] = context.DbI7;
-
- ptrRegs[REG_INDEX(DB_D0)] = context.DbD0;
- ptrRegs[REG_INDEX(DB_D1)] = context.DbD1;
- ptrRegs[REG_INDEX(DB_D2)] = context.DbD2;
- ptrRegs[REG_INDEX(DB_D3)] = context.DbD3;
- ptrRegs[REG_INDEX(DB_D4)] = context.DbD4;
- ptrRegs[REG_INDEX(DB_D5)] = context.DbD5;
- ptrRegs[REG_INDEX(DB_D6)] = context.DbD6;
- ptrRegs[REG_INDEX(DB_D7)] = context.DbD7;
-
-#elif _M_IX86
+#ifdef _M_IX86
#define REG_INDEX(x) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##x
context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -34,21 +34,11 @@
private boolean gotID;
private long id;
- /** The address argument must be the address of the HANDLE of the
- desired thread in the target process. */
+ // The address argument must be the address of the OSThread::_thread_id
WindbgAMD64Thread(WindbgDebugger debugger, Address addr) {
this.debugger = debugger;
- // FIXME: size of data fetched here should be configurable.
- // However, making it so would produce a dependency on the "types"
- // package from the debugger package, which is not desired.
-
- // another hack here is that we use sys thread id instead of handle.
- // windbg can't get details based on handles it seems.
- // I assume that osThread_win32 thread struct has _thread_id (which
- // sys thread id) just after handle field.
-
- this.sysId = (int) addr.addOffsetTo(debugger.getAddressSize()).getCIntegerAt(0, 4, true);
- gotID = false;
+ this.sysId = (long)addr.getCIntegerAt(0, 4, true);
+ gotID = false;
}
WindbgAMD64Thread(WindbgDebugger debugger, long sysId) {
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -34,21 +34,11 @@
private boolean gotID;
private long id;
- /** The address argument must be the address of the HANDLE of the
- desired thread in the target process. */
+ // The address argument must be the address of OSThread::_thread_id
WindbgX86Thread(WindbgDebugger debugger, Address addr) {
this.debugger = debugger;
- // FIXME: size of data fetched here should be configurable.
- // However, making it so would produce a dependency on the "types"
- // package from the debugger package, which is not desired.
-
- // another hack here is that we use sys thread id instead of handle.
- // windbg can't get details based on handles it seems.
- // I assume that osThread_win32 thread struct has _thread_id (which
- // sys thread id) just after handle field.
-
- this.sysId = (int) addr.addOffsetTo(debugger.getAddressSize()).getCIntegerAt(0, 4, true);
- gotID = false;
+ this.sysId = (long)addr.getCIntegerAt(0, 4, true);
+ gotID = false;
}
WindbgX86Thread(WindbgDebugger debugger, long sysId) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/AFLBinaryTreeDictionary.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,59 @@
+/*
+ * @(#)BinaryTreeDictionary.java
+ * Copyright (c) 2000, 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.
+ *
+ */
+
+package sun.jvm.hotspot.memory;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.runtime.*;
+
+public class AFLBinaryTreeDictionary extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("AFLBinaryTreeDictionary");
+ totalSizeField = type.getCIntegerField("_total_size");
+ }
+
+ // Fields
+ private static CIntegerField totalSizeField;
+
+ // Accessors
+ public long size() {
+ return totalSizeField.getValue(addr);
+ }
+
+ // Constructor
+ public AFLBinaryTreeDictionary(Address addr) {
+ super(addr);
+ }
+}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * @(#)BinaryTreeDictionary.java
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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.
- *
- */
-
-package sun.jvm.hotspot.memory;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.runtime.*;
-
-public class BinaryTreeDictionary extends VMObject {
- static {
- VM.registerVMInitializedObserver(new Observer() {
- public void update(Observable o, Object data) {
- initialize(VM.getVM().getTypeDataBase());
- }
- });
- }
-
- private static synchronized void initialize(TypeDataBase db) {
- Type type = db.lookupType("BinaryTreeDictionary");
- totalSizeField = type.getCIntegerField("_totalSize");
- }
-
- // Fields
- private static CIntegerField totalSizeField;
-
- // Accessors
- public long size() {
- return totalSizeField.getValue(addr);
- }
-
- // Constructor
- public BinaryTreeDictionary(Address addr) {
- super(addr);
- }
-}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -117,9 +117,9 @@
}
// large block
- BinaryTreeDictionary bfbd = (BinaryTreeDictionary) VMObjectFactory.newObject(BinaryTreeDictionary.class,
+ AFLBinaryTreeDictionary aflbd = (AFLBinaryTreeDictionary) VMObjectFactory.newObject(AFLBinaryTreeDictionary.class,
dictionaryField.getValue(addr));
- size += bfbd.size();
+ size += aflbd.size();
// linear block in TLAB
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,7 +1,7 @@
/*
* @(#)FreeList.java
*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -41,7 +41,7 @@
}
private static synchronized void initialize(TypeDataBase db) {
- Type type = db.lookupType("FreeList");
+ Type type = db.lookupType("FreeList<FreeChunk>");
sizeField = type.getCIntegerField("_size");
countField = type.getCIntegerField("_count");
headerSize = type.getSize();
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java Wed Feb 13 13:01:16 2013 -0800
@@ -467,7 +467,7 @@
liveRegions.add(tlab.start());
liveRegions.add(tlab.start());
liveRegions.add(tlab.top());
- liveRegions.add(tlab.end());
+ liveRegions.add(tlab.hardEnd());
}
}
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -32,6 +32,7 @@
// to the sys_thread_t structure of the classic JVM implementation.
public class OSThread extends VMObject {
private static JIntField interruptedField;
+ private static JIntField threadIdField;
static {
VM.registerVMInitializedObserver(new Observer() {
public void update(Observable o, Object data) {
@@ -43,6 +44,7 @@
private static synchronized void initialize(TypeDataBase db) {
Type type = db.lookupType("OSThread");
interruptedField = type.getJIntField("_interrupted");
+ threadIdField = type.getJIntField("_thread_id");
}
public OSThread(Address addr) {
@@ -52,4 +54,9 @@
public boolean interrupted() {
return ((int)interruptedField.getValue(addr)) != 0;
}
+
+ public int threadId() {
+ return (int)threadIdField.getValue(addr);
+ }
+
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java Wed Feb 13 13:01:16 2013 -0800
@@ -27,6 +27,7 @@
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.types.*;
/** <P> ThreadLocalAllocBuffer: a descriptor for thread-local storage
@@ -62,9 +63,22 @@
super(addr);
}
- public Address start() { return startField.getValue(addr); }
- public Address end() { return endField.getValue(addr); }
- public Address top() { return topField.getValue(addr); }
+ public Address start() { return startField.getValue(addr); }
+ public Address end() { return endField.getValue(addr); }
+ public Address top() { return topField.getValue(addr); }
+ public Address hardEnd() { return end().addOffsetTo(alignmentReserve()); }
+
+ private long alignmentReserve() {
+ return Oop.alignObjectSize(endReserve());
+ }
+
+ private long endReserve() {
+ long minFillerArraySize = Array.baseOffsetInBytes(BasicType.T_INT);
+ long reserveForAllocationPrefetch = VM.getVM().getReserveForAllocationPrefetch();
+ long heapWordSize = VM.getVM().getHeapWordSize();
+
+ return Math.max(minFillerArraySize, reserveForAllocationPrefetch * heapWordSize);
+ }
/** Support for iteration over heap -- not sure how this will
interact with GC in reflective system, but necessary for the
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Wed Feb 13 13:01:16 2013 -0800
@@ -114,6 +114,7 @@
private int invalidOSREntryBCI;
private ReversePtrs revPtrs;
private VMRegImpl vmregImpl;
+ private int reserveForAllocationPrefetch;
// System.getProperties from debuggee VM
private Properties sysProps;
@@ -293,6 +294,10 @@
vmRelease = CStringUtilities.getString(releaseAddr);
Address vmInternalInfoAddr = vmVersion.getAddressField("_s_internal_vm_info_string").getValue();
vmInternalInfo = CStringUtilities.getString(vmInternalInfoAddr);
+
+ CIntegerType intType = (CIntegerType) db.lookupType("int");
+ CIntegerField reserveForAllocationPrefetchField = vmVersion.getCIntegerField("_reserve_for_allocation_prefetch");
+ reserveForAllocationPrefetch = (int)reserveForAllocationPrefetchField.getCInteger(intType);
} catch (Exception exp) {
throw new RuntimeException("can't determine target's VM version : " + exp.getMessage());
}
@@ -778,6 +783,10 @@
return vmInternalInfo;
}
+ public int getReserveForAllocationPrefetch() {
+ return reserveForAllocationPrefetch;
+ }
+
public boolean isSharingEnabled() {
if (sharingEnabled == null) {
Flag flag = getCommandLineFlag("UseSharedSpaces");
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -43,7 +43,7 @@
private static AddressField osThreadField;
// Field from OSThread
- private static Field osThreadThreadHandleField;
+ private static Field osThreadThreadIdField;
// This is currently unneeded but is being kept in case we change
// the currentFrameGuess algorithm
@@ -64,7 +64,7 @@
osThreadField = type.getAddressField("_osthread");
type = db.lookupType("OSThread");
- osThreadThreadHandleField = type.getField("_thread_handle");
+ osThreadThreadIdField = type.getField("_thread_id");
}
public Address getLastJavaFP(Address addr) {
@@ -128,10 +128,10 @@
// Fetch the OSThread (for now and for simplicity, not making a
// separate "OSThread" class in this package)
Address osThreadAddr = osThreadField.getValue(addr);
- // Get the address of the HANDLE within the OSThread
- Address threadHandleAddr =
- osThreadAddr.addOffsetTo(osThreadThreadHandleField.getOffset());
+ // Get the address of the thread_id within the OSThread
+ Address threadIdAddr =
+ osThreadAddr.addOffsetTo(osThreadThreadIdField.getOffset());
JVMDebugger debugger = VM.getVM().getDebugger();
- return debugger.getThreadForIdentifierAddress(threadHandleAddr);
+ return debugger.getThreadForIdentifierAddress(threadIdAddr);
}
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -42,7 +42,7 @@
private static AddressField osThreadField;
// Field from OSThread
- private static Field osThreadThreadHandleField;
+ private static Field osThreadThreadIdField;
// This is currently unneeded but is being kept in case we change
// the currentFrameGuess algorithm
@@ -63,7 +63,7 @@
osThreadField = type.getAddressField("_osthread");
type = db.lookupType("OSThread");
- osThreadThreadHandleField = type.getField("_thread_handle");
+ osThreadThreadIdField = type.getField("_thread_id");
}
public Address getLastJavaFP(Address addr) {
@@ -127,10 +127,10 @@
// Fetch the OSThread (for now and for simplicity, not making a
// separate "OSThread" class in this package)
Address osThreadAddr = osThreadField.getValue(addr);
- // Get the address of the HANDLE within the OSThread
- Address threadHandleAddr =
- osThreadAddr.addOffsetTo(osThreadThreadHandleField.getOffset());
+ // Get the address of the thread_id within the OSThread
+ Address threadIdAddr =
+ osThreadAddr.addOffsetTo(osThreadThreadIdField.getOffset());
JVMDebugger debugger = VM.getVM().getDebugger();
- return debugger.getThreadForIdentifierAddress(threadHandleAddr);
+ return debugger.getThreadForIdentifierAddress(threadIdAddr);
}
}
--- a/hotspot/make/Makefile Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/Makefile Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -87,7 +87,6 @@
# Typical C1/C2 targets made available with this Makefile
C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
C2_VM_TARGETS=product fastdebug optimized jvmg
-KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1
@@ -161,11 +160,6 @@
$(CD) $(GAMMADIR)/make; \
$(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
-$(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) BUILD_FLAVOR=$(@:%kernel=%) VM_TARGET=$@ \
- generic_buildkernel $(ALT_OUT)
-
$(ZERO_VM_TARGETS):
$(CD) $(GAMMADIR)/make; \
$(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
@@ -223,24 +217,6 @@
$(MAKE_ARGS) $(VM_TARGET)
endif
-generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
-ifeq ($(OSNAME),windows)
- ifeq ($(ARCH_DATA_MODEL), 32)
- $(CD) $(OUTPUTDIR); \
- $(NMAKE) -f $(ABS_OS_MAKEFILE) \
- Variant=kernel \
- WorkSpace=$(ABS_GAMMADIR) \
- BootStrapDir=$(ABS_BOOTDIR) \
- BuildUser=$(USERNAME) \
- $(MAKE_ARGS) $(VM_TARGET:%kernel=%)
- else
- @$(ECHO) "No kernel ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
- endif
-else
- @$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
-endif
-
generic_buildzero:
$(MKDIR) -p $(OUTPUTDIR)
$(CD) $(OUTPUTDIR); \
@@ -314,12 +290,10 @@
DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
-KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
MINIMAL1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
@@ -333,10 +307,6 @@
MISC_DIR=$(C1_DIR)
GEN_DIR=$(C1_BASE_DIR)/generated
endif
-ifeq ($(JVM_VARIANT_KERNEL), true)
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
-endif
ifeq ($(JVM_VARIANT_ZEROSHARK), true)
MISC_DIR=$(SHARK_DIR)
GEN_DIR=$(SHARK_BASE_DIR)/generated
@@ -386,16 +356,6 @@
$(install-file)
$(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map
$(install-file)
-
-# Kernel files always come from kernel area
-$(EXPORT_KERNEL_DIR)/%.diz: $(KERNEL_DIR)/%.diz
- $(install-file)
-$(EXPORT_KERNEL_DIR)/%.dll: $(KERNEL_DIR)/%.dll
- $(install-file)
-$(EXPORT_KERNEL_DIR)/%.pdb: $(KERNEL_DIR)/%.pdb
- $(install-file)
-$(EXPORT_KERNEL_DIR)/%.map: $(KERNEL_DIR)/%.map
- $(install-file)
endif
# Minimal JVM files always come from minimal area
@@ -538,7 +498,7 @@
$(install-file)
# Xusage file
-$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt $(EXPORT_MINIMAL_DIR)/Xusage.txt: $(XUSAGE)
+$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_MINIMAL_DIR)/Xusage.txt: $(XUSAGE)
$(prep-target)
$(RM) $@.temp
$(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
@@ -551,7 +511,6 @@
clean_build:
$(RM) -r $(C1_DIR)
$(RM) -r $(C2_DIR)
- $(RM) -r $(KERNEL_DIR)
$(RM) -r $(ZERO_DIR)
$(RM) -r $(SHARK_DIR)
$(RM) -r $(MINIMAL1_DIR)
@@ -586,10 +545,6 @@
$(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
$(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
endif
- ifeq ($(JVM_VARIANT_KERNEL), true)
- $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
- $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
- endif
copy_product_jdk::
$(RM) -r $(JDK_IMAGE_DIR)
@@ -665,7 +620,6 @@
@$(ECHO) "Other targets are:"
@$(ECHO) " $(C1_VM_TARGETS)"
@$(ECHO) " $(C2_VM_TARGETS)"
- @$(ECHO) " $(KERNEL_VM_TARGETS)"
@$(ECHO) " $(MINIMAL1_VM_TARGETS)"
# Variable help (only common ones used by this workspace)
@@ -761,8 +715,8 @@
include $(GAMMADIR)/make/jprt.gmk
.PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \
- $(KERNEL_VM_TARGETS) $(MINIMAL1_VM_TARGETS) \
- generic_build1 generic_build2 generic_buildkernel generic_buildminimal1 generic_export \
+ $(MINIMAL1_VM_TARGETS) \
+ generic_build1 generic_build2 generic_buildminimal1 generic_export \
export_product export_fastdebug export_debug export_optimized \
export_jdk_product export_jdk_fastdebug export_jdk_debug \
create_jdk copy_jdk update_jdk test_jdk \
--- a/hotspot/make/bsd/makefiles/dtrace.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/bsd/makefiles/dtrace.make Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -25,10 +25,9 @@
# Rules to build jvm_db/dtrace, used by vm.make
# We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
-# but not for CORE or KERNEL configurations.
+# but not for CORE configuration.
ifneq ("${TYPE}", "CORE")
-ifneq ("${TYPE}", "KERNEL")
ifeq ($(OS_VENDOR), Darwin)
# we build dtrace for macosx using USDT2 probes
@@ -280,13 +279,6 @@
endif # ifeq ($(OS_VENDOR), Darwin)
-else # KERNEL build
-
-dtraceCheck:
- $(QUIETLY) echo "**NOTICE** Dtrace support disabled for KERNEL builds"
-
-endif # ifneq ("${TYPE}", "KERNEL")
-
else # CORE build
dtraceCheck:
--- a/hotspot/make/bsd/makefiles/mapfile-vers-debug Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-debug Wed Feb 13 13:01:16 2013 -0800
@@ -188,6 +188,7 @@
JVM_IsSilentCompiler;
JVM_IsSupportedJNIVersion;
JVM_IsThreadAlive;
+ JVM_IsVMGeneratedMethodIx;
JVM_LatestUserDefinedLoader;
JVM_Listen;
JVM_LoadClass0;
--- a/hotspot/make/bsd/makefiles/mapfile-vers-product Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-product Wed Feb 13 13:01:16 2013 -0800
@@ -188,6 +188,7 @@
JVM_IsSilentCompiler;
JVM_IsSupportedJNIVersion;
JVM_IsThreadAlive;
+ JVM_IsVMGeneratedMethodIx;
JVM_LatestUserDefinedLoader;
JVM_Listen;
JVM_LoadClass0;
--- a/hotspot/make/bsd/makefiles/minimal1.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/bsd/makefiles/minimal1.make Wed Feb 13 13:01:16 2013 -0800
@@ -30,7 +30,7 @@
INCLUDE_JNI_CHECK ?= false
INCLUDE_SERVICES ?= false
INCLUDE_MANAGEMENT ?= false
-INCLUDE_ALTERNATE_GCS ?= false
+INCLUDE_ALL_GCS ?= false
INCLUDE_NMT ?= false
INCLUDE_CDS ?= false
--- a/hotspot/make/excludeSrc.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/excludeSrc.make Wed Feb 13 13:01:16 2013 -0800
@@ -72,12 +72,10 @@
Src_Files_EXCLUDE += metaspaceShared.cpp
endif
-ifeq ($(INCLUDE_ALTERNATE_GCS), false)
- CXXFLAGS += -DINCLUDE_ALTERNATE_GCS=0
- CFLAGS += -DINCLUDE_ALTERNATE_GCS=0
+ifeq ($(INCLUDE_ALL_GCS), false)
+ CXXFLAGS += -DINCLUDE_ALL_GCS=0
+ CFLAGS += -DINCLUDE_ALL_GCS=0
- CXXFLAGS += -DSERIALGC
- CFLAGS += -DSERIALGC
Src_Files_EXCLUDE += \
cmsAdaptiveSizePolicy.cpp cmsCollectorPolicy.cpp \
cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp cmsPermGen.cpp compactibleFreeListSpace.cpp \
--- a/hotspot/make/hotspot_version Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/hotspot_version Wed Feb 13 13:01:16 2013 -0800
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=17
+HS_BUILD_NUMBER=18
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
--- a/hotspot/make/linux/makefiles/mapfile-vers-debug Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/linux/makefiles/mapfile-vers-debug Wed Feb 13 13:01:16 2013 -0800
@@ -184,6 +184,7 @@
JVM_IsSilentCompiler;
JVM_IsSupportedJNIVersion;
JVM_IsThreadAlive;
+ JVM_IsVMGeneratedMethodIx;
JVM_LatestUserDefinedLoader;
JVM_Listen;
JVM_LoadClass0;
--- a/hotspot/make/linux/makefiles/mapfile-vers-product Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/linux/makefiles/mapfile-vers-product Wed Feb 13 13:01:16 2013 -0800
@@ -184,6 +184,7 @@
JVM_IsSilentCompiler;
JVM_IsSupportedJNIVersion;
JVM_IsThreadAlive;
+ JVM_IsVMGeneratedMethodIx;
JVM_LatestUserDefinedLoader;
JVM_Listen;
JVM_LoadClass0;
--- a/hotspot/make/linux/makefiles/minimal1.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/linux/makefiles/minimal1.make Wed Feb 13 13:01:16 2013 -0800
@@ -30,7 +30,7 @@
INCLUDE_JNI_CHECK ?= false
INCLUDE_SERVICES ?= false
INCLUDE_MANAGEMENT ?= false
-INCLUDE_ALTERNATE_GCS ?= false
+INCLUDE_ALL_GCS ?= false
INCLUDE_NMT ?= false
INCLUDE_CDS ?= false
--- a/hotspot/make/solaris/Makefile Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/solaris/Makefile Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
@@ -157,13 +157,11 @@
SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
-SUBDIRS_KERNEL = $(addprefix $(OSNAME)_$(BUILDARCH)_kernel/,$(TARGETS))
TARGETS_C2 = $(TARGETS)
TARGETS_C1 = $(addsuffix 1,$(TARGETS))
TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
TARGETS_CORE = $(addsuffix core,$(TARGETS))
-TARGETS_KERNEL = $(addsuffix kernel,$(TARGETS))
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
@@ -229,10 +227,6 @@
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
$(BUILDTREE) VARIANT=core
-$(SUBDIRS_KERNEL): $(BUILDTREE_MAKE)
- $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
- $(BUILDTREE) VARIANT=kernel
-
# Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
$(TARGETS_C2): $(SUBDIRS_C2)
@@ -271,20 +265,10 @@
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
-$(TARGETS_KERNEL): $(SUBDIRS_KERNEL)
- cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS)
-ifeq ($(TEST_IN_BUILD),true)
- cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma
-endif
-ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
# Just build the tree, and nothing else:
tree: $(SUBDIRS_C2)
tree1: $(SUBDIRS_C1)
treecore: $(SUBDIRS_CORE)
-treekernel: $(SUBDIRS_KERNEL)
# Doc target. This is the same for all build options.
# Hence create a docs directory beside ...$(ARCH)_[...]
@@ -304,10 +288,10 @@
clean_docs:
rm -rf $(SUBDIR_DOCS)
-clean_compiler1 clean_compiler2 clean_core clean_kernel:
+clean_compiler1 clean_compiler2 clean_core:
rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
-clean: clean_compiler2 clean_compiler1 clean_core clean_docs clean_kernel
+clean: clean_compiler2 clean_compiler1 clean_core clean_docs
include $(GAMMADIR)/make/cscope.make
--- a/hotspot/make/solaris/makefiles/dtrace.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/solaris/makefiles/dtrace.make Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -25,10 +25,9 @@
# Rules to build jvm_db/dtrace, used by vm.make
# We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
-# but not for CORE or KERNEL configurations.
+# but not for CORE configuration.
ifneq ("${TYPE}", "CORE")
-ifneq ("${TYPE}", "KERNEL")
ifdef USE_GCC
@@ -362,13 +361,6 @@
endif # ifdef USE_GCC
-else # KERNEL build
-
-dtraceCheck:
- $(QUIETLY) echo "**NOTICE** Dtrace support disabled for KERNEL builds"
-
-endif # ifneq ("${TYPE}", "KERNEL")
-
else # CORE build
dtraceCheck:
--- a/hotspot/make/solaris/makefiles/kernel.make Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-#
-#
-# Sets make macros for making kernel version of VM.
-# This target on solaris is just tempoarily for debugging the kernel build.
-
-TYPE=KERNEL
-
-VM_SUBDIR = client
-
-CFLAGS += -DKERNEL
--- a/hotspot/make/solaris/makefiles/mapfile-vers Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/solaris/makefiles/mapfile-vers Wed Feb 13 13:01:16 2013 -0800
@@ -184,6 +184,7 @@
JVM_IsSilentCompiler;
JVM_IsSupportedJNIVersion;
JVM_IsThreadAlive;
+ JVM_IsVMGeneratedMethodIx;
JVM_LatestUserDefinedLoader;
JVM_Listen;
JVM_LoadClass0;
--- a/hotspot/make/windows/build.bat Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/windows/build.bat Wed Feb 13 13:01:16 2013 -0800
@@ -1,6 +1,6 @@
@echo off
REM
-REM Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
REM
REM This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,6 @@
:test1
if "%2" == "core" goto test2
-if "%2" == "kernel" goto test2
if "%2" == "compiler1" goto test2
if "%2" == "compiler2" goto test2
if "%2" == "tiered" goto test2
@@ -109,7 +108,7 @@
echo.
echo where:
echo flavor is "product", "debug" or "fastdebug",
-echo version is "core", "kernel", "compiler1", "compiler2", or "tiered",
+echo version is "core", "compiler1", "compiler2", or "tiered",
echo workspace is source directory without trailing slash,
echo bootstrap_dir is a full path to a JDK in which bin/java
echo and bin/javac are present and working, and build_id is an
--- a/hotspot/make/windows/create_obj_files.sh Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/windows/create_obj_files.sh Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -107,7 +107,6 @@
# Include dirs per type.
case "${TYPE}" in
"core") Src_Dirs="${CORE_PATHS}" ;;
- "kernel") Src_Dirs="${BASE_PATHS} ${COMPILER1_PATHS}" ;;
"compiler1") Src_Dirs="${CORE_PATHS} ${COMPILER1_PATHS}" ;;
"compiler2") Src_Dirs="${CORE_PATHS} ${COMPILER2_PATHS}" ;;
"tiered") Src_Dirs="${CORE_PATHS} ${COMPILER1_PATHS} ${COMPILER2_PATHS}" ;;
@@ -120,16 +119,12 @@
SHARK_SPECIFIC_FILES="shark"
ZERO_SPECIFIC_FILES="zero"
-# These files need to be excluded when building the kernel target.
-KERNEL_EXCLUDED_FILES="attachListener.cpp attachListener_windows.cpp metaspaceShared_${Platform_arch_model}.cpp forte.cpp fprofiler.cpp heapDumper.cpp heapInspection.cpp jniCheck.cpp jvmtiCodeBlobEvents.cpp jvmtiExtensions.cpp jvmtiImpl.cpp jvmtiRawMonitor.cpp jvmtiTagMap.cpp jvmtiTrace.cpp vmStructs.cpp g1MemoryPool.cpp psMemoryPool.cpp gcAdaptivePolicyCounters.cpp concurrentGCThread.cpp metaspaceShared.cpp mutableNUMASpace.cpp allocationStats.cpp gSpaceCounters.cpp immutableSpace.cpp mutableSpace.cpp spaceCounters.cpp yieldingWorkgroup.cpp"
-
# Always exclude these.
Src_Files_EXCLUDE="jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp"
# Exclude per type.
case "${TYPE}" in
"core") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
- "kernel") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ${KERNEL_EXCLUDED_FILES} ciTypeFlow.cpp" ;;
"compiler1") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
"compiler2") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;;
"tiered") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;;
--- a/hotspot/make/windows/makefiles/defs.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/windows/makefiles/defs.make Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
@@ -157,7 +157,7 @@
MAKE_ARGS += RM="$(RM)"
MAKE_ARGS += ZIPEXE=$(ZIPEXE)
-# On 32 bit windows we build server, client and kernel, on 64 bit just server.
+# On 32 bit windows we build server and client, on 64 bit just server.
ifeq ($(JVM_VARIANTS),)
ifeq ($(ARCH_DATA_MODEL), 32)
JVM_VARIANTS:=client,server
@@ -250,7 +250,6 @@
EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
-EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
ifeq ($(JVM_VARIANT_SERVER),true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
@@ -277,18 +276,6 @@
endif
endif
endif
-ifeq ($(JVM_VARIANT_KERNEL),true)
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.diz
- else
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
- endif
- endif
-endif
EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
--- a/hotspot/make/windows/makefiles/projectcreator.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/windows/makefiles/projectcreator.make Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -167,63 +167,6 @@
$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=core)
##################################################
-# JKERNEL specific options
-##################################################
-ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
- -define_kernel KERNEL \
-$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=kernel) \
- -ignorePath_kernel src/share/vm/gc_implementation/parallelScavenge \
- -ignorePath_kernel src/share/vm/gc_implementation/parNew \
- -ignorePath_kernel src/share/vm/gc_implementation/concurrentMarkSweep \
- -ignorePath_kernel src/share/vm/gc_implementation/g1 \
- -ignoreFile_kernel attachListener.cpp \
- -ignoreFile_kernel attachListener_windows.cpp \
- -ignoreFile_kernel dump.cpp \
- -ignoreFile_kernel dump_$(Platform_arch_model).cpp \
- -ignoreFile_kernel forte.cpp \
- -ignoreFile_kernel fprofiler.cpp \
- -ignoreFile_kernel heapDumper.cpp \
- -ignoreFile_kernel heapInspection.cpp \
- -ignoreFile_kernel jniCheck.cpp \
- -ignoreFile_kernel jvmtiCodeBlobEvents.cpp \
- -ignoreFile_kernel jvmtiExtensions.cpp \
- -ignoreFile_kernel jvmtiImpl.cpp \
- -ignoreFile_kernel jvmtiRawMonitor.cpp \
- -ignoreFile_kernel jvmtiTagMap.cpp \
- -ignoreFile_kernel jvmtiTrace.cpp \
- -ignoreFile_kernel jvmtiTrace.hpp \
- -ignoreFile_kernel restore.cpp \
- -ignoreFile_kernel serialize.cpp \
- -ignoreFile_kernel vmStructs.cpp \
- -ignoreFile_kernel g1MemoryPool.cpp \
- -ignoreFile_kernel g1MemoryPool.hpp \
- -ignoreFile_kernel psMemoryPool.cpp \
- -ignoreFile_kernel psMemoryPool.hpp \
- -ignoreFile_kernel gcAdaptivePolicyCounters.cpp \
- -ignoreFile_kernel concurrentGCThread.cpp \
- -ignoreFile_kernel mutableNUMASpace.cpp \
- -ignoreFile_kernel ciTypeFlow.cpp \
- -ignoreFile_kernel ciTypeFlow.hpp \
- -ignoreFile_kernel oop.pcgc.inline.hpp \
- -ignoreFile_kernel oop.psgc.inline.hpp \
- -ignoreFile_kernel allocationStats.cpp \
- -ignoreFile_kernel allocationStats.hpp \
- -ignoreFile_kernel concurrentGCThread.hpp \
- -ignoreFile_kernel gSpaceCounters.cpp \
- -ignoreFile_kernel gSpaceCounters.hpp \
- -ignoreFile_kernel gcAdaptivePolicyCounters.hpp \
- -ignoreFile_kernel immutableSpace.cpp \
- -ignoreFile_kernel mutableNUMASpace.hpp \
- -ignoreFile_kernel mutableSpace.cpp \
- -ignoreFile_kernel spaceCounters.cpp \
- -ignoreFile_kernel spaceCounters.hpp \
- -ignoreFile_kernel yieldingWorkgroup.cpp \
- -ignoreFile_kernel yieldingWorkgroup.hpp \
- -ignorePath_kernel vmStructs_ \
- -ignoreFile_kernel $(Platform_arch_model).ad \
- -additionalFile_kernel gcTaskManager.hpp
-
-##################################################
# Client(C1) compiler specific options
##################################################
ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
--- a/hotspot/make/windows/makefiles/vm.make Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/make/windows/makefiles/vm.make Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -44,10 +44,6 @@
# No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2
!endif
-!if "$(Variant)" == "kernel"
-CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL"
-!endif
-
!if "$(Variant)" == "compiler1"
CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1"
!endif
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -30,10 +30,11 @@
#include "c1/c1_Runtime1.hpp"
#include "nativeInst_sparc.hpp"
#include "runtime/sharedRuntime.hpp"
+#include "utilities/macros.hpp"
#include "vmreg_sparc.inline.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#define __ ce->masm()->
@@ -420,7 +421,7 @@
///////////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
// At this point we know that marking is in progress.
@@ -483,7 +484,7 @@
__ delayed()->nop();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
///////////////////////////////////////////////////////////////////////////////////
#undef __
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -35,6 +35,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/vframeArray.hpp"
+#include "utilities/macros.hpp"
#include "vmreg_sparc.inline.hpp"
// Implementation of StubAssembler
@@ -822,7 +823,7 @@
}
break;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case g1_pre_barrier_slow_id:
{ // G4: previous value of memory
BarrierSet* bs = Universe::heap()->barrier_set();
@@ -984,7 +985,7 @@
__ delayed()->restore();
}
break;
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
default:
{ __ set_info("unimplemented entry", dont_gc_arguments);
--- a/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -42,7 +42,7 @@
#else
define_pd_global(bool, ProfileInterpreter, true);
#endif // CC_INTERP
-define_pd_global(bool, TieredCompilation, trueInTiered);
+define_pd_global(bool, TieredCompilation, false);
define_pd_global(intx, CompileThreshold, 10000);
define_pd_global(intx, BackEdgeThreshold, 140000);
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -45,6 +45,7 @@
#include "runtime/timer.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
#ifdef SHARK
#include "shark/shark_globals.hpp"
#endif
@@ -551,7 +552,7 @@
}
address InterpreterGenerator::generate_Reference_get_entry(void) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseG1GC) {
// We need to generate have a routine that generates code to:
// * load the value in the referent field
@@ -563,7 +564,7 @@
// field as live.
Unimplemented();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -36,11 +36,12 @@
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
#include "gc_implementation/g1/heapRegion.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
#define BLOCK_COMMENT(str) /* nothing */
@@ -3867,7 +3868,7 @@
}
///////////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
static address satb_log_enqueue_with_frame = NULL;
static u_char* satb_log_enqueue_with_frame_end = NULL;
@@ -4231,7 +4232,7 @@
bind(filtered);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
///////////////////////////////////////////////////////////////////////////////////
void MacroAssembler::card_write_barrier_post(Register store_addr, Register new_val, Register tmp) {
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -26,6 +26,7 @@
#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
#include "asm/assembler.hpp"
+#include "utilities/macros.hpp"
// <sys/trap.h> promises that the system will not use traps 16-31
#define ST_RESERVED_FOR_USER_0 0x10
@@ -1181,13 +1182,13 @@
void card_write_barrier_post(Register store_addr, Register new_val, Register tmp);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// General G1 pre-barrier generator.
void g1_write_barrier_pre(Register obj, Register index, int offset, Register pre_val, Register tmp, bool preserve_o_regs);
// General G1 post-barrier generator
void g1_write_barrier_post(Register store_addr, Register new_val, Register tmp);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// pushes double TOS element of FPU stack on CPU stack; pops from FPU stack
void push_fTOS();
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -44,6 +44,7 @@
#include "runtime/timer.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
#ifndef CC_INTERP
#ifndef FAST_DISPATCH
@@ -734,7 +735,7 @@
// Method entry for java.lang.ref.Reference.get.
address InterpreterGenerator::generate_Reference_get_entry(void) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Code: _aload_0, _getfield, _areturn
// parameter size = 1
//
@@ -805,7 +806,7 @@
(void) generate_normal_entry(false);
return entry;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -34,6 +34,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
+#include "utilities/macros.hpp"
#ifndef CC_INTERP
#define __ _masm->
@@ -53,7 +54,7 @@
assert(tmp != val && tmp != base && tmp != index, "register collision");
assert(index == noreg || offset == 0, "only one offset");
switch (barrier) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
{
@@ -82,7 +83,7 @@
}
}
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableExtension:
{
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -36,11 +36,12 @@
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
#include "gc_implementation/g1/heapRegion.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
#define BLOCK_COMMENT(str) /* nothing */
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -543,7 +543,7 @@
// of instructions are freely declared without the need for wrapping them an ifdef.
// (Some dangerous instructions are ifdef's out of inappropriate jvm's.)
// In the .cpp file the implementations are wrapped so that they are dropped out
- // of the resulting jvm. This is done mostly to keep the footprint of KERNEL
+ // of the resulting jvm. This is done mostly to keep the footprint of MINIMAL
// to the size it was prior to merging up the 32bit and 64bit assemblers.
//
// This does mean you'll get a linker/runtime error if you use a 64bit only instruction
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -30,10 +30,11 @@
#include "c1/c1_Runtime1.hpp"
#include "nativeInst_x86.hpp"
#include "runtime/sharedRuntime.hpp"
+#include "utilities/macros.hpp"
#include "vmreg_x86.inline.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#define __ ce->masm()->
@@ -482,7 +483,7 @@
}
/////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
// At this point we know that marking is in progress.
@@ -528,7 +529,7 @@
__ jmp(_continuation);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
/////////////////////////////////////////////////////////////////////////////
#undef __
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -36,6 +36,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/vframeArray.hpp"
+#include "utilities/macros.hpp"
#include "vmreg_x86.inline.hpp"
@@ -1607,7 +1608,7 @@
}
break;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case g1_pre_barrier_slow_id:
{
StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
@@ -1804,7 +1805,7 @@
}
break;
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
default:
{ StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
--- a/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -44,7 +44,7 @@
#else
define_pd_global(bool, ProfileInterpreter, true);
#endif // CC_INTERP
-define_pd_global(bool, TieredCompilation, trueInTiered);
+define_pd_global(bool, TieredCompilation, false);
define_pd_global(intx, CompileThreshold, 10000);
define_pd_global(intx, BackEdgeThreshold, 100000);
--- a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -45,6 +45,7 @@
#include "runtime/timer.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
#ifdef SHARK
#include "shark/shark_globals.hpp"
#endif
@@ -938,7 +939,7 @@
}
address InterpreterGenerator::generate_Reference_get_entry(void) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseG1GC) {
// We need to generate have a routine that generates code to:
// * load the value in the referent field
@@ -950,7 +951,7 @@
// field as live.
Unimplemented();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -37,11 +37,12 @@
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
#include "gc_implementation/g1/heapRegion.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
#define BLOCK_COMMENT(str) /* nothing */
@@ -3207,7 +3208,7 @@
//////////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void MacroAssembler::g1_write_barrier_pre(Register obj,
Register pre_val,
@@ -3417,7 +3418,7 @@
bind(done);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
//////////////////////////////////////////////////////////////////////////////////
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -26,6 +26,7 @@
#define CPU_X86_VM_MACROASSEMBLER_X86_HPP
#include "asm/assembler.hpp"
+#include "utilities/macros.hpp"
// MacroAssembler extends Assembler by frequently used macros.
@@ -294,7 +295,7 @@
void store_check(Register obj); // store check for obj - register is destroyed afterwards
void store_check(Register obj, Address dst); // same as above, dst is exact store location (reg. is destroyed)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void g1_write_barrier_pre(Register obj,
Register pre_val,
@@ -309,7 +310,7 @@
Register tmp,
Register tmp2);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// split store_check(Register obj) to enhance instruction interleaving
void store_check_part_1(Register obj);
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -44,6 +44,7 @@
#include "runtime/timer.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
#define __ _masm->
@@ -761,7 +762,7 @@
// Method entry for java.lang.ref.Reference.get.
address InterpreterGenerator::generate_Reference_get_entry(void) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Code: _aload_0, _getfield, _areturn
// parameter size = 1
//
@@ -844,7 +845,7 @@
return entry;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -44,6 +44,7 @@
#include "runtime/timer.hpp"
#include "runtime/vframeArray.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
#define __ _masm->
@@ -742,7 +743,7 @@
// Method entry for java.lang.ref.Reference.get.
address InterpreterGenerator::generate_Reference_get_entry(void) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Code: _aload_0, _getfield, _areturn
// parameter size = 1
//
@@ -821,7 +822,7 @@
return entry;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -35,6 +35,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
+#include "utilities/macros.hpp"
#ifndef CC_INTERP
#define __ _masm->
@@ -125,7 +126,7 @@
bool precise) {
assert(val == noreg || val == rax, "parameter is just for looks");
switch (barrier) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
{
@@ -164,7 +165,7 @@
}
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableExtension:
{
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -35,6 +35,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
+#include "utilities/macros.hpp"
#ifndef CC_INTERP
@@ -136,7 +137,7 @@
bool precise) {
assert(val == noreg || val == rax, "parameter is just for looks");
switch (barrier) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
{
@@ -167,7 +168,7 @@
}
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableExtension:
{
--- a/hotspot/src/cpu/zero/vm/assembler_zero.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/zero/vm/assembler_zero.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -36,11 +36,12 @@
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
#include "gc_implementation/g1/heapRegion.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
int AbstractAssembler::code_fill_byte() {
return 0;
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -47,6 +47,7 @@
#include "runtime/vframeArray.hpp"
#include "stack_zero.inline.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
#ifdef SHARK
#include "shark/shark_globals.hpp"
#endif
@@ -791,7 +792,7 @@
}
address InterpreterGenerator::generate_Reference_get_entry(void) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseG1GC) {
// We need to generate have a routine that generates code to:
// * load the value in the referent field
@@ -803,7 +804,7 @@
// field as live.
Unimplemented();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// If G1 is not enabled then attempt to go through the accessor entry point
// Reference.get is an accessor
--- a/hotspot/src/os/linux/vm/os_linux.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1155,13 +1155,9 @@
// for initial thread if its stack size exceeds 6M. Cap it at 2M,
// in case other parts in glibc still assumes 2M max stack size.
// FIXME: alt signal stack is gone, maybe we can relax this constraint?
-#ifndef IA64
- if (stack_size > 2 * K * K) stack_size = 2 * K * K;
-#else
// Problem still exists RH7.2 (IA64 anyway) but 2MB is a little small
- if (stack_size > 4 * K * K) stack_size = 4 * K * K;
-#endif
-
+ if (stack_size > 2 * K * K IA64_ONLY(*2))
+ stack_size = 2 * K * K IA64_ONLY(*2);
// Try to figure out where the stack base (top) is. This is harder.
//
// When an application is started, glibc saves the initial stack pointer in
@@ -4367,16 +4363,12 @@
if (is_NPTL()) {
return pthread_cond_timedwait(_cond, _mutex, _abstime);
} else {
-#ifndef IA64
// 6292965: LinuxThreads pthread_cond_timedwait() resets FPU control
// word back to default 64bit precision if condvar is signaled. Java
// wants 53bit precision. Save and restore current value.
int fpu = get_fpu_control_word();
-#endif // IA64
int status = pthread_cond_timedwait(_cond, _mutex, _abstime);
-#ifndef IA64
set_fpu_control_word(fpu);
-#endif // IA64
return status;
}
}
--- a/hotspot/src/os/windows/vm/os_windows.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -349,6 +349,33 @@
#ifdef _M_IA64
// IA64 has memory and register stacks
+ //
+ // This is the stack layout you get on NT/IA64 if you specify 1MB stack limit
+ // at thread creation (1MB backing store growing upwards, 1MB memory stack
+ // growing downwards, 2MB summed up)
+ //
+ // ...
+ // ------- top of stack (high address) -----
+ // |
+ // | 1MB
+ // | Backing Store (Register Stack)
+ // |
+ // | / \
+ // | |
+ // | |
+ // | |
+ // ------------------------ stack base -----
+ // | 1MB
+ // | Memory Stack
+ // |
+ // | |
+ // | |
+ // | |
+ // | \ /
+ // |
+ // ----- bottom of stack (low address) -----
+ // ...
+
stack_size = stack_size / 2;
#endif
return stack_bottom + stack_size;
@@ -2005,17 +2032,34 @@
JavaThread* thread = JavaThread::current();
// Save pc in thread
#ifdef _M_IA64
- thread->set_saved_exception_pc((address)exceptionInfo->ContextRecord->StIIP);
+ // Do not blow up if no thread info available.
+ if (thread) {
+ // Saving PRECISE pc (with slot information) in thread.
+ uint64_t precise_pc = (uint64_t) exceptionInfo->ExceptionRecord->ExceptionAddress;
+ // Convert precise PC into "Unix" format
+ precise_pc = (precise_pc & 0xFFFFFFFFFFFFFFF0) | ((precise_pc & 0xF) >> 2);
+ thread->set_saved_exception_pc((address)precise_pc);
+ }
// Set pc to handler
exceptionInfo->ContextRecord->StIIP = (DWORD64)handler;
+ // Clear out psr.ri (= Restart Instruction) in order to continue
+ // at the beginning of the target bundle.
+ exceptionInfo->ContextRecord->StIPSR &= 0xFFFFF9FFFFFFFFFF;
+ assert(((DWORD64)handler & 0xF) == 0, "Target address must point to the beginning of a bundle!");
#elif _M_AMD64
- thread->set_saved_exception_pc((address)exceptionInfo->ContextRecord->Rip);
+ // Do not blow up if no thread info available.
+ if (thread) {
+ thread->set_saved_exception_pc((address)(DWORD_PTR)exceptionInfo->ContextRecord->Rip);
+ }
// Set pc to handler
exceptionInfo->ContextRecord->Rip = (DWORD64)handler;
#else
- thread->set_saved_exception_pc((address)exceptionInfo->ContextRecord->Eip);
+ // Do not blow up if no thread info available.
+ if (thread) {
+ thread->set_saved_exception_pc((address)(DWORD_PTR)exceptionInfo->ContextRecord->Eip);
+ }
// Set pc to handler
- exceptionInfo->ContextRecord->Eip = (LONG)handler;
+ exceptionInfo->ContextRecord->Eip = (DWORD)(DWORD_PTR)handler;
#endif
// Continue the execution
@@ -2040,6 +2084,14 @@
// included or copied here.
#define EXCEPTION_INFO_EXEC_VIOLATION 0x08
+// Handle NAT Bit consumption on IA64.
+#ifdef _M_IA64
+#define EXCEPTION_REG_NAT_CONSUMPTION STATUS_REG_NAT_CONSUMPTION
+#endif
+
+// Windows Vista/2008 heap corruption check
+#define EXCEPTION_HEAP_CORRUPTION 0xC0000374
+
#define def_excpt(val) #val, val
struct siglabel {
@@ -2082,6 +2134,10 @@
def_excpt(EXCEPTION_GUARD_PAGE),
def_excpt(EXCEPTION_INVALID_HANDLE),
def_excpt(EXCEPTION_UNCAUGHT_CXX_EXCEPTION),
+ def_excpt(EXCEPTION_HEAP_CORRUPTION),
+#ifdef _M_IA64
+ def_excpt(EXCEPTION_REG_NAT_CONSUMPTION),
+#endif
NULL, 0
};
@@ -2206,7 +2262,14 @@
if (InterceptOSException) return EXCEPTION_CONTINUE_SEARCH;
DWORD exception_code = exceptionInfo->ExceptionRecord->ExceptionCode;
#ifdef _M_IA64
- address pc = (address) exceptionInfo->ContextRecord->StIIP;
+ // On Itanium, we need the "precise pc", which has the slot number coded
+ // into the least 4 bits: 0000=slot0, 0100=slot1, 1000=slot2 (Windows format).
+ address pc = (address) exceptionInfo->ExceptionRecord->ExceptionAddress;
+ // Convert the pc to "Unix format", which has the slot number coded
+ // into the least 2 bits: 0000=slot0, 0001=slot1, 0010=slot2
+ // This is needed for IA64 because "relocation" / "implicit null check" / "poll instruction"
+ // information is saved in the Unix format.
+ address pc_unix_format = (address) ((((uint64_t)pc) & 0xFFFFFFFFFFFFFFF0) | ((((uint64_t)pc) & 0xF) >> 2));
#elif _M_AMD64
address pc = (address) exceptionInfo->ContextRecord->Rip;
#else
@@ -2321,29 +2384,40 @@
if (exception_code == EXCEPTION_STACK_OVERFLOW) {
if (os::uses_stack_guard_pages()) {
#ifdef _M_IA64
- //
- // If it's a legal stack address continue, Windows will map it in.
- //
+ // Use guard page for register stack.
PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
address addr = (address) exceptionRecord->ExceptionInformation[1];
- if (addr > thread->stack_yellow_zone_base() && addr < thread->stack_base() )
- return EXCEPTION_CONTINUE_EXECUTION;
-
- // The register save area is the same size as the memory stack
- // and starts at the page just above the start of the memory stack.
- // If we get a fault in this area, we've run out of register
- // stack. If we are in java, try throwing a stack overflow exception.
- if (addr > thread->stack_base() &&
- addr <= (thread->stack_base()+thread->stack_size()) ) {
- char buf[256];
- jio_snprintf(buf, sizeof(buf),
- "Register stack overflow, addr:%p, stack_base:%p\n",
- addr, thread->stack_base() );
- tty->print_raw_cr(buf);
- // If not in java code, return and hope for the best.
- return in_java ? Handle_Exception(exceptionInfo,
- SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW))
- : EXCEPTION_CONTINUE_EXECUTION;
+ // Check for a register stack overflow on Itanium
+ if (thread->addr_inside_register_stack_red_zone(addr)) {
+ // Fatal red zone violation happens if the Java program
+ // catches a StackOverflow error and does so much processing
+ // that it runs beyond the unprotected yellow guard zone. As
+ // a result, we are out of here.
+ fatal("ERROR: Unrecoverable stack overflow happened. JVM will exit.");
+ } else if(thread->addr_inside_register_stack(addr)) {
+ // Disable the yellow zone which sets the state that
+ // we've got a stack overflow problem.
+ if (thread->stack_yellow_zone_enabled()) {
+ thread->disable_stack_yellow_zone();
+ }
+ // Give us some room to process the exception.
+ thread->disable_register_stack_guard();
+ // Tracing with +Verbose.
+ if (Verbose) {
+ tty->print_cr("SOF Compiled Register Stack overflow at " INTPTR_FORMAT " (SIGSEGV)", pc);
+ tty->print_cr("Register Stack access at " INTPTR_FORMAT, addr);
+ tty->print_cr("Register Stack base " INTPTR_FORMAT, thread->register_stack_base());
+ tty->print_cr("Register Stack [" INTPTR_FORMAT "," INTPTR_FORMAT "]",
+ thread->register_stack_base(),
+ thread->register_stack_base() + thread->stack_size());
+ }
+
+ // Reguard the permanent register stack red zone just to be sure.
+ // We saw Windows silently disabling this without telling us.
+ thread->enable_register_stack_red_zone();
+
+ return Handle_Exception(exceptionInfo,
+ SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW));
}
#endif
if (thread->stack_yellow_zone_enabled()) {
@@ -2418,50 +2492,33 @@
{
// Null pointer exception.
#ifdef _M_IA64
- // We catch register stack overflows in compiled code by doing
- // an explicit compare and executing a st8(G0, G0) if the
- // BSP enters into our guard area. We test for the overflow
- // condition and fall into the normal null pointer exception
- // code if BSP hasn't overflowed.
- if ( in_java ) {
- if(thread->register_stack_overflow()) {
- assert((address)exceptionInfo->ContextRecord->IntS3 ==
- thread->register_stack_limit(),
- "GR7 doesn't contain register_stack_limit");
- // Disable the yellow zone which sets the state that
- // we've got a stack overflow problem.
- if (thread->stack_yellow_zone_enabled()) {
- thread->disable_stack_yellow_zone();
+ // Process implicit null checks in compiled code. Note: Implicit null checks
+ // can happen even if "ImplicitNullChecks" is disabled, e.g. in vtable stubs.
+ if (CodeCache::contains((void*) pc_unix_format) && !MacroAssembler::needs_explicit_null_check((intptr_t) addr)) {
+ CodeBlob *cb = CodeCache::find_blob_unsafe(pc_unix_format);
+ // Handle implicit null check in UEP method entry
+ if (cb && (cb->is_frame_complete_at(pc) ||
+ (cb->is_nmethod() && ((nmethod *)cb)->inlinecache_check_contains(pc)))) {
+ if (Verbose) {
+ intptr_t *bundle_start = (intptr_t*) ((intptr_t) pc_unix_format & 0xFFFFFFFFFFFFFFF0);
+ tty->print_cr("trap: null_check at " INTPTR_FORMAT " (SIGSEGV)", pc_unix_format);
+ tty->print_cr(" to addr " INTPTR_FORMAT, addr);
+ tty->print_cr(" bundle is " INTPTR_FORMAT " (high), " INTPTR_FORMAT " (low)",
+ *(bundle_start + 1), *bundle_start);
}
- // Give us some room to process the exception
- thread->disable_register_stack_guard();
- // Update GR7 with the new limit so we can continue running
- // compiled code.
- exceptionInfo->ContextRecord->IntS3 =
- (ULONGLONG)thread->register_stack_limit();
return Handle_Exception(exceptionInfo,
- SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW));
- } else {
- //
- // Check for implicit null
- // We only expect null pointers in the stubs (vtable)
- // the rest are checked explicitly now.
- //
- if (((uintptr_t)addr) < os::vm_page_size() ) {
- // an access to the first page of VM--assume it is a null pointer
- address stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
- if (stub != NULL) return Handle_Exception(exceptionInfo, stub);
- }
+ SharedRuntime::continuation_for_implicit_exception(thread, pc_unix_format, SharedRuntime::IMPLICIT_NULL));
}
- } // in_java
-
- // IA64 doesn't use implicit null checking yet. So we shouldn't
- // get here.
- tty->print_raw_cr("Access violation, possible null pointer exception");
+ }
+
+ // Implicit null checks were processed above. Hence, we should not reach
+ // here in the usual case => die!
+ if (Verbose) tty->print_raw_cr("Access violation, possible null pointer exception");
report_error(t, exception_code, pc, exceptionInfo->ExceptionRecord,
exceptionInfo->ContextRecord);
return EXCEPTION_CONTINUE_SEARCH;
-#else /* !IA64 */
+
+#else // !IA64
// Windows 98 reports faulting addresses incorrectly
if (!MacroAssembler::needs_explicit_null_check((intptr_t)addr) ||
@@ -2493,7 +2550,24 @@
report_error(t, exception_code, pc, exceptionInfo->ExceptionRecord,
exceptionInfo->ContextRecord);
return EXCEPTION_CONTINUE_SEARCH;
- }
+ } // /EXCEPTION_ACCESS_VIOLATION
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#if defined _M_IA64
+ else if ((exception_code == EXCEPTION_ILLEGAL_INSTRUCTION ||
+ exception_code == EXCEPTION_ILLEGAL_INSTRUCTION_2)) {
+ M37 handle_wrong_method_break(0, NativeJump::HANDLE_WRONG_METHOD, PR0);
+
+ // Compiled method patched to be non entrant? Following conditions must apply:
+ // 1. must be first instruction in bundle
+ // 2. must be a break instruction with appropriate code
+ if((((uint64_t) pc & 0x0F) == 0) &&
+ (((IPF_Bundle*) pc)->get_slot0() == handle_wrong_method_break.bits())) {
+ return Handle_Exception(exceptionInfo,
+ (address)SharedRuntime::get_handle_wrong_method_stub());
+ }
+ } // /EXCEPTION_ILLEGAL_INSTRUCTION
+#endif
+
if (in_java) {
switch (exception_code) {
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -372,7 +372,7 @@
CAST_FROM_FN_PTR(address, os::current_frame));
if (os::is_first_C_frame(&myframe)) {
// stack is not walkable
- return frame(NULL, NULL, NULL);
+ return frame();
} else {
return os::get_sender_for_C_frame(&myframe);
}
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -189,7 +189,7 @@
CAST_FROM_FN_PTR(address, os::current_frame));
if (os::is_first_C_frame(&myframe)) {
// stack is not walkable
- return frame(NULL, NULL, NULL);
+ return frame();
} else {
return os::get_sender_for_C_frame(&myframe);
}
--- a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -399,7 +399,7 @@
typedef intptr_t* get_fp_func ();
get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*,
StubRoutines::x86::get_previous_fp_entry());
- if (func == NULL) return frame(NULL, NULL, NULL);
+ if (func == NULL) return frame();
intptr_t* fp = (*func)();
#else
intptr_t* fp = _get_previous_fp();
@@ -410,7 +410,7 @@
CAST_FROM_FN_PTR(address, os::current_frame));
if (os::is_first_C_frame(&myframe)) {
// stack is not walkable
- return frame(NULL, NULL, NULL);
+ return frame();
} else {
return os::get_sender_for_C_frame(&myframe);
}
--- a/hotspot/src/share/tools/whitebox/sun/hotspot/WhiteBox.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/tools/whitebox/sun/hotspot/WhiteBox.java Wed Feb 13 13:01:16 2013 -0800
@@ -76,4 +76,9 @@
public native long g1NumFreeRegions();
public native int g1RegionSize();
public native Object[] parseCommandLine(String commandline, DiagnosticCommand[] args);
+
+ // NMT
+ public native boolean NMTAllocTest();
+ public native boolean NMTFreeTestMemory();
+ public native boolean NMTWaitForDataMerge();
}
--- a/hotspot/src/share/vm/adlc/adlparse.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/adlc/adlparse.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -168,7 +168,7 @@
// Check for block delimiter
if ( (_curchar != '%')
|| ( next_char(), (_curchar != '{')) ) {
- parse_err(SYNERR, "missing '%{' in instruction definition\n");
+ parse_err(SYNERR, "missing '%%{' in instruction definition\n");
return;
}
next_char(); // Maintain the invariant
@@ -253,7 +253,7 @@
} while(_curchar != '%');
next_char();
if (_curchar != '}') {
- parse_err(SYNERR, "missing '%}' in instruction definition\n");
+ parse_err(SYNERR, "missing '%%}' in instruction definition\n");
return;
}
// Check for "Set" form of chain rule
@@ -423,7 +423,7 @@
skipws();
// Check for block delimiter
if ((_curchar != '%') || (*(_ptr+1) != '{')) { // If not open block
- parse_err(SYNERR, "missing '%c{' in operand definition\n","%");
+ parse_err(SYNERR, "missing '%%{' in operand definition\n");
return;
}
next_char(); next_char(); // Skip over "%{" symbol
@@ -483,7 +483,7 @@
} while(_curchar != '%');
next_char();
if (_curchar != '}') {
- parse_err(SYNERR, "missing '%}' in operand definition\n");
+ parse_err(SYNERR, "missing '%%}' in operand definition\n");
return;
}
// Add operand to tail of operand list
@@ -1324,7 +1324,7 @@
// Check for block delimiter
if ( (_curchar != '%')
|| ( next_char(), (_curchar != '{')) ) {
- parse_err(SYNERR, "missing '%{' in pipeline definition\n");
+ parse_err(SYNERR, "missing '%%{' in pipeline definition\n");
return;
}
next_char(); // Maintain the invariant
@@ -1341,7 +1341,7 @@
skipws();
if ( (_curchar != '%')
|| ( next_char(), (_curchar != '{')) ) {
- parse_err(SYNERR, "expected '%{'\n");
+ parse_err(SYNERR, "expected '%%{'\n");
return;
}
next_char(); skipws();
@@ -1397,7 +1397,7 @@
skipws();
if ( (_curchar != '%')
|| ( next_char(), (_curchar != '{')) ) {
- parse_err(SYNERR, "expected '%{'\n");
+ parse_err(SYNERR, "expected '%%{'\n");
return;
}
next_char(); skipws();
@@ -1586,7 +1586,7 @@
if ( (_curchar != '%')
|| ( next_char(), (_curchar != '}')) ) {
- parse_err(SYNERR, "expected '%}', found \"%c\"\n", _curchar);
+ parse_err(SYNERR, "expected '%%}', found \"%c\"\n", _curchar);
}
next_char(); skipws();
@@ -1612,7 +1612,7 @@
next_char();
if (_curchar != '}') {
- parse_err(SYNERR, "missing \"%}\" in pipeline definition\n");
+ parse_err(SYNERR, "missing \"%%}\" in pipeline definition\n");
return;
}
@@ -1775,7 +1775,7 @@
// Check for block delimiter
if ( (_curchar != '%')
|| ( next_char(), (_curchar != '{')) ) {
- parse_err(SYNERR, "missing \"%{\" in pipe_class definition\n");
+ parse_err(SYNERR, "missing \"%%{\" in pipe_class definition\n");
return;
}
next_char();
@@ -2062,7 +2062,7 @@
next_char();
if (_curchar != '}') {
- parse_err(SYNERR, "missing \"%}\" in pipe_class definition\n");
+ parse_err(SYNERR, "missing \"%%}\" in pipe_class definition\n");
return;
}
@@ -3341,12 +3341,12 @@
char *disp = NULL;
if (_curchar != '%') {
- parse_err(SYNERR, "Missing '%{' for 'interface' block.\n");
+ parse_err(SYNERR, "Missing '%%{' for 'interface' block.\n");
return NULL;
}
next_char(); // Skip '%'
if (_curchar != '{') {
- parse_err(SYNERR, "Missing '%{' for 'interface' block.\n");
+ parse_err(SYNERR, "Missing '%%{' for 'interface' block.\n");
return NULL;
}
next_char(); // Skip '{'
@@ -3354,7 +3354,7 @@
do {
char *field = get_ident();
if (field == NULL) {
- parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%}' ending interface.\n");
+ parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%%}' ending interface.\n");
return NULL;
}
if ( strcmp(field,"base") == 0 ) {
@@ -3370,13 +3370,13 @@
disp = interface_field_parse();
}
else {
- parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%}' ending interface.\n");
+ parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%%}' ending interface.\n");
return NULL;
}
} while( _curchar != '%' );
next_char(); // Skip '%'
if ( _curchar != '}' ) {
- parse_err(SYNERR, "Missing '%}' for 'interface' block.\n");
+ parse_err(SYNERR, "Missing '%%}' for 'interface' block.\n");
return NULL;
}
next_char(); // Skip '}'
@@ -3403,12 +3403,12 @@
const char *greater_format = "gt";
if (_curchar != '%') {
- parse_err(SYNERR, "Missing '%{' for 'cond_interface' block.\n");
+ parse_err(SYNERR, "Missing '%%{' for 'cond_interface' block.\n");
return NULL;
}
next_char(); // Skip '%'
if (_curchar != '{') {
- parse_err(SYNERR, "Missing '%{' for 'cond_interface' block.\n");
+ parse_err(SYNERR, "Missing '%%{' for 'cond_interface' block.\n");
return NULL;
}
next_char(); // Skip '{'
@@ -3416,7 +3416,7 @@
do {
char *field = get_ident();
if (field == NULL) {
- parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%}' ending interface.\n");
+ parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%%}' ending interface.\n");
return NULL;
}
if ( strcmp(field,"equal") == 0 ) {
@@ -3438,13 +3438,13 @@
greater = interface_field_parse(&greater_format);
}
else {
- parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%}' ending interface.\n");
+ parse_err(SYNERR, "Expected keyword, base|index|scale|disp, or '%%}' ending interface.\n");
return NULL;
}
} while( _curchar != '%' );
next_char(); // Skip '%'
if ( _curchar != '}' ) {
- parse_err(SYNERR, "Missing '%}' for 'interface' block.\n");
+ parse_err(SYNERR, "Missing '%%}' for 'interface' block.\n");
return NULL;
}
next_char(); // Skip '}'
@@ -3543,7 +3543,7 @@
}
else if ((cnstr = find_cpp_block("match constructor")) == NULL ) {
parse_err(SYNERR, "invalid construction of match rule\n"
- "Missing ';' or invalid '%{' and '%}' constructor\n");
+ "Missing ';' or invalid '%%{' and '%%}' constructor\n");
return NULL; // No MatchRule to return
}
if (_AD._adl_debug > 1)
@@ -3646,7 +3646,7 @@
// Check for closing '"' and '%}' in format description
skipws(); // Move to closing '%}'
if ( _curchar != '%' ) {
- parse_err(SYNERR, "non-blank characters between closing '\"' and '%' in format");
+ parse_err(SYNERR, "non-blank characters between closing '\"' and '%%' in format");
return NULL;
}
} // Done with format description inside
@@ -3654,7 +3654,7 @@
skipws();
// Past format description, at '%'
if ( _curchar != '%' || *(_ptr+1) != '}' ) {
- parse_err(SYNERR, "missing '%}' at end of format block");
+ parse_err(SYNERR, "missing '%%}' at end of format block");
return NULL;
}
next_char(); // Move past the '%'
@@ -3785,7 +3785,7 @@
skipws();
// Past format description, at '%'
if ( _curchar != '%' || *(_ptr+1) != '}' ) {
- parse_err(SYNERR, "missing '%}' at end of format block");
+ parse_err(SYNERR, "missing '%%}' at end of format block");
return NULL;
}
next_char(); // Move past the '%'
@@ -3834,7 +3834,7 @@
skipws(); // Skip leading whitespace
if ((_curchar != '%')
|| (next_char(), (_curchar != '{')) ) { // If not open block
- parse_err(SYNERR, "missing '%{' in expand definition\n");
+ parse_err(SYNERR, "missing '%%{' in expand definition\n");
return(NULL);
}
next_char(); // Maintain the invariant
@@ -3933,7 +3933,7 @@
} while(_curchar != '%');
next_char();
if (_curchar != '}') {
- parse_err(SYNERR, "missing '%}' in expand rule definition\n");
+ parse_err(SYNERR, "missing '%%}' in expand rule definition\n");
return(NULL);
}
next_char();
--- a/hotspot/src/share/vm/c1/c1_CodeStubs.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/c1/c1_CodeStubs.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -31,6 +31,7 @@
#include "c1/c1_LIR.hpp"
#include "c1/c1_Runtime1.hpp"
#include "utilities/array.hpp"
+#include "utilities/macros.hpp"
class CodeEmitInfo;
class LIR_Assembler;
@@ -515,7 +516,7 @@
};
//////////////////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Code stubs for Garbage-First barriers.
class G1PreBarrierStub: public CodeStub {
@@ -608,7 +609,7 @@
#endif // PRODUCT
};
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
//////////////////////////////////////////////////////////////////////////////////////////
#endif // SHARE_VM_C1_C1_CODESTUBS_HPP
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -3667,11 +3667,12 @@
}
// now perform tests that are based on flag settings
- if (callee->force_inline() || callee->should_inline()) {
- // ignore heuristic controls on inlining
- if (callee->force_inline())
- print_inlining(callee, "force inline by annotation");
+ if (callee->force_inline()) {
+ print_inlining(callee, "force inline by annotation");
+ } else if (callee->should_inline()) {
+ print_inlining(callee, "force inline by CompileOracle");
} else {
+ // use heuristic controls on inlining
if (inline_level() > MaxInlineLevel ) INLINE_BAILOUT("inlining too deep");
if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("recursive inlining too deep");
if (callee->code_size_for_inlining() > max_inline_size() ) INLINE_BAILOUT("callee is too large");
--- a/hotspot/src/share/vm/c1/c1_Instruction.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/c1/c1_Instruction.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -188,7 +188,7 @@
ciType* LoadIndexed::declared_type() const {
ciType* array_type = array()->declared_type();
- if (array_type == NULL) {
+ if (array_type == NULL || !array_type->is_loaded()) {
return NULL;
}
assert(array_type->is_array_klass(), "what else?");
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -35,9 +35,10 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "utilities/bitMap.inline.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/heapRegion.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef ASSERT
#define __ gen()->lir(__FILE__, __LINE__)->
@@ -1417,12 +1418,12 @@
bool do_load, bool patch, CodeEmitInfo* info) {
// Do the pre-write barrier, if any.
switch (_bs->kind()) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
G1SATBCardTableModRef_pre_barrier(addr_opr, pre_val, do_load, patch, info);
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableExtension:
// No pre barriers
@@ -1439,12 +1440,12 @@
void LIRGenerator::post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) {
switch (_bs->kind()) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
G1SATBCardTableModRef_post_barrier(addr, new_val);
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableExtension:
CardTableModRef_post_barrier(addr, new_val);
@@ -1459,7 +1460,7 @@
}
////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void LIRGenerator::G1SATBCardTableModRef_pre_barrier(LIR_Opr addr_opr, LIR_Opr pre_val,
bool do_load, bool patch, CodeEmitInfo* info) {
@@ -1575,7 +1576,7 @@
__ branch_destination(slow->continuation());
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
////////////////////////////////////////////////////////////////////////
void LIRGenerator::CardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) {
@@ -2181,7 +2182,7 @@
get_Object_unsafe(value, src.result(), off.result(), type, x->is_volatile());
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// We might be reading the value of the referent field of a
// Reference object in order to attach it back to the live
// object graph. If G1 is enabled then we need to record
@@ -2311,7 +2312,7 @@
__ branch_destination(Lcont->label());
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
if (x->is_volatile() && os::is_MP()) __ membar_acquire();
}
--- a/hotspot/src/share/vm/ci/ciEnv.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -52,6 +52,7 @@
#include "runtime/reflection.hpp"
#include "runtime/sharedRuntime.hpp"
#include "utilities/dtrace.hpp"
+#include "utilities/macros.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
@@ -1168,7 +1169,7 @@
void ciEnv::dump_replay_data(outputStream* out) {
ASSERT_IN_VM;
-
+ ResourceMark rm;
#if INCLUDE_JVMTI
out->print_cr("JvmtiExport can_access_local_variables %d", _jvmti_can_access_local_variables);
out->print_cr("JvmtiExport can_hotswap_or_post_breakpoint %d", _jvmti_can_hotswap_or_post_breakpoint);
--- a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciInstanceKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -580,6 +580,7 @@
}
void do_field(fieldDescriptor* fd) {
if (fd->is_final() && !fd->has_initial_value()) {
+ ResourceMark rm;
oop mirror = fd->field_holder()->java_mirror();
_out->print("staticfield %s %s %s ", _holder, fd->name()->as_quoted_ascii(), fd->signature()->as_quoted_ascii());
switch (fd->field_type()) {
@@ -643,6 +644,8 @@
void ciInstanceKlass::dump_replay_data(outputStream* out) {
ASSERT_IN_VM;
+ ResourceMark rm;
+
InstanceKlass* ik = get_instanceKlass();
ConstantPool* cp = ik->constants();
--- a/hotspot/src/share/vm/ci/ciMethod.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -977,7 +977,7 @@
// ciMethod::set_not_compilable
//
// Tell the VM that this method cannot be compiled at all.
-void ciMethod::set_not_compilable() {
+void ciMethod::set_not_compilable(const char* reason) {
check_is_loaded();
VM_ENTRY_MARK;
ciEnv* env = CURRENT_ENV;
@@ -986,7 +986,7 @@
} else {
_is_c2_compilable = false;
}
- get_Method()->set_not_compilable(env->comp_level());
+ get_Method()->set_not_compilable(env->comp_level(), true, reason);
}
// ------------------------------------------------------------------
@@ -1178,6 +1178,7 @@
void ciMethod::dump_replay_data(outputStream* st) {
ASSERT_IN_VM;
+ ResourceMark rm;
Method* method = get_Method();
Klass* holder = method->method_holder();
st->print_cr("ciMethod %s %s %s %d %d %d %d %d",
--- a/hotspot/src/share/vm/ci/ciMethod.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -252,7 +252,7 @@
bool has_option(const char *option);
bool can_be_compiled();
bool can_be_osr_compiled(int entry_bci);
- void set_not_compilable();
+ void set_not_compilable(const char* reason = NULL);
bool has_compiled_code();
void log_nmethod_identity(xmlStream* log);
bool is_not_reached(int bci);
--- a/hotspot/src/share/vm/ci/ciMethodData.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciMethodData.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -374,6 +374,7 @@
void ciMethodData::dump_replay_data(outputStream* out) {
ASSERT_IN_VM;
+ ResourceMark rm;
MethodData* mdo = get_MethodData();
Method* method = mdo->method();
Klass* holder = method->method_holder();
--- a/hotspot/src/share/vm/ci/ciReplay.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -30,6 +30,7 @@
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "utilities/copy.hpp"
+#include "utilities/macros.hpp"
#ifndef PRODUCT
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1947,6 +1947,8 @@
u2** localvariable_type_table_start;
u2 method_parameters_length = 0;
u1* method_parameters_data = NULL;
+ bool method_parameters_seen = false;
+ bool method_parameters_four_byte_flags;
bool parsed_code_attribute = false;
bool parsed_checked_exceptions_attribute = false;
bool parsed_stackmap_attribute = false;
@@ -2157,21 +2159,31 @@
method_attribute_length,
cp, CHECK_(nullHandle));
} else if (method_attribute_name == vmSymbols::tag_method_parameters()) {
+ // reject multiple method parameters
+ if (method_parameters_seen) {
+ classfile_parse_error("Multiple MethodParameters attributes in class file %s", CHECK_(nullHandle));
+ }
+ method_parameters_seen = true;
method_parameters_length = cfs->get_u1_fast();
// Track the actual size (note: this is written for clarity; a
// decent compiler will CSE and constant-fold this into a single
// expression)
- u2 actual_size = 1;
+ // Use the attribute length to figure out the size of flags
+ if (method_attribute_length == (method_parameters_length * 6u) + 1u) {
+ method_parameters_four_byte_flags = true;
+ } else if (method_attribute_length == (method_parameters_length * 4u) + 1u) {
+ method_parameters_four_byte_flags = false;
+ } else {
+ classfile_parse_error(
+ "Invalid MethodParameters method attribute length %u in class file",
+ method_attribute_length, CHECK_(nullHandle));
+ }
method_parameters_data = cfs->get_u1_buffer();
- actual_size += 2 * method_parameters_length;
cfs->skip_u2_fast(method_parameters_length);
- actual_size += 4 * method_parameters_length;
- cfs->skip_u4_fast(method_parameters_length);
- // Enforce attribute length
- if (method_attribute_length != actual_size) {
- classfile_parse_error(
- "Invalid MethodParameters method attribute length %u in class file %s",
- method_attribute_length, CHECK_(nullHandle));
+ if (method_parameters_four_byte_flags) {
+ cfs->skip_u4_fast(method_parameters_length);
+ } else {
+ cfs->skip_u2_fast(method_parameters_length);
}
// ignore this attribute if it cannot be reflected
if (!SystemDictionary::Parameter_klass_loaded())
@@ -2316,15 +2328,16 @@
// Copy method parameters
if (method_parameters_length > 0) {
MethodParametersElement* elem = m->constMethod()->method_parameters_start();
- for(int i = 0; i < method_parameters_length; i++) {
- elem[i].name_cp_index =
- Bytes::get_Java_u2(method_parameters_data);
+ for (int i = 0; i < method_parameters_length; i++) {
+ elem[i].name_cp_index = Bytes::get_Java_u2(method_parameters_data);
method_parameters_data += 2;
- u4 flags = Bytes::get_Java_u4(method_parameters_data);
- // This caused an alignment fault on Sparc, if flags was a u4
- elem[i].flags_lo = extract_low_short_from_int(flags);
- elem[i].flags_hi = extract_high_short_from_int(flags);
- method_parameters_data += 4;
+ if (method_parameters_four_byte_flags) {
+ elem[i].flags = Bytes::get_Java_u4(method_parameters_data);
+ method_parameters_data += 4;
+ } else {
+ elem[i].flags = Bytes::get_Java_u2(method_parameters_data);
+ method_parameters_data += 2;
+ }
}
}
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -50,11 +50,12 @@
#include "classfile/classLoaderData.hpp"
#include "classfile/classLoaderData.inline.hpp"
#include "classfile/javaClasses.hpp"
+#include "classfile/metadataOnStackMark.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/metaspaceShared.hpp"
-#include "prims/jvmtiRedefineClasses.hpp"
+#include "memory/oopFactory.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutex.hpp"
#include "runtime/safepoint.hpp"
@@ -723,13 +724,13 @@
}
MetaspaceAux::dump(out);
}
+#endif // PRODUCT
void ClassLoaderData::print_value_on(outputStream* out) const {
if (class_loader() == NULL) {
- out->print_cr("NULL class_loader");
+ out->print("NULL class_loader");
} else {
out->print("class loader "PTR_FORMAT, this);
class_loader()->print_value_on(out);
}
}
-#endif // PRODUCT
--- a/hotspot/src/share/vm/classfile/classLoaderData.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/classLoaderData.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -220,7 +220,7 @@
void set_jmethod_ids(JNIMethodBlock* new_block) { _jmethod_ids = new_block; }
void print_value() { print_value_on(tty); }
- void print_value_on(outputStream* out) const PRODUCT_RETURN;
+ void print_value_on(outputStream* out) const;
void dump(outputStream * const out) PRODUCT_RETURN;
void verify();
const char* loader_name();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/classfile/metadataOnStackMark.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "classfile/metadataOnStackMark.hpp"
+#include "code/codeCache.hpp"
+#include "compiler/compileBroker.hpp"
+#include "oops/metadata.hpp"
+#include "runtime/synchronizer.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/growableArray.hpp"
+
+
+// Keep track of marked on-stack metadata so it can be cleared.
+GrowableArray<Metadata*>* _marked_objects = NULL;
+NOT_PRODUCT(bool MetadataOnStackMark::_is_active = false;)
+
+// Walk metadata on the stack and mark it so that redefinition doesn't delete
+// it. Class unloading also walks the previous versions and might try to
+// delete it, so this class is used by class unloading also.
+MetadataOnStackMark::MetadataOnStackMark() {
+ assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
+ NOT_PRODUCT(_is_active = true;)
+ if (_marked_objects == NULL) {
+ _marked_objects = new (ResourceObj::C_HEAP, mtClass) GrowableArray<Metadata*>(1000, true);
+ }
+ Threads::metadata_do(Metadata::mark_on_stack);
+ CodeCache::alive_nmethods_do(nmethod::mark_on_stack);
+ CompileBroker::mark_on_stack();
+}
+
+MetadataOnStackMark::~MetadataOnStackMark() {
+ assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
+ // Unmark everything that was marked. Can't do the same walk because
+ // redefine classes messes up the code cache so the set of methods
+ // might not be the same.
+ for (int i = 0; i< _marked_objects->length(); i++) {
+ _marked_objects->at(i)->set_on_stack(false);
+ }
+ _marked_objects->clear(); // reuse growable array for next time.
+ NOT_PRODUCT(_is_active = false;)
+}
+
+// Record which objects are marked so we can unmark the same objects.
+void MetadataOnStackMark::record(Metadata* m) {
+ assert(_is_active, "metadata on stack marking is active");
+ _marked_objects->push(m);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/classfile/metadataOnStackMark.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * 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_CLASSFILE_METADATAONSTACKMARK_HPP
+#define SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
+
+#include "memory/allocation.hpp"
+
+class Metadata;
+
+// Helper class to mark and unmark metadata used on the stack as either handles
+// or executing methods, so that it can't be deleted during class redefinition
+// and class unloading.
+// This is also used for other things that can be deallocated, like class
+// metadata during parsing, relocated methods, and methods in backtraces.
+class MetadataOnStackMark : public StackObj {
+ NOT_PRODUCT(static bool _is_active;)
+ public:
+ MetadataOnStackMark();
+ ~MetadataOnStackMark();
+ static void record(Metadata* m);
+};
+
+#endif // SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
--- a/hotspot/src/share/vm/classfile/stackMapFrame.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/stackMapFrame.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -178,7 +178,7 @@
#ifdef DEBUG
// Put bogus type to indicate it's no longer valid.
if (_stack_mark != -1) {
- for (int i = _stack_mark; i >= _stack_size; --i) {
+ for (int i = _stack_mark - 1; i >= _stack_size; --i) {
_stack[i] = VerificationType::bogus_type();
}
}
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1199,66 +1199,6 @@
return ik;
}
-#ifdef KERNEL
-// Some classes on the bootstrap class path haven't been installed on the
-// system yet. Call the DownloadManager method to make them appear in the
-// bootstrap class path and try again to load the named class.
-// Note that with delegation class loaders all classes in another loader will
-// first try to call this so it'd better be fast!!
-static instanceKlassHandle download_and_retry_class_load(
- Symbol* class_name,
- TRAPS) {
-
- Klass* dlm = SystemDictionary::DownloadManager_klass();
- instanceKlassHandle nk;
-
- // If download manager class isn't loaded just return.
- if (dlm == NULL) return nk;
-
- { HandleMark hm(THREAD);
- ResourceMark rm(THREAD);
- Handle s = java_lang_String::create_from_symbol(class_name, CHECK_(nk));
- Handle class_string = java_lang_String::externalize_classname(s, CHECK_(nk));
-
- // return value
- JavaValue result(T_OBJECT);
-
- // Call the DownloadManager. We assume that it has a lock because
- // multiple classes could be not found and downloaded at the same time.
- // class sun.misc.DownloadManager;
- // public static String getBootClassPathEntryForClass(String className);
- JavaCalls::call_static(&result,
- KlassHandle(THREAD, dlm),
- vmSymbols::getBootClassPathEntryForClass_name(),
- vmSymbols::string_string_signature(),
- class_string,
- CHECK_(nk));
-
- // Get result.string and add to bootclasspath
- assert(result.get_type() == T_OBJECT, "just checking");
- oop obj = (oop) result.get_jobject();
- if (obj == NULL) { return nk; }
-
- Handle h_obj(THREAD, obj);
- char* new_class_name = java_lang_String::as_platform_dependent_str(h_obj,
- CHECK_(nk));
-
- // lock the loader
- // we use this lock because JVMTI does.
- Handle loader_lock(THREAD, SystemDictionary::system_loader_lock());
-
- ObjectLocker ol(loader_lock, THREAD);
- // add the file to the bootclasspath
- ClassLoader::update_class_path_entry_list(new_class_name, true);
- } // end HandleMark
-
- if (TraceClassLoading) {
- ClassLoader::print_bootclasspath();
- }
- return ClassLoader::load_classfile(class_name, CHECK_(nk));
-}
-#endif // KERNEL
-
instanceKlassHandle SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) {
instanceKlassHandle nh = instanceKlassHandle(); // null Handle
@@ -1278,15 +1218,6 @@
k = ClassLoader::load_classfile(class_name, CHECK_(nh));
}
-#ifdef KERNEL
- // If the VM class loader has failed to load the class, call the
- // DownloadManager class to make it magically appear on the classpath
- // and try again. This is only configured with the Kernel VM.
- if (k.is_null()) {
- k = download_and_retry_class_load(class_name, CHECK_(nh));
- }
-#endif // KERNEL
-
// find_or_define_instance_class may return a different InstanceKlass
if (!k.is_null()) {
k = find_or_define_instance_class(class_name, class_loader, k, CHECK_(nh));
@@ -1822,13 +1753,7 @@
Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid);
Klass** klassp = &_well_known_klasses[id];
bool must_load = (init_opt < SystemDictionary::Opt);
- bool try_load = true;
- if (init_opt == SystemDictionary::Opt_Kernel) {
-#ifndef KERNEL
- try_load = false;
-#endif //KERNEL
- }
- if ((*klassp) == NULL && try_load) {
+ if ((*klassp) == NULL) {
if (must_load) {
(*klassp) = resolve_or_fail(symbol, true, CHECK_0); // load required class
} else {
@@ -1918,12 +1843,6 @@
//_box_klasses[T_OBJECT] = WK_KLASS(object_klass);
//_box_klasses[T_ARRAY] = WK_KLASS(object_klass);
-#ifdef KERNEL
- if (DownloadManager_klass() == NULL) {
- warning("Cannot find sun/jkernel/DownloadManager");
- }
-#endif // KERNEL
-
{ // Compute whether we should use loadClass or loadClassInternal when loading classes.
Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature());
_has_loadClassInternal = (method != NULL);
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -168,8 +168,6 @@
/* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \
do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \
\
- do_klass(DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel ) \
- \
do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \
\
/* Preload boxing klasses */ \
@@ -211,7 +209,6 @@
Opt, // preload tried; NULL if not present
Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection
Opt_Only_JDK15, // preload tried; use only with JDK1.5+
- Opt_Kernel, // preload tried only #ifdef KERNEL
OPTION_LIMIT,
CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT)
};
@@ -394,7 +391,6 @@
static Klass* check_klass_Pre( Klass* k) { return check_klass(k); }
static Klass* check_klass_Pre_JSR292(Klass* k) { return EnableInvokeDynamic ? check_klass(k) : k; }
static Klass* check_klass_Opt( Klass* k) { return k; }
- static Klass* check_klass_Opt_Kernel(Klass* k) { return k; } //== Opt
static Klass* check_klass_Opt_Only_JDK15(Klass* k) {
assert(JDK_Version::is_gte_jdk15x_version(), "JDK 1.5 only");
return k;
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -108,7 +108,6 @@
template(java_lang_Compiler, "java/lang/Compiler") \
template(sun_misc_Signal, "sun/misc/Signal") \
template(java_lang_AssertionStatusDirectives, "java/lang/AssertionStatusDirectives") \
- template(sun_jkernel_DownloadManager, "sun/jkernel/DownloadManager") \
template(getBootClassPathEntryForClass_name, "getBootClassPathEntryForClass") \
template(sun_misc_PostVMInitHook, "sun/misc/PostVMInitHook") \
template(sun_misc_Launcher_ExtClassLoader, "sun/misc/Launcher$ExtClassLoader") \
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1398,7 +1398,7 @@
method->print_short_name(tty);
tty->cr();
}
- method->set_not_compilable_quietly();
+ method->set_not_compilable(CompLevel_all, !quietly, "excluded by CompilerOracle");
}
return false;
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -102,7 +102,7 @@
// temporarily disabled).
switch (dictionaryChoice) {
case FreeBlockDictionary<FreeChunk>::dictionaryBinaryTree:
- _dictionary = new BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>(mr);
+ _dictionary = new AFLBinaryTreeDictionary(mr);
break;
case FreeBlockDictionary<FreeChunk>::dictionarySplayTree:
case FreeBlockDictionary<FreeChunk>::dictionarySkipList:
@@ -122,7 +122,8 @@
// moved to its new location before the klass is moved.
// Set the _refillSize for the linear allocation blocks
if (!use_adaptive_freelists) {
- FreeChunk* fc = _dictionary->get_chunk(mr.word_size());
+ FreeChunk* fc = _dictionary->get_chunk(mr.word_size(),
+ FreeBlockDictionary<FreeChunk>::atLeast);
// The small linAB initially has all the space and will allocate
// a chunk of any size.
HeapWord* addr = (HeapWord*) fc;
@@ -1647,7 +1648,8 @@
FreeChunk*
CompactibleFreeListSpace::getChunkFromDictionary(size_t size) {
assert_locked();
- FreeChunk* fc = _dictionary->get_chunk(size);
+ FreeChunk* fc = _dictionary->get_chunk(size,
+ FreeBlockDictionary<FreeChunk>::atLeast);
if (fc == NULL) {
return NULL;
}
@@ -1664,7 +1666,8 @@
FreeChunk*
CompactibleFreeListSpace::getChunkFromDictionaryExact(size_t size) {
assert_locked();
- FreeChunk* fc = _dictionary->get_chunk(size);
+ FreeChunk* fc = _dictionary->get_chunk(size,
+ FreeBlockDictionary<FreeChunk>::atLeast);
if (fc == NULL) {
return fc;
}
@@ -1677,7 +1680,8 @@
if (fc->size() < size + MinChunkSize) {
// Return the chunk to the dictionary and go get a bigger one.
returnChunkToDictionary(fc);
- fc = _dictionary->get_chunk(size + MinChunkSize);
+ fc = _dictionary->get_chunk(size + MinChunkSize,
+ FreeBlockDictionary<FreeChunk>::atLeast);
if (fc == NULL) {
return NULL;
}
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -131,7 +131,7 @@
LinearAllocBlock _smallLinearAllocBlock;
FreeBlockDictionary<FreeChunk>::DictionaryChoice _dictionaryChoice;
- FreeBlockDictionary<FreeChunk>* _dictionary; // ptr to dictionary for large size blocks
+ AFLBinaryTreeDictionary* _dictionary; // ptr to dictionary for large size blocks
AdaptiveFreeList<FreeChunk> _indexedFreeList[IndexSetSize];
// indexed array for small size blocks
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,8 +25,6 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
-typedef BinaryTreeDictionary<FreeChunk, AdaptiveFreeList> AFLBinaryTreeDictionary;
-
#define VM_STRUCTS_CMS(nonstatic_field, \
volatile_nonstatic_field, \
static_field) \
@@ -34,14 +32,15 @@
nonstatic_field(CompactibleFreeListSpace, _bt, BlockOffsetArrayNonContigSpace) \
\
nonstatic_field(CMSBitMap, _bmWordSize, size_t) \
- nonstatic_field(CMSBitMap, _shifter, const int) \
- nonstatic_field(CMSBitMap, _bm, BitMap) \
- nonstatic_field(CMSBitMap, _virtual_space, VirtualSpace) \
+ nonstatic_field(CMSBitMap, _shifter, const int) \
+ nonstatic_field(CMSBitMap, _bm, BitMap) \
+ nonstatic_field(CMSBitMap, _virtual_space, VirtualSpace) \
nonstatic_field(CMSCollector, _markBitMap, CMSBitMap) \
nonstatic_field(ConcurrentMarkSweepGeneration, _cmsSpace, CompactibleFreeListSpace*) \
static_field(ConcurrentMarkSweepThread, _collector, CMSCollector*) \
nonstatic_field(LinearAllocBlock, _word_size, size_t) \
nonstatic_field(AFLBinaryTreeDictionary, _total_size, size_t) \
+ nonstatic_field(CompactibleFreeListSpace, _dictionary, AFLBinaryTreeDictionary*) \
nonstatic_field(CompactibleFreeListSpace, _indexedFreeList[0], FreeList<FreeChunk>) \
nonstatic_field(CompactibleFreeListSpace, _smallLinearAllocBlock, LinearAllocBlock)
@@ -62,10 +61,9 @@
declare_toplevel_type(SurrogateLockerThread*) \
declare_toplevel_type(CompactibleFreeListSpace*) \
declare_toplevel_type(CMSCollector*) \
- declare_toplevel_type(AFLBinaryTreeDictionary*) \
+ declare_toplevel_type(AFLBinaryTreeDictionary) \
declare_toplevel_type(LinearAllocBlock) \
- declare_toplevel_type(FreeBlockDictionary<FreeChunk>) \
- declare_type(AFLBinaryTreeDictionary, FreeBlockDictionary<FreeChunk>)
+ declare_toplevel_type(FreeBlockDictionary<FreeChunk>)
#define VM_INT_CONSTANTS_CMS(declare_constant) \
declare_constant(Generation::ConcurrentMarkSweep) \
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -571,19 +571,14 @@
_sleep_factor = 0.0;
_marking_task_overhead = 1.0;
} else {
- if (ConcGCThreads > 0) {
- // notice that ConcGCThreads overwrites G1MarkingOverheadPercent
+ if (!FLAG_IS_DEFAULT(ConcGCThreads) && ConcGCThreads > 0) {
+ // Note: ConcGCThreads has precedence over G1MarkingOverheadPercent
// if both are set
-
- _parallel_marking_threads = (uint) ConcGCThreads;
- _max_parallel_marking_threads = _parallel_marking_threads;
_sleep_factor = 0.0;
_marking_task_overhead = 1.0;
} else if (G1MarkingOverheadPercent > 0) {
- // we will calculate the number of parallel marking threads
- // based on a target overhead with respect to the soft real-time
- // goal
-
+ // We will calculate the number of parallel marking threads based
+ // on a target overhead with respect to the soft real-time goal
double marking_overhead = (double) G1MarkingOverheadPercent / 100.0;
double overall_cm_overhead =
(double) MaxGCPauseMillis * marking_overhead /
@@ -596,17 +591,22 @@
double sleep_factor =
(1.0 - marking_task_overhead) / marking_task_overhead;
- _parallel_marking_threads = (uint) marking_thread_num;
- _max_parallel_marking_threads = _parallel_marking_threads;
+ FLAG_SET_ERGO(uintx, ConcGCThreads, (uint) marking_thread_num);
_sleep_factor = sleep_factor;
_marking_task_overhead = marking_task_overhead;
} else {
- _parallel_marking_threads = scale_parallel_threads((uint)ParallelGCThreads);
- _max_parallel_marking_threads = _parallel_marking_threads;
+ // Calculate the number of parallel marking threads by scaling
+ // the number of parallel GC threads.
+ uint marking_thread_num = scale_parallel_threads((uint) ParallelGCThreads);
+ FLAG_SET_ERGO(uintx, ConcGCThreads, marking_thread_num);
_sleep_factor = 0.0;
_marking_task_overhead = 1.0;
}
+ assert(ConcGCThreads > 0, "Should have been set");
+ _parallel_marking_threads = (uint) ConcGCThreads;
+ _max_parallel_marking_threads = _parallel_marking_threads;
+
if (parallel_marking_threads() > 1) {
_cleanup_task_overhead = 1.0;
} else {
@@ -1190,7 +1190,7 @@
uint active_workers = MAX2(1U, parallel_marking_threads());
CMRootRegionScanTask task(this);
- if (parallel_marking_threads() > 0) {
+ if (use_parallel_marking_threads()) {
_parallel_workers->set_active_workers((int) active_workers);
_parallel_workers->run_task(&task);
} else {
@@ -1226,7 +1226,7 @@
set_phase(active_workers, true /* concurrent */);
CMConcurrentMarkingTask markingTask(this, cmThread());
- if (parallel_marking_threads() > 0) {
+ if (use_parallel_marking_threads()) {
_parallel_workers->set_active_workers((int)active_workers);
// Don't set _n_par_threads because it affects MT in proceess_strong_roots()
// and the decisions on that MT processing is made elsewhere.
@@ -2167,7 +2167,8 @@
assert(tmp_free_list.is_empty(), "post-condition");
}
-// Support closures for reference procssing in G1
+// Supporting Object and Oop closures for reference discovery
+// and processing in during marking
bool G1CMIsAliveClosure::do_object_b(oop obj) {
HeapWord* addr = (HeapWord*)obj;
@@ -2175,73 +2176,26 @@
(!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj));
}
-class G1CMKeepAliveClosure: public ExtendedOopClosure {
- G1CollectedHeap* _g1;
- ConcurrentMark* _cm;
- public:
- G1CMKeepAliveClosure(G1CollectedHeap* g1, ConcurrentMark* cm) :
- _g1(g1), _cm(cm) {
- assert(Thread::current()->is_VM_thread(), "otherwise fix worker id");
- }
-
- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
- virtual void do_oop( oop* p) { do_oop_work(p); }
-
- template <class T> void do_oop_work(T* p) {
- oop obj = oopDesc::load_decode_heap_oop(p);
- HeapWord* addr = (HeapWord*)obj;
-
- if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("\t[0] we're looking at location "
- "*"PTR_FORMAT" = "PTR_FORMAT,
- p, (void*) obj);
- }
-
- if (_g1->is_in_g1_reserved(addr) && _g1->is_obj_ill(obj)) {
- _cm->mark_and_count(obj);
- _cm->mark_stack_push(obj);
- }
- }
-};
-
-class G1CMDrainMarkingStackClosure: public VoidClosure {
- ConcurrentMark* _cm;
- CMMarkStack* _markStack;
- G1CMKeepAliveClosure* _oopClosure;
- public:
- G1CMDrainMarkingStackClosure(ConcurrentMark* cm, CMMarkStack* markStack,
- G1CMKeepAliveClosure* oopClosure) :
- _cm(cm),
- _markStack(markStack),
- _oopClosure(oopClosure) { }
-
- void do_void() {
- _markStack->drain(_oopClosure, _cm->nextMarkBitMap(), false);
- }
-};
-
-// 'Keep Alive' closure used by parallel reference processing.
-// An instance of this closure is used in the parallel reference processing
-// code rather than an instance of G1CMKeepAliveClosure. We could have used
-// the G1CMKeepAliveClosure as it is MT-safe. Also reference objects are
-// placed on to discovered ref lists once so we can mark and push with no
-// need to check whether the object has already been marked. Using the
-// G1CMKeepAliveClosure would mean, however, having all the worker threads
-// operating on the global mark stack. This means that an individual
-// worker would be doing lock-free pushes while it processes its own
-// discovered ref list followed by drain call. If the discovered ref lists
-// are unbalanced then this could cause interference with the other
-// workers. Using a CMTask (and its embedded local data structures)
-// avoids that potential interference.
-class G1CMParKeepAliveAndDrainClosure: public OopClosure {
+// 'Keep Alive' oop closure used by both serial parallel reference processing.
+// Uses the CMTask associated with a worker thread (for serial reference
+// processing the CMTask for worker 0 is used) to preserve (mark) and
+// trace referent objects.
+//
+// Using the CMTask and embedded local queues avoids having the worker
+// threads operating on the global mark stack. This reduces the risk
+// of overflowing the stack - which we would rather avoid at this late
+// state. Also using the tasks' local queues removes the potential
+// of the workers interfering with each other that could occur if
+// operating on the global stack.
+
+class G1CMKeepAliveAndDrainClosure: public OopClosure {
ConcurrentMark* _cm;
CMTask* _task;
int _ref_counter_limit;
int _ref_counter;
public:
- G1CMParKeepAliveAndDrainClosure(ConcurrentMark* cm, CMTask* task) :
- _cm(cm), _task(task),
- _ref_counter_limit(G1RefProcDrainInterval) {
+ G1CMKeepAliveAndDrainClosure(ConcurrentMark* cm, CMTask* task) :
+ _cm(cm), _task(task), _ref_counter_limit(G1RefProcDrainInterval) {
assert(_ref_counter_limit > 0, "sanity");
_ref_counter = _ref_counter_limit;
}
@@ -2262,18 +2216,22 @@
_ref_counter--;
if (_ref_counter == 0) {
- // We have dealt with _ref_counter_limit references, pushing them and objects
- // reachable from them on to the local stack (and possibly the global stack).
- // Call do_marking_step() to process these entries. We call the routine in a
- // loop, which we'll exit if there's nothing more to do (i.e. we're done
- // with the entries that we've pushed as a result of the deal_with_reference
- // calls above) or we overflow.
- // Note: CMTask::do_marking_step() can set the CMTask::has_aborted() flag
- // while there may still be some work to do. (See the comment at the
- // beginning of CMTask::do_marking_step() for those conditions - one of which
- // is reaching the specified time target.) It is only when
- // CMTask::do_marking_step() returns without setting the has_aborted() flag
- // that the marking has completed.
+ // We have dealt with _ref_counter_limit references, pushing them
+ // and objects reachable from them on to the local stack (and
+ // possibly the global stack). Call CMTask::do_marking_step() to
+ // process these entries.
+ //
+ // We call CMTask::do_marking_step() in a loop, which we'll exit if
+ // there's nothing more to do (i.e. we're done with the entries that
+ // were pushed as a result of the CMTask::deal_with_reference() calls
+ // above) or we overflow.
+ //
+ // Note: CMTask::do_marking_step() can set the CMTask::has_aborted()
+ // flag while there may still be some work to do. (See the comment at
+ // the beginning of CMTask::do_marking_step() for those conditions -
+ // one of which is reaching the specified time target.) It is only
+ // when CMTask::do_marking_step() returns without setting the
+ // has_aborted() flag that the marking step has completed.
do {
double mark_step_duration_ms = G1ConcMarkStepDurationMillis;
_task->do_marking_step(mark_step_duration_ms,
@@ -2290,36 +2248,59 @@
}
};
-class G1CMParDrainMarkingStackClosure: public VoidClosure {
+// 'Drain' oop closure used by both serial and parallel reference processing.
+// Uses the CMTask associated with a given worker thread (for serial
+// reference processing the CMtask for worker 0 is used). Calls the
+// do_marking_step routine, with an unbelievably large timeout value,
+// to drain the marking data structures of the remaining entries
+// added by the 'keep alive' oop closure above.
+
+class G1CMDrainMarkingStackClosure: public VoidClosure {
ConcurrentMark* _cm;
- CMTask* _task;
+ CMTask* _task;
+ bool _do_stealing;
+ bool _do_termination;
public:
- G1CMParDrainMarkingStackClosure(ConcurrentMark* cm, CMTask* task) :
- _cm(cm), _task(task) { }
+ G1CMDrainMarkingStackClosure(ConcurrentMark* cm, CMTask* task, bool is_par) :
+ _cm(cm), _task(task) {
+ assert(is_par || _task->worker_id() == 0,
+ "Only task for worker 0 should be used if ref processing is single threaded");
+ // We only allow stealing and only enter the termination protocol
+ // in CMTask::do_marking_step() if this closure is being instantiated
+ // for parallel reference processing.
+ _do_stealing = _do_termination = is_par;
+ }
void do_void() {
do {
if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("\t[%u] Drain: Calling do marking_step",
- _task->worker_id());
+ gclog_or_tty->print_cr("\t[%u] Drain: Calling do_marking_step - "
+ "stealing: %s, termination: %s",
+ _task->worker_id(),
+ BOOL_TO_STR(_do_stealing),
+ BOOL_TO_STR(_do_termination));
}
- // We call CMTask::do_marking_step() to completely drain the local and
- // global marking stacks. The routine is called in a loop, which we'll
- // exit if there's nothing more to do (i.e. we'completely drained the
- // entries that were pushed as a result of applying the
- // G1CMParKeepAliveAndDrainClosure to the entries on the discovered ref
- // lists above) or we overflow the global marking stack.
- // Note: CMTask::do_marking_step() can set the CMTask::has_aborted() flag
- // while there may still be some work to do. (See the comment at the
- // beginning of CMTask::do_marking_step() for those conditions - one of which
- // is reaching the specified time target.) It is only when
- // CMTask::do_marking_step() returns without setting the has_aborted() flag
- // that the marking has completed.
+ // We call CMTask::do_marking_step() to completely drain the local
+ // and global marking stacks of entries pushed by the 'keep alive'
+ // oop closure (an instance of G1CMKeepAliveAndDrainClosure above).
+ //
+ // CMTask::do_marking_step() is called in a loop, which we'll exit
+ // if there's nothing more to do (i.e. we'completely drained the
+ // entries that were pushed as a a result of applying the 'keep alive'
+ // closure to the entries on the discovered ref lists) or we overflow
+ // the global marking stack.
+ //
+ // Note: CMTask::do_marking_step() can set the CMTask::has_aborted()
+ // flag while there may still be some work to do. (See the comment at
+ // the beginning of CMTask::do_marking_step() for those conditions -
+ // one of which is reaching the specified time target.) It is only
+ // when CMTask::do_marking_step() returns without setting the
+ // has_aborted() flag that the marking step has completed.
_task->do_marking_step(1000000000.0 /* something very large */,
- true /* do_stealing */,
- true /* do_termination */);
+ _do_stealing,
+ _do_termination);
} while (_task->has_aborted() && !_cm->has_overflown());
}
};
@@ -2352,19 +2333,23 @@
ProcessTask& _proc_task;
G1CollectedHeap* _g1h;
ConcurrentMark* _cm;
+ bool _processing_is_mt;
public:
G1CMRefProcTaskProxy(ProcessTask& proc_task,
G1CollectedHeap* g1h,
ConcurrentMark* cm) :
AbstractGangTask("Process reference objects in parallel"),
- _proc_task(proc_task), _g1h(g1h), _cm(cm) { }
+ _proc_task(proc_task), _g1h(g1h), _cm(cm) {
+ ReferenceProcessor* rp = _g1h->ref_processor_cm();
+ _processing_is_mt = rp->processing_is_mt();
+ }
virtual void work(uint worker_id) {
CMTask* marking_task = _cm->task(worker_id);
G1CMIsAliveClosure g1_is_alive(_g1h);
- G1CMParKeepAliveAndDrainClosure g1_par_keep_alive(_cm, marking_task);
- G1CMParDrainMarkingStackClosure g1_par_drain(_cm, marking_task);
+ G1CMKeepAliveAndDrainClosure g1_par_keep_alive(_cm, marking_task);
+ G1CMDrainMarkingStackClosure g1_par_drain(_cm, marking_task, _processing_is_mt);
_proc_task.work(worker_id, g1_is_alive, g1_par_keep_alive, g1_par_drain);
}
@@ -2372,6 +2357,7 @@
void G1CMRefProcTaskExecutor::execute(ProcessTask& proc_task) {
assert(_workers != NULL, "Need parallel worker threads.");
+ assert(_g1h->ref_processor_cm()->processing_is_mt(), "processing is not MT");
G1CMRefProcTaskProxy proc_task_proxy(proc_task, _g1h, _cm);
@@ -2399,6 +2385,7 @@
void G1CMRefProcTaskExecutor::execute(EnqueueTask& enq_task) {
assert(_workers != NULL, "Need parallel worker threads.");
+ assert(_g1h->ref_processor_cm()->processing_is_mt(), "processing is not MT");
G1CMRefEnqueueTaskProxy enq_task_proxy(enq_task);
@@ -2429,59 +2416,58 @@
// See the comment in G1CollectedHeap::ref_processing_init()
// about how reference processing currently works in G1.
- // Process weak references.
+ // Set the soft reference policy
rp->setup_policy(clear_all_soft_refs);
assert(_markStack.isEmpty(), "mark stack should be empty");
- G1CMKeepAliveClosure g1_keep_alive(g1h, this);
- G1CMDrainMarkingStackClosure
- g1_drain_mark_stack(this, &_markStack, &g1_keep_alive);
-
- // We use the work gang from the G1CollectedHeap and we utilize all
- // the worker threads.
- uint active_workers = g1h->workers() ? g1h->workers()->active_workers() : 1U;
+ // Non-MT instances 'Keep Alive' and 'Complete GC' oop closures.
+ G1CMKeepAliveAndDrainClosure g1_keep_alive(this, task(0));
+ G1CMDrainMarkingStackClosure g1_drain_mark_stack(this, task(0), false);
+
+ // We need at least one active thread. If reference processing is
+ // not multi-threaded we use the current (ConcurrentMarkThread) thread,
+ // otherwise we use the work gang from the G1CollectedHeap and we
+ // utilize all the worker threads we can.
+ uint active_workers = (rp->processing_is_mt() && g1h->workers() != NULL
+ ? g1h->workers()->active_workers()
+ : 1U);
+
active_workers = MAX2(MIN2(active_workers, _max_worker_id), 1U);
G1CMRefProcTaskExecutor par_task_executor(g1h, this,
g1h->workers(), active_workers);
- if (rp->processing_is_mt()) {
- // Set the degree of MT here. If the discovery is done MT, there
- // may have been a different number of threads doing the discovery
- // and a different number of discovered lists may have Ref objects.
- // That is OK as long as the Reference lists are balanced (see
- // balance_all_queues() and balance_queues()).
- rp->set_active_mt_degree(active_workers);
-
- rp->process_discovered_references(&g1_is_alive,
+ AbstractRefProcTaskExecutor* executor = (rp->processing_is_mt()
+ ? &par_task_executor
+ : NULL);
+
+ // Set the degree of MT processing here. If the discovery was done MT,
+ // the number of threads involved during discovery could differ from
+ // the number of active workers. This is OK as long as the discovered
+ // Reference lists are balanced (see balance_all_queues() and balance_queues()).
+ rp->set_active_mt_degree(active_workers);
+
+ // Process the weak references.
+ rp->process_discovered_references(&g1_is_alive,
&g1_keep_alive,
&g1_drain_mark_stack,
- &par_task_executor);
-
- // The work routines of the parallel keep_alive and drain_marking_stack
- // will set the has_overflown flag if we overflow the global marking
- // stack.
- } else {
- rp->process_discovered_references(&g1_is_alive,
- &g1_keep_alive,
- &g1_drain_mark_stack,
- NULL);
- }
+ executor);
+
+ // The do_oop work routines of the keep_alive and drain_marking_stack
+ // oop closures will set the has_overflown flag if we overflow the
+ // global marking stack.
assert(_markStack.overflow() || _markStack.isEmpty(),
"mark stack should be empty (unless it overflowed)");
if (_markStack.overflow()) {
- // Should have been done already when we tried to push an
+ // This should have been done already when we tried to push an
// entry on to the global mark stack. But let's do it again.
set_has_overflown();
}
- if (rp->processing_is_mt()) {
- assert(rp->num_q() == active_workers, "why not");
- rp->enqueue_discovered_references(&par_task_executor);
- } else {
- rp->enqueue_discovered_references();
- }
+ assert(rp->num_q() == active_workers, "why not");
+
+ rp->enqueue_discovered_references(executor);
rp->verify_no_references_recorded();
assert(!rp->discovery_enabled(), "Post condition");
@@ -3242,7 +3228,9 @@
}
void ConcurrentMark::print_worker_threads_on(outputStream* st) const {
- _parallel_workers->print_worker_threads_on(st);
+ if (use_parallel_marking_threads()) {
+ _parallel_workers->print_worker_threads_on(st);
+ }
}
// We take a break if someone is trying to stop the world.
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -371,8 +371,8 @@
friend class CalcLiveObjectsClosure;
friend class G1CMRefProcTaskProxy;
friend class G1CMRefProcTaskExecutor;
- friend class G1CMParKeepAliveAndDrainClosure;
- friend class G1CMParDrainMarkingStackClosure;
+ friend class G1CMKeepAliveAndDrainClosure;
+ friend class G1CMDrainMarkingStackClosure;
protected:
ConcurrentMarkThread* _cmThread; // the thread doing the work
@@ -499,17 +499,26 @@
}
// accessor methods
- uint parallel_marking_threads() { return _parallel_marking_threads; }
- uint max_parallel_marking_threads() { return _max_parallel_marking_threads;}
- double sleep_factor() { return _sleep_factor; }
- double marking_task_overhead() { return _marking_task_overhead;}
- double cleanup_sleep_factor() { return _cleanup_sleep_factor; }
- double cleanup_task_overhead() { return _cleanup_task_overhead;}
+ uint parallel_marking_threads() const { return _parallel_marking_threads; }
+ uint max_parallel_marking_threads() const { return _max_parallel_marking_threads;}
+ double sleep_factor() { return _sleep_factor; }
+ double marking_task_overhead() { return _marking_task_overhead;}
+ double cleanup_sleep_factor() { return _cleanup_sleep_factor; }
+ double cleanup_task_overhead() { return _cleanup_task_overhead;}
- HeapWord* finger() { return _finger; }
- bool concurrent() { return _concurrent; }
- uint active_tasks() { return _active_tasks; }
- ParallelTaskTerminator* terminator() { return &_terminator; }
+ bool use_parallel_marking_threads() const {
+ assert(parallel_marking_threads() <=
+ max_parallel_marking_threads(), "sanity");
+ assert((_parallel_workers == NULL && parallel_marking_threads() == 0) ||
+ parallel_marking_threads() > 0,
+ "parallel workers not set up correctly");
+ return _parallel_workers != NULL;
+ }
+
+ HeapWord* finger() { return _finger; }
+ bool concurrent() { return _concurrent; }
+ uint active_tasks() { return _active_tasks; }
+ ParallelTaskTerminator* terminator() { return &_terminator; }
// It claims the next available region to be scanned by a marking
// task/thread. It might return NULL if the next region is empty or
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -28,8 +28,9 @@
#include "memory/cardTableModRefBS.hpp"
#include "memory/memRegion.hpp"
#include "oops/oop.inline.hpp"
+#include "utilities/macros.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
class DirtyCardQueueSet;
@@ -120,6 +121,6 @@
};
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -32,8 +32,9 @@
#include "gc_implementation/shared/spaceDecorator.hpp"
#include "memory/space.inline.hpp"
#include "memory/watermark.hpp"
+#include "utilities/macros.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// A HeapRegion is the smallest piece of a G1CollectedHeap that
// can be collected independently.
@@ -837,6 +838,6 @@
bool complete() { return _complete; }
};
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP
--- a/hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,10 +23,11 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/allocationStats.hpp"
#include "utilities/ostream.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// Technically this should be derived from machine speed, and
// ideally it would be dynamically adjusted.
--- a/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,11 +25,12 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/gcUtil.hpp"
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
class AllocationStats VALUE_OBJ_CLASS_SPEC {
// A duration threshold (in ms) used to filter
--- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,9 +25,10 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "runtime/thread.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
class VoidClosure;
--- a/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,11 +23,12 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/gSpaceCounters.hpp"
#include "memory/generation.hpp"
#include "memory/resourceArea.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
GSpaceCounters::GSpaceCounters(const char* name, int ordinal, size_t max_size,
Generation* g, GenerationCounters* gc,
--- a/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,11 +25,12 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/generationCounters.hpp"
#include "memory/generation.hpp"
#include "runtime/perfData.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// A GSpaceCounter is a holder class for performance counters
// that track a space;
--- a/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,10 +25,11 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// This class keeps statistical information and computes the
// size of the heap.
--- a/hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,11 +25,12 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_HSPACECOUNTERS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_HSPACECOUNTERS_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/generationCounters.hpp"
#include "memory/generation.hpp"
#include "runtime/perfData.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// A HSpaceCounter is a holder class for performance counters
// that track a collections (logical spaces) in a heap;
--- a/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,11 +23,12 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/immutableSpace.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
void ImmutableSpace::initialize(MemRegion mr) {
HeapWord* bottom = mr.start();
--- a/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,9 +25,10 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// This class provides a method for block structured setting of the
// _is_gc_active state without requiring accessors in CollectedHeap
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -28,9 +28,10 @@
#include "gc_implementation/shared/markSweep.hpp"
#include "gc_interface/collectedHeap.hpp"
#include "utilities/stack.inline.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
inline void MarkSweep::mark_object(oop obj) {
// some marks may contain information we need to preserve so we store them away
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,10 +25,11 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/gcUtil.hpp"
#include "gc_implementation/shared/mutableSpace.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
/*
* The NUMA-aware allocator (MutableNUMASpace) is basically a modification
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,13 +23,14 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/mutableSpace.hpp"
#include "gc_implementation/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
MutableSpace::MutableSpace(size_t alignment): ImmutableSpace(), _top(NULL), _alignment(alignment) {
assert(MutableSpace::alignment() >= 0 &&
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,10 +23,11 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/spaceCounters.hpp"
#include "memory/resourceArea.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
SpaceCounters::SpaceCounters(const char* name, int ordinal, size_t max_size,
MutableSpace* m, GenerationCounters* gc) :
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,12 +25,13 @@
#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/shared/generationCounters.hpp"
#include "gc_implementation/shared/immutableSpace.hpp"
#include "gc_implementation/shared/mutableSpace.hpp"
#include "runtime/perfData.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// A SpaceCounter is a holder class for performance counters
// that track a space;
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -36,9 +36,10 @@
#include "runtime/interfaceSupport.hpp"
#include "utilities/dtrace.hpp"
#include "utilities/preserveException.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifndef USDT2
HS_DTRACE_PROBE_DECL1(hotspot, gc__begin, bool);
@@ -167,7 +168,9 @@
ch->collect_as_vm_thread(GCCause::_heap_inspection);
}
}
- HeapInspection::heap_inspection(_out, _need_prologue /* need_prologue */);
+ HeapInspection inspect(_csv_format, _print_help, _print_class_stats,
+ _columns);
+ inspect.heap_inspection(_out, _need_prologue /* need_prologue */);
}
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -130,6 +130,10 @@
outputStream* _out;
bool _full_gc;
bool _need_prologue;
+ bool _csv_format; // "comma separated values" format for spreadsheet.
+ bool _print_help;
+ bool _print_class_stats;
+ const char* _columns;
public:
VM_GC_HeapInspection(outputStream* out, bool request_full_gc,
bool need_prologue) :
@@ -140,6 +144,10 @@
_out = out;
_full_gc = request_full_gc;
_need_prologue = need_prologue;
+ _csv_format = false;
+ _print_help = false;
+ _print_class_stats = false;
+ _columns = NULL;
}
~VM_GC_HeapInspection() {}
@@ -147,6 +155,10 @@
virtual bool skip_operation() const;
virtual bool doit_prologue();
virtual void doit();
+ void set_csv_format(bool value) {_csv_format = value;}
+ void set_print_help(bool value) {_print_help = value;}
+ void set_print_class_stats(bool value) {_print_class_stats = value;}
+ void set_columns(const char* value) {_columns = value;}
};
--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -3099,9 +3099,9 @@
tty->print_cr("&native_fresult: " INTPTR_FORMAT, (uintptr_t) &this->_native_fresult);
tty->print_cr("native_lresult: " INTPTR_FORMAT, (uintptr_t) this->_native_lresult);
#endif
-#if defined(IA64) && !defined(ZERO)
+#if !defined(ZERO)
tty->print_cr("last_Java_fp: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_fp);
-#endif // IA64 && !ZERO
+#endif // !ZERO
tty->print_cr("self_link: " INTPTR_FORMAT, (uintptr_t) this->_self_link);
}
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -1241,7 +1241,7 @@
void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
assert(EnableInvokeDynamic, "");
- pool->set_invokedynamic(); // mark header to flag active call sites
+ pool->set_has_invokedynamic(); // mark header to flag active call sites
//resolve_pool(<resolved_klass>, method_name, method_signature, current_klass, pool, index, CHECK);
Symbol* method_name = pool->name_ref_at(index);
--- a/hotspot/src/share/vm/memory/allocation.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/allocation.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -145,9 +145,10 @@
mtChunk = 0x0B00, // chunk that holds content of arenas
mtJavaHeap = 0x0C00, // Java heap
mtClassShared = 0x0D00, // class data sharing
- mt_number_of_types = 0x000D, // number of memory types (mtDontTrack
+ mtTest = 0x0E00, // Test type for verifying NMT
+ mt_number_of_types = 0x000E, // number of memory types (mtDontTrack
// is not included as validate type)
- mtDontTrack = 0x0E00, // memory we do not or cannot track
+ mtDontTrack = 0x0F00, // memory we do not or cannot track
mt_masks = 0x7F00,
// object type mask
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "utilities/macros.hpp"
#include "gc_implementation/shared/allocationStats.hpp"
#include "memory/binaryTreeDictionary.hpp"
#include "memory/freeList.hpp"
@@ -31,12 +32,13 @@
#include "memory/metachunk.hpp"
#include "runtime/globals.hpp"
#include "utilities/ostream.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
#include "gc_implementation/shared/spaceDecorator.hpp"
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
////////////////////////////////////////////////////////////////////////////////
// A binary tree based search structure for free blocks.
@@ -118,7 +120,7 @@
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Specialize for AdaptiveFreeList which tries to avoid
// splitting a chunk of a size that is under populated in favor of
// an over populated size. The general get_better_list() just returns
@@ -160,7 +162,7 @@
}
return curTL;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
template <class Chunk_t, template <class> class FreeList_t>
TreeList<Chunk_t, FreeList_t>*
@@ -871,9 +873,9 @@
template <class Chunk_t, template <class> class FreeList_t>
void BinaryTreeDictionary<Chunk_t, FreeList_t>::dict_census_update(size_t size, bool split, bool birth){}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
template <>
-void BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>::dict_census_update(size_t size, bool split, bool birth){
+void AFLBinaryTreeDictionary::dict_census_update(size_t size, bool split, bool birth){
TreeList<FreeChunk, AdaptiveFreeList>* nd = find_list(size);
if (nd) {
if (split) {
@@ -900,7 +902,7 @@
// This is a birth associated with a LinAB. The chunk
// for the LinAB is not in the dictionary.
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
template <class Chunk_t, template <class> class FreeList_t>
bool BinaryTreeDictionary<Chunk_t, FreeList_t>::coal_dict_over_populated(size_t size) {
@@ -909,9 +911,9 @@
return true;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
template <>
-bool BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>::coal_dict_over_populated(size_t size) {
+bool AFLBinaryTreeDictionary::coal_dict_over_populated(size_t size) {
if (FLSAlwaysCoalesceLarge) return true;
TreeList<FreeChunk, AdaptiveFreeList>* list_of_size = find_list(size);
@@ -919,7 +921,7 @@
return list_of_size == NULL || list_of_size->coal_desired() <= 0 ||
list_of_size->count() > list_of_size->coal_desired();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Closures for walking the binary tree.
// do_list() walks the free list in a node applying the closure
@@ -979,7 +981,7 @@
void do_list(FreeList<Chunk_t>* fl) {}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void do_list(AdaptiveFreeList<Chunk_t>* fl) {
double coalSurplusPercent = _percentage;
fl->compute_desired(_inter_sweep_current, _inter_sweep_estimate, _intra_sweep_estimate);
@@ -987,7 +989,7 @@
fl->set_before_sweep(fl->count());
fl->set_bfr_surp(fl->surplus());
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
};
// Used to search the tree until a condition is met.
@@ -1134,13 +1136,13 @@
setTreeSurplusClosure(double v) { percentage = v; }
void do_list(FreeList<Chunk_t>* fl) {}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void do_list(AdaptiveFreeList<Chunk_t>* fl) {
double splitSurplusPercent = percentage;
fl->set_surplus(fl->count() -
(ssize_t)((double)fl->desired() * splitSurplusPercent));
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
};
template <class Chunk_t, template <class> class FreeList_t>
@@ -1157,7 +1159,7 @@
setTreeHintsClosure(size_t v) { hint = v; }
void do_list(FreeList<Chunk_t>* fl) {}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void do_list(AdaptiveFreeList<Chunk_t>* fl) {
fl->set_hint(hint);
assert(fl->hint() == 0 || fl->hint() > fl->size(),
@@ -1166,7 +1168,7 @@
hint = fl->size();
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
};
template <class Chunk_t, template <class> class FreeList_t>
@@ -1180,7 +1182,7 @@
class clearTreeCensusClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
void do_list(FreeList<Chunk_t>* fl) {}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void do_list(AdaptiveFreeList<Chunk_t>* fl) {
fl->set_prev_sweep(fl->count());
fl->set_coal_births(0);
@@ -1188,7 +1190,7 @@
fl->set_split_births(0);
fl->set_split_deaths(0);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
};
template <class Chunk_t, template <class> class FreeList_t>
@@ -1252,7 +1254,7 @@
total()->set_count( total()->count() + fl->count() );
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void do_list(AdaptiveFreeList<Chunk_t>* fl) {
if (++_print_line >= 40) {
FreeList_t<Chunk_t>::print_labels_on(gclog_or_tty, "size");
@@ -1271,7 +1273,7 @@
total()->set_split_births(total()->split_births() + fl->split_births());
total()->set_split_deaths(total()->split_deaths() + fl->split_deaths());
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
};
template <class Chunk_t, template <class> class FreeList_t>
@@ -1286,9 +1288,9 @@
FreeList_t<Chunk_t>::print_labels_on(gclog_or_tty, " ");
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
template <>
-void BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>::print_dict_census(void) const {
+void AFLBinaryTreeDictionary::print_dict_census(void) const {
gclog_or_tty->print("\nBinaryTree\n");
AdaptiveFreeList<FreeChunk>::print_labels_on(gclog_or_tty, "size");
@@ -1308,7 +1310,7 @@
(double)(total->desired() - total->count())
/(total->desired() != 0 ? (double)total->desired() : 1.0));
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
template <class Chunk_t, template <class> class FreeList_t>
class PrintFreeListsClosure : public AscendTreeCensusClosure<Chunk_t, FreeList_t> {
@@ -1414,10 +1416,10 @@
template class TreeChunk<Metachunk, FreeList>;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Explicitly instantiate these types for FreeChunk.
template class TreeList<FreeChunk, AdaptiveFreeList>;
template class BinaryTreeDictionary<FreeChunk, AdaptiveFreeList>;
template class TreeChunk<FreeChunk, AdaptiveFreeList>;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -43,6 +43,10 @@
template <class Chunk_t, template <class> class FreeList_t> class DescendTreeCensusClosure;
template <class Chunk_t, template <class> class FreeList_t> class DescendTreeSearchClosure;
+class FreeChunk;
+template <class> class AdaptiveFreeList;
+typedef BinaryTreeDictionary<FreeChunk, AdaptiveFreeList> AFLBinaryTreeDictionary;
+
template <class Chunk_t, template <class> class FreeList_t>
class TreeList : public FreeList_t<Chunk_t> {
friend class TreeChunk<Chunk_t, FreeList_t>;
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -34,6 +34,7 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/virtualspace.hpp"
#include "services/memTracker.hpp"
+#include "utilities/macros.hpp"
#ifdef COMPILER1
#include "c1/c1_LIR.hpp"
#include "c1/c1_LIRGenerator.hpp"
@@ -499,13 +500,13 @@
int n_threads = SharedHeap::heap()->n_par_threads();
bool is_par = n_threads > 0;
if (is_par) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
assert(SharedHeap::heap()->n_par_threads() ==
SharedHeap::heap()->workers()->active_workers(), "Mismatch");
non_clean_card_iterate_parallel_work(sp, mr, cl, ct, n_threads);
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
fatal("Parallel gc not supported here.");
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
} else {
// We do not call the non_clean_card_iterate_serial() version below because
// we want to clear the cards (which non_clean_card_iterate_serial() does not
--- a/hotspot/src/share/vm/memory/cardTableRS.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/cardTableRS.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -31,10 +31,11 @@
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
#include "runtime/os.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/concurrentMark.hpp"
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
CardTableRS::CardTableRS(MemRegion whole_heap,
int max_covered_regions) :
@@ -42,7 +43,7 @@
_cur_youngergen_card_val(youngergenP1_card),
_regions_to_iterate(max_covered_regions - 1)
{
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseG1GC) {
_ct_bs = new G1SATBCardTableLoggingModRefBS(whole_heap,
max_covered_regions);
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -39,10 +39,11 @@
#include "runtime/java.hpp"
#include "runtime/thread.inline.hpp"
#include "runtime/vmThread.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// CollectorPolicy methods.
@@ -235,6 +236,18 @@
if (NewSize + OldSize > MaxHeapSize) {
MaxHeapSize = NewSize + OldSize;
}
+
+ if (FLAG_IS_CMDLINE(OldSize) && FLAG_IS_DEFAULT(NewSize)) {
+ // NewRatio will be used later to set the young generation size so we use
+ // it to calculate how big the heap should be based on the requested OldSize
+ // and NewRatio.
+ assert(NewRatio > 0, "NewRatio should have been set up earlier");
+ size_t calculated_heapsize = (OldSize / NewRatio) * (NewRatio + 1);
+
+ calculated_heapsize = align_size_up(calculated_heapsize, max_alignment());
+ MaxHeapSize = calculated_heapsize;
+ InitialHeapSize = calculated_heapsize;
+ }
MaxHeapSize = align_size_up(MaxHeapSize, max_alignment());
always_do_update_barrier = UseConcMarkSweepGC;
@@ -384,14 +397,15 @@
// keeping it simple also seems a worthwhile goal.
bool TwoGenerationCollectorPolicy::adjust_gen0_sizes(size_t* gen0_size_ptr,
size_t* gen1_size_ptr,
- size_t heap_size,
- size_t min_gen0_size) {
+ const size_t heap_size,
+ const size_t min_gen1_size) {
bool result = false;
+
if ((*gen1_size_ptr + *gen0_size_ptr) > heap_size) {
- if (((*gen0_size_ptr + OldSize) > heap_size) &&
- (heap_size - min_gen0_size) >= min_alignment()) {
- // Adjust gen0 down to accomodate OldSize
- *gen0_size_ptr = heap_size - min_gen0_size;
+ if ((heap_size < (*gen0_size_ptr + min_gen1_size)) &&
+ (heap_size >= min_gen1_size + min_alignment())) {
+ // Adjust gen0 down to accommodate min_gen1_size
+ *gen0_size_ptr = heap_size - min_gen1_size;
*gen0_size_ptr =
MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
min_alignment());
--- a/hotspot/src/share/vm/memory/collectorPolicy.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/collectorPolicy.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
#include "memory/barrierSet.hpp"
#include "memory/generationSpec.hpp"
#include "memory/genRemSet.hpp"
+#include "utilities/macros.hpp"
// This class (or more correctly, subtypes of this class)
// are used to define global garbage collector attributes.
@@ -48,10 +49,10 @@
class GenCollectorPolicy;
class TwoGenerationCollectorPolicy;
class AdaptiveSizePolicy;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
class ConcurrentMarkSweepPolicy;
class G1CollectorPolicy;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
class GCPolicyCounters;
class MarkSweepPolicy;
@@ -134,21 +135,21 @@
virtual GenCollectorPolicy* as_generation_policy() { return NULL; }
virtual TwoGenerationCollectorPolicy* as_two_generation_policy() { return NULL; }
virtual MarkSweepPolicy* as_mark_sweep_policy() { return NULL; }
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
virtual ConcurrentMarkSweepPolicy* as_concurrent_mark_sweep_policy() { return NULL; }
virtual G1CollectorPolicy* as_g1_policy() { return NULL; }
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Note that these are not virtual.
bool is_generation_policy() { return as_generation_policy() != NULL; }
bool is_two_generation_policy() { return as_two_generation_policy() != NULL; }
bool is_mark_sweep_policy() { return as_mark_sweep_policy() != NULL; }
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
bool is_concurrent_mark_sweep_policy() { return as_concurrent_mark_sweep_policy() != NULL; }
bool is_g1_policy() { return as_g1_policy() != NULL; }
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
bool is_concurrent_mark_sweep_policy() { return false; }
bool is_g1_policy() { return false; }
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
virtual BarrierSet::Name barrier_set_name() = 0;
@@ -321,7 +322,7 @@
// Returns true is gen0 sizes were adjusted
bool adjust_gen0_sizes(size_t* gen0_size_ptr, size_t* gen1_size_ptr,
- size_t heap_size, size_t min_gen1_size);
+ const size_t heap_size, const size_t min_gen1_size);
};
class MarkSweepPolicy : public TwoGenerationCollectorPolicy {
--- a/hotspot/src/share/vm/memory/filemap.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/filemap.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -210,13 +210,14 @@
tty->print_cr(" %s", _full_path);
}
- // Remove the existing file in case another process has it open.
+#ifdef _WINDOWS // On Windows, need WRITE permission to remove the file.
+ chmod(_full_path, _S_IREAD | _S_IWRITE);
+#endif
+
+ // Use remove() to delete the existing file because, on Unix, this will
+ // allow processes that have it open continued access to the file.
remove(_full_path);
-#ifdef _WINDOWS // if 0444 is used on Windows, then remove() will fail.
- int fd = open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0744);
-#else
int fd = open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0444);
-#endif
if (fd < 0) {
fail_stop("Unable to create shared archive file %s.", _full_path);
}
--- a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,13 +23,15 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#include "memory/freeBlockDictionary.hpp"
#include "memory/metablock.hpp"
#include "memory/metachunk.hpp"
#include "runtime/thread.inline.hpp"
+#include "utilities/macros.hpp"
#ifndef PRODUCT
template <class Chunk> Mutex* FreeBlockDictionary<Chunk>::par_lock() const {
@@ -56,7 +58,7 @@
template class FreeBlockDictionary<Metablock>;
template class FreeBlockDictionary<Metachunk>;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Explicitly instantiate for FreeChunk
template class FreeBlockDictionary<FreeChunk>;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
--- a/hotspot/src/share/vm/memory/freeList.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/freeList.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -31,10 +31,11 @@
#include "runtime/globals.hpp"
#include "runtime/mutex.hpp"
#include "runtime/vmThread.hpp"
+#include "utilities/macros.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Free list. A FreeList is used to access a linked list of chunks
// of space in the heap. The head and tail are maintained so that
@@ -341,6 +342,6 @@
template class FreeList<Metablock>;
template class FreeList<Metachunk>;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
template class FreeList<FreeChunk>;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -51,10 +51,11 @@
#include "services/memoryService.hpp"
#include "utilities/vmError.hpp"
#include "utilities/workgroup.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
GenCollectedHeap* GenCollectedHeap::_gch;
NOT_PRODUCT(size_t GenCollectedHeap::_skip_header_HeapWords = 0;)
@@ -141,14 +142,14 @@
}
clear_incremental_collection_failed();
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// If we are running CMS, create the collector responsible
// for collecting the CMS generations.
if (collector_policy()->is_concurrent_mark_sweep_policy()) {
bool success = create_cms_collector();
if (!success) return JNI_ENOMEM;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
return JNI_OK;
}
@@ -686,12 +687,12 @@
void GenCollectedHeap::collect(GCCause::Cause cause) {
if (should_do_concurrent_full_gc(cause)) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// mostly concurrent full collection
collect_mostly_concurrent(cause);
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
ShouldNotReachHere();
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
} else {
#ifdef ASSERT
if (cause == GCCause::_scavenge_alot) {
@@ -736,7 +737,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
bool GenCollectedHeap::create_cms_collector() {
assert(((_gens[1]->kind() == Generation::ConcurrentMarkSweep) ||
@@ -772,7 +773,7 @@
VMThread::execute(&op);
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void GenCollectedHeap::do_full_collection(bool clear_all_soft_refs) {
do_full_collection(clear_all_soft_refs, _n_gens - 1);
@@ -1116,22 +1117,22 @@
if (workers() != NULL) {
workers()->threads_do(tc);
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC) {
ConcurrentMarkSweepThread::threads_do(tc);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
}
void GenCollectedHeap::print_gc_threads_on(outputStream* st) const {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseParNewGC) {
workers()->print_worker_threads_on(st);
}
if (UseConcMarkSweepGC) {
ConcurrentMarkSweepThread::print_all_on(st);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
}
void GenCollectedHeap::print_tracing_info() const {
--- a/hotspot/src/share/vm/memory/generationSpec.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/generationSpec.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -30,11 +30,12 @@
#include "memory/generationSpec.hpp"
#include "memory/tenuredGeneration.hpp"
#include "runtime/java.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parNew/asParNewGeneration.hpp"
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
#include "gc_implementation/parNew/parNewGeneration.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
Generation* GenerationSpec::init(ReservedSpace rs, int level,
GenRemSet* remset) {
@@ -45,7 +46,7 @@
case Generation::MarkSweepCompact:
return new TenuredGeneration(rs, init_size(), level, remset);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case Generation::ParNew:
return new ParNewGeneration(rs, init_size(), level);
@@ -94,7 +95,7 @@
return g;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
default:
guarantee(false, "unrecognized GenerationName");
--- a/hotspot/src/share/vm/memory/heapInspection.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/heapInspection.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -23,15 +23,17 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderData.hpp"
#include "gc_interface/collectedHeap.hpp"
#include "memory/genCollectedHeap.hpp"
#include "memory/heapInspection.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/os.hpp"
#include "utilities/globalDefinitions.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// HeapInspection
@@ -41,12 +43,24 @@
} else if(e1->_instance_words < e2->_instance_words) {
return 1;
}
- return 0;
+ // Sort alphabetically, note 'Z' < '[' < 'a', but it's better to group
+ // the array classes before all the instance classes.
+ ResourceMark rm;
+ const char* name1 = e1->klass()->external_name();
+ const char* name2 = e2->klass()->external_name();
+ bool d1 = (name1[0] == '[');
+ bool d2 = (name2[0] == '[');
+ if (d1 && !d2) {
+ return -1;
+ } else if (d2 && !d1) {
+ return 1;
+ } else {
+ return strcmp(name1, name2);
+ }
}
-void KlassInfoEntry::print_on(outputStream* st) const {
- ResourceMark rm;
- const char* name;;
+const char* KlassInfoEntry::name() const {
+ const char* name;
if (_klass->name() != NULL) {
name = _klass->external_name();
} else {
@@ -60,11 +74,17 @@
if (_klass == Universe::longArrayKlassObj()) name = "<longArrayKlass>"; else
name = "<no name>";
}
+ return name;
+}
+
+void KlassInfoEntry::print_on(outputStream* st) const {
+ ResourceMark rm;
+
// simplify the formatting (ILP32 vs LP64) - always cast the numbers to 64-bit
st->print_cr(INT64_FORMAT_W(13) " " UINT64_FORMAT_W(13) " %s",
(jlong) _instance_count,
(julong) _instance_words * HeapWordSize,
- name);
+ name());
}
KlassInfoEntry* KlassInfoBucket::lookup(Klass* const k) {
@@ -101,7 +121,14 @@
}
}
-KlassInfoTable::KlassInfoTable(int size, HeapWord* ref) {
+void KlassInfoTable::AllClassesFinder::do_klass(Klass* k) {
+ // This has the SIDE EFFECT of creating a KlassInfoEntry
+ // for <k>, if one doesn't exist yet.
+ _table->lookup(k);
+}
+
+KlassInfoTable::KlassInfoTable(int size, HeapWord* ref,
+ bool need_class_stats) {
_size = 0;
_ref = ref;
_buckets = NEW_C_HEAP_ARRAY(KlassInfoBucket, size, mtInternal);
@@ -110,6 +137,10 @@
for (int index = 0; index < _size; index++) {
_buckets[index].initialize();
}
+ if (need_class_stats) {
+ AllClassesFinder finder(this);
+ ClassLoaderDataGraph::classes_do(&finder);
+ }
}
}
@@ -165,7 +196,8 @@
return (*e1)->compare(*e1,*e2);
}
-KlassInfoHisto::KlassInfoHisto(const char* title, int estimatedCount) :
+KlassInfoHisto::KlassInfoHisto(KlassInfoTable* cit, const char* title, int estimatedCount) :
+ _cit(cit),
_title(title) {
_elements = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<KlassInfoEntry*>(estimatedCount,true);
}
@@ -196,9 +228,205 @@
total, totalw * HeapWordSize);
}
-void KlassInfoHisto::print_on(outputStream* st) const {
- st->print_cr("%s",title());
- print_elements(st);
+#define MAKE_COL_NAME(field, name, help) #name,
+#define MAKE_COL_HELP(field, name, help) help,
+
+static const char *name_table[] = {
+ HEAP_INSPECTION_COLUMNS_DO(MAKE_COL_NAME)
+};
+
+static const char *help_table[] = {
+ HEAP_INSPECTION_COLUMNS_DO(MAKE_COL_HELP)
+};
+
+bool KlassInfoHisto::is_selected(const char *col_name) {
+ if (_selected_columns == NULL) {
+ return true;
+ }
+ if (strcmp(_selected_columns, col_name) == 0) {
+ return true;
+ }
+
+ const char *start = strstr(_selected_columns, col_name);
+ if (start == NULL) {
+ return false;
+ }
+
+ // The following must be true, because _selected_columns != col_name
+ if (start > _selected_columns && start[-1] != ',') {
+ return false;
+ }
+ char x = start[strlen(col_name)];
+ if (x != ',' && x != '\0') {
+ return false;
+ }
+
+ return true;
+}
+
+void KlassInfoHisto::print_title(outputStream* st, bool csv_format,
+ bool selected[], int width_table[],
+ const char *name_table[]) {
+ if (csv_format) {
+ st->print("Index,Super");
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {st->print(",%s", name_table[c]);}
+ }
+ st->print(",ClassName");
+ } else {
+ st->print("Index Super");
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {st->print(str_fmt(width_table[c]), name_table[c]);}
+ }
+ st->print(" ClassName");
+ }
+
+ if (is_selected("ClassLoader")) {
+ st->print(",ClassLoader");
+ }
+ st->cr();
+}
+
+void KlassInfoHisto::print_class_stats(outputStream* st,
+ bool csv_format, const char *columns) {
+ ResourceMark rm;
+ KlassSizeStats sz, sz_sum;
+ int i;
+ julong *col_table = (julong*)(&sz);
+ julong *colsum_table = (julong*)(&sz_sum);
+ int width_table[KlassSizeStats::_num_columns];
+ bool selected[KlassSizeStats::_num_columns];
+
+ _selected_columns = columns;
+
+ memset(&sz_sum, 0, sizeof(sz_sum));
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ selected[c] = is_selected(name_table[c]);
+ }
+
+ for(i=0; i < elements()->length(); i++) {
+ elements()->at(i)->set_index(i+1);
+ }
+
+ for (int pass=1; pass<=2; pass++) {
+ if (pass == 2) {
+ print_title(st, csv_format, selected, width_table, name_table);
+ }
+ for(i=0; i < elements()->length(); i++) {
+ KlassInfoEntry* e = (KlassInfoEntry*)elements()->at(i);
+ const Klass* k = e->klass();
+
+ memset(&sz, 0, sizeof(sz));
+ sz._inst_count = e->count();
+ sz._inst_bytes = HeapWordSize * e->words();
+ k->collect_statistics(&sz);
+ sz._total_bytes = sz._ro_bytes + sz._rw_bytes;
+
+ if (pass == 1) {
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ colsum_table[c] += col_table[c];
+ }
+ } else {
+ int super_index = -1;
+ if (k->oop_is_instance()) {
+ Klass* super = ((InstanceKlass*)k)->java_super();
+ if (super) {
+ KlassInfoEntry* super_e = _cit->lookup(super);
+ if (super_e) {
+ super_index = super_e->index();
+ }
+ }
+ }
+
+ if (csv_format) {
+ st->print("%d,%d", e->index(), super_index);
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {st->print("," JULONG_FORMAT, col_table[c]);}
+ }
+ st->print(",%s",e->name());
+ } else {
+ st->print("%5d %5d", e->index(), super_index);
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {print_julong(st, width_table[c], col_table[c]);}
+ }
+ st->print(" %s", e->name());
+ }
+ if (is_selected("ClassLoader")) {
+ ClassLoaderData* loader_data = k->class_loader_data();
+ st->print(",");
+ loader_data->print_value_on(st);
+ }
+ st->cr();
+ }
+ }
+
+ if (pass == 1) {
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ width_table[c] = col_width(colsum_table[c], name_table[c]);
+ }
+ }
+ }
+
+ sz_sum._inst_size = 0;
+
+ if (csv_format) {
+ st->print(",");
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {st->print("," JULONG_FORMAT, colsum_table[c]);}
+ }
+ } else {
+ st->print(" ");
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {print_julong(st, width_table[c], colsum_table[c]);}
+ }
+ st->print(" Total");
+ if (sz_sum._total_bytes > 0) {
+ st->cr();
+ st->print(" ");
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ if (selected[c]) {
+ switch (c) {
+ case KlassSizeStats::_index_inst_size:
+ case KlassSizeStats::_index_inst_count:
+ case KlassSizeStats::_index_method_count:
+ st->print(str_fmt(width_table[c]), "-");
+ break;
+ default:
+ {
+ double perc = (double)(100) * (double)(colsum_table[c]) / (double)sz_sum._total_bytes;
+ st->print(perc_fmt(width_table[c]), perc);
+ }
+ }
+ }
+ }
+ }
+ }
+ st->cr();
+
+ if (!csv_format) {
+ print_title(st, csv_format, selected, width_table, name_table);
+ }
+}
+
+julong KlassInfoHisto::annotations_bytes(Array<AnnotationArray*>* p) const {
+ julong bytes = 0;
+ if (p != NULL) {
+ for (int i = 0; i < p->length(); i++) {
+ bytes += count_bytes_array(p->at(i));
+ }
+ bytes += count_bytes_array(p);
+ }
+ return bytes;
+}
+
+void KlassInfoHisto::print_histo_on(outputStream* st, bool print_stats,
+ bool csv_format, const char *columns) {
+ if (print_stats) {
+ print_class_stats(st, csv_format, columns);
+ } else {
+ st->print_cr("%s",title());
+ print_elements(st);
+ }
}
class HistoClosure : public KlassInfoClosure {
@@ -236,8 +464,26 @@
CollectedHeap* heap = Universe::heap();
bool is_shared_heap = false;
+ if (_print_help) {
+ for (int c=0; c<KlassSizeStats::_num_columns; c++) {
+ st->print("%s:\n\t", name_table[c]);
+ const int max_col = 60;
+ int col = 0;
+ for (const char *p = help_table[c]; *p; p++,col++) {
+ if (col >= max_col && *p == ' ') {
+ st->print("\n\t");
+ col = 0;
+ } else {
+ st->print("%c", *p);
+ }
+ }
+ st->print_cr(".\n");
+ }
+ return;
+ }
+
// Collect klass instance info
- KlassInfoTable cit(KlassInfoTable::cit_size, ref);
+ KlassInfoTable cit(KlassInfoTable::cit_size, ref, _print_class_stats);
if (!cit.allocation_failed()) {
// Iterate over objects in the heap
RecordInstanceClosure ric(&cit);
@@ -252,14 +498,14 @@
missed_count);
}
// Sort and print klass instance info
- KlassInfoHisto histo("\n"
- " num #instances #bytes class name\n"
- "----------------------------------------------",
- KlassInfoHisto::histo_initial_size);
+ const char *title = "\n"
+ " num #instances #bytes class name\n"
+ "----------------------------------------------";
+ KlassInfoHisto histo(&cit, title, KlassInfoHisto::histo_initial_size);
HistoClosure hc(&histo);
cit.iterate(&hc);
histo.sort();
- histo.print_on(st);
+ histo.print_histo_on(st, _print_class_stats, _csv_format, _columns);
} else {
st->print_cr("WARNING: Ran out of C-heap; histogram not generated");
}
--- a/hotspot/src/share/vm/memory/heapInspection.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/heapInspection.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -27,6 +27,8 @@
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
+#include "oops/annotations.hpp"
+#include "utilities/macros.hpp"
#if INCLUDE_SERVICES
@@ -44,16 +46,144 @@
// to KlassInfoEntry's and is used to sort
// the entries.
+#define HEAP_INSPECTION_COLUMNS_DO(f) \
+ f(inst_size, InstSize, \
+ "Size of each object instance of the Java class") \
+ f(inst_count, InstCount, \
+ "Number of object instances of the Java class") \
+ f(inst_bytes, InstBytes, \
+ "This is usually (InstSize * InstNum). The only exception is " \
+ "java.lang.Class, whose InstBytes also includes the slots " \
+ "used to store static fields. InstBytes is not counted in " \
+ "ROAll, RWAll or Total") \
+ f(mirror_bytes, Mirror, \
+ "Size of the Klass::java_mirror() object") \
+ f(klass_bytes, KlassBytes, \
+ "Size of the InstanceKlass or ArrayKlass for this class. " \
+ "Note that this includes VTab, ITab, OopMap") \
+ f(secondary_supers_bytes, K_secondary_supers, \
+ "Number of bytes used by the Klass::secondary_supers() array") \
+ f(vtab_bytes, VTab, \
+ "Size of the embedded vtable in InstanceKlass") \
+ f(itab_bytes, ITab, \
+ "Size of the embedded itable in InstanceKlass") \
+ f(nonstatic_oopmap_bytes, OopMap, \
+ "Size of the embedded nonstatic_oop_map in InstanceKlass") \
+ f(methods_array_bytes, IK_methods, \
+ "Number of bytes used by the InstanceKlass::methods() array") \
+ f(method_ordering_bytes, IK_method_ordering, \
+ "Number of bytes used by the InstanceKlass::method_ordering() array") \
+ f(local_interfaces_bytes, IK_local_interfaces, \
+ "Number of bytes used by the InstanceKlass::local_interfaces() array") \
+ f(transitive_interfaces_bytes, IK_transitive_interfaces, \
+ "Number of bytes used by the InstanceKlass::transitive_interfaces() array") \
+ f(fields_bytes, IK_fields, \
+ "Number of bytes used by the InstanceKlass::fields() array") \
+ f(inner_classes_bytes, IK_inner_classes, \
+ "Number of bytes used by the InstanceKlass::inner_classes() array") \
+ f(signers_bytes, IK_signers, \
+ "Number of bytes used by the InstanceKlass::singers() array") \
+ f(class_annotations_bytes, class_annotations, \
+ "Size of class annotations") \
+ f(fields_annotations_bytes, fields_annotations, \
+ "Size of field annotations") \
+ f(methods_annotations_bytes, methods_annotations, \
+ "Size of method annotations") \
+ f(methods_parameter_annotations_bytes, methods_parameter_annotations, \
+ "Size of method parameter annotations") \
+ f(methods_default_annotations_bytes, methods_default_annotations, \
+ "Size of methods default annotations") \
+ f(type_annotations_bytes, type_annotations, \
+ "Size of type annotations") \
+ f(annotations_bytes, annotations, \
+ "Size of all annotations") \
+ f(cp_bytes, Cp, \
+ "Size of InstanceKlass::constants()") \
+ f(cp_tags_bytes, CpTags, \
+ "Size of InstanceKlass::constants()->tags()") \
+ f(cp_cache_bytes, CpCache, \
+ "Size of InstanceKlass::constants()->cache()") \
+ f(cp_operands_bytes, CpOperands, \
+ "Size of InstanceKlass::constants()->operands()") \
+ f(cp_refmap_bytes, CpRefMap, \
+ "Size of InstanceKlass::constants()->reference_map()") \
+ f(cp_all_bytes, CpAll, \
+ "Sum of Cp + CpTags + CpCache + CpOperands + CpRefMap") \
+ f(method_count, MethodCount, \
+ "Number of methods in this class") \
+ f(method_bytes, MethodBytes, \
+ "Size of the Method object") \
+ f(const_method_bytes, ConstMethod, \
+ "Size of the ConstMethod object") \
+ f(method_data_bytes, MethodData, \
+ "Size of the MethodData object") \
+ f(stackmap_bytes, StackMap, \
+ "Size of the stackmap_data") \
+ f(bytecode_bytes, Bytecodes, \
+ "Of the MethodBytes column, how much are the space taken up by bytecodes") \
+ f(method_all_bytes, MethodAll, \
+ "Sum of MethodBytes + Constmethod + Stackmap + Methoddata") \
+ f(ro_bytes, ROAll, \
+ "Size of all class meta data that could (potentially) be placed " \
+ "in read-only memory. (This could change with CDS design)") \
+ f(rw_bytes, RWAll, \
+ "Size of all class meta data that must be placed in read/write " \
+ "memory. (This could change with CDS design) ") \
+ f(total_bytes, Total, \
+ "ROAll + RWAll. Note that this does NOT include InstBytes.")
+
+// Size statistics for a Klass - filled in by Klass::collect_statistics()
+class KlassSizeStats {
+public:
+#define COUNT_KLASS_SIZE_STATS_FIELD(field, name, help) _index_ ## field,
+#define DECLARE_KLASS_SIZE_STATS_FIELD(field, name, help) julong _ ## field;
+
+ enum {
+ HEAP_INSPECTION_COLUMNS_DO(COUNT_KLASS_SIZE_STATS_FIELD)
+ _num_columns
+ };
+
+ HEAP_INSPECTION_COLUMNS_DO(DECLARE_KLASS_SIZE_STATS_FIELD)
+
+ static int count(oop x) {
+ return (HeapWordSize * ((x) ? (x)->size() : 0));
+ }
+
+ static int count_array(objArrayOop x) {
+ return (HeapWordSize * ((x) ? (x)->size() : 0));
+ }
+
+ template <class T> static int count(T* x) {
+ return (HeapWordSize * ((x) ? (x)->size() : 0));
+ }
+
+ template <class T> static int count_array(T* x) {
+ if (x == NULL) {
+ return 0;
+ }
+ if (x->length() == 0) {
+ // This is a shared array, e.g., Universe::the_empty_int_array(). Don't
+ // count it to avoid double-counting.
+ return 0;
+ }
+ return HeapWordSize * x->size();
+ }
+};
+
+
+
+
class KlassInfoEntry: public CHeapObj<mtInternal> {
private:
KlassInfoEntry* _next;
Klass* _klass;
long _instance_count;
size_t _instance_words;
+ long _index;
public:
KlassInfoEntry(Klass* k, KlassInfoEntry* next) :
- _klass(k), _instance_count(0), _instance_words(0), _next(next)
+ _klass(k), _instance_count(0), _instance_words(0), _next(next), _index(-1)
{}
KlassInfoEntry* next() { return _next; }
bool is_equal(Klass* k) { return k == _klass; }
@@ -62,8 +192,11 @@
void set_count(long ct) { _instance_count = ct; }
size_t words() { return _instance_words; }
void set_words(size_t wds) { _instance_words = wds; }
+ void set_index(long index) { _index = index; }
+ long index() { return _index; }
int compare(KlassInfoEntry* e1, KlassInfoEntry* e2);
void print_on(outputStream* st) const;
+ const char* name() const;
};
class KlassInfoClosure: public StackObj {
@@ -95,45 +228,132 @@
KlassInfoBucket* _buckets;
uint hash(Klass* p);
- KlassInfoEntry* lookup(Klass* const k);
+ KlassInfoEntry* lookup(Klass* const k); // allocates if not found!
+
+ class AllClassesFinder : public KlassClosure {
+ KlassInfoTable *_table;
+ public:
+ AllClassesFinder(KlassInfoTable* table) : _table(table) {}
+ virtual void do_klass(Klass* k);
+ };
public:
// Table size
enum {
cit_size = 20011
};
- KlassInfoTable(int size, HeapWord* ref);
+ KlassInfoTable(int size, HeapWord* ref, bool need_class_stats);
~KlassInfoTable();
bool record_instance(const oop obj);
void iterate(KlassInfoClosure* cic);
bool allocation_failed() { return _buckets == NULL; }
+
+ friend class KlassInfoHisto;
};
class KlassInfoHisto : public StackObj {
private:
+ KlassInfoTable *_cit;
GrowableArray<KlassInfoEntry*>* _elements;
GrowableArray<KlassInfoEntry*>* elements() const { return _elements; }
const char* _title;
const char* title() const { return _title; }
static int sort_helper(KlassInfoEntry** e1, KlassInfoEntry** e2);
void print_elements(outputStream* st) const;
+ void print_class_stats(outputStream* st, bool csv_format, const char *columns);
+ julong annotations_bytes(Array<AnnotationArray*>* p) const;
+ const char *_selected_columns;
+ bool is_selected(const char *col_name);
+ void print_title(outputStream* st, bool csv_format,
+ bool selected_columns_table[], int width_table[],
+ const char *name_table[]);
+
+ template <class T> static int count_bytes(T* x) {
+ return (HeapWordSize * ((x) ? (x)->size() : 0));
+ }
+
+ template <class T> static int count_bytes_array(T* x) {
+ if (x == NULL) {
+ return 0;
+ }
+ if (x->length() == 0) {
+ // This is a shared array, e.g., Universe::the_empty_int_array(). Don't
+ // count it to avoid double-counting.
+ return 0;
+ }
+ return HeapWordSize * x->size();
+ }
+
+ // returns a format string to print a julong with the given width. E.g,
+ // printf(num_fmt(6), julong(10)) would print out the number 10 with 4
+ // leading spaces.
+ static void print_julong(outputStream* st, int width, julong n) {
+ int num_spaces = width - julong_width(n);
+ if (num_spaces > 0) {
+ st->print(str_fmt(num_spaces), "");
+ }
+ st->print(JULONG_FORMAT, n);
+ }
+
+ static char* perc_fmt(int width) {
+ static char buf[32];
+ jio_snprintf(buf, sizeof(buf), "%%%d.1f%%%%", width-1);
+ return buf;
+ }
+
+ static char* str_fmt(int width) {
+ static char buf[32];
+ jio_snprintf(buf, sizeof(buf), "%%%ds", width);
+ return buf;
+ }
+
+ static int julong_width(julong n) {
+ if (n == 0) {
+ return 1;
+ }
+ int w = 0;
+ while (n > 0) {
+ n /= 10;
+ w += 1;
+ }
+ return w;
+ }
+
+ static int col_width(julong n, const char *name) {
+ int w = julong_width(n);
+ int min = (int)(strlen(name));
+ if (w < min) {
+ w = min;
+ }
+ // add a leading space for separation.
+ return w + 1;
+ }
+
public:
enum {
histo_initial_size = 1000
};
- KlassInfoHisto(const char* title,
+ KlassInfoHisto(KlassInfoTable* cit, const char* title,
int estimatedCount);
~KlassInfoHisto();
void add(KlassInfoEntry* cie);
- void print_on(outputStream* st) const;
+ void print_histo_on(outputStream* st, bool print_class_stats, bool csv_format, const char *columns);
void sort();
};
#endif // INCLUDE_SERVICES
-class HeapInspection : public AllStatic {
+class HeapInspection : public StackObj {
+ bool _csv_format; // "comma separated values" format for spreadsheet.
+ bool _print_help;
+ bool _print_class_stats;
+ const char* _columns;
public:
- static void heap_inspection(outputStream* st, bool need_prologue) NOT_SERVICES_RETURN;
+ HeapInspection(bool csv_format, bool print_help,
+ bool print_class_stats, const char *columns) :
+ _csv_format(csv_format), _print_help(print_help),
+ _print_class_stats(print_class_stats), _columns(columns) {}
+ void heap_inspection(outputStream* st, bool need_prologue) NOT_SERVICES_RETURN;
static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
};
--- a/hotspot/src/share/vm/memory/metaspace.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1737,10 +1737,10 @@
*class_chunk_word_size = ClassSmallChunk;
break;
}
- assert(chunk_word_size != 0 && class_chunk_word_size != 0,
+ assert(*chunk_word_size != 0 && *class_chunk_word_size != 0,
err_msg("Initial chunks sizes bad: data " SIZE_FORMAT
" class " SIZE_FORMAT,
- chunk_word_size, class_chunk_word_size));
+ *chunk_word_size, *class_chunk_word_size));
}
size_t SpaceManager::sum_free_in_chunks_in_use() const {
@@ -2040,7 +2040,7 @@
align_size_up(humongous_chunks->word_size(),
HumongousChunkGranularity),
err_msg("Humongous chunk size is wrong: word size " SIZE_FORMAT
- " granularity " SIZE_FORMAT,
+ " granularity %d",
humongous_chunks->word_size(), HumongousChunkGranularity));
Metachunk* next_humongous_chunks = humongous_chunks->next();
chunk_manager->humongous_dictionary()->return_chunk(humongous_chunks);
@@ -2264,7 +2264,8 @@
}
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
assert(allocation_total() == sum_used_in_chunks_in_use(),
- err_msg("allocation total is not consistent %d vs %d",
+ err_msg("allocation total is not consistent " SIZE_FORMAT
+ " vs " SIZE_FORMAT,
allocation_total(), sum_used_in_chunks_in_use()));
}
@@ -2578,7 +2579,8 @@
// argument passed in is at the top of the compressed space
void Metaspace::initialize_class_space(ReservedSpace rs) {
// The reserved space size may be bigger because of alignment, esp with UseLargePages
- assert(rs.size() >= ClassMetaspaceSize, err_msg("%d != %d", rs.size(), ClassMetaspaceSize));
+ assert(rs.size() >= ClassMetaspaceSize,
+ err_msg(SIZE_FORMAT " != " UINTX_FORMAT, rs.size(), ClassMetaspaceSize));
_class_space_list = new VirtualSpaceList(rs);
}
--- a/hotspot/src/share/vm/memory/space.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/space.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -40,6 +40,7 @@
#include "runtime/safepoint.hpp"
#include "utilities/copy.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
void SpaceMemRegionOopsIterClosure::do_oop(oop* p) { SpaceMemRegionOopsIterClosure::do_oop_work(p); }
void SpaceMemRegionOopsIterClosure::do_oop(narrowOop* p) { SpaceMemRegionOopsIterClosure::do_oop_work(p); }
@@ -658,7 +659,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define ContigSpace_PAR_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \
\
void ContiguousSpace::par_oop_iterate(MemRegion mr, OopClosureType* blk) {\
@@ -673,7 +674,7 @@
ALL_PAR_OOP_ITERATE_CLOSURES(ContigSpace_PAR_OOP_ITERATE_DEFN)
#undef ContigSpace_PAR_OOP_ITERATE_DEFN
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void ContiguousSpace::oop_iterate(ExtendedOopClosure* blk) {
if (is_empty()) return;
--- a/hotspot/src/share/vm/memory/space.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/space.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -34,6 +34,7 @@
#include "oops/markOop.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/prefetch.hpp"
+#include "utilities/macros.hpp"
#include "utilities/workgroup.hpp"
#ifdef TARGET_OS_FAMILY_linux
# include "os_linux.inline.hpp"
@@ -884,14 +885,14 @@
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// In support of parallel oop_iterate.
#define ContigSpace_PAR_OOP_ITERATE_DECL(OopClosureType, nv_suffix) \
void par_oop_iterate(MemRegion mr, OopClosureType* blk);
ALL_PAR_OOP_ITERATE_CLOSURES(ContigSpace_PAR_OOP_ITERATE_DECL)
#undef ContigSpace_PAR_OOP_ITERATE_DECL
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Compaction support
virtual void reset_after_compaction() {
--- a/hotspot/src/share/vm/memory/specialized_oop_closures.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/specialized_oop_closures.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -26,9 +26,10 @@
#define SHARE_VM_MEMORY_SPECIALIZED_OOP_CLOSURES_HPP
#include "runtime/atomic.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1_specialized_oop_closures.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// The following OopClosure types get specialized versions of
// "oop_oop_iterate" that invoke the closures' do_oop methods
@@ -80,20 +81,20 @@
f(FastScanClosure,_nv) \
f(FilteringClosure,_nv)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f) \
f(ParScanWithBarrierClosure,_nv) \
f(ParScanWithoutBarrierClosure,_nv)
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_1(f) \
f(NoHeaderExtendedOopClosure,_nv) \
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_S(f) \
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(f) \
f(MarkRefsIntoAndScanClosure,_nv) \
f(Par_MarkRefsIntoAndScanClosure,_nv) \
@@ -104,9 +105,9 @@
f(CMSKeepAliveClosure,_nv) \
f(CMSInnerParMarkAndPushClosure,_nv) \
FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES(f)
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(f)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// We separate these out, because sometime the general one has
@@ -120,7 +121,7 @@
#define ALL_OOP_OOP_ITERATE_CLOSURES_2(f) \
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(f)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// This macro applies an argument macro to all OopClosures for which we
// want specialized bodies of a family of methods related to
// "par_oop_iterate". The arguments to f are the same as above.
@@ -136,7 +137,7 @@
#define ALL_PAR_OOP_ITERATE_CLOSURES(f) \
f(ExtendedOopClosure,_v) \
SPECIALIZED_PAR_OOP_ITERATE_CLOSURES(f)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// This macro applies an argument macro to all OopClosures for which we
// want specialized bodies of a family of methods related to
@@ -155,14 +156,14 @@
f(ScanClosure,_nv) \
f(FastScanClosure,_nv)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG_P(f) \
f(ParScanWithBarrierClosure,_nv) \
f(ParScanWithoutBarrierClosure,_nv) \
FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(f)
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
#define SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG_P(f)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#define SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG(f) \
SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG_S(f) \
--- a/hotspot/src/share/vm/memory/tenuredGeneration.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/tenuredGeneration.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -33,6 +33,7 @@
#include "memory/tenuredGeneration.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
+#include "utilities/macros.hpp"
TenuredGeneration::TenuredGeneration(ReservedSpace rs,
size_t initial_byte_size, int level,
@@ -61,7 +62,7 @@
_space_counters = new CSpaceCounters(gen_name, 0,
_virtual_space.reserved_size(),
_the_space, _gen_counters);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseParNewGC) {
typedef ParGCAllocBufferWithBOT* ParGCAllocBufferWithBOTPtr;
_alloc_buffers = NEW_C_HEAP_ARRAY(ParGCAllocBufferWithBOTPtr,
@@ -77,7 +78,7 @@
} else {
_alloc_buffers = NULL;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
}
@@ -339,7 +340,7 @@
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
oop TenuredGeneration::par_promote(int thread_num,
oop old, markOop m, size_t word_sz) {
@@ -423,10 +424,10 @@
}
}
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
void TenuredGeneration::retire_alloc_buffers_before_full_gc() {}
void TenuredGeneration::verify_alloc_buffers_clean() {}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const {
size_t available = max_contiguous_available();
--- a/hotspot/src/share/vm/memory/tenuredGeneration.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/tenuredGeneration.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -29,6 +29,7 @@
#include "gc_implementation/shared/gcStats.hpp"
#include "gc_implementation/shared/generationCounters.hpp"
#include "memory/generation.hpp"
+#include "utilities/macros.hpp"
// TenuredGeneration models the heap containing old (promoted/tenured) objects.
@@ -45,11 +46,11 @@
size_t _capacity_at_prologue;
size_t _used_at_prologue;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// To support parallel promotion: an array of parallel allocation
// buffers, one per thread, initially NULL.
ParGCAllocBufferWithBOT** _alloc_buffers;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Retire all alloc buffers before a full GC, so that they will be
// re-allocated at the start of the next young GC.
@@ -93,14 +94,14 @@
size_t size,
bool is_tlab);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Overrides.
virtual oop par_promote(int thread_num,
oop obj, markOop m, size_t word_sz);
virtual void par_promote_alloc_undo(int thread_num,
HeapWord* obj, size_t word_sz);
virtual void par_promote_alloc_done(int thread_num);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Performance Counter support
void update_counters();
--- a/hotspot/src/share/vm/memory/universe.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/universe.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -70,13 +70,14 @@
#include "utilities/events.hpp"
#include "utilities/hashtable.inline.hpp"
#include "utilities/preserveException.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// Known objects
Klass* Universe::_boolArrayKlassObj = NULL;
@@ -144,6 +145,7 @@
NarrowPtrStruct Universe::_narrow_klass = { NULL, 0, true };
address Universe::_narrow_ptrs_base;
+size_t Universe::_class_metaspace_size;
void Universe::basic_type_classes_do(void f(Klass*)) {
f(boolArrayKlassObj());
@@ -689,8 +691,15 @@
// Return specified base for the first request.
if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
base = HeapBaseMinAddress;
- } else if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) {
- if (total_size <= NarrowOopHeapMax && (mode == UnscaledNarrowOop) &&
+
+ // If the total size and the metaspace size are small enough to allow
+ // UnscaledNarrowOop then just use UnscaledNarrowOop.
+ } else if ((total_size <= OopEncodingHeapMax) && (mode != HeapBasedNarrowOop) &&
+ (!UseCompressedKlassPointers ||
+ (((OopEncodingHeapMax - heap_size) + Universe::class_metaspace_size()) <= KlassEncodingMetaspaceMax))) {
+ // We don't need to check the metaspace size here because it is always smaller
+ // than total_size.
+ if ((total_size <= NarrowOopHeapMax) && (mode == UnscaledNarrowOop) &&
(Universe::narrow_oop_shift() == 0)) {
// Use 32-bits oops without encoding and
// place heap's top on the 4Gb boundary
@@ -706,14 +715,24 @@
base = (OopEncodingHeapMax - heap_size);
}
}
+
+ // See if ZeroBaseNarrowOop encoding will work for a heap based at
+ // (KlassEncodingMetaspaceMax - class_metaspace_size()).
+ } else if (UseCompressedKlassPointers && (mode != HeapBasedNarrowOop) &&
+ (Universe::class_metaspace_size() + HeapBaseMinAddress <= KlassEncodingMetaspaceMax) &&
+ (KlassEncodingMetaspaceMax + heap_size - Universe::class_metaspace_size() <= OopEncodingHeapMax)) {
+ base = (KlassEncodingMetaspaceMax - Universe::class_metaspace_size());
} else {
- // Can't reserve below 32Gb.
+ // UnscaledNarrowOop encoding didn't work, and no base was found for ZeroBasedOops or
+ // HeapBasedNarrowOop encoding was requested. So, can't reserve below 32Gb.
Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
}
+
// Set narrow_oop_base and narrow_oop_use_implicit_null_checks
// used in ReservedHeapSpace() constructors.
// The final values will be set in initialize_heap() below.
- if (base != 0 && (base + heap_size) <= OopEncodingHeapMax) {
+ if ((base != 0) && ((base + heap_size) <= OopEncodingHeapMax) &&
+ (!UseCompressedKlassPointers || (base + Universe::class_metaspace_size()) <= KlassEncodingMetaspaceMax)) {
// Use zero based compressed oops
Universe::set_narrow_oop_base(NULL);
// Don't need guard page for implicit checks in indexed
@@ -740,20 +759,20 @@
jint Universe::initialize_heap() {
if (UseParallelGC) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
Universe::_collectedHeap = new ParallelScavengeHeap();
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
fatal("UseParallelGC not supported in this VM.");
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
} else if (UseG1GC) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
G1CollectorPolicy* g1p = new G1CollectorPolicy();
G1CollectedHeap* g1h = new G1CollectedHeap(g1p);
Universe::_collectedHeap = g1h;
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
fatal("UseG1GC not supported in java kernel vm.");
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
} else {
GenCollectorPolicy *gc_policy;
@@ -761,15 +780,15 @@
if (UseSerialGC) {
gc_policy = new MarkSweepPolicy();
} else if (UseConcMarkSweepGC) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseAdaptiveSizePolicy) {
gc_policy = new ASConcurrentMarkSweepPolicy();
} else {
gc_policy = new ConcurrentMarkSweepPolicy();
}
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
fatal("UseConcMarkSweepGC not supported in this VM.");
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
} else { // default old generation
gc_policy = new MarkSweepPolicy();
}
@@ -796,7 +815,9 @@
tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
Universe::heap()->base(), Universe::heap()->reserved_region().byte_size()/M);
}
- if ((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax) {
+ if (((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax) ||
+ (UseCompressedKlassPointers &&
+ ((uint64_t)Universe::heap()->base() + Universe::class_metaspace_size() > KlassEncodingMetaspaceMax))) {
// Can't reserve heap below 32Gb.
// keep the Universe::narrow_oop_base() set in Universe::reserve_heap()
Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
@@ -862,8 +883,8 @@
// be compressed the same as instances.
// Need to round class space size up because it's below the heap and
// the actual alignment depends on its size.
- size_t metaspace_size = align_size_up(ClassMetaspaceSize, alignment);
- size_t total_reserved = align_size_up(heap_size + metaspace_size, alignment);
+ Universe::set_class_metaspace_size(align_size_up(ClassMetaspaceSize, alignment));
+ size_t total_reserved = align_size_up(heap_size + Universe::class_metaspace_size(), alignment);
char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
@@ -904,8 +925,8 @@
// compressed oops is greater than the one used for compressed klass
// ptrs, a metadata space on top of the heap could become
// unreachable.
- ReservedSpace class_rs = total_rs.first_part(metaspace_size);
- ReservedSpace heap_rs = total_rs.last_part(metaspace_size, alignment);
+ ReservedSpace class_rs = total_rs.first_part(Universe::class_metaspace_size());
+ ReservedSpace heap_rs = total_rs.last_part(Universe::class_metaspace_size(), alignment);
Metaspace::initialize_class_space(class_rs);
if (UseCompressedOops) {
--- a/hotspot/src/share/vm/memory/universe.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/memory/universe.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -211,6 +211,9 @@
static struct NarrowPtrStruct _narrow_klass;
static address _narrow_ptrs_base;
+ // Aligned size of the metaspace.
+ static size_t _class_metaspace_size;
+
// array of dummy objects used with +FullGCAlot
debug_only(static objArrayOop _fullgc_alot_dummy_array;)
// index of next entry to clear
@@ -278,6 +281,13 @@
static bool reserve_metaspace_helper(bool with_base = false);
static ReservedHeapSpace reserve_heap_metaspace(size_t heap_size, size_t alignment, bool& contiguous);
+ static size_t class_metaspace_size() {
+ return _class_metaspace_size;
+ }
+ static void set_class_metaspace_size(size_t metaspace_size) {
+ _class_metaspace_size = metaspace_size;
+ }
+
// Debugging
static int _verify_count; // number of verifies done
// True during call to verify(). Should only be set/cleared in verify().
--- a/hotspot/src/share/vm/oops/annotations.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/annotations.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.hpp"
+#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "oops/annotations.hpp"
@@ -114,6 +115,50 @@
st->print("Anotations(" INTPTR_FORMAT ")", this);
}
+#if INCLUDE_SERVICES
+// Size Statistics
+
+julong Annotations::count_bytes(Array<AnnotationArray*>* p) {
+ julong bytes = 0;
+ if (p != NULL) {
+ for (int i = 0; i < p->length(); i++) {
+ bytes += KlassSizeStats::count_array(p->at(i));
+ }
+ bytes += KlassSizeStats::count_array(p);
+ }
+ return bytes;
+}
+
+void Annotations::collect_statistics(KlassSizeStats *sz) const {
+ sz->_annotations_bytes = sz->count(this);
+ sz->_class_annotations_bytes = sz->count(class_annotations());
+ sz->_fields_annotations_bytes = count_bytes(fields_annotations());
+ sz->_methods_annotations_bytes = count_bytes(methods_annotations());
+ sz->_methods_parameter_annotations_bytes =
+ count_bytes(methods_parameter_annotations());
+ sz->_methods_default_annotations_bytes =
+ count_bytes(methods_default_annotations());
+
+ const Annotations* type_anno = type_annotations();
+ if (type_anno != NULL) {
+ sz->_type_annotations_bytes = sz->count(type_anno);
+ sz->_type_annotations_bytes += sz->count(type_anno->class_annotations());
+ sz->_type_annotations_bytes += count_bytes(type_anno->fields_annotations());
+ sz->_type_annotations_bytes += count_bytes(type_anno->methods_annotations());
+ }
+
+ sz->_annotations_bytes +=
+ sz->_class_annotations_bytes +
+ sz->_fields_annotations_bytes +
+ sz->_methods_annotations_bytes +
+ sz->_methods_parameter_annotations_bytes +
+ sz->_methods_default_annotations_bytes +
+ sz->_type_annotations_bytes;
+
+ sz->_ro_bytes += sz->_annotations_bytes;
+}
+#endif // INCLUDE_SERVICES
+
#define BULLET " - "
#ifndef PRODUCT
--- a/hotspot/src/share/vm/oops/annotations.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/annotations.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -34,6 +34,7 @@
class ClassLoaderData;
class outputStream;
+class KlassSizeStats;
typedef Array<u1> AnnotationArray;
@@ -82,7 +83,12 @@
Array<AnnotationArray*>* mda, TRAPS);
void deallocate_contents(ClassLoaderData* loader_data);
DEBUG_ONLY(bool on_stack() { return false; }) // for template
+
+ // Sizing (in words)
static int size() { return sizeof(Annotations) / wordSize; }
+#if INCLUDE_SERVICES
+ void collect_statistics(KlassSizeStats *sz) const;
+#endif
// Constructor to initialize to null
Annotations() : _class_annotations(NULL),
@@ -142,7 +148,7 @@
void set_methods_annotations_of(instanceKlassHandle ik,
int idnum, AnnotationArray* anno,
Array<AnnotationArray*>** md_p, TRAPS);
-
+ static julong count_bytes(Array<AnnotationArray*>* p);
public:
const char* internal_name() const { return "{constant pool}"; }
#ifndef PRODUCT
--- a/hotspot/src/share/vm/oops/arrayKlass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/arrayKlass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -106,6 +106,14 @@
static int header_size() { return sizeof(ArrayKlass)/HeapWordSize; }
static int static_size(int header_size);
+#if INCLUDE_SERVICES
+ virtual void collect_statistics(KlassSizeStats *sz) const {
+ Klass::collect_statistics(sz);
+ // Do nothing for now, but remember to modify if you add new
+ // stuff to ArrayKlass.
+ }
+#endif
+
// Java vtable
klassVtable* vtable() const; // return new klassVtable
int vtable_length() const { return _vtable_len; }
--- a/hotspot/src/share/vm/oops/constMethod.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/constMethod.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/gcLocker.hpp"
+#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "oops/constMethod.hpp"
#include "oops/method.hpp"
@@ -330,6 +331,18 @@
method()->print_value_on(st);
}
+#if INCLUDE_SERVICES
+// Size Statistics
+void ConstMethod::collect_statistics(KlassSizeStats *sz) const {
+ int n1, n2, n3;
+ sz->_const_method_bytes += (n1 = sz->count(this));
+ sz->_bytecode_bytes += (n2 = code_size());
+ sz->_stackmap_bytes += (n3 = sz->count_array(stackmap_data()));
+
+ sz->_method_all_bytes += n1 + n3; // note: n2 is part of n3
+ sz->_ro_bytes += n1 + n3;
+}
+#endif // INCLUDE_SERVICES
// Verification
--- a/hotspot/src/share/vm/oops/constMethod.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/constMethod.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -122,14 +122,10 @@
class MethodParametersElement VALUE_OBJ_CLASS_SPEC {
public:
u2 name_cp_index;
- // This has to happen, otherwise it will cause SIGBUS from a
- // misaligned u4 on some architectures (ie SPARC)
- // because MethodParametersElements are only aligned mod 2
- // within the ConstMethod container u2 flags_hi;
- u2 flags_hi;
- u2 flags_lo;
+ u2 flags;
};
+class KlassSizeStats;
class ConstMethod : public MetaspaceObj {
friend class VMStructs;
@@ -320,6 +316,9 @@
int size() const { return _constMethod_size;}
void set_constMethod_size(int size) { _constMethod_size = size; }
+#if INCLUDE_SERVICES
+ void collect_statistics(KlassSizeStats *sz) const;
+#endif
// code size
int code_size() const { return _code_size; }
--- a/hotspot/src/share/vm/oops/constantPool.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/constantPool.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,16 +25,17 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.hpp"
#include "classfile/javaClasses.hpp"
+#include "classfile/metadataOnStackMark.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "interpreter/linkResolver.hpp"
+#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "oops/constantPool.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/objArrayKlass.hpp"
-#include "prims/jvmtiRedefineClasses.hpp"
#include "runtime/fieldType.hpp"
#include "runtime/init.hpp"
#include "runtime/javaCalls.hpp"
@@ -65,11 +66,10 @@
set_operands(NULL);
set_pool_holder(NULL);
set_flags(0);
+
// only set to non-zero if constant pool is merged by RedefineClasses
set_version(0);
set_lock(new Monitor(Monitor::nonleaf + 2, "A constant pool lock"));
- // all fields are initialized; needed for GC
- set_on_stack(false);
// initialize tag array
int length = tags->length();
@@ -100,18 +100,6 @@
set_lock(NULL);
}
-void ConstantPool::set_flag_at(FlagBit fb) {
- const int MAX_STATE_CHANGES = 2;
- for (int i = MAX_STATE_CHANGES + 10; i > 0; i--) {
- int oflags = _flags;
- int nflags = oflags | (1 << (int)fb);
- if (Atomic::cmpxchg(nflags, &_flags, oflags) == oflags)
- return;
- }
- assert(false, "failed to cmpxchg flags");
- _flags |= (1 << (int)fb); // better than nothing
-}
-
objArrayOop ConstantPool::resolved_references() const {
return (objArrayOop)JNIHandles::resolve(_resolved_references);
}
@@ -1111,32 +1099,9 @@
} // end compare_entry_to()
-// Copy this constant pool's entries at start_i to end_i (inclusive)
-// to the constant pool to_cp's entries starting at to_i. A total of
-// (end_i - start_i) + 1 entries are copied.
-void ConstantPool::copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i,
- constantPoolHandle to_cp, int to_i, TRAPS) {
-
- int dest_i = to_i; // leave original alone for debug purposes
-
- for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) {
- copy_entry_to(from_cp, src_i, to_cp, dest_i, CHECK);
-
- switch (from_cp->tag_at(src_i).value()) {
- case JVM_CONSTANT_Double:
- case JVM_CONSTANT_Long:
- // double and long take two constant pool entries
- src_i += 2;
- dest_i += 2;
- break;
-
- default:
- // all others take one constant pool entry
- src_i++;
- dest_i++;
- break;
- }
- }
+void ConstantPool::copy_operands(constantPoolHandle from_cp,
+ constantPoolHandle to_cp,
+ TRAPS) {
int from_oplen = operand_array_length(from_cp->operands());
int old_oplen = operand_array_length(to_cp->operands());
@@ -1164,7 +1129,7 @@
(len = old_off) * sizeof(u2));
fillp += len;
// first part of src
- Copy::conjoint_memory_atomic(to_cp->operands()->adr_at(0),
+ Copy::conjoint_memory_atomic(from_cp->operands()->adr_at(0),
new_operands->adr_at(fillp),
(len = from_off) * sizeof(u2));
fillp += len;
@@ -1174,7 +1139,7 @@
(len = old_len - old_off) * sizeof(u2));
fillp += len;
// second part of src
- Copy::conjoint_memory_atomic(to_cp->operands()->adr_at(from_off),
+ Copy::conjoint_memory_atomic(from_cp->operands()->adr_at(from_off),
new_operands->adr_at(fillp),
(len = from_len - from_off) * sizeof(u2));
fillp += len;
@@ -1192,8 +1157,39 @@
to_cp->set_operands(new_operands);
}
}
+} // end copy_operands()
-} // end copy_cp_to()
+
+// Copy this constant pool's entries at start_i to end_i (inclusive)
+// to the constant pool to_cp's entries starting at to_i. A total of
+// (end_i - start_i) + 1 entries are copied.
+void ConstantPool::copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i,
+ constantPoolHandle to_cp, int to_i, TRAPS) {
+
+
+ int dest_i = to_i; // leave original alone for debug purposes
+
+ for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) {
+ copy_entry_to(from_cp, src_i, to_cp, dest_i, CHECK);
+
+ switch (from_cp->tag_at(src_i).value()) {
+ case JVM_CONSTANT_Double:
+ case JVM_CONSTANT_Long:
+ // double and long take two constant pool entries
+ src_i += 2;
+ dest_i += 2;
+ break;
+
+ default:
+ // all others take one constant pool entry
+ src_i++;
+ dest_i++;
+ break;
+ }
+ }
+ copy_operands(from_cp, to_cp, CHECK);
+
+} // end copy_cp_to_impl()
// Copy this constant pool's entry at from_i to the constant pool
@@ -1755,7 +1751,11 @@
void ConstantPool::set_on_stack(const bool value) {
- _on_stack = value;
+ if (value) {
+ _flags |= _on_stack;
+ } else {
+ _flags &= ~_on_stack;
+ }
if (value) MetadataOnStackMark::record(this);
}
@@ -1827,6 +1827,7 @@
if (has_pseudo_string()) st->print(" has_pseudo_string");
if (has_invokedynamic()) st->print(" has_invokedynamic");
if (has_preresolution()) st->print(" has_preresolution");
+ if (on_stack()) st->print(" on_stack");
st->cr();
}
if (pool_holder() != NULL) {
@@ -1954,6 +1955,20 @@
}
}
+#if INCLUDE_SERVICES
+// Size Statistics
+void ConstantPool::collect_statistics(KlassSizeStats *sz) const {
+ sz->_cp_all_bytes += (sz->_cp_bytes = sz->count(this));
+ sz->_cp_all_bytes += (sz->_cp_tags_bytes = sz->count_array(tags()));
+ sz->_cp_all_bytes += (sz->_cp_cache_bytes = sz->count(cache()));
+ sz->_cp_all_bytes += (sz->_cp_operands_bytes = sz->count_array(operands()));
+ sz->_cp_all_bytes += (sz->_cp_refmap_bytes = sz->count_array(reference_map()));
+
+ sz->_ro_bytes += sz->_cp_operands_bytes + sz->_cp_tags_bytes +
+ sz->_cp_refmap_bytes;
+ sz->_rw_bytes += sz->_cp_bytes + sz->_cp_cache_bytes;
+}
+#endif // INCLUDE_SERVICES
// Verification
--- a/hotspot/src/share/vm/oops/constantPool.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/constantPool.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -80,6 +80,7 @@
}
};
+class KlassSizeStats;
class ConstantPool : public Metadata {
friend class VMStructs;
friend class BytecodeInterpreter; // Directly extracts an oop in the pool for fast instanceof/checkcast
@@ -95,11 +96,16 @@
jobject _resolved_references;
Array<u2>* _reference_map;
- int _flags; // a few header bits to describe contents for GC
+ enum {
+ _has_invokedynamic = 1, // Flags
+ _has_pseudo_string = 2,
+ _has_preresolution = 4,
+ _on_stack = 8
+ };
+
+ int _flags; // old fashioned bit twiddling
int _length; // number of elements in the array
- bool _on_stack; // Redefined method still executing refers to this constant pool.
-
union {
// set for CDS to restore resolved references
int _resolved_reference_length;
@@ -115,17 +121,8 @@
void set_operands(Array<u2>* operands) { _operands = operands; }
- enum FlagBit {
- FB_has_invokedynamic = 1,
- FB_has_pseudo_string = 2,
- FB_has_preresolution = 3
- };
-
- int flags() const { return _flags; }
- void set_flags(int f) { _flags = f; }
- bool flag_at(FlagBit fb) const { return (_flags & (1 << (int)fb)) != 0; }
- void set_flag_at(FlagBit fb);
- // no clear_flag_at function; they only increase
+ int flags() const { return _flags; }
+ void set_flags(int f) { _flags = f; }
private:
intptr_t* base() const { return (intptr_t*) (((char*) this) + sizeof(ConstantPool)); }
@@ -178,18 +175,20 @@
Array<u1>* tags() const { return _tags; }
Array<u2>* operands() const { return _operands; }
- bool has_pseudo_string() const { return flag_at(FB_has_pseudo_string); }
- bool has_invokedynamic() const { return flag_at(FB_has_invokedynamic); }
- bool has_preresolution() const { return flag_at(FB_has_preresolution); }
- void set_pseudo_string() { set_flag_at(FB_has_pseudo_string); }
- void set_invokedynamic() { set_flag_at(FB_has_invokedynamic); }
- void set_preresolution() { set_flag_at(FB_has_preresolution); }
+ bool has_invokedynamic() const { return (_flags & _has_invokedynamic) != 0; }
+ void set_has_invokedynamic() { _flags |= _has_invokedynamic; }
+
+ bool has_pseudo_string() const { return (_flags & _has_pseudo_string) != 0; }
+ void set_has_pseudo_string() { _flags |= _has_pseudo_string; }
+
+ bool has_preresolution() const { return (_flags & _has_preresolution) != 0; }
+ void set_has_preresolution() { _flags |= _has_preresolution; }
// Redefine classes support. If a method refering to this constant pool
// is on the executing stack, or as a handle in vm code, this constant pool
// can't be removed from the set of previous versions saved in the instance
// class.
- bool on_stack() const { return _on_stack; }
+ bool on_stack() const { return (_flags &_on_stack) != 0; }
void set_on_stack(const bool value);
// Klass holding pool
@@ -457,7 +456,7 @@
void pseudo_string_at_put(int which, int obj_index, oop x) {
assert(EnableInvokeDynamic, "");
- set_pseudo_string(); // mark header
+ set_has_pseudo_string(); // mark header
assert(tag_at(which).is_string(), "Corrupted constant pool");
string_at_put(which, obj_index, x); // this works just fine
}
@@ -686,9 +685,13 @@
return 0 <= index && index < length();
}
+ // Sizing (in words)
static int header_size() { return sizeof(ConstantPool)/HeapWordSize; }
static int size(int length) { return align_object_size(header_size() + length); }
int size() const { return size(length()); }
+#if INCLUDE_SERVICES
+ void collect_statistics(KlassSizeStats *sz) const;
+#endif
friend class ClassFileParser;
friend class SystemDictionary;
@@ -783,6 +786,7 @@
}
static void copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i, constantPoolHandle to_cp, int to_i, TRAPS);
static void copy_entry_to(constantPoolHandle from_cp, int from_i, constantPoolHandle to_cp, int to_i, TRAPS);
+ static void copy_operands(constantPoolHandle from_cp, constantPoolHandle to_cp, TRAPS);
int find_matching_entry(int pattern_i, constantPoolHandle search_cp, TRAPS);
int version() const { return _saved._version; }
void set_version(int version) { _saved._version = version; }
--- a/hotspot/src/share/vm/oops/cpCache.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/cpCache.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -33,9 +33,10 @@
#include "prims/jvmtiRedefineClassesTrace.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/handles.inline.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
# include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// Implememtation of ConstantPoolCacheEntry
--- a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -36,12 +36,13 @@
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "runtime/handles.inline.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parNew/parOopClosures.inline.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#define if_do_metadata_checked(closure, nv_suffix) \
/* Make sure the non-virtual and the virtual versions match. */ \
@@ -73,7 +74,7 @@
return size; \
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
\
int InstanceClassLoaderKlass:: \
@@ -83,7 +84,7 @@
int size = InstanceKlass::oop_oop_iterate_backwards##nv_suffix(obj, closure); \
return size; \
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
#define InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
@@ -111,10 +112,10 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN_m)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN_m)
@@ -129,7 +130,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void InstanceClassLoaderKlass::oop_follow_contents(ParCompactionManager* cm,
oop obj) {
InstanceKlass::oop_follow_contents(cm, obj);
@@ -155,5 +156,5 @@
}
return size_helper();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
--- a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -26,6 +26,7 @@
#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
#include "oops/instanceKlass.hpp"
+#include "utilities/macros.hpp"
// An InstanceClassLoaderKlass is a specialization of the InstanceKlass. It does
// not add any field. It is added to walk the dependencies for the class loader
@@ -61,13 +62,13 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
int oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* blk);
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// Garbage collection
void oop_follow_contents(oop obj);
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -34,6 +34,7 @@
#include "interpreter/rewriter.hpp"
#include "jvmtifiles/jvmti.h"
#include "memory/genOopClosures.inline.hpp"
+#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "oops/fieldStreams.hpp"
@@ -55,7 +56,8 @@
#include "runtime/thread.inline.hpp"
#include "services/threadService.hpp"
#include "utilities/dtrace.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
@@ -66,7 +68,7 @@
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_Compiler.hpp"
#endif
@@ -2042,7 +2044,7 @@
assert_is_in_closed_subset)
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void InstanceKlass::oop_follow_contents(ParCompactionManager* cm,
oop obj) {
assert(obj != NULL, "can't follow the content of NULL object");
@@ -2054,7 +2056,7 @@
PSParallelCompact::mark_and_push(cm, p), \
assert_is_in)
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// closure's do_metadata() method dictates whether the given closure should be
// applied to the klass ptr in the object header.
@@ -2082,7 +2084,7 @@
return size_helper(); \
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
\
int InstanceKlass::oop_oop_iterate_backwards##nv_suffix(oop obj, \
@@ -2100,7 +2102,7 @@
assert_is_in_closed_subset) \
return size_helper(); \
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
#define InstanceKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
\
@@ -2124,10 +2126,10 @@
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DEFN_m)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN_m)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
int InstanceKlass::oop_adjust_pointers(oop obj) {
int size = size_helper();
@@ -2139,7 +2141,7 @@
return size;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void InstanceKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
InstanceKlass_OOP_MAP_REVERSE_ITERATE( \
obj, \
@@ -2159,7 +2161,7 @@
return size;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void InstanceKlass::clean_implementors_list(BoolObjectClosure* is_alive) {
assert(is_loader_alive(is_alive), "this klass should be live");
@@ -2960,6 +2962,52 @@
return external_name();
}
+#if INCLUDE_SERVICES
+// Size Statistics
+void InstanceKlass::collect_statistics(KlassSizeStats *sz) const {
+ Klass::collect_statistics(sz);
+
+ sz->_inst_size = HeapWordSize * size_helper();
+ sz->_vtab_bytes = HeapWordSize * align_object_offset(vtable_length());
+ sz->_itab_bytes = HeapWordSize * align_object_offset(itable_length());
+ sz->_nonstatic_oopmap_bytes = HeapWordSize *
+ ((is_interface() || is_anonymous()) ?
+ align_object_offset(nonstatic_oop_map_size()) :
+ nonstatic_oop_map_size());
+
+ int n = 0;
+ n += (sz->_methods_array_bytes = sz->count_array(methods()));
+ n += (sz->_method_ordering_bytes = sz->count_array(method_ordering()));
+ n += (sz->_local_interfaces_bytes = sz->count_array(local_interfaces()));
+ n += (sz->_transitive_interfaces_bytes = sz->count_array(transitive_interfaces()));
+ n += (sz->_signers_bytes = sz->count_array(signers()));
+ n += (sz->_fields_bytes = sz->count_array(fields()));
+ n += (sz->_inner_classes_bytes = sz->count_array(inner_classes()));
+ sz->_ro_bytes += n;
+
+ const ConstantPool* cp = constants();
+ if (cp) {
+ cp->collect_statistics(sz);
+ }
+
+ const Annotations* anno = annotations();
+ if (anno) {
+ anno->collect_statistics(sz);
+ }
+
+ const Array<Method*>* methods_array = methods();
+ if (methods()) {
+ for (int i = 0; i < methods_array->length(); i++) {
+ Method* method = methods_array->at(i);
+ if (method) {
+ sz->_method_count ++;
+ method->collect_statistics(sz);
+ }
+ }
+ }
+}
+#endif // INCLUDE_SERVICES
+
// Verification
class VerifyFieldClosure: public OopClosure {
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -36,6 +36,7 @@
#include "runtime/os.hpp"
#include "utilities/accessFlags.hpp"
#include "utilities/bitMap.inline.hpp"
+#include "utilities/macros.hpp"
// An InstanceKlass is the VM level representation of a Java class.
// It contains all information needed for at class at execution runtime.
@@ -256,6 +257,16 @@
// JVMTI fields can be moved to their own structure - see 6315920
unsigned char * _cached_class_file_bytes; // JVMTI: cached class file, before retransformable agent modified it in CFLH
jint _cached_class_file_len; // JVMTI: length of above
+
+ volatile u2 _idnum_allocated_count; // JNI/JVMTI: increments with the addition of methods, old ids don't change
+
+ // Class states are defined as ClassState (see above).
+ // Place the _init_state here to utilize the unused 2-byte after
+ // _idnum_allocated_count.
+ u1 _init_state; // state of class
+ u1 _reference_type; // reference type
+
+
JvmtiCachedClassFieldMap* _jvmti_cached_class_field_map; // JVMTI: used during heap iteration
// Method array.
@@ -281,15 +292,6 @@
// ...
Array<u2>* _fields;
- volatile u2 _idnum_allocated_count; // JNI/JVMTI: increments with the addition of methods, old ids don't change
-
- // Class states are defined as ClassState (see above).
- // Place the _init_state here to utilize the unused 2-byte after
- // _idnum_allocated_count.
- u1 _init_state; // state of class
-
- u1 _reference_type; // reference type
-
// embedded Java vtable follows here
// embedded Java itables follows here
// embedded static fields follows here
@@ -826,6 +828,9 @@
is_interface(),
is_anonymous());
}
+#if INCLUDE_SERVICES
+ virtual void collect_statistics(KlassSizeStats *sz) const;
+#endif
static int vtable_start_offset() { return header_size(); }
static int vtable_length_offset() { return offset_of(InstanceKlass, _vtable_len) / HeapWordSize; }
@@ -932,13 +937,13 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
int oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* blk);
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
u2 idnum_allocated_count() const { return _idnum_allocated_count; }
private:
--- a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -35,7 +35,8 @@
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "runtime/handles.inline.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
@@ -45,7 +46,7 @@
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
int InstanceMirrorKlass::_offset_of_static_fields = 0;
@@ -168,7 +169,7 @@
assert_is_in_closed_subset)
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void InstanceMirrorKlass::oop_follow_contents(ParCompactionManager* cm,
oop obj) {
InstanceKlass::oop_follow_contents(cm, obj);
@@ -189,7 +190,7 @@
PSParallelCompact::mark_and_push(cm, p), \
assert_is_in)
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
int InstanceMirrorKlass::oop_adjust_pointers(oop obj) {
int size = oop_size(obj);
@@ -262,7 +263,7 @@
} \
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
\
int InstanceMirrorKlass:: \
@@ -278,7 +279,7 @@
InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(oop, nv_suffix); \
} \
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
#define InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
@@ -310,14 +311,14 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void InstanceMirrorKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
// Note that we don't have to follow the mirror -> klass pointer, since all
// klasses that are dirty will be scavenged when we iterate over the
@@ -353,7 +354,7 @@
assert_nothing)
return size;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
int InstanceMirrorKlass::instance_size(KlassHandle k) {
if (k() != NULL && k->oop_is_instance()) {
--- a/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -28,6 +28,7 @@
#include "classfile/systemDictionary.hpp"
#include "oops/instanceKlass.hpp"
#include "runtime/handles.hpp"
+#include "utilities/macros.hpp"
// An InstanceMirrorKlass is a specialized InstanceKlass for
// java.lang.Class instances. These instances are special because
@@ -107,13 +108,13 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
int oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* blk);
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
};
#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
--- a/hotspot/src/share/vm/oops/instanceRefKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -33,7 +33,8 @@
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/preserveException.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
#include "gc_implementation/g1/g1RemSet.inline.hpp"
@@ -42,7 +43,7 @@
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
template <class T>
void specialized_oop_follow_contents(InstanceRefKlass* ref, oop obj) {
@@ -120,7 +121,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
template <class T>
void specialized_oop_follow_contents(InstanceRefKlass* ref,
ParCompactionManager* cm,
@@ -194,7 +195,7 @@
specialized_oop_follow_contents<oop>(this, cm, obj);
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#ifdef ASSERT
template <class T> void trace_reference_gc(const char *s, oop obj,
@@ -317,7 +318,7 @@
} \
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
\
int InstanceRefKlass:: \
@@ -333,7 +334,7 @@
InstanceRefKlass_SPECIALIZED_OOP_ITERATE(oop, nv_suffix, contains); \
} \
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
#define InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
@@ -354,14 +355,14 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_DEFN)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
template <class T>
void specialized_oop_push_contents(InstanceRefKlass *ref,
PSPromotionManager* pm, oop obj) {
@@ -444,7 +445,7 @@
}
return size_helper();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void InstanceRefKlass::update_nonstatic_oop_maps(Klass* k) {
// Clear the nonstatic oop-map entries corresponding to referent
--- a/hotspot/src/share/vm/oops/instanceRefKlass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -26,6 +26,7 @@
#define SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
#include "oops/instanceKlass.hpp"
+#include "utilities/macros.hpp"
// An InstanceRefKlass is a specialized InstanceKlass for Java
// classes that are subclasses of java/lang/ref/Reference.
@@ -83,13 +84,13 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
int oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* blk);
ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
static void release_and_notify_pending_list_lock(BasicLock *pending_list_basic_lock);
static void acquire_pending_list_lock(BasicLock *pending_list_basic_lock);
--- a/hotspot/src/share/vm/oops/klass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/klass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,6 +29,7 @@
#include "classfile/vmSymbols.hpp"
#include "gc_implementation/shared/markSweep.inline.hpp"
#include "gc_interface/collectedHeap.inline.hpp"
+#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
@@ -37,11 +38,12 @@
#include "oops/oop.inline2.hpp"
#include "runtime/atomic.hpp"
#include "utilities/stack.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
void Klass::set_name(Symbol* n) {
_name = n;
@@ -624,6 +626,17 @@
obj->print_address_on(st);
}
+#if INCLUDE_SERVICES
+// Size Statistics
+void Klass::collect_statistics(KlassSizeStats *sz) const {
+ sz->_klass_bytes = sz->count(this);
+ sz->_mirror_bytes = sz->count(java_mirror());
+ sz->_secondary_supers_bytes = sz->count_array(secondary_supers());
+
+ sz->_ro_bytes += sz->_secondary_supers_bytes;
+ sz->_rw_bytes += sz->_klass_bytes + sz->_mirror_bytes;
+}
+#endif // INCLUDE_SERVICES
// Verification
--- a/hotspot/src/share/vm/oops/klass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/klass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -35,11 +35,12 @@
#include "runtime/orderAccess.hpp"
#include "trace/traceMacros.hpp"
#include "utilities/accessFlags.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
#include "gc_implementation/g1/g1OopClosures.hpp"
#include "gc_implementation/parNew/parOopClosures.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
//
// A Klass provides:
@@ -75,11 +76,11 @@
// [class_loader_data]
// [modifier_flags]
// [access_flags ]
-// [verify_count ] - not in product
-// [alloc_count ]
// [last_biased_lock_bulk_revocation_time] (64 bits)
// [prototype_header]
// [biased_lock_revocation_count]
+// [verify_count ] - not in product
+// [alloc_count ]
// [_modified_oops]
// [_accumulated_modified_oops]
// [trace_id]
@@ -91,6 +92,7 @@
class ClassLoaderData;
class klassVtable;
class ParCompactionManager;
+class KlassSizeStats;
class Klass : public Metadata {
friend class VMStructs;
@@ -164,18 +166,18 @@
jint _modifier_flags; // Processed access flags, for use by Class.getModifiers.
AccessFlags _access_flags; // Access flags. The class/interface distinction is stored here.
+ // Biased locking implementation and statistics
+ // (the 64-bit chunk goes first, to avoid some fragmentation)
+ jlong _last_biased_lock_bulk_revocation_time;
+ markOop _prototype_header; // Used when biased locking is both enabled and disabled for this type
+ jint _biased_lock_revocation_count;
+
#ifndef PRODUCT
int _verify_count; // to avoid redundant verifies
#endif
juint _alloc_count; // allocation profiling support
- // Biased locking implementation and statistics
- // (the 64-bit chunk goes first, to avoid some fragmentation)
- jlong _last_biased_lock_bulk_revocation_time;
- markOop _prototype_header; // Used when biased locking is both enabled and disabled for this type
- jint _biased_lock_revocation_count;
-
TRACE_DEFINE_KLASS_TRACE_ID;
// Remembered sets support for the oops in the klasses.
@@ -477,6 +479,9 @@
// Size of klass in word size.
virtual int size() const = 0;
+#if INCLUDE_SERVICES
+ virtual void collect_statistics(KlassSizeStats *sz) const;
+#endif
// Returns the Java name for a class (Resource allocated)
// For arrays, this returns the name of the element with a leading '['.
@@ -625,13 +630,13 @@
return oop_oop_iterate(obj, blk);
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// In case we don't have a specialized backward scanner use forward
// iteration.
virtual int oop_oop_iterate_backwards_v(oop obj, ExtendedOopClosure* blk) {
return oop_oop_iterate_v(obj, blk);
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// Iterates "blk" over all the oops in "obj" (of type "this") within "mr".
// (I don't see why the _m should be required, but without it the Solaris
@@ -663,7 +668,7 @@
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_1(Klass_OOP_OOP_ITERATE_DECL)
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(Klass_OOP_OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define Klass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
virtual int oop_oop_iterate_backwards##nv_suffix(oop obj, \
OopClosureType* blk) { \
@@ -673,7 +678,7 @@
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_1(Klass_OOP_OOP_ITERATE_BACKWARDS_DECL)
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(Klass_OOP_OOP_ITERATE_BACKWARDS_DECL)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
virtual void array_klasses_do(void f(Klass* k)) {}
virtual void with_array_klasses_do(void f(Klass* k));
--- a/hotspot/src/share/vm/oops/klassPS.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/klassPS.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -27,7 +27,9 @@
// Expands to Parallel Scavenge and Parallel Old declarations
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+
+#if INCLUDE_ALL_GCS
#define PARALLEL_GC_DECLS \
virtual void oop_push_contents(PSPromotionManager* pm, oop obj); \
/* Parallel Old GC support \
@@ -44,9 +46,9 @@
virtual void oop_push_contents(PSPromotionManager* pm, oop obj) = 0; \
virtual void oop_follow_contents(ParCompactionManager* cm, oop obj) = 0; \
virtual int oop_update_pointers(ParCompactionManager* cm, oop obj) = 0;
-#else // SERIALGC
+#else // INCLUDE_ALL_GCS
#define PARALLEL_GC_DECLS
#define PARALLEL_GC_DECLS_PV
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#endif // SHARE_VM_OOPS_KLASSPS_HPP
--- a/hotspot/src/share/vm/oops/method.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/method.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/metadataOnStackMark.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/debugInfoRec.hpp"
#include "gc_interface/collectedHeap.inline.hpp"
@@ -33,6 +34,7 @@
#include "interpreter/oopMapCache.hpp"
#include "memory/gcLocker.hpp"
#include "memory/generation.hpp"
+#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "oops/constMethod.hpp"
@@ -41,7 +43,6 @@
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "prims/jvmtiExport.hpp"
-#include "prims/jvmtiRedefineClasses.hpp"
#include "prims/methodHandles.hpp"
#include "prims/nativeLookup.hpp"
#include "runtime/arguments.hpp"
@@ -699,7 +700,7 @@
}
-void Method::print_made_not_compilable(int comp_level, bool is_osr, bool report) {
+void Method::print_made_not_compilable(int comp_level, bool is_osr, bool report, const char* reason) {
if (PrintCompilation && report) {
ttyLocker ttyl;
tty->print("made not %scompilable on ", is_osr ? "OSR " : "");
@@ -713,14 +714,21 @@
}
this->print_short_name(tty);
int size = this->code_size();
- if (size > 0)
+ if (size > 0) {
tty->print(" (%d bytes)", size);
+ }
+ if (reason != NULL) {
+ tty->print(" %s", reason);
+ }
tty->cr();
}
if ((TraceDeoptimization || LogCompilation) && (xtty != NULL)) {
ttyLocker ttyl;
xtty->begin_elem("make_not_%scompilable thread='" UINTX_FORMAT "'",
is_osr ? "osr_" : "", os::current_thread_id());
+ if (reason != NULL) {
+ xtty->print(" reason=\'%s\'", reason);
+ }
xtty->method(this);
xtty->stamp();
xtty->end_elem();
@@ -742,8 +750,8 @@
}
// call this when compiler finds that this method is not compilable
-void Method::set_not_compilable(int comp_level, bool report) {
- print_made_not_compilable(comp_level, /*is_osr*/ false, report);
+void Method::set_not_compilable(int comp_level, bool report, const char* reason) {
+ print_made_not_compilable(comp_level, /*is_osr*/ false, report, reason);
if (comp_level == CompLevel_all) {
set_not_c1_compilable();
set_not_c2_compilable();
@@ -768,8 +776,8 @@
return false;
}
-void Method::set_not_osr_compilable(int comp_level, bool report) {
- print_made_not_compilable(comp_level, /*is_osr*/ true, report);
+void Method::set_not_osr_compilable(int comp_level, bool report, const char* reason) {
+ print_made_not_compilable(comp_level, /*is_osr*/ true, report, reason);
if (comp_level == CompLevel_all) {
set_not_c1_osr_compilable();
set_not_c2_osr_compilable();
@@ -1027,7 +1035,7 @@
cp->set_pool_holder(InstanceKlass::cast(holder()));
cp->symbol_at_put(_imcp_invoke_name, name);
cp->symbol_at_put(_imcp_invoke_signature, signature);
- cp->set_preresolution();
+ cp->set_has_preresolution();
// decide on access bits: public or not?
int flags_bits = (JVM_ACC_NATIVE | JVM_ACC_SYNTHETIC | JVM_ACC_FINAL);
@@ -1954,6 +1962,22 @@
if (WizardMode && code() != NULL) st->print(" ((nmethod*)%p)", code());
}
+#if INCLUDE_SERVICES
+// Size Statistics
+void Method::collect_statistics(KlassSizeStats *sz) const {
+ int mysize = sz->count(this);
+ sz->_method_bytes += mysize;
+ sz->_method_all_bytes += mysize;
+ sz->_rw_bytes += mysize;
+
+ if (constMethod()) {
+ constMethod()->collect_statistics(sz);
+ }
+ if (method_data()) {
+ method_data()->collect_statistics(sz);
+ }
+}
+#endif // INCLUDE_SERVICES
// Verification
--- a/hotspot/src/share/vm/oops/method.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/method.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -101,6 +101,7 @@
class AdapterHandlerEntry;
class MethodData;
class ConstMethod;
+class KlassSizeStats;
class Method : public Metadata {
friend class VMStructs;
@@ -127,8 +128,8 @@
InvocationCounter _backedge_counter; // Incremented before each backedge taken - used to trigger frequencey-based optimizations
#ifdef TIERED
+ float _rate; // Events (invocation and backedge counter increments) per millisecond
jlong _prev_time; // Previous time the rate was acquired
- float _rate; // Events (invocation and backedge counter increments) per millisecond
#endif
#ifndef PRODUCT
@@ -593,6 +594,9 @@
static int header_size() { return sizeof(Method)/HeapWordSize; }
static int size(bool is_native);
int size() const { return method_size(); }
+#if INCLUDE_SERVICES
+ void collect_statistics(KlassSizeStats *sz) const;
+#endif
// interpreter support
static ByteSize const_offset() { return byte_offset_of(Method, _constMethod ); }
@@ -760,18 +764,18 @@
// whether it is not compilable for another reason like having a
// breakpoint set in it.
bool is_not_compilable(int comp_level = CompLevel_any) const;
- void set_not_compilable(int comp_level = CompLevel_all, bool report = true);
+ void set_not_compilable(int comp_level = CompLevel_all, bool report = true, const char* reason = NULL);
void set_not_compilable_quietly(int comp_level = CompLevel_all) {
set_not_compilable(comp_level, false);
}
bool is_not_osr_compilable(int comp_level = CompLevel_any) const;
- void set_not_osr_compilable(int comp_level = CompLevel_all, bool report = true);
+ void set_not_osr_compilable(int comp_level = CompLevel_all, bool report = true, const char* reason = NULL);
void set_not_osr_compilable_quietly(int comp_level = CompLevel_all) {
set_not_osr_compilable(comp_level, false);
}
private:
- void print_made_not_compilable(int comp_level, bool is_osr, bool report);
+ void print_made_not_compilable(int comp_level, bool is_osr, bool report, const char* reason);
public:
bool is_not_c1_compilable() const { return access_flags().is_not_c1_compilable(); }
--- a/hotspot/src/share/vm/oops/methodData.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/methodData.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -27,6 +27,7 @@
#include "interpreter/bytecode.hpp"
#include "interpreter/bytecodeStream.hpp"
#include "interpreter/linkResolver.hpp"
+#include "memory/heapInspection.hpp"
#include "oops/methodData.hpp"
#include "prims/jvmtiRedefineClasses.hpp"
#include "runtime/compilationPolicy.hpp"
@@ -859,6 +860,15 @@
}
#endif
+#if INCLUDE_SERVICES
+// Size Statistics
+void MethodData::collect_statistics(KlassSizeStats *sz) const {
+ int n = sz->count(this);
+ sz->_method_data_bytes += n;
+ sz->_method_all_bytes += n;
+ sz->_rw_bytes += n;
+}
+#endif // INCLUDE_SERVICES
// Verification
--- a/hotspot/src/share/vm/oops/methodData.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/methodData.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -32,6 +32,7 @@
#include "runtime/orderAccess.hpp"
class BytecodeStream;
+class KlassSizeStats;
// The MethodData object collects counts and other profile information
// during zeroth-tier (interpretive) and first-tier execution.
@@ -1289,6 +1290,9 @@
// My size
int size_in_bytes() const { return _size; }
int size() const { return align_object_size(align_size_up(_size, BytesPerWord)/BytesPerWord); }
+#if INCLUDE_SERVICES
+ void collect_statistics(KlassSizeStats *sz) const;
+#endif
int creation_mileage() const { return _creation_mileage; }
void set_creation_mileage(int x) { _creation_mileage = x; }
@@ -1465,7 +1469,7 @@
void inc_decompile_count() {
_nof_decompiles += 1;
if (decompile_count() > (uint)PerMethodRecompilationCutoff) {
- method()->set_not_compilable(CompLevel_full_optimization);
+ method()->set_not_compilable(CompLevel_full_optimization, true, "decompile_count > PerMethodRecompilationCutoff");
}
}
--- a/hotspot/src/share/vm/oops/objArrayKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/objArrayKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -43,7 +43,8 @@
#include "runtime/handles.inline.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/copy.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
@@ -54,7 +55,7 @@
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
ObjArrayKlass* ObjArrayKlass::allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS) {
assert(ObjArrayKlass::header_size() <= InstanceKlass::header_size(),
@@ -461,7 +462,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm,
oop obj) {
assert(obj->is_array(), "obj must be array");
@@ -472,7 +473,7 @@
objarray_follow_contents<oop>(cm, obj, 0);
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#define if_do_metadata_checked(closure, nv_suffix) \
/* Make sure the non-virtual and the virtual versions match. */ \
@@ -573,7 +574,7 @@
return size;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void ObjArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
assert(obj->is_objArray(), "obj must be obj array");
ObjArrayKlass_OOP_ITERATE( \
@@ -591,7 +592,7 @@
ObjArrayKlass_OOP_ITERATE(a, p, PSParallelCompact::adjust_pointer(p))
return size;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// JVM support
--- a/hotspot/src/share/vm/oops/objArrayKlass.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/objArrayKlass.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -28,6 +28,7 @@
#include "classfile/classLoaderData.hpp"
#include "memory/specialized_oop_closures.hpp"
#include "oops/arrayKlass.hpp"
+#include "utilities/macros.hpp"
// ObjArrayKlass is the klass for objArrays
@@ -111,11 +112,11 @@
// Parallel Scavenge and Parallel Old
PARALLEL_GC_DECLS
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
inline void oop_follow_contents(ParCompactionManager* cm, oop obj, int index);
template <class T> inline void
objarray_follow_contents(ParCompactionManager* cm, oop obj, int index);
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// Iterators
int oop_oop_iterate(oop obj, ExtendedOopClosure* blk) {
--- a/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -27,10 +27,11 @@
#include "gc_implementation/shared/markSweep.inline.hpp"
#include "oops/objArrayKlass.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
void ObjArrayKlass::oop_follow_contents(oop obj, int index) {
if (UseCompressedOops) {
@@ -63,7 +64,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj,
int index) {
if (UseCompressedOops) {
@@ -96,6 +97,6 @@
cm->push_objarray(a, end_index); // Push the continuation.
}
}
-#endif // #ifndef SERIALGC
+#endif // INCLUDE_ALL_GCS
#endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP
--- a/hotspot/src/share/vm/oops/oop.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/oop.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -29,6 +29,7 @@
#include "memory/memRegion.hpp"
#include "memory/specialized_oop_closures.hpp"
#include "oops/metadata.hpp"
+#include "utilities/macros.hpp"
#include "utilities/top.hpp"
// oopDesc is the top baseclass for objects classes. The {name}Desc classes describe
@@ -298,7 +299,7 @@
// reference field in "this".
void follow_contents(void);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Parallel Scavenge
void push_contents(PSPromotionManager* pm);
@@ -306,7 +307,7 @@
void update_contents(ParCompactionManager* cm);
void follow_contents(ParCompactionManager* cm);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
bool is_scavengable() const;
@@ -316,13 +317,13 @@
void forward_to(oop p);
bool cas_forward_to(oop p, markOop compare);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Like "forward_to", but inserts the forwarding pointer atomically.
// Exactly one thread succeeds in inserting the forwarding pointer, and
// this call returns "NULL" for that thread; any other thread has the
// value of the forwarding pointer returned and does not modify "this".
oop forward_to_atomic(oop p);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
oop forwardee() const;
@@ -334,10 +335,10 @@
// return the size of this oop. This is used by the MarkSweep collector.
int adjust_pointers();
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Parallel old
void update_header(ParCompactionManager* cm);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// mark-sweep support
void follow_body(int begin, int end);
@@ -354,7 +355,7 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(OOP_ITERATE_DECL)
ALL_OOP_OOP_ITERATE_CLOSURES_2(OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
int oop_iterate_backwards(OopClosureType* blk);
--- a/hotspot/src/share/vm/oops/oop.inline.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -40,6 +40,7 @@
#include "oops/oop.hpp"
#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
+#include "utilities/macros.hpp"
#ifdef TARGET_ARCH_x86
# include "bytes_x86.hpp"
#endif
@@ -227,12 +228,12 @@
// might not be the same as oop.
inline narrowOop oopDesc::encode_klass_not_null(Klass* v) {
- assert(!is_null(v), "oop value can never be zero");
+ assert(!is_null(v), "klass value can never be zero");
assert(check_klass_alignment(v), "Address not aligned");
address base = Universe::narrow_klass_base();
int shift = Universe::narrow_klass_shift();
uint64_t pd = (uint64_t)(pointer_delta((void*)v, (void*)base, 1));
- assert(OopEncodingHeapMax > pd, "change encoding max if new encoding");
+ assert(KlassEncodingMetaspaceMax > pd, "change encoding max if new encoding");
uint64_t result = pd >> shift;
assert((result & CONST64(0xffffffff00000000)) == 0, "narrow klass pointer overflow");
assert(decode_klass(result) == v, "reversibility");
@@ -760,7 +761,7 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(OOP_ITERATE_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(OOP_ITERATE_DEFN)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#define OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
\
inline int oopDesc::oop_iterate_backwards(OopClosureType* blk) { \
@@ -770,6 +771,6 @@
ALL_OOP_OOP_ITERATE_CLOSURES_1(OOP_ITERATE_BACKWARDS_DEFN)
ALL_OOP_OOP_ITERATE_CLOSURES_2(OOP_ITERATE_BACKWARDS_DEFN)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
#endif // SHARE_VM_OOPS_OOP_INLINE_HPP
--- a/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,14 +25,15 @@
#ifndef SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
#define SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parNew/parNewGeneration.hpp"
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
inline void oopDesc::update_contents(ParCompactionManager* cm) {
// The klass field must be updated before anything else
--- a/hotspot/src/share/vm/oops/oop.psgc.inline.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/oop.psgc.inline.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,11 +25,12 @@
#ifndef SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP
#define SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// ParallelScavengeHeap methods
--- a/hotspot/src/share/vm/oops/symbol.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/symbol.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -152,6 +152,7 @@
}
void Symbol::print_symbol_on(outputStream* st) const {
+ ResourceMark rm;
st = st ? st : tty;
st->print("%s", as_quoted_ascii());
}
--- a/hotspot/src/share/vm/oops/typeArrayKlass.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/oops/typeArrayKlass.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -39,6 +39,7 @@
#include "oops/typeArrayKlass.hpp"
#include "oops/typeArrayOop.hpp"
#include "runtime/handles.inline.hpp"
+#include "utilities/macros.hpp"
bool TypeArrayKlass::compute_is_subtype_of(Klass* k) {
if (!k->oop_is_typeArray()) {
@@ -208,13 +209,13 @@
// know that Universe::TypeArrayKlass never moves.
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void TypeArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj) {
assert(obj->is_typeArray(),"must be a type array");
// Performance tweak: We skip iterating over the klass pointer since we
// know that Universe::TypeArrayKlass never moves.
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
int TypeArrayKlass::oop_adjust_pointers(oop obj) {
assert(obj->is_typeArray(),"must be a type array");
@@ -240,7 +241,7 @@
return t->object_size();
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void TypeArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
ShouldNotReachHere();
assert(obj->is_typeArray(),"must be a type array");
@@ -251,7 +252,7 @@
assert(obj->is_typeArray(),"must be a type array");
return typeArrayOop(obj)->object_size();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void TypeArrayKlass::initialize(TRAPS) {
// Nothing to do. Having this function is handy since objArrayKlasses can be
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -420,14 +420,24 @@
}
//------------------------------print_inlining---------------------------------
-// Really, the failure_msg can be a success message also.
-void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci, const char* failure_msg) const {
- C->print_inlining(callee_method, inline_level(), caller_bci, failure_msg ? failure_msg : "inline");
- if (callee_method == NULL) tty->print(" callee not monotonic or profiled");
- if (Verbose && callee_method) {
- const InlineTree *top = this;
- while( top->caller_tree() != NULL ) { top = top->caller_tree(); }
- //tty->print(" bcs: %d+%d invoked: %d", top->count_inline_bcs(), callee_method->code_size(), callee_method->interpreter_invocation_count());
+void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci,
+ const char* msg, bool success) const {
+ assert(msg != NULL, "just checking");
+ if (C->log() != NULL) {
+ if (success) {
+ C->log()->inline_success(msg);
+ } else {
+ C->log()->inline_fail(msg);
+ }
+ }
+ if (PrintInlining) {
+ C->print_inlining(callee_method, inline_level(), caller_bci, msg);
+ if (callee_method == NULL) tty->print(" callee not monotonic or profiled");
+ if (Verbose && callee_method) {
+ const InlineTree *top = this;
+ while( top->caller_tree() != NULL ) { top = top->caller_tree(); }
+ //tty->print(" bcs: %d+%d invoked: %d", top->count_inline_bcs(), callee_method->code_size(), callee_method->interpreter_invocation_count());
+ }
}
}
@@ -451,23 +461,23 @@
// Do some initial checks.
if (!pass_initial_checks(caller_method, caller_bci, callee_method)) {
- if (PrintInlining) print_inlining(callee_method, caller_bci, "failed initial checks");
+ print_inlining(callee_method, caller_bci, "failed initial checks",
+ false /* !success */);
return NULL;
}
// Do some parse checks.
failure_msg = check_can_parse(callee_method);
if (failure_msg != NULL) {
- if (PrintInlining) print_inlining(callee_method, caller_bci, failure_msg);
+ print_inlining(callee_method, caller_bci, failure_msg,
+ false /* !success */);
return NULL;
}
// Check if inlining policy says no.
WarmCallInfo wci = *(initial_wci);
- failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci, should_delay);
- if (failure_msg != NULL && C->log() != NULL) {
- C->log()->inline_fail(failure_msg);
- }
+ failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile,
+ &wci, should_delay);
#ifndef PRODUCT
if (UseOldInlining && InlineWarmCalls
@@ -487,7 +497,7 @@
wci = *(WarmCallInfo::always_hot());
else
wci = *(WarmCallInfo::always_cold());
- }
+ }
if (!InlineWarmCalls) {
if (!wci.is_cold() && !wci.is_hot()) {
// Do not inline the warm calls.
@@ -496,11 +506,10 @@
}
if (!wci.is_cold()) {
- // In -UseOldInlining, the failure_msg may also be a success message.
- if (failure_msg == NULL) failure_msg = "inline (hot)";
-
// Inline!
- if (PrintInlining) print_inlining(callee_method, caller_bci, failure_msg);
+ print_inlining(callee_method, caller_bci,
+ failure_msg ? failure_msg : "inline (hot)",
+ true /* success */);
if (UseOldInlining)
build_inline_tree_for_callee(callee_method, jvms, caller_bci);
if (InlineWarmCalls && !wci.is_hot())
@@ -509,8 +518,9 @@
}
// Do not inline
- if (failure_msg == NULL) failure_msg = "too cold to inline";
- if (PrintInlining) print_inlining(callee_method, caller_bci, failure_msg);
+ print_inlining(callee_method, caller_bci,
+ failure_msg ? failure_msg : "too cold to inline",
+ false /* !success */ );
return NULL;
}
--- a/hotspot/src/share/vm/opto/callGenerator.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/opto/callGenerator.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -305,11 +305,13 @@
void LateInlineCallGenerator::do_late_inline() {
// Can't inline it
if (call_node() == NULL || call_node()->outcnt() == 0 ||
- call_node()->in(0) == NULL || call_node()->in(0)->is_top())
+ call_node()->in(0) == NULL || call_node()->in(0)->is_top()) {
return;
+ }
+ const TypeTuple *r = call_node()->tf()->domain();
for (int i1 = 0; i1 < method()->arg_size(); i1++) {
- if (call_node()->in(TypeFunc::Parms + i1)->is_top()) {
+ if (call_node()->in(TypeFunc::Parms + i1)->is_top() && r->field_at(TypeFunc::Parms + i1) != Type::HALF) {
assert(Compile::current()->inlining_incrementally(), "shouldn't happen during parsing");
return;
}
--- a/hotspot/src/share/vm/opto/generateOptoStub.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/opto/generateOptoStub.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -88,12 +88,12 @@
thread,
in_bytes(JavaThread::frame_anchor_offset()) +
in_bytes(JavaFrameAnchor::last_Java_pc_offset()));
-#if defined(SPARC) || defined(IA64)
+#if defined(SPARC)
Node* adr_flags = basic_plus_adr(top(),
thread,
in_bytes(JavaThread::frame_anchor_offset()) +
in_bytes(JavaFrameAnchor::flags_offset()));
-#endif /* defined(SPARC) || defined(IA64) */
+#endif /* defined(SPARC) */
// Drop in the last_Java_sp. last_Java_fp is not touched.
@@ -102,10 +102,8 @@
// users will look at the other fields.
//
Node *adr_sp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_sp_offset()));
-#ifndef IA64
Node *last_sp = basic_plus_adr(top(), frameptr(), (intptr_t) STACK_BIAS);
store_to_memory(NULL, adr_sp, last_sp, T_ADDRESS, NoAlias);
-#endif
// Set _thread_in_native
// The order of stores into TLS is critical! Setting _thread_in_native MUST
@@ -210,19 +208,12 @@
//-----------------------------
// Clear last_Java_sp
-#ifdef IA64
- if( os::is_MP() ) insert_mem_bar(Op_MemBarRelease);
-#endif
-
store_to_memory(NULL, adr_sp, null(), T_ADDRESS, NoAlias);
-#ifdef IA64
- if (os::is_MP() && UseMembar) insert_mem_bar(new MemBarVolatileNode());
-#endif // def IA64
// Clear last_Java_pc and (optionally)_flags
store_to_memory(NULL, adr_last_Java_pc, null(), T_ADDRESS, NoAlias);
-#if defined(SPARC) || defined(IA64)
+#if defined(SPARC)
store_to_memory(NULL, adr_flags, intcon(0), T_INT, NoAlias);
-#endif /* defined(SPARC) || defined(IA64) */
+#endif /* defined(SPARC) */
#ifdef IA64
Node* adr_last_Java_fp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_fp_offset()));
if( os::is_MP() ) insert_mem_bar(Op_MemBarRelease);
--- a/hotspot/src/share/vm/opto/parse.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/opto/parse.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -73,7 +73,8 @@
const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result, bool& should_delay);
const char* should_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const;
const char* should_not_inline(ciMethod* callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const;
- void print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const;
+ void print_inlining(ciMethod* callee_method, int caller_bci,
+ const char* msg, bool success) const;
InlineTree *caller_tree() const { return _caller_tree; }
InlineTree* callee_at(int bci, ciMethod* m) const;
--- a/hotspot/src/share/vm/opto/parse3.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/opto/parse3.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -487,7 +487,8 @@
fun, NULL, TypeRawPtr::BOTTOM,
makecon(TypeKlassPtr::make(array_klass)),
length[0], length[1], length[2],
- length[3], length[4]);
+ (ndimensions > 2) ? length[3] : NULL,
+ (ndimensions > 3) ? length[4] : NULL);
} else {
// Create a java array for dimension sizes
Node* dims = NULL;
--- a/hotspot/src/share/vm/precompiled/precompiled.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/precompiled/precompiled.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -24,6 +24,7 @@
// Precompiled headers are turned off for Sun Studion,
// or if the user passes USE_PRECOMPILED_HEADER=0 to the makefiles.
+
#ifndef DONT_USE_PRECOMPILED_HEADER
# include "asm/assembler.hpp"
@@ -285,7 +286,7 @@
# include "c1/c1_ValueType.hpp"
# include "c1/c1_globals.hpp"
#endif // COMPILER1
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
# include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
# include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
# include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
@@ -314,6 +315,6 @@
# include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp"
# include "gc_implementation/shared/gcPolicyCounters.hpp"
# include "gc_implementation/shared/parGCAllocBuffer.hpp"
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#endif // !DONT_USE_PRECOMPILED_HEADER
--- a/hotspot/src/share/vm/prims/jni.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jni.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -32,9 +32,10 @@
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "interpreter/linkResolver.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/gcLocker.inline.hpp"
@@ -2641,7 +2642,7 @@
o = JvmtiExport::jni_GetField_probe(thread, obj, o, k, fieldID, false);
}
jobject ret = JNIHandles::make_local(env, o->obj_field(offset));
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// If G1 is enabled and we are accessing the value of the referent
// field in a reference object then we need to register a non-null
// referent with the SATB barrier.
@@ -2660,7 +2661,7 @@
G1SATBCardTableModRefBS::enqueue(referent);
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectField__return, ret);
#else /* USDT2 */
--- a/hotspot/src/share/vm/prims/jniCheck.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jniCheck.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,9 +25,7 @@
#ifndef SHARE_VM_PRIMS_JNICHECK_HPP
#define SHARE_VM_PRIMS_JNICHECK_HPP
-#ifndef KERNEL
#include "runtime/thread.hpp"
-#endif
extern "C" {
// Report a JNI failure caught by -Xcheck:jni. Perform a core dump.
--- a/hotspot/src/share/vm/prims/jvm.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvm.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1620,7 +1620,7 @@
// For a 0 index, give a NULL symbol
Symbol* const sym = 0 != params[i].name_cp_index ?
mh->constants()->symbol_at(params[i].name_cp_index) : NULL;
- int flags = build_int_from_shorts(params[i].flags_lo, params[i].flags_hi);
+ int flags = params[i].flags;
oop param = Reflection::new_parameter(reflected_method, i, sym,
flags, CHECK_NULL);
result->obj_at_put(i, param);
@@ -2302,6 +2302,15 @@
JVM_END
+JVM_QUICK_ENTRY(jboolean, JVM_IsVMGeneratedMethodIx(JNIEnv *env, jclass cls, int method_index))
+ JVMWrapper("JVM_IsVMGeneratedMethodIx");
+ ResourceMark rm(THREAD);
+ Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
+ k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
+ Method* method = InstanceKlass::cast(k)->methods()->at(method_index);
+ return method->is_overpass();
+JVM_END
+
JVM_ENTRY(const char*, JVM_GetMethodIxNameUTF(JNIEnv *env, jclass cls, jint method_index))
JVMWrapper("JVM_GetMethodIxIxUTF");
Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
@@ -4519,10 +4528,6 @@
// consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat
// counter defined in runtimeService.cpp.
info->is_attachable = AttachListener::is_attach_supported();
-#ifdef KERNEL
- info->is_kernel_jvm = 1; // true;
-#else // KERNEL
info->is_kernel_jvm = 0; // false;
-#endif // KERNEL
}
JVM_END
--- a/hotspot/src/share/vm/prims/jvm.h Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvm.h Wed Feb 13 13:01:16 2013 -0800
@@ -860,6 +860,13 @@
JVM_IsConstructorIx(JNIEnv *env, jclass cb, int index);
/*
+ * Is the given method generated by the VM.
+ * The method is identified by method_index.
+ */
+JNIEXPORT jboolean JNICALL
+JVM_IsVMGeneratedMethodIx(JNIEnv *env, jclass cb, int index);
+
+/*
* Returns the name of a given method in UTF format.
* The result remains valid until JVM_ReleaseUTF is called.
*
--- a/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,9 +25,7 @@
#ifndef SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
#define SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
-#ifndef JVMTI_KERNEL
#include "jvmtifiles/jvmti.h"
-#endif
// forward declaration
class JvmtiEnv;
--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -647,8 +647,6 @@
return JVMTI_ERROR_NONE;
} /* end GetJLocationFormat */
-#ifndef JVMTI_KERNEL
-
//
// Thread functions
//
@@ -3436,5 +3434,3 @@
}
return err;
} /* end SetSystemProperty */
-
-#endif // !JVMTI_KERNEL
--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -74,10 +74,8 @@
JvmtiManageCapabilities::initialize();
-#ifndef JVMTI_KERNEL
// register extension functions and events
JvmtiExtensions::register_extensions();
-#endif // !JVMTI_KERNEL
#ifdef JVMTI_TRACE
JvmtiTrace::initialize();
@@ -236,14 +234,12 @@
// Same situation as with events (see above)
set_native_method_prefixes(0, NULL);
-#ifndef JVMTI_KERNEL
JvmtiTagMap* tag_map_to_deallocate = _tag_map;
set_tag_map(NULL);
// A tag map can be big, deallocate it now
if (tag_map_to_deallocate != NULL) {
delete tag_map_to_deallocate;
}
-#endif // !JVMTI_KERNEL
_needs_clean_up = true;
}
@@ -255,14 +251,12 @@
// There is a small window of time during which the tag map of a
// disposed environment could have been reallocated.
// Make sure it is gone.
-#ifndef JVMTI_KERNEL
JvmtiTagMap* tag_map_to_deallocate = _tag_map;
set_tag_map(NULL);
// A tag map can be big, deallocate it now
if (tag_map_to_deallocate != NULL) {
delete tag_map_to_deallocate;
}
-#endif // !JVMTI_KERNEL
_magic = BAD_MAGIC;
}
@@ -593,8 +587,6 @@
return (jclass)jni_reference(k->java_mirror());
}
-#ifndef JVMTI_KERNEL
-
//
// Field Information
//
@@ -1482,5 +1474,3 @@
}
}
}
-
-#endif // !JVMTI_KERNEL
--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -35,6 +35,7 @@
#include "runtime/thread.hpp"
#include "runtime/vm_operations.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
//
// Forward Declarations
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -50,9 +50,10 @@
#include "runtime/vframe.hpp"
#include "services/attachListener.hpp"
#include "services/serviceUtil.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef JVMTI_TRACE
#define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr out; }
@@ -677,7 +678,6 @@
}
-#ifndef JVMTI_KERNEL
static inline Klass* oop_to_klass(oop obj) {
Klass* k = obj->klass();
@@ -2178,7 +2178,6 @@
typedef jint (JNICALL *OnAttachEntry_t)(JavaVM*, char *, void *);
}
-#ifndef SERVICES_KERNEL
jint JvmtiExport::load_agent_library(AttachOperation* op, outputStream* st) {
char ebuf[1024];
char buffer[JVM_MAXPATHLEN];
@@ -2259,7 +2258,6 @@
}
return result;
}
-#endif // SERVICES_KERNEL
////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2457,4 +2455,3 @@
JvmtiExport::post_garbage_collection_finish();
}
}
-#endif // JVMTI_KERNEL
--- a/hotspot/src/share/vm/prims/jvmtiExport.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiExport.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -34,6 +34,7 @@
#include "runtime/handles.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
// Must be included after jvmti.h.
#include "code/jvmticmlr.h"
--- a/hotspot/src/share/vm/prims/jvmtiExtensions.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiExtensions.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,11 +25,9 @@
#ifndef SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
#define SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
-#ifndef JVMTI_KERNEL
#include "jvmtifiles/jvmti.h"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/allocation.hpp"
-#endif
// JvmtiExtensions
//
--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -905,8 +905,6 @@
#endif
}
-#ifndef KERNEL
-
JvmtiDeferredEvent JvmtiDeferredEvent::compiled_method_load_event(
nmethod* nm) {
JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_COMPILED_METHOD_LOAD);
@@ -1098,5 +1096,3 @@
}
}
}
-
-#endif // ndef KERNEL
--- a/hotspot/src/share/vm/prims/jvmtiImpl.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -25,8 +25,6 @@
#ifndef SHARE_VM_PRIMS_JVMTIIMPL_HPP
#define SHARE_VM_PRIMS_JVMTIIMPL_HPP
-#ifndef JVMTI_KERNEL
-
#include "classfile/systemDictionary.hpp"
#include "jvmtifiles/jvmti.h"
#include "oops/objArrayOop.hpp"
@@ -435,7 +433,6 @@
static void print();
};
-#endif // !JVMTI_KERNEL
/**
* When a thread (such as the compiler thread or VM thread) cannot post a
--- a/hotspot/src/share/vm/prims/jvmtiRawMonitor.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiRawMonitor.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -25,10 +25,8 @@
#ifndef SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
#define SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
-#ifndef JVMTI_KERNEL
#include "runtime/objectMonitor.hpp"
#include "utilities/growableArray.hpp"
-#endif
//
// class JvmtiRawMonitor
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/metadataOnStackMark.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/verifier.hpp"
#include "code/codeCache.hpp"
@@ -115,43 +116,6 @@
return true;
}
-// Keep track of marked on-stack metadata so it can be cleared.
-GrowableArray<Metadata*>* _marked_objects = NULL;
-NOT_PRODUCT(bool MetadataOnStackMark::_is_active = false;)
-
-// Walk metadata on the stack and mark it so that redefinition doesn't delete
-// it. Class unloading also walks the previous versions and might try to
-// delete it, so this class is used by class unloading also.
-MetadataOnStackMark::MetadataOnStackMark() {
- assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
- NOT_PRODUCT(_is_active = true;)
- if (_marked_objects == NULL) {
- _marked_objects = new (ResourceObj::C_HEAP, mtClass) GrowableArray<Metadata*>(1000, true);
- }
- Threads::metadata_do(Metadata::mark_on_stack);
- CodeCache::alive_nmethods_do(nmethod::mark_on_stack);
- CompileBroker::mark_on_stack();
-}
-
-MetadataOnStackMark::~MetadataOnStackMark() {
- assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
- // Unmark everything that was marked. Can't do the same walk because
- // redefine classes messes up the code cache so the set of methods
- // might not be the same.
- for (int i = 0; i< _marked_objects->length(); i++) {
- _marked_objects->at(i)->set_on_stack(false);
- }
- _marked_objects->clear(); // reuse growable array for next time.
- NOT_PRODUCT(_is_active = false;)
-}
-
-// Record which objects are marked so we can unmark the same objects.
-void MetadataOnStackMark::record(Metadata* m) {
- assert(_is_active, "metadata on stack marking is active");
- _marked_objects->push(m);
-}
-
-
void VM_RedefineClasses::doit() {
Thread *thread = Thread::current();
@@ -314,76 +278,23 @@
case JVM_CONSTANT_NameAndType:
{
int name_ref_i = scratch_cp->name_ref_index_at(scratch_i);
- int new_name_ref_i = 0;
- bool match = (name_ref_i < *merge_cp_length_p) &&
- scratch_cp->compare_entry_to(name_ref_i, *merge_cp_p, name_ref_i,
- THREAD);
- if (!match) {
- // forward reference in *merge_cp_p or not a direct match
-
- int found_i = scratch_cp->find_matching_entry(name_ref_i, *merge_cp_p,
- THREAD);
- if (found_i != 0) {
- guarantee(found_i != name_ref_i,
- "compare_entry_to() and find_matching_entry() do not agree");
-
- // Found a matching entry somewhere else in *merge_cp_p so
- // just need a mapping entry.
- new_name_ref_i = found_i;
- map_index(scratch_cp, name_ref_i, found_i);
- } else {
- // no match found so we have to append this entry to *merge_cp_p
- append_entry(scratch_cp, name_ref_i, merge_cp_p, merge_cp_length_p,
- THREAD);
- // The above call to append_entry() can only append one entry
- // so the post call query of *merge_cp_length_p is only for
- // the sake of consistency.
- new_name_ref_i = *merge_cp_length_p - 1;
- }
- }
+ int new_name_ref_i = find_or_append_indirect_entry(scratch_cp, name_ref_i, merge_cp_p,
+ merge_cp_length_p, THREAD);
int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i);
- int new_signature_ref_i = 0;
- match = (signature_ref_i < *merge_cp_length_p) &&
- scratch_cp->compare_entry_to(signature_ref_i, *merge_cp_p,
- signature_ref_i, THREAD);
- if (!match) {
- // forward reference in *merge_cp_p or not a direct match
-
- int found_i = scratch_cp->find_matching_entry(signature_ref_i,
- *merge_cp_p, THREAD);
- if (found_i != 0) {
- guarantee(found_i != signature_ref_i,
- "compare_entry_to() and find_matching_entry() do not agree");
-
- // Found a matching entry somewhere else in *merge_cp_p so
- // just need a mapping entry.
- new_signature_ref_i = found_i;
- map_index(scratch_cp, signature_ref_i, found_i);
- } else {
- // no match found so we have to append this entry to *merge_cp_p
- append_entry(scratch_cp, signature_ref_i, merge_cp_p,
- merge_cp_length_p, THREAD);
- // The above call to append_entry() can only append one entry
- // so the post call query of *merge_cp_length_p is only for
- // the sake of consistency.
- new_signature_ref_i = *merge_cp_length_p - 1;
- }
- }
+ int new_signature_ref_i = find_or_append_indirect_entry(scratch_cp, signature_ref_i,
+ merge_cp_p, merge_cp_length_p,
+ THREAD);
// If the referenced entries already exist in *merge_cp_p, then
// both new_name_ref_i and new_signature_ref_i will both be 0.
// In that case, all we are appending is the current entry.
- if (new_name_ref_i == 0) {
- new_name_ref_i = name_ref_i;
- } else {
+ if (new_name_ref_i != name_ref_i) {
RC_TRACE(0x00080000,
("NameAndType entry@%d name_ref_index change: %d to %d",
*merge_cp_length_p, name_ref_i, new_name_ref_i));
}
- if (new_signature_ref_i == 0) {
- new_signature_ref_i = signature_ref_i;
- } else {
+ if (new_signature_ref_i != signature_ref_i) {
RC_TRACE(0x00080000,
("NameAndType entry@%d signature_ref_index change: %d to %d",
*merge_cp_length_p, signature_ref_i, new_signature_ref_i));
@@ -405,76 +316,12 @@
case JVM_CONSTANT_Methodref:
{
int klass_ref_i = scratch_cp->uncached_klass_ref_index_at(scratch_i);
- int new_klass_ref_i = 0;
- bool match = (klass_ref_i < *merge_cp_length_p) &&
- scratch_cp->compare_entry_to(klass_ref_i, *merge_cp_p, klass_ref_i,
- THREAD);
- if (!match) {
- // forward reference in *merge_cp_p or not a direct match
-
- int found_i = scratch_cp->find_matching_entry(klass_ref_i, *merge_cp_p,
- THREAD);
- if (found_i != 0) {
- guarantee(found_i != klass_ref_i,
- "compare_entry_to() and find_matching_entry() do not agree");
-
- // Found a matching entry somewhere else in *merge_cp_p so
- // just need a mapping entry.
- new_klass_ref_i = found_i;
- map_index(scratch_cp, klass_ref_i, found_i);
- } else {
- // no match found so we have to append this entry to *merge_cp_p
- append_entry(scratch_cp, klass_ref_i, merge_cp_p, merge_cp_length_p,
- THREAD);
- // The above call to append_entry() can only append one entry
- // so the post call query of *merge_cp_length_p is only for
- // the sake of consistency. Without the optimization where we
- // use JVM_CONSTANT_UnresolvedClass, then up to two entries
- // could be appended.
- new_klass_ref_i = *merge_cp_length_p - 1;
- }
- }
-
- int name_and_type_ref_i =
- scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
- int new_name_and_type_ref_i = 0;
- match = (name_and_type_ref_i < *merge_cp_length_p) &&
- scratch_cp->compare_entry_to(name_and_type_ref_i, *merge_cp_p,
- name_and_type_ref_i, THREAD);
- if (!match) {
- // forward reference in *merge_cp_p or not a direct match
-
- int found_i = scratch_cp->find_matching_entry(name_and_type_ref_i,
- *merge_cp_p, THREAD);
- if (found_i != 0) {
- guarantee(found_i != name_and_type_ref_i,
- "compare_entry_to() and find_matching_entry() do not agree");
-
- // Found a matching entry somewhere else in *merge_cp_p so
- // just need a mapping entry.
- new_name_and_type_ref_i = found_i;
- map_index(scratch_cp, name_and_type_ref_i, found_i);
- } else {
- // no match found so we have to append this entry to *merge_cp_p
- append_entry(scratch_cp, name_and_type_ref_i, merge_cp_p,
- merge_cp_length_p, THREAD);
- // The above call to append_entry() can append more than
- // one entry so the post call query of *merge_cp_length_p
- // is required in order to get the right index for the
- // JVM_CONSTANT_NameAndType entry.
- new_name_and_type_ref_i = *merge_cp_length_p - 1;
- }
- }
-
- // If the referenced entries already exist in *merge_cp_p, then
- // both new_klass_ref_i and new_name_and_type_ref_i will both be
- // 0. In that case, all we are appending is the current entry.
- if (new_klass_ref_i == 0) {
- new_klass_ref_i = klass_ref_i;
- }
- if (new_name_and_type_ref_i == 0) {
- new_name_and_type_ref_i = name_and_type_ref_i;
- }
+ int new_klass_ref_i = find_or_append_indirect_entry(scratch_cp, klass_ref_i,
+ merge_cp_p, merge_cp_length_p, THREAD);
+
+ int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
+ int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i,
+ merge_cp_p, merge_cp_length_p, THREAD);
const char *entry_name;
switch (scratch_cp->tag_at(scratch_i).value()) {
@@ -517,6 +364,72 @@
(*merge_cp_length_p)++;
} break;
+ // this is an indirect CP entry so it needs special handling
+ case JVM_CONSTANT_MethodType:
+ {
+ int ref_i = scratch_cp->method_type_index_at(scratch_i);
+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
+ merge_cp_length_p, THREAD);
+ if (new_ref_i != ref_i) {
+ RC_TRACE(0x00080000,
+ ("MethodType entry@%d ref_index change: %d to %d",
+ *merge_cp_length_p, ref_i, new_ref_i));
+ }
+ (*merge_cp_p)->method_type_index_at_put(*merge_cp_length_p, new_ref_i);
+ if (scratch_i != *merge_cp_length_p) {
+ // The new entry in *merge_cp_p is at a different index than
+ // the new entry in scratch_cp so we need to map the index values.
+ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
+ }
+ (*merge_cp_length_p)++;
+ } break;
+
+ // this is an indirect CP entry so it needs special handling
+ case JVM_CONSTANT_MethodHandle:
+ {
+ int ref_kind = scratch_cp->method_handle_ref_kind_at(scratch_i);
+ int ref_i = scratch_cp->method_handle_index_at(scratch_i);
+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
+ merge_cp_length_p, THREAD);
+ if (new_ref_i != ref_i) {
+ RC_TRACE(0x00080000,
+ ("MethodHandle entry@%d ref_index change: %d to %d",
+ *merge_cp_length_p, ref_i, new_ref_i));
+ }
+ (*merge_cp_p)->method_handle_index_at_put(*merge_cp_length_p, ref_kind, new_ref_i);
+ if (scratch_i != *merge_cp_length_p) {
+ // The new entry in *merge_cp_p is at a different index than
+ // the new entry in scratch_cp so we need to map the index values.
+ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
+ }
+ (*merge_cp_length_p)++;
+ } break;
+
+ // this is an indirect CP entry so it needs special handling
+ case JVM_CONSTANT_InvokeDynamic:
+ {
+ // TBD: cross-checks and possible extra appends into CP and bsm operands
+ // are needed as well. This issue is tracked by a separate bug 8007037.
+ int bss_idx = scratch_cp->invoke_dynamic_bootstrap_specifier_index(scratch_i);
+
+ int ref_i = scratch_cp->invoke_dynamic_name_and_type_ref_index_at(scratch_i);
+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
+ merge_cp_length_p, THREAD);
+ if (new_ref_i != ref_i) {
+ RC_TRACE(0x00080000,
+ ("InvokeDynamic entry@%d name_and_type ref_index change: %d to %d",
+ *merge_cp_length_p, ref_i, new_ref_i));
+ }
+
+ (*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, bss_idx, new_ref_i);
+ if (scratch_i != *merge_cp_length_p) {
+ // The new entry in *merge_cp_p is at a different index than
+ // the new entry in scratch_cp so we need to map the index values.
+ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
+ }
+ (*merge_cp_length_p)++;
+ } break;
+
// At this stage, Class or UnresolvedClass could be here, but not
// ClassIndex
case JVM_CONSTANT_ClassIndex: // fall through
@@ -543,6 +456,35 @@
} // end append_entry()
+int VM_RedefineClasses::find_or_append_indirect_entry(constantPoolHandle scratch_cp,
+ int ref_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
+
+ int new_ref_i = ref_i;
+ bool match = (ref_i < *merge_cp_length_p) &&
+ scratch_cp->compare_entry_to(ref_i, *merge_cp_p, ref_i, THREAD);
+
+ if (!match) {
+ // forward reference in *merge_cp_p or not a direct match
+ int found_i = scratch_cp->find_matching_entry(ref_i, *merge_cp_p, THREAD);
+ if (found_i != 0) {
+ guarantee(found_i != ref_i, "compare_entry_to() and find_matching_entry() do not agree");
+ // Found a matching entry somewhere else in *merge_cp_p so just need a mapping entry.
+ new_ref_i = found_i;
+ map_index(scratch_cp, ref_i, found_i);
+ } else {
+ // no match found so we have to append this entry to *merge_cp_p
+ append_entry(scratch_cp, ref_i, merge_cp_p, merge_cp_length_p, THREAD);
+ // The above call to append_entry() can only append one entry
+ // so the post call query of *merge_cp_length_p is only for
+ // the sake of consistency.
+ new_ref_i = *merge_cp_length_p - 1;
+ }
+ }
+
+ return new_ref_i;
+} // end find_or_append_indirect_entry()
+
+
void VM_RedefineClasses::swap_all_method_annotations(int i, int j, instanceKlassHandle scratch_class, TRAPS) {
AnnotationArray* save;
@@ -1158,6 +1100,8 @@
}
} // end for each old_cp entry
+ ConstantPool::copy_operands(old_cp, *merge_cp_p, CHECK_0);
+
// We don't need to sanity check that *merge_cp_length_p is within
// *merge_cp_p bounds since we have the minimum on-entry check above.
(*merge_cp_length_p) = old_i;
@@ -1341,8 +1285,12 @@
_index_map_count = 0;
_index_map_p = new intArray(scratch_cp->length(), -1);
+ // reference to the cp holder is needed for copy_operands()
+ merge_cp->set_pool_holder(scratch_class());
bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp,
&merge_cp_length, THREAD);
+ merge_cp->set_pool_holder(NULL);
+
if (!result) {
// The merge can fail due to memory allocation failure or due
// to robustness checks.
@@ -1594,6 +1542,7 @@
case Bytecodes::_getfield : // fall through
case Bytecodes::_getstatic : // fall through
case Bytecodes::_instanceof : // fall through
+ case Bytecodes::_invokedynamic : // fall through
case Bytecodes::_invokeinterface: // fall through
case Bytecodes::_invokespecial : // fall through
case Bytecodes::_invokestatic : // fall through
@@ -2416,13 +2365,14 @@
assert(version != 0, "sanity check");
smaller_cp->set_version(version);
+ // attach klass to new constant pool
+ // reference to the cp holder is needed for copy_operands()
+ smaller_cp->set_pool_holder(scratch_class());
+
scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
scratch_cp = smaller_cp;
// attach new constant pool to klass
- scratch_cp->set_pool_holder(scratch_class());
-
- // attach klass to new constant pool
scratch_class->set_constants(scratch_cp());
int i; // for portability
@@ -3140,11 +3090,9 @@
Klass* the_class_oop = java_lang_Class::as_Klass(the_class_mirror);
instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop);
-#ifndef JVMTI_KERNEL
// Remove all breakpoints in methods of this class
JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints();
jvmti_breakpoints.clearall_in_class_at_safepoint(the_class_oop);
-#endif // !JVMTI_KERNEL
if (the_class_oop == Universe::reflect_invoke_cache()->klass()) {
// We are redefining java.lang.reflect.Method. Method.invoke() is
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -421,10 +421,11 @@
// and in all direct and indirect subclasses.
void increment_class_counter(InstanceKlass *ik, TRAPS);
- // Support for constant pool merging (these routines are in alpha
- // order):
+ // Support for constant pool merging (these routines are in alpha order):
void append_entry(constantPoolHandle scratch_cp, int scratch_i,
constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
+ int find_or_append_indirect_entry(constantPoolHandle scratch_cp, int scratch_i,
+ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
int find_new_index(int old_index);
bool is_unresolved_class_mismatch(constantPoolHandle cp1, int index1,
constantPoolHandle cp2, int index2);
@@ -487,17 +488,4 @@
// and redefine implementation
static bool is_modifiable_class(oop klass_mirror);
};
-
-
-// Helper class to mark and unmark metadata used on the stack as either handles
-// or executing methods, so that it can't be deleted during class redefinition
-// and class unloading.
-class MetadataOnStackMark : public StackObj {
- NOT_PRODUCT(static bool _is_active;)
- public:
- MetadataOnStackMark() NOT_JVMTI_RETURN;
- ~MetadataOnStackMark() NOT_JVMTI_RETURN;
- static void record(Metadata* m) NOT_JVMTI_RETURN;
-};
-
#endif // SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -45,9 +45,10 @@
#include "runtime/vmThread.hpp"
#include "runtime/vm_operations.hpp"
#include "services/serviceUtil.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// JvmtiTagHashmapEntry
//
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,14 +27,12 @@
#ifndef SHARE_VM_PRIMS_JVMTITAGMAP_HPP
#define SHARE_VM_PRIMS_JVMTITAGMAP_HPP
-#ifndef JVMTI_KERNEL
#include "gc_interface/collectedHeap.hpp"
#include "jvmtifiles/jvmti.h"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/allocation.hpp"
#include "memory/genCollectedHeap.hpp"
#include "memory/universe.hpp"
-#endif
// forward references
class JvmtiTagHashmap;
--- a/hotspot/src/share/vm/prims/nativeLookup.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/nativeLookup.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -40,6 +40,7 @@
#include "runtime/javaCalls.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
+#include "utilities/macros.hpp"
#ifdef TARGET_OS_FAMILY_linux
# include "os_linux.inline.hpp"
#endif
--- a/hotspot/src/share/vm/prims/unsafe.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/unsafe.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -24,9 +24,10 @@
#include "precompiled.hpp"
#include "classfile/vmSymbols.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#include "memory/allocation.inline.hpp"
#include "prims/jni.h"
#include "prims/jvm.h"
@@ -189,7 +190,7 @@
if (obj == NULL) THROW_0(vmSymbols::java_lang_NullPointerException());
GET_OOP_FIELD(obj, offset, v)
jobject ret = JNIHandles::make_local(env, v);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// We could be accessing the referent field in a reference
// object. If G1 is enabled then we need to register a non-null
// referent with the SATB barrier.
@@ -212,7 +213,7 @@
G1SATBCardTableModRefBS::enqueue(referent);
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
return ret;
UNSAFE_END
@@ -247,7 +248,7 @@
UnsafeWrapper("Unsafe_GetObject");
GET_OOP_FIELD(obj, offset, v)
jobject ret = JNIHandles::make_local(env, v);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// We could be accessing the referent field in a reference
// object. If G1 is enabled then we need to register non-null
// referent with the SATB barrier.
@@ -270,7 +271,7 @@
G1SATBCardTableModRefBS::enqueue(referent);
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
return ret;
UNSAFE_END
--- a/hotspot/src/share/vm/prims/whitebox.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/prims/whitebox.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -36,12 +36,17 @@
#include "runtime/interfaceSupport.hpp"
#include "runtime/os.hpp"
#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/concurrentMark.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
+
+#ifdef INCLUDE_NMT
+#include "services/memTracker.hpp"
+#endif // INCLUDE_NMT
bool WhiteBox::_used = false;
@@ -85,7 +90,7 @@
return closure.found();
WB_END
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
WB_ENTRY(jboolean, WB_G1IsHumongous(JNIEnv* env, jobject o, jobject obj))
G1CollectedHeap* g1 = G1CollectedHeap::heap();
oop result = JNIHandles::resolve(obj);
@@ -108,7 +113,61 @@
WB_ENTRY(jint, WB_G1RegionSize(JNIEnv* env, jobject o))
return (jint)HeapRegion::GrainBytes;
WB_END
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
+
+#ifdef INCLUDE_NMT
+// Keep track of the 3 allocations in NMTAllocTest so we can free them later
+// on and verify that they're not visible anymore
+static void* nmtMtTest1 = NULL, *nmtMtTest2 = NULL, *nmtMtTest3 = NULL;
+
+// Alloc memory using the test memory type so that we can use that to see if
+// NMT picks it up correctly
+WB_ENTRY(jboolean, WB_NMTAllocTest(JNIEnv* env))
+ void *mem;
+
+ if (!MemTracker::is_on() || MemTracker::shutdown_in_progress()) {
+ return false;
+ }
+
+ // Allocate 2 * 128k + 256k + 1024k and free the 1024k one to make sure we track
+ // everything correctly. Total should be 512k held alive.
+ nmtMtTest1 = os::malloc(128 * 1024, mtTest);
+ mem = os::malloc(1024 * 1024, mtTest);
+ nmtMtTest2 = os::malloc(256 * 1024, mtTest);
+ os::free(mem, mtTest);
+ nmtMtTest3 = os::malloc(128 * 1024, mtTest);
+
+ return true;
+WB_END
+
+// Free the memory allocated by NMTAllocTest
+WB_ENTRY(jboolean, WB_NMTFreeTestMemory(JNIEnv* env))
+
+ if (nmtMtTest1 == NULL || nmtMtTest2 == NULL || nmtMtTest3 == NULL) {
+ return false;
+ }
+
+ os::free(nmtMtTest1, mtTest);
+ nmtMtTest1 = NULL;
+ os::free(nmtMtTest2, mtTest);
+ nmtMtTest2 = NULL;
+ os::free(nmtMtTest3, mtTest);
+ nmtMtTest3 = NULL;
+
+ return true;
+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
+
+#endif // INCLUDE_NMT
//Some convenience methods to deal with objects from java
int WhiteBox::offset_for_field(const char* field_name, oop object,
@@ -171,12 +230,17 @@
CC "(Ljava/lang/String;[Lsun/hotspot/parser/DiagnosticCommand;)[Ljava/lang/Object;",
(void*) &WB_ParseCommandLine
},
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
{CC"g1InConcurrentMark", CC"()Z", (void*)&WB_G1InConcurrentMark},
{CC"g1IsHumongous", CC"(Ljava/lang/Object;)Z", (void*)&WB_G1IsHumongous },
{CC"g1NumFreeRegions", CC"()J", (void*)&WB_G1NumFreeRegions },
{CC"g1RegionSize", CC"()I", (void*)&WB_G1RegionSize },
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
+#ifdef INCLUDE_NMT
+ {CC"NMTAllocTest", CC"()Z", (void*)&WB_NMTAllocTest },
+ {CC"NMTFreeTestMemory", CC"()Z", (void*)&WB_NMTFreeTestMemory },
+ {CC"NMTWaitForDataMerge",CC"()Z", (void*)&WB_NMTWaitForDataMerge},
+#endif // INCLUDE_NMT
};
#undef CC
--- a/hotspot/src/share/vm/runtime/arguments.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -38,6 +38,7 @@
#include "services/management.hpp"
#include "services/memTracker.hpp"
#include "utilities/defaultStream.hpp"
+#include "utilities/macros.hpp"
#include "utilities/taskqueue.hpp"
#ifdef TARGET_OS_FAMILY_linux
# include "os_linux.inline.hpp"
@@ -51,9 +52,9 @@
#ifdef TARGET_OS_FAMILY_bsd
# include "os_bsd.inline.hpp"
#endif
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// Note: This is a special bug reporting site for the JVM
#define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp"
@@ -827,7 +828,8 @@
return true;
}
- const char * const argname = *arg == '+' || *arg == '-' ? arg + 1 : arg;
+ bool has_plus_minus = (*arg == '+' || *arg == '-');
+ const char* const argname = has_plus_minus ? arg + 1 : arg;
if (is_newly_obsolete(arg, &since)) {
char version[256];
since.to_string(version, sizeof(version));
@@ -838,13 +840,29 @@
// For locked flags, report a custom error message if available.
// Otherwise, report the standard unrecognized VM option.
- Flag* locked_flag = Flag::find_flag((char*)argname, strlen(argname), true);
- if (locked_flag != NULL) {
+ size_t arg_len;
+ const char* equal_sign = strchr(argname, '=');
+ if (equal_sign == NULL) {
+ arg_len = strlen(argname);
+ } else {
+ arg_len = equal_sign - argname;
+ }
+
+ Flag* found_flag = Flag::find_flag((char*)argname, arg_len, true);
+ if (found_flag != NULL) {
char locked_message_buf[BUFLEN];
- locked_flag->get_locked_message(locked_message_buf, BUFLEN);
+ found_flag->get_locked_message(locked_message_buf, BUFLEN);
if (strlen(locked_message_buf) == 0) {
- jio_fprintf(defaultStream::error_stream(),
- "Unrecognized VM option '%s'\n", argname);
+ if (found_flag->is_bool() && !has_plus_minus) {
+ jio_fprintf(defaultStream::error_stream(),
+ "Missing +/- setting for VM option '%s'\n", argname);
+ } else if (!found_flag->is_bool() && has_plus_minus) {
+ jio_fprintf(defaultStream::error_stream(),
+ "Unexpected +/- setting in VM option '%s'\n", argname);
+ } else {
+ jio_fprintf(defaultStream::error_stream(),
+ "Improperly specified VM option '%s'\n", argname);
+ }
} else {
jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf);
}
@@ -1072,7 +1090,7 @@
}
}
-#if INCLUDE_ALTERNATE_GCS
+#if INCLUDE_ALL_GCS
static void disable_adaptive_size_policy(const char* collector_name) {
if (UseAdaptiveSizePolicy) {
if (FLAG_IS_CMDLINE(UseAdaptiveSizePolicy)) {
@@ -1284,7 +1302,7 @@
tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
}
}
-#endif // INCLUDE_ALTERNATE_GCS
+#endif // INCLUDE_ALL_GCS
void set_object_alignment() {
// Object alignment.
@@ -1301,10 +1319,10 @@
// Oop encoding heap max
OopEncodingHeapMax = (uint64_t(max_juint) + 1) << LogMinObjAlignmentInBytes;
-#if INCLUDE_ALTERNATE_GCS
+#if INCLUDE_ALL_GCS
// Set CMS global values
CompactibleFreeListSpace::set_cms_values();
-#endif // INCLUDE_ALTERNATE_GCS
+#endif // INCLUDE_ALL_GCS
}
bool verify_object_alignment() {
@@ -1429,13 +1447,18 @@
}
// Set the ClassMetaspaceSize to something that will not need to be
// expanded, since it cannot be expanded.
- if (UseCompressedKlassPointers && FLAG_IS_DEFAULT(ClassMetaspaceSize)) {
- // 100,000 classes seems like a good size, so 100M assumes around 1K
- // per klass. The vtable and oopMap is embedded so we don't have a fixed
- // size per klass. Eventually, this will be parameterized because it
- // would also be useful to determine the optimal size of the
- // systemDictionary.
- FLAG_SET_ERGO(uintx, ClassMetaspaceSize, 100*M);
+ if (UseCompressedKlassPointers) {
+ if (ClassMetaspaceSize > KlassEncodingMetaspaceMax) {
+ warning("Class metaspace size is too large for UseCompressedKlassPointers");
+ FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
+ } else if (FLAG_IS_DEFAULT(ClassMetaspaceSize)) {
+ // 100,000 classes seems like a good size, so 100M assumes around 1K
+ // per klass. The vtable and oopMap is embedded so we don't have a fixed
+ // size per klass. Eventually, this will be parameterized because it
+ // would also be useful to determine the optimal size of the
+ // systemDictionary.
+ FLAG_SET_ERGO(uintx, ClassMetaspaceSize, 100*M);
+ }
}
}
// Also checks that certain machines are slower with compressed oops
@@ -1976,7 +1999,7 @@
status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk");
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseG1GC) {
status = status && verify_percentage(InitiatingHeapOccupancyPercent,
"InitiatingHeapOccupancyPercent");
@@ -1985,7 +2008,7 @@
status = status && verify_min_value((intx)G1ConcMarkStepDurationMillis, 1,
"G1ConcMarkStepDurationMillis");
}
-#endif
+#endif // INCLUDE_ALL_GCS
status = status && verify_interval(RefDiscoveryPolicy,
ReferenceProcessor::DiscoveryPolicyMin,
@@ -2472,10 +2495,7 @@
// -Xshare:dump
} else if (match_option(option, "-Xshare:dump", &tail)) {
-#if defined(KERNEL)
- vm_exit_during_initialization(
- "Dumping a shared archive is not supported on the Kernel JVM.", NULL);
-#elif !INCLUDE_CDS
+#if !INCLUDE_CDS
vm_exit_during_initialization(
"Dumping a shared archive is not supported in this VM.", NULL);
#else
@@ -3157,7 +3177,7 @@
UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
#endif
-#if !INCLUDE_ALTERNATE_GCS
+#if !INCLUDE_ALL_GCS
if (UseParallelGC) {
warning("Parallel GC is not supported in this VM. Using Serial GC.");
}
@@ -3170,7 +3190,7 @@
if (UseParNewGC) {
warning("Par New GC is not supported in this VM. Using Serial GC.");
}
-#endif // INCLUDE_ALTERNATE_GCS
+#endif // INCLUDE_ALL_GCS
#ifndef PRODUCT
if (TraceBytecodesAt != 0) {
@@ -3217,9 +3237,9 @@
// Set object alignment values.
set_object_alignment();
-#ifdef SERIALGC
+#if !INCLUDE_ALL_GCS
force_serial_gc();
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#if !INCLUDE_CDS
no_shared_spaces();
#endif // INCLUDE_CDS
@@ -3247,7 +3267,7 @@
// Set heap size based on available physical memory
set_heap_size();
-#if INCLUDE_ALTERNATE_GCS
+#if INCLUDE_ALL_GCS
// Set per-collector flags
if (UseParallelGC || UseParallelOldGC) {
set_parallel_gc_flags();
@@ -3259,11 +3279,9 @@
set_g1_gc_flags();
}
check_deprecated_gcs();
-#endif // INCLUDE_ALTERNATE_GCS
-
-#ifdef SERIALGC
+#else // INCLUDE_ALL_GCS
assert(verify_serial_gc_flags(), "SerialGC unset");
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Set bytecode rewriting flags
set_bytecode_flags();
@@ -3357,7 +3375,7 @@
}
jint Arguments::adjust_after_os() {
-#if INCLUDE_ALTERNATE_GCS
+#if INCLUDE_ALL_GCS
if (UseParallelGC || UseParallelOldGC) {
if (UseNUMA) {
if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
@@ -3368,7 +3386,7 @@
UseNUMAInterleaving = true;
}
}
-#endif
+#endif // INCLUDE_ALL_GCS
return JNI_OK;
}
@@ -3463,36 +3481,6 @@
PropertyList_add(plist, k, v);
}
-#ifdef KERNEL
-char *Arguments::get_kernel_properties() {
- // Find properties starting with kernel and append them to string
- // We need to find out how long they are first because the URL's that they
- // might point to could get long.
- int length = 0;
- SystemProperty* prop;
- for (prop = _system_properties; prop != NULL; prop = prop->next()) {
- if (strncmp(prop->key(), "kernel.", 7 ) == 0) {
- length += (strlen(prop->key()) + strlen(prop->value()) + 5); // "-D ="
- }
- }
- // Add one for null terminator.
- char *props = AllocateHeap(length + 1, mtInternal);
- if (length != 0) {
- int pos = 0;
- for (prop = _system_properties; prop != NULL; prop = prop->next()) {
- if (strncmp(prop->key(), "kernel.", 7 ) == 0) {
- jio_snprintf(&props[pos], length-pos,
- "-D%s=%s ", prop->key(), prop->value());
- pos = strlen(props);
- }
- }
- }
- // null terminate props in case of null
- props[length] = '\0';
- return props;
-}
-#endif // KERNEL
-
// Copies src into buf, replacing "%%" with "%" and "%p" with pid
// Returns true if all of the source pointed by src has been copied over to
// the destination buffer pointed by buf. Otherwise, returns false.
--- a/hotspot/src/share/vm/runtime/arguments.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/arguments.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -540,11 +540,6 @@
// Utility: copies src into buf, replacing "%%" with "%" and "%p" with pid.
static bool copy_expand_pid(const char* src, size_t srclen, char* buf, size_t buflen);
-
-#ifdef KERNEL
- // For java kernel vm, return property string for kernel properties.
- static char *get_kernel_properties();
-#endif // KERNEL
};
#endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1559,7 +1559,7 @@
if (trap_method() == nm->method()) {
make_not_compilable = true;
} else {
- trap_method->set_not_compilable(CompLevel_full_optimization);
+ trap_method->set_not_compilable(CompLevel_full_optimization, true, "overflow_recompile_count > PerBytecodeRecompilationCutoff");
// But give grace to the enclosing nm->method().
}
}
--- a/hotspot/src/share/vm/runtime/fprofiler.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/fprofiler.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,6 +25,7 @@
#ifndef SHARE_VM_RUNTIME_FPROFILER_HPP
#define SHARE_VM_RUNTIME_FPROFILER_HPP
+#include "utilities/macros.hpp"
#include "runtime/timer.hpp"
// a simple flat profiler for Java
--- a/hotspot/src/share/vm/runtime/globals.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/globals.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -29,10 +29,11 @@
#include "runtime/globals.hpp"
#include "runtime/globals_extension.hpp"
#include "utilities/ostream.hpp"
+#include "utilities/macros.hpp"
#include "utilities/top.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1_globals.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
#endif
@@ -256,9 +257,9 @@
static Flag flagTable[] = {
RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
G1_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, C1_PD_DEVELOP_FLAG_STRUCT, C1_PRODUCT_FLAG_STRUCT, C1_PD_PRODUCT_FLAG_STRUCT, C1_NOTPRODUCT_FLAG_STRUCT)
#endif
--- a/hotspot/src/share/vm/runtime/globals_extension.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/globals_extension.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -26,6 +26,7 @@
#define SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP
#include "runtime/globals.hpp"
+#include "utilities/macros.hpp"
#include "utilities/top.hpp"
// Construct enum of Flag_<cmdline-arg> constants.
@@ -94,9 +95,9 @@
typedef enum {
RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER, RUNTIME_LP64_PRODUCT_FLAG_MEMBER)
RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER)
-#if INCLUDE_ALTERNATE_GCS
+#if INCLUDE_ALL_GCS
G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER)
-#endif // INCLUDE_ALTERNATE_GCS
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER)
#endif
@@ -187,7 +188,7 @@
RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
-#if INCLUDE_ALTERNATE_GCS
+#if INCLUDE_ALL_GCS
G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE,
RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
@@ -197,7 +198,7 @@
RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE,
RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE)
-#endif // INCLUDE_ALTERNATE_GCS
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE,
C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
--- a/hotspot/src/share/vm/runtime/init.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/init.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -34,6 +34,7 @@
#include "runtime/init.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/sharedRuntime.hpp"
+#include "utilities/macros.hpp"
// Initialization done by VM thread in vm_init_globals()
void check_ThreadShadow();
--- a/hotspot/src/share/vm/runtime/java.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/java.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -64,6 +64,7 @@
#include "utilities/dtrace.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/histogram.hpp"
+#include "utilities/macros.hpp"
#include "utilities/vmError.hpp"
#ifdef TARGET_ARCH_x86
# include "vm_version_x86.hpp"
@@ -80,11 +81,11 @@
#ifdef TARGET_ARCH_ppc
# include "vm_version_ppc.hpp"
#endif
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_Compiler.hpp"
#include "c1/c1_Runtime1.hpp"
--- a/hotspot/src/share/vm/runtime/os.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/os.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -985,15 +985,28 @@
// if C stack is walkable beyond current frame. The check for fp() is not
// necessary on Sparc, but it's harmless.
bool os::is_first_C_frame(frame* fr) {
-#ifdef IA64
- // In order to walk native frames on Itanium, we need to access the unwind
- // table, which is inside ELF. We don't want to parse ELF after fatal error,
- // so return true for IA64. If we need to support C stack walking on IA64,
- // this function needs to be moved to CPU specific files, as fp() on IA64
- // is register stack, which grows towards higher memory address.
+#if defined(IA64) && !defined(_WIN32)
+ // On IA64 we have to check if the callers bsp is still valid
+ // (i.e. within the register stack bounds).
+ // Notice: this only works for threads created by the VM and only if
+ // we walk the current stack!!! If we want to be able to walk
+ // arbitrary other threads, we'll have to somehow store the thread
+ // object in the frame.
+ Thread *thread = Thread::current();
+ if ((address)fr->fp() <=
+ thread->register_stack_base() HPUX_ONLY(+ 0x0) LINUX_ONLY(+ 0x50)) {
+ // This check is a little hacky, because on Linux the first C
+ // frame's ('start_thread') register stack frame starts at
+ // "register_stack_base + 0x48" while on HPUX, the first C frame's
+ // ('__pthread_bound_body') register stack frame seems to really
+ // start at "register_stack_base".
+ return true;
+ } else {
+ return false;
+ }
+#elif defined(IA64) && defined(_WIN32)
return true;
-#endif
-
+#else
// Load up sp, fp, sender sp and sender fp, check for reasonable values.
// Check usp first, because if that's bad the other accessors may fault
// on some architectures. Ditto ufp second, etc.
@@ -1023,6 +1036,7 @@
if (old_fp - ufp > 64 * K) return true;
return false;
+#endif
}
#ifdef ASSERT
--- a/hotspot/src/share/vm/runtime/safepoint.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -52,6 +52,7 @@
#include "services/memTracker.hpp"
#include "services/runtimeService.hpp"
#include "utilities/events.hpp"
+#include "utilities/macros.hpp"
#ifdef TARGET_ARCH_x86
# include "nativeInst_x86.hpp"
# include "vmreg_x86.inline.hpp"
@@ -72,10 +73,10 @@
# include "nativeInst_ppc.hpp"
# include "vmreg_ppc.inline.hpp"
#endif
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/shared/concurrentGCThread.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
#endif
@@ -103,7 +104,7 @@
_ts_of_current_safepoint = tty->time_stamp().seconds();
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC) {
// In the future we should investigate whether CMS can use the
// more-general mechanism below. DLD (01/05).
@@ -111,7 +112,7 @@
} else if (UseG1GC) {
ConcurrentGCThread::safepoint_synchronize();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// By getting the Threads_lock, we assure that no threads are about to start or
// exit. It is released again in SafepointSynchronize::end().
@@ -480,14 +481,14 @@
Threads_lock->unlock();
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// If there are any concurrent GC threads resume them.
if (UseConcMarkSweepGC) {
ConcurrentMarkSweepThread::desynchronize(false);
} else if (UseG1GC) {
ConcurrentGCThread::safepoint_desynchronize();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// record this time so VMThread can keep track how much time has elasped
// since last safepoint.
_end_of_last_safepoint = os::javaTimeMillis();
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -56,6 +56,7 @@
#include "utilities/dtrace.hpp"
#include "utilities/events.hpp"
#include "utilities/hashtable.inline.hpp"
+#include "utilities/macros.hpp"
#include "utilities/xmlstream.hpp"
#ifdef TARGET_ARCH_x86
# include "nativeInst_x86.hpp"
@@ -212,7 +213,7 @@
}
#endif // PRODUCT
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// G1 write-barrier pre: executed before a pointer store.
JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread))
@@ -230,7 +231,7 @@
thread->dirty_card_queue().enqueue(card_addr);
JRT_END
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x))
@@ -2816,10 +2817,6 @@
JRT_LEAF(intptr_t*, SharedRuntime::OSR_migration_begin( JavaThread *thread) )
-#ifdef IA64
- ShouldNotReachHere(); // NYI
-#endif /* IA64 */
-
//
// This code is dependent on the memory layout of the interpreter local
// array and the monitors. On all of our platforms the layout is identical
--- a/hotspot/src/share/vm/runtime/sharedRuntime.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -32,6 +32,7 @@
#include "memory/resourceArea.hpp"
#include "runtime/threadLocalStorage.hpp"
#include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
class AdapterHandlerEntry;
class AdapterHandlerTable;
@@ -168,11 +169,11 @@
static address raw_exception_handler_for_return_address(JavaThread* thread, address return_address);
static address exception_handler_for_return_address(JavaThread* thread, address return_address);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// G1 write barriers
static void g1_wb_pre(oopDesc* orig, JavaThread *thread);
static void g1_wb_post(void* card_addr, JavaThread* thread);
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// exception handling and implicit exceptions
static address compute_compiled_exc_handler(nmethod* nm, address ret_pc, Handle& exception,
--- a/hotspot/src/share/vm/runtime/synchronizer.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/synchronizer.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -53,7 +53,7 @@
# include "os_bsd.inline.hpp"
#endif
-#if defined(__GNUC__) && !defined(IA64)
+#if defined(__GNUC__)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
#define ATTR __attribute__((noinline))
#else
--- a/hotspot/src/share/vm/runtime/thread.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/thread.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -82,6 +82,7 @@
#include "utilities/dtrace.hpp"
#include "utilities/events.hpp"
#include "utilities/preserveException.hpp"
+#include "utilities/macros.hpp"
#ifdef TARGET_OS_FAMILY_linux
# include "os_linux.inline.hpp"
#endif
@@ -94,11 +95,11 @@
#ifdef TARGET_OS_FAMILY_bsd
# include "os_bsd.inline.hpp"
#endif
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
#include "gc_implementation/parallelScavenge/pcTasks.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_Compiler.hpp"
#endif
@@ -1482,17 +1483,17 @@
pd_initialize();
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
SATBMarkQueueSet JavaThread::_satb_mark_queue_set;
DirtyCardQueueSet JavaThread::_dirty_card_queue_set;
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
JavaThread::JavaThread(bool is_attaching_via_jni) :
Thread()
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
, _satb_mark_queue(&_satb_mark_queue_set),
_dirty_card_queue(&_dirty_card_queue_set)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
{
initialize();
if (is_attaching_via_jni) {
@@ -1500,7 +1501,7 @@
} else {
_jni_attach_state = _not_attaching_via_jni;
}
- assert(_deferred_card_mark.is_empty(), "Default MemRegion ctor");
+ assert(deferred_card_mark().is_empty(), "Default MemRegion ctor");
_safepoint_visible = false;
}
@@ -1547,10 +1548,10 @@
JavaThread::JavaThread(ThreadFunction entry_point, size_t stack_sz) :
Thread()
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
, _satb_mark_queue(&_satb_mark_queue_set),
_dirty_card_queue(&_dirty_card_queue_set)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
{
if (TraceThreadEvents) {
tty->print_cr("creating thread %p", this);
@@ -1896,19 +1897,26 @@
JvmtiExport::cleanup_thread(this);
}
-#ifndef SERIALGC
- // We must flush G1-related buffers before removing a thread from
+ // We must flush any deferred card marks before removing a thread from
// the list of active threads.
+ Universe::heap()->flush_deferred_store_barrier(this);
+ assert(deferred_card_mark().is_empty(), "Should have been flushed");
+
+#if INCLUDE_ALL_GCS
+ // We must flush the G1-related buffers before removing a thread
+ // from the list of active threads. We must do this after any deferred
+ // card marks have been flushed (above) so that any entries that are
+ // added to the thread's dirty card queue as a result are not lost.
if (UseG1GC) {
flush_barrier_queues();
}
-#endif
+#endif // INCLUDE_ALL_GCS
// Remove from list of active threads list, and notify VM thread if we are the last non-daemon thread
Threads::remove(this);
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Flush G1-related queues.
void JavaThread::flush_barrier_queues() {
satb_mark_queue().flush();
@@ -1936,7 +1944,7 @@
// active field set to true.
assert(dirty_queue.is_active(), "dirty card queue should be active");
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
void JavaThread::cleanup_failed_attach_current_thread() {
if (get_thread_profiler() != NULL) {
@@ -1964,11 +1972,11 @@
tlab().make_parsable(true); // retire TLAB, if any
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (UseG1GC) {
flush_barrier_queues();
}
-#endif
+#endif // INCLUDE_ALL_GCS
Threads::remove(this);
delete this;
@@ -3600,7 +3608,7 @@
vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Support for ConcurrentMarkSweep. This should be cleaned up
// and better encapsulated. The ugly nested if test would go away
// once things are properly refactored. XXX YSR
@@ -3614,7 +3622,7 @@
vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
}
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Always call even when there are not JVMTI environments yet, since environments
// may be attached late and JVMTI must track phases of VM execution
@@ -3739,28 +3747,6 @@
name)) {
library = os::dll_load(buffer, ebuf, sizeof ebuf);
}
-#ifdef KERNEL
- // Download instrument dll
- if (library == NULL && strcmp(name, "instrument") == 0) {
- char *props = Arguments::get_kernel_properties();
- char *home = Arguments::get_java_home();
- const char *fmt = "%s/bin/java %s -Dkernel.background.download=false"
- " sun.jkernel.DownloadManager -download client_jvm";
- size_t length = strlen(props) + strlen(home) + strlen(fmt) + 1;
- char *cmd = NEW_C_HEAP_ARRAY(char, length, mtThread);
- jio_snprintf(cmd, length, fmt, home, props);
- int status = os::fork_and_exec(cmd);
- FreeHeap(props);
- if (status == -1) {
- warning(cmd);
- vm_exit_during_initialization("fork_and_exec failed: %s",
- strerror(errno));
- }
- FREE_C_HEAP_ARRAY(char, cmd, mtThread);
- // when this comes back the instrument.dll should be where it belongs.
- library = os::dll_load(buffer, ebuf, sizeof ebuf);
- }
-#endif // KERNEL
if (library == NULL) { // Try the local directory
char ns[1] = {0};
if (os::dll_build_name(buffer, sizeof(buffer), ns, name)) {
@@ -4209,7 +4195,7 @@
}
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Used by ParallelScavenge
void Threads::create_thread_roots_tasks(GCTaskQueue* q) {
ALL_JAVA_THREADS(p) {
@@ -4225,7 +4211,7 @@
}
q->enqueue(new ThreadRootsMarkingTask(VMThread::vm_thread()));
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void Threads::nmethods_do(CodeBlobClosure* cf) {
ALL_JAVA_THREADS(p) {
@@ -4333,13 +4319,13 @@
);
st->cr();
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Dump concurrent locks
ConcurrentLocksDump concurrent_locks;
if (print_concurrent_locks) {
concurrent_locks.dump_at_safepoint();
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
ALL_JAVA_THREADS(p) {
ResourceMark rm;
@@ -4352,11 +4338,11 @@
}
}
st->cr();
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
if (print_concurrent_locks) {
concurrent_locks.print_locks_on(p, st);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
}
VMThread::vm_thread()->print_on(st);
--- a/hotspot/src/share/vm/runtime/thread.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/thread.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -41,6 +41,7 @@
#include "runtime/stubRoutines.hpp"
#include "runtime/threadLocalStorage.hpp"
#include "runtime/unhandledOops.hpp"
+#include "utilities/macros.hpp"
#if INCLUDE_NMT
#include "services/memRecorder.hpp"
@@ -49,10 +50,10 @@
#include "trace/tracing.hpp"
#include "utilities/exceptions.hpp"
#include "utilities/top.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/dirtyCardQueue.hpp"
#include "gc_implementation/g1/satbQueue.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef ZERO
#ifdef TARGET_ARCH_zero
# include "stack_zero.hpp"
@@ -929,7 +930,7 @@
} _jmp_ring[ jump_ring_buffer_size ];
#endif /* PRODUCT */
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Support for G1 barriers
ObjPtrQueue _satb_mark_queue; // Thread-local log for SATB barrier.
@@ -941,7 +942,7 @@
static DirtyCardQueueSet _dirty_card_queue_set;
void flush_barrier_queues();
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
friend class VMThread;
friend class ThreadWaitTransition;
@@ -1345,10 +1346,10 @@
return byte_offset_of(JavaThread, _should_post_on_exceptions_flag);
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
static ByteSize satb_mark_queue_offset() { return byte_offset_of(JavaThread, _satb_mark_queue); }
static ByteSize dirty_card_queue_offset() { return byte_offset_of(JavaThread, _dirty_card_queue); }
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// Returns the jni environment for this thread
JNIEnv* jni_environment() { return &_jni_environment; }
@@ -1637,7 +1638,7 @@
_stack_size_at_create = value;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// SATB marking queue support
ObjPtrQueue& satb_mark_queue() { return _satb_mark_queue; }
static SATBMarkQueueSet& satb_mark_queue_set() {
@@ -1649,7 +1650,7 @@
static DirtyCardQueueSet& dirty_card_queue_set() {
return _dirty_card_queue_set;
}
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// This method initializes the SATB and dirty card queues before a
// JavaThread is added to the Java thread list. Right now, we don't
@@ -1668,11 +1669,11 @@
// might happen between the JavaThread constructor being called and the
// thread being added to the Java thread list (an example of this is
// when the structure for the DestroyJavaVM thread is created).
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void initialize_queues();
-#else // !SERIALGC
+#else // INCLUDE_ALL_GCS
void initialize_queues() { }
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
// Machine dependent stuff
#ifdef TARGET_OS_ARCH_linux_x86
--- a/hotspot/src/share/vm/runtime/vframeArray.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/vframeArray.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -233,8 +233,6 @@
// Force early return from top frame after deoptimization
#ifndef CC_INTERP
pc = Interpreter::remove_activation_early_entry(state->earlyret_tos());
-#else
- // TBD: Need to implement ForceEarlyReturn for CC_INTERP (ia64)
#endif
} else {
// Possibly override the previous pc computation of the top (youngest) frame
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -101,6 +101,7 @@
#include "utilities/array.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/hashtable.hpp"
+#include "utilities/macros.hpp"
#ifdef TARGET_ARCH_x86
# include "vmStructs_x86.hpp"
#endif
@@ -146,7 +147,7 @@
#ifdef TARGET_OS_ARCH_bsd_zero
# include "vmStructs_bsd_zero.hpp"
#endif
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
@@ -161,7 +162,7 @@
#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
#include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
#include "gc_implementation/g1/vmStructs_g1.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER2
#include "opto/addnode.hpp"
#include "opto/block.hpp"
@@ -1161,6 +1162,7 @@
static_field(Abstract_VM_Version, _vm_major_version, int) \
static_field(Abstract_VM_Version, _vm_minor_version, int) \
static_field(Abstract_VM_Version, _vm_build_number, int) \
+ static_field(Abstract_VM_Version, _reserve_for_allocation_prefetch, int) \
\
static_field(JDK_Version, _current, JDK_Version) \
nonstatic_field(JDK_Version, _partially_initialized, bool) \
@@ -2087,8 +2089,7 @@
declare_toplevel_type(FreeBlockDictionary<Metablock>*) \
declare_toplevel_type(FreeList<Metablock>*) \
declare_toplevel_type(FreeList<Metablock>) \
- declare_toplevel_type(MetablockTreeDictionary*) \
- declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>)
+ declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>)
//--------------------------------------------------------------------------------
@@ -2786,7 +2787,7 @@
GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
GENERATE_STATIC_VM_STRUCT_ENTRY)
@@ -2796,7 +2797,7 @@
VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
GENERATE_STATIC_VM_STRUCT_ENTRY)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
GENERATE_STATIC_VM_STRUCT_ENTRY,
@@ -2830,7 +2831,7 @@
GENERATE_C2_VM_TYPE_ENTRY,
GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
VM_TYPES_PARALLELGC(GENERATE_VM_TYPE_ENTRY,
GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
@@ -2841,7 +2842,7 @@
VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
@@ -2872,11 +2873,11 @@
GENERATE_C2_VM_INT_CONSTANT_ENTRY,
GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)
VM_INT_CONSTANTS_PARNEW(GENERATE_VM_INT_CONSTANT_ENTRY)
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
@@ -2930,7 +2931,7 @@
CHECK_NO_OP,
CHECK_NO_OP);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_STATIC_VM_STRUCT_ENTRY);
@@ -2940,7 +2941,7 @@
VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_STATIC_VM_STRUCT_ENTRY);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_STATIC_VM_STRUCT_ENTRY,
@@ -2969,7 +2970,7 @@
CHECK_C2_VM_TYPE_ENTRY,
CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
VM_TYPES_PARALLELGC(CHECK_VM_TYPE_ENTRY,
CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
@@ -2980,7 +2981,7 @@
VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
@@ -3035,7 +3036,7 @@
ENSURE_C2_FIELD_TYPE_PRESENT,
CHECK_NO_OP,
CHECK_NO_OP));
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT,
ENSURE_FIELD_TYPE_PRESENT));
debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT,
@@ -3043,7 +3044,7 @@
ENSURE_FIELD_TYPE_PRESENT));
debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT,
ENSURE_FIELD_TYPE_PRESENT));
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
ENSURE_FIELD_TYPE_PRESENT,
CHECK_NO_OP,
--- a/hotspot/src/share/vm/runtime/vmStructs.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/vmStructs.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,9 +25,7 @@
#ifndef SHARE_VM_RUNTIME_VMSTRUCTS_HPP
#define SHARE_VM_RUNTIME_VMSTRUCTS_HPP
-#ifndef VM_STRUCTS_KERNEL
#include "utilities/debug.hpp"
-#endif
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
--- a/hotspot/src/share/vm/runtime/vm_version.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -111,9 +111,6 @@
#endif
#ifndef VMTYPE
- #ifdef KERNEL
- #define VMTYPE "Kernel"
- #else // KERNEL
#ifdef TIERED
#define VMTYPE "Server"
#else // TIERED
@@ -128,7 +125,6 @@
COMPILER2_PRESENT("Server")
#endif // ZERO
#endif // TIERED
- #endif // KERNEL
#endif
#ifndef HOTSPOT_VM_DISTRO
--- a/hotspot/src/share/vm/services/attachListener.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/attachListener.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -170,7 +170,6 @@
return JNI_OK;
}
-#ifndef SERVICES_KERNEL // Heap dumping not supported
// Implementation of "dumpheap" command.
// See also: HeapDumpDCmd class
//
@@ -212,7 +211,6 @@
}
return JNI_OK;
}
-#endif // SERVICES_KERNEL
// Implementation of "inspectheap" command
// See also: ClassHistogramDCmd class
@@ -382,9 +380,7 @@
static AttachOperationFunctionInfo funcs[] = {
{ "agentProperties", get_agent_properties },
{ "datadump", data_dump },
-#ifndef SERVICES_KERNEL
{ "dumpheap", dump_heap },
-#endif // SERVICES_KERNEL
{ "load", JvmtiExport::load_agent_library },
{ "properties", get_system_properties },
{ "threaddump", thread_dump },
--- a/hotspot/src/share/vm/services/attachListener.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/attachListener.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -28,6 +28,7 @@
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
#include "utilities/ostream.hpp"
+#include "utilities/macros.hpp"
// The AttachListener thread services a queue of operations that are enqueued
// by client tools. Each operation is identified by a name and has up to 3
@@ -38,8 +39,6 @@
// complets the result value and any result data is returned to the client
// tool.
-#ifndef SERVICES_KERNEL
-
class AttachOperation;
typedef jint (*AttachOperationFunction)(AttachOperation* op, outputStream* out);
@@ -48,7 +47,6 @@
const char* name;
AttachOperationFunction func;
};
-#endif // SERVICES_KERNEL
class AttachListener: AllStatic {
public:
--- a/hotspot/src/share/vm/services/classLoadingService.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/classLoadingService.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -31,6 +31,7 @@
#include "services/classLoadingService.hpp"
#include "services/memoryService.hpp"
#include "utilities/dtrace.hpp"
+#include "utilities/macros.hpp"
#ifdef DTRACE_ENABLED
--- a/hotspot/src/share/vm/services/classLoadingService.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/classLoadingService.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -28,6 +28,7 @@
#include "runtime/handles.hpp"
#include "runtime/perfData.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
class InstanceKlass;
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -30,6 +30,7 @@
#include "services/diagnosticFramework.hpp"
#include "services/heapDumper.hpp"
#include "services/management.hpp"
+#include "utilities/macros.hpp"
void DCmdRegistrant::register_dcmds(){
// Registration of the diagnostic commands
@@ -43,12 +44,12 @@
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(true, false));
-#if INCLUDE_SERVICES // Heap dumping supported
+#if INCLUDE_SERVICES // Heap dumping/inspection supported
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassStatsDCmd>(true, false));
#endif // INCLUDE_SERVICES
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(true, false));
-
//Enhanced JMX Agent Support
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(true,false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartLocalDCmd>(true,false));
@@ -252,7 +253,7 @@
vmSymbols::void_method_signature(), CHECK);
}
-#if INCLUDE_SERVICES // Heap dumping supported
+#if INCLUDE_SERVICES // Heap dumping/inspection supported
HeapDumpDCmd::HeapDumpDCmd(outputStream* output, bool heap) :
DCmdWithParser(output, heap),
_filename("filename","Name of the dump file", "STRING",true),
@@ -292,7 +293,6 @@
return 0;
}
}
-#endif // INCLUDE_SERVICES
ClassHistogramDCmd::ClassHistogramDCmd(outputStream* output, bool heap) :
DCmdWithParser(output, heap),
@@ -319,6 +319,65 @@
}
}
+#define DEFAULT_COLUMNS "InstBytes,KlassBytes,CpAll,annotations,MethodCount,Bytecodes,MethodAll,ROAll,RWAll,Total"
+ClassStatsDCmd::ClassStatsDCmd(outputStream* output, bool heap) :
+ DCmdWithParser(output, heap),
+ _csv("-csv", "Print in CSV (comma-separated values) format for spreadsheets",
+ "BOOLEAN", false, "false"),
+ _all("-all", "Show all columns",
+ "BOOLEAN", false, "false"),
+ _help("-help", "Show meaning of all the columns",
+ "BOOLEAN", false, "false"),
+ _columns("columns", "Comma-separated list of all the columns to show. "
+ "If not specified, the following columns are shown: " DEFAULT_COLUMNS,
+ "STRING", false) {
+ _dcmdparser.add_dcmd_option(&_all);
+ _dcmdparser.add_dcmd_option(&_csv);
+ _dcmdparser.add_dcmd_option(&_help);
+ _dcmdparser.add_dcmd_argument(&_columns);
+}
+
+void ClassStatsDCmd::execute(TRAPS) {
+ if (!UnlockDiagnosticVMOptions) {
+ output()->print_cr("GC.class_stats command requires -XX:+UnlockDiagnosticVMOptions");
+ return;
+ }
+
+ VM_GC_HeapInspection heapop(output(),
+ true, /* request_full_gc */
+ true /* need_prologue */);
+ heapop.set_csv_format(_csv.value());
+ heapop.set_print_help(_help.value());
+ heapop.set_print_class_stats(true);
+ if (_all.value()) {
+ if (_columns.has_value()) {
+ output()->print_cr("Cannot specify -all and individual columns at the same time");
+ return;
+ } else {
+ heapop.set_columns(NULL);
+ }
+ } else {
+ if (_columns.has_value()) {
+ heapop.set_columns(_columns.value());
+ } else {
+ heapop.set_columns(DEFAULT_COLUMNS);
+ }
+ }
+ VMThread::execute(&heapop);
+}
+
+int ClassStatsDCmd::num_arguments() {
+ ResourceMark rm;
+ ClassStatsDCmd* dcmd = new ClassStatsDCmd(NULL, false);
+ if (dcmd != NULL) {
+ DCmdMark mark(dcmd);
+ return dcmd->_dcmdparser.num_arguments();
+ } else {
+ return 0;
+ }
+}
+#endif // INCLUDE_SERVICES
+
ThreadDumpDCmd::ThreadDumpDCmd(outputStream* output, bool heap) :
DCmdWithParser(output, heap),
_locks("-l", "print java.util.concurrent locks", "BOOLEAN", false, "false") {
@@ -406,7 +465,32 @@
_jmxremote_ssl_config_file
("jmxremote.ssl.config.file",
- "set com.sun.management.jmxremote.ssl_config_file", "STRING", false)
+ "set com.sun.management.jmxremote.ssl_config_file", "STRING", false),
+
+// JDP Protocol support
+ _jmxremote_autodiscovery
+ ("jmxremote.autodiscovery",
+ "set com.sun.management.jmxremote.autodiscovery", "STRING", false),
+
+ _jdp_port
+ ("jdp.port",
+ "set com.sun.management.jdp.port", "INT", false),
+
+ _jdp_address
+ ("jdp.address",
+ "set com.sun.management.jdp.address", "STRING", false),
+
+ _jdp_source_addr
+ ("jdp.source_addr",
+ "set com.sun.management.jdp.source_addr", "STRING", false),
+
+ _jdp_ttl
+ ("jdp.ttl",
+ "set com.sun.management.jdp.ttl", "INT", false),
+
+ _jdp_pause
+ ("jdp.pause",
+ "set com.sun.management.jdp.pause", "INT", false)
{
_dcmdparser.add_dcmd_option(&_config_file);
@@ -422,6 +506,12 @@
_dcmdparser.add_dcmd_option(&_jmxremote_ssl_enabled_protocols);
_dcmdparser.add_dcmd_option(&_jmxremote_ssl_need_client_auth);
_dcmdparser.add_dcmd_option(&_jmxremote_ssl_config_file);
+ _dcmdparser.add_dcmd_option(&_jmxremote_autodiscovery);
+ _dcmdparser.add_dcmd_option(&_jdp_port);
+ _dcmdparser.add_dcmd_option(&_jdp_address);
+ _dcmdparser.add_dcmd_option(&_jdp_source_addr);
+ _dcmdparser.add_dcmd_option(&_jdp_ttl);
+ _dcmdparser.add_dcmd_option(&_jdp_pause);
}
@@ -436,7 +526,6 @@
}
}
-
void JMXStartRemoteDCmd::execute(TRAPS) {
ResourceMark rm(THREAD);
HandleMark hm(THREAD);
@@ -466,7 +555,9 @@
// file.
#define PUT_OPTION(a) \
if ( (a).is_set() ){ \
- options.print("%scom.sun.management.%s=%s", comma, (a).name(), (a).value()); \
+ options.print(\
+ ( *((a).type()) == 'I' ) ? "%scom.sun.management.%s=%d" : "%scom.sun.management.%s=%s",\
+ comma, (a).name(), (a).value()); \
comma[0] = ','; \
}
@@ -483,6 +574,12 @@
PUT_OPTION(_jmxremote_ssl_enabled_protocols);
PUT_OPTION(_jmxremote_ssl_need_client_auth);
PUT_OPTION(_jmxremote_ssl_config_file);
+ PUT_OPTION(_jmxremote_autodiscovery);
+ PUT_OPTION(_jdp_port);
+ PUT_OPTION(_jdp_address);
+ PUT_OPTION(_jdp_source_addr);
+ PUT_OPTION(_jdp_ttl);
+ PUT_OPTION(_jdp_pause);
#undef PUT_OPTION
--- a/hotspot/src/share/vm/services/diagnosticCommand.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -35,6 +35,7 @@
#include "services/diagnosticCommand.hpp"
#include "services/diagnosticFramework.hpp"
#include "services/diagnosticCommand_ext.hpp"
+#include "utilities/macros.hpp"
class HelpDCmd : public DCmdWithParser {
protected:
@@ -178,7 +179,7 @@
};
#endif // INCLUDE_SERVICES
-// See also: inspeactheap in attachListener.cpp
+// See also: inspectheap in attachListener.cpp
class ClassHistogramDCmd : public DCmdWithParser {
protected:
DCmdArgument<bool> _all;
@@ -197,6 +198,27 @@
virtual void execute(TRAPS);
};
+class ClassStatsDCmd : public DCmdWithParser {
+protected:
+ DCmdArgument<bool> _all;
+ DCmdArgument<bool> _csv;
+ DCmdArgument<bool> _help;
+ DCmdArgument<char*> _columns;
+public:
+ ClassStatsDCmd(outputStream* output, bool heap);
+ static const char* name() {
+ return "GC.class_stats";
+ }
+ static const char* description() {
+ return "Provide statistics about Java class meta data. Requires -XX:+UnlockDiagnosticVMOptions.";
+ }
+ static const char* impact() {
+ return "High: Depends on Java heap size and content.";
+ }
+ static int num_arguments();
+ virtual void execute(TRAPS);
+};
+
// See also: thread_dump in attachListener.cpp
class ThreadDumpDCmd : public DCmdWithParser {
protected:
@@ -236,6 +258,16 @@
DCmdArgument<char *> _jmxremote_ssl_need_client_auth;
DCmdArgument<char *> _jmxremote_ssl_config_file;
+ // JDP support
+ // Keep autodiscovery char* not bool to pass true/false
+ // as property value to java level.
+ DCmdArgument<char *> _jmxremote_autodiscovery;
+ DCmdArgument<jlong> _jdp_port;
+ DCmdArgument<char *> _jdp_address;
+ DCmdArgument<char *> _jdp_source_addr;
+ DCmdArgument<jlong> _jdp_ttl;
+ DCmdArgument<jlong> _jdp_pause;
+
public:
JMXStartRemoteDCmd(outputStream *output, bool heap_allocated);
--- a/hotspot/src/share/vm/services/g1MemoryPool.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/g1MemoryPool.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,11 +25,12 @@
#ifndef SHARE_VM_SERVICES_G1MEMORYPOOL_HPP
#define SHARE_VM_SERVICES_G1MEMORYPOOL_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1MonitoringSupport.hpp"
#include "services/memoryPool.hpp"
#include "services/memoryUsage.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// This file contains the three classes that represent the memory
// pools of the G1 spaces: G1EdenPool, G1SurvivorPool, and
--- a/hotspot/src/share/vm/services/heapDumper.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/heapDumper.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -40,9 +40,10 @@
#include "services/heapDumper.hpp"
#include "services/threadService.hpp"
#include "utilities/ostream.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
/*
* HPROF binary format - description copied from:
--- a/hotspot/src/share/vm/services/management.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/management.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -53,6 +53,7 @@
#include "services/memoryService.hpp"
#include "services/runtimeService.hpp"
#include "services/threadService.hpp"
+#include "utilities/macros.hpp"
PerfVariable* Management::_begin_vm_creation_time = NULL;
PerfVariable* Management::_end_vm_creation_time = NULL;
--- a/hotspot/src/share/vm/services/memBaseline.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memBaseline.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -40,6 +40,7 @@
{mtNMT, "Memory Tracking"},
{mtChunk, "Pooled Free Chunks"},
{mtClassShared,"Shared spaces for classes"},
+ {mtTest, "Test"},
{mtNone, "Unknown"} // It can happen when type tagging records are lagging
// behind
};
--- a/hotspot/src/share/vm/services/memPtr.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memPtr.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -27,8 +27,8 @@
#include "services/memTracker.hpp"
volatile jint SequenceGenerator::_seq_number = 1;
+volatile unsigned long SequenceGenerator::_generation = 1;
NOT_PRODUCT(jint SequenceGenerator::_max_seq_number = 1;)
-DEBUG_ONLY(volatile unsigned long SequenceGenerator::_generation = 0;)
jint SequenceGenerator::next() {
jint seq = Atomic::add(1, &_seq_number);
--- a/hotspot/src/share/vm/services/memPtr.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memPtr.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -47,16 +47,16 @@
static void reset() {
assert(SafepointSynchronize::is_at_safepoint(), "Safepoint required");
_seq_number = 1;
- DEBUG_ONLY(_generation ++;)
+ _generation ++;
};
- DEBUG_ONLY(static unsigned long current_generation() { return (unsigned long)_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;
- NOT_PRODUCT(static jint _max_seq_number; )
- DEBUG_ONLY(static volatile unsigned long _generation; )
+ static volatile jint _seq_number;
+ static volatile unsigned long _generation;
+ NOT_PRODUCT(static jint _max_seq_number; )
};
/*
--- a/hotspot/src/share/vm/services/memRecorder.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memRecorder.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -55,7 +55,7 @@
MemRecorder::MemRecorder() {
assert(MemTracker::is_on(), "Native memory tracking is off");
Atomic::inc(&_instance_count);
- debug_only(set_generation();)
+ set_generation();
if (MemTracker::track_callsite()) {
_pointer_records = new (std::nothrow)FixedSizeMemPointerArray<SeqMemPointerRecordEx,
@@ -151,11 +151,12 @@
}
-#ifdef ASSERT
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();
--- a/hotspot/src/share/vm/services/memRecorder.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memRecorder.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -213,7 +213,7 @@
// used for linked list
MemRecorder* _next;
// active recorder can only record a certain generation data
- debug_only(unsigned long _generation;)
+ unsigned long _generation;
protected:
_NOINLINE_ MemRecorder();
@@ -251,6 +251,8 @@
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;
@@ -263,7 +265,7 @@
static int sort_record_fn(const void* e1, const void* e2);
debug_only(void check_dup_seq(jint seq) const;)
- debug_only(void set_generation();)
+ void set_generation();
};
#endif // SHARE_VM_SERVICES_MEM_RECORDER_HPP
--- a/hotspot/src/share/vm/services/memReporter.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memReporter.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -29,6 +29,7 @@
#include "services/memBaseline.hpp"
#include "services/memTracker.hpp"
#include "utilities/ostream.hpp"
+#include "utilities/macros.hpp"
#if INCLUDE_NMT
--- a/hotspot/src/share/vm/services/memTrackWorker.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memTrackWorker.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -91,6 +91,8 @@
MemSnapshot* snapshot = MemTracker::get_snapshot();
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();)
@@ -100,6 +102,12 @@
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);
@@ -129,6 +137,9 @@
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
--- a/hotspot/src/share/vm/services/memTrackWorker.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memTrackWorker.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -107,6 +107,7 @@
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));
}
--- a/hotspot/src/share/vm/services/memTracker.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memTracker.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -29,6 +29,7 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/threadCritical.hpp"
+#include "runtime/vm_operations.hpp"
#include "services/memPtr.hpp"
#include "services/memReporter.hpp"
#include "services/memTracker.hpp"
@@ -65,6 +66,8 @@
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;
debug_only(intx MemTracker::_main_thread_tid = 0;)
NOT_PRODUCT(volatile jint MemTracker::_pending_recorder_count = 0;)
@@ -279,7 +282,7 @@
}
cur_head->set_next(NULL);
Atomic::dec(&_pooled_recorder_count);
- debug_only(cur_head->set_generation();)
+ cur_head->set_generation();
return cur_head;
}
}
@@ -570,6 +573,51 @@
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
+ MutexLockerEx lock(_query_lock, true);
+ 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;
+ }
+ } 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;
+ }
+ }
+
+ // 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;
+ }
+ // 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) {
MutexLockerEx lock(_query_lock, true);
--- a/hotspot/src/share/vm/services/memTracker.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memTracker.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -91,9 +91,10 @@
static bool compare_memory_usage(BaselineOutputer& out, size_t unit,
bool summary_only = true) { }
+ static bool wbtest_wait_for_data_merge() { }
+
static inline void sync() { }
static inline void thread_exiting(JavaThread* thread) { }
-
};
@@ -111,6 +112,10 @@
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
@@ -380,6 +385,11 @@
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();
@@ -432,6 +442,15 @@
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;
+ }
+
private:
// global memory snapshot
static MemSnapshot* _snapshot;
@@ -483,6 +502,11 @@
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;
};
#endif // !INCLUDE_NMT
--- a/hotspot/src/share/vm/services/memoryPool.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memoryPool.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -32,6 +32,7 @@
#include "services/management.hpp"
#include "services/memoryManager.hpp"
#include "services/memoryPool.hpp"
+#include "utilities/macros.hpp"
MemoryPool::MemoryPool(const char* name,
PoolType type,
@@ -208,7 +209,7 @@
return MemoryUsage(initial_size(), used, committed, maxSize);
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
CompactibleFreeListSpacePool::CompactibleFreeListSpacePool(CompactibleFreeListSpace* space,
const char* name,
PoolType type,
@@ -225,7 +226,7 @@
return MemoryUsage(initial_size(), used, committed, maxSize);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
GenerationPool::GenerationPool(Generation* gen,
const char* name,
--- a/hotspot/src/share/vm/services/memoryPool.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memoryPool.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -30,9 +30,10 @@
#include "memory/heap.hpp"
#include "memory/space.hpp"
#include "services/memoryUsage.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// A memory pool represents the memory area that the VM manages.
// The Java virtual machine has at least one memory pool
@@ -185,7 +186,7 @@
}
};
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
class CompactibleFreeListSpacePool : public CollectedMemoryPool {
private:
CompactibleFreeListSpace* _space;
@@ -199,7 +200,7 @@
MemoryUsage get_memory_usage();
size_t used_in_bytes() { return _space->used(); }
};
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
class GenerationPool : public CollectedMemoryPool {
--- a/hotspot/src/share/vm/services/memoryService.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/memoryService.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -43,7 +43,8 @@
#include "services/memoryPool.hpp"
#include "services/memoryService.hpp"
#include "utilities/growableArray.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/parNew/parNewGeneration.hpp"
@@ -52,7 +53,7 @@
#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
#include "services/g1MemoryPool.hpp"
#include "services/psMemoryPool.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
GrowableArray<MemoryPool*>* MemoryService::_pools_list =
new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryPool*>(init_pools_list_size, true);
@@ -83,7 +84,7 @@
add_gen_collected_heap_info(GenCollectedHeap::heap());
break;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case CollectedHeap::ParallelScavengeHeap : {
add_parallel_scavenge_heap_info(ParallelScavengeHeap::heap());
break;
@@ -92,7 +93,7 @@
add_g1_heap_info(G1CollectedHeap::heap());
break;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
default: {
guarantee(false, "Unrecognized kind of heap");
}
@@ -130,22 +131,22 @@
case Generation::DefNew:
_minor_gc_manager = MemoryManager::get_copy_memory_manager();
break;
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case Generation::ParNew:
case Generation::ASParNew:
_minor_gc_manager = MemoryManager::get_parnew_memory_manager();
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
default:
guarantee(false, "Unrecognized generation spec");
break;
}
if (policy->is_mark_sweep_policy()) {
_major_gc_manager = MemoryManager::get_msc_memory_manager();
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
} else if (policy->is_concurrent_mark_sweep_policy()) {
_major_gc_manager = MemoryManager::get_cms_memory_manager();
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
} else {
guarantee(false, "Unknown two-gen policy");
}
@@ -159,7 +160,7 @@
add_generation_memory_pool(heap->get_gen(major), _major_gc_manager);
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
// Add memory pools for ParallelScavengeHeap
// This function currently only supports two generations collected heap.
// The collector for ParallelScavengeHeap will have two memory managers.
@@ -185,7 +186,7 @@
add_g1YoungGen_memory_pool(g1h, _major_gc_manager, _minor_gc_manager);
add_g1OldGen_memory_pool(g1h, _major_gc_manager);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
MemoryPool* MemoryService::add_gen(Generation* gen,
const char* name,
@@ -222,7 +223,7 @@
return (MemoryPool*) pool;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
MemoryPool* MemoryService::add_cms_space(CompactibleFreeListSpace* space,
const char* name,
bool is_heap,
@@ -233,7 +234,7 @@
_pools_list->append(pool);
return (MemoryPool*) pool;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
// Add memory pool(s) for one generation
void MemoryService::add_generation_memory_pool(Generation* gen,
@@ -261,7 +262,7 @@
break;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case Generation::ParNew:
case Generation::ASParNew:
{
@@ -282,7 +283,7 @@
break;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case Generation::MarkSweepCompact: {
assert(major_mgr != NULL && minor_mgr == NULL, "Should have only one manager");
@@ -293,7 +294,7 @@
break;
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case Generation::ConcurrentMarkSweep:
case Generation::ASConcurrentMarkSweep:
{
@@ -306,7 +307,7 @@
true /* support_usage_threshold */);
break;
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
default:
assert(false, "should not reach here");
@@ -326,7 +327,7 @@
}
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
void MemoryService::add_psYoung_memory_pool(PSYoungGen* gen, MemoryManager* major_mgr, MemoryManager* minor_mgr) {
assert(major_mgr != NULL && minor_mgr != NULL, "Should have two managers");
@@ -384,7 +385,7 @@
mgr->add_pool(old_gen);
_pools_list->append(old_gen);
}
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
void MemoryService::add_code_heap_memory_pool(CodeHeap* heap) {
_code_heap_pool = new CodeHeapPool(heap,
@@ -534,17 +535,17 @@
TraceMemoryManagerStats::TraceMemoryManagerStats(Generation::Name kind, GCCause::Cause cause) {
switch (kind) {
case Generation::DefNew:
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case Generation::ParNew:
case Generation::ASParNew:
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
_fullGC=false;
break;
case Generation::MarkSweepCompact:
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case Generation::ConcurrentMarkSweep:
case Generation::ASConcurrentMarkSweep:
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
_fullGC=true;
break;
default:
--- a/hotspot/src/share/vm/services/psMemoryPool.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/psMemoryPool.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,7 +25,8 @@
#ifndef SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
#define SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "gc_implementation/parallelScavenge/psOldGen.hpp"
#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
#include "gc_implementation/shared/mutableSpace.hpp"
@@ -34,7 +35,7 @@
#include "memory/space.hpp"
#include "services/memoryPool.hpp"
#include "services/memoryUsage.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
class PSGenerationPool : public CollectedMemoryPool {
private:
--- a/hotspot/src/share/vm/services/runtimeService.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/services/runtimeService.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -29,6 +29,7 @@
#include "services/runtimeService.hpp"
#include "utilities/dtrace.hpp"
#include "utilities/exceptions.hpp"
+#include "utilities/macros.hpp"
#ifndef USDT2
HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin);
--- a/hotspot/src/share/vm/utilities/macros.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/utilities/macros.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -130,23 +130,23 @@
#endif // INCLUDE_MANAGEMENT
/*
- * When INCLUDE_ALTERNATE_GCS is false the only garbage collectors
+ * When INCLUDE_ALL_GCS is false the only garbage collectors
* included in the JVM are defaultNewGeneration and markCompact.
*
- * When INCLUDE_ALTERNATE_GCS is true all garbage collectors are
+ * When INCLUDE_ALL_GCS is true all garbage collectors are
* included in the JVM.
*/
-#ifndef INCLUDE_ALTERNATE_GCS
-#define INCLUDE_ALTERNATE_GCS 1
-#endif // INCLUDE_ALTERNATE_GCS
+#ifndef INCLUDE_ALL_GCS
+#define INCLUDE_ALL_GCS 1
+#endif // INCLUDE_ALL_GCS
-#if INCLUDE_ALTERNATE_GCS
-#define NOT_ALTERNATE_GCS_RETURN /* next token must be ; */
-#define NOT_ALTERNATE_GCS_RETURN_(code) /* next token must be ; */
+#if INCLUDE_ALL_GCS
+#define NOT_ALL_GCS_RETURN /* next token must be ; */
+#define NOT_ALL_GCS_RETURN_(code) /* next token must be ; */
#else
-#define NOT_ALTERNATE_GCS_RETURN {}
-#define NOT_ALTERNATE_GCS_RETURN_(code) { return code; }
-#endif // INCLUDE_ALTERNATE_GCS
+#define NOT_ALL_GCS_RETURN {}
+#define NOT_ALL_GCS_RETURN_(code) { return code; }
+#endif // INCLUDE_ALL_GCS
#ifndef INCLUDE_NMT
#define INCLUDE_NMT 1
--- a/hotspot/src/share/vm/utilities/top.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/utilities/top.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -33,9 +33,9 @@
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
#include "utilities/sizes.hpp"
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/g1_globals.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
#endif
--- a/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp Wed Feb 13 13:01:16 2013 -0800
@@ -23,9 +23,10 @@
*/
#include "precompiled.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "utilities/yieldingWorkgroup.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// Forward declaration of classes declared here.
--- a/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp Wed Feb 13 13:01:16 2013 -0800
@@ -25,9 +25,10 @@
#ifndef SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
#define SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
#include "utilities/workgroup.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
// Forward declarations
--- a/hotspot/test/TEST.ROOT Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/test/TEST.ROOT Wed Feb 13 13:01:16 2013 -0800
@@ -28,4 +28,4 @@
# DO NOT EDIT without first contacting hotspot-regtest@sun.com
# The list of keywords supported in this test suite
-keys=cte_test
+keys=cte_test jcmd nmt regression
--- a/hotspot/test/compiler/8004741/Test8004741.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/test/compiler/8004741/Test8004741.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -25,70 +25,160 @@
* @test Test8004741.java
* @bug 8004741
* @summary Missing compiled exception handle table entry for multidimensional array allocation
+ * @run main/othervm -Xmx64m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+StressCompiledExceptionHandlers -XX:+SafepointALot -XX:GuaranteedSafepointInterval=100 Test8004741
* @run main/othervm -Xmx64m -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+StressCompiledExceptionHandlers Test8004741
- *
*/
import java.util.*;
public class Test8004741 extends Thread {
+ static int passed = 0;
+
+ /**
+ * Loop forever allocating 2-d arrays.
+ * Catches and rethrows all exceptions; in the case of ThreadDeath, increments passed.
+ * Note that passed is incremented here because this is the exception handler with
+ * the smallest scope; we only want to declare success in the case where it is highly
+ * likely that the test condition
+ * (exception in 2-d array alloc interrupted by ThreadDeath)
+ * actually occurs.
+ */
static int[][] test(int a, int b) throws Exception {
- int[][] ar = null;
+ int[][] ar;
try {
ar = new int[a][b];
- } catch (Error e) {
- System.out.println("test got Error");
- passed = true;
- throw(e);
- } catch (Exception e) {
- System.out.println("test got Exception");
+ } catch (ThreadDeath e) {
+ System.out.println("test got ThreadDeath");
+ passed++;
throw(e);
}
return ar;
}
- static boolean passed = false;
+ /* Cookbook wait-notify to track progress of test thread. */
+ Object progressLock = new Object();
+ private static final int NOT_STARTED = 0;
+ private static final int RUNNING = 1;
+ private static final int STOPPING = 2;
+
+ int progressState = NOT_STARTED;
- public void run() {
- System.out.println("test started");
- try {
- while(true) {
- test(2,20000);
+ void toState(int state) {
+ synchronized (progressLock) {
+ progressState = state;
+ progressLock.notify();
+ }
+ }
+
+ void waitFor(int state) {
+ synchronized (progressLock) {
+ while (progressState < state) {
+ try {
+ progressLock.wait();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ System.out.println("unexpected InterruptedException");
+ fail();
}
- } catch (ThreadDeath e) {
- System.out.println("test got ThreadDeath");
- passed = true;
- } catch (Error e) {
- e.printStackTrace();
- System.out.println("test got Error");
- } catch (Exception e) {
- e.printStackTrace();
- System.out.println("test got Exception");
+ }
+ if (progressState > state) {
+ System.out.println("unexpected test state change, expected " +
+ state + " but saw " + progressState);
+ fail();
+ }
+ }
+ }
+
+ /**
+ * Loops running test until some sort of an exception or error,
+ * expects to see ThreadDeath.
+ */
+ public void run() {
+ try {
+ // Print before state change, so that other thread is most likely
+ // to see this thread executing calls to test() in a loop.
+ System.out.println("thread running");
+ toState(RUNNING);
+ while (true) {
+ // (2,2) (2,10) (2,100) were observed to tickle the bug;
+ test(2, 100);
}
+ } catch (ThreadDeath e) {
+ // nothing to say, passing was incremented by the test.
+ } catch (Throwable e) {
+ e.printStackTrace();
+ System.out.println("unexpected Throwable " + e);
+ fail();
+ }
+ toState(STOPPING);
+ }
+
+ /**
+ * Runs a single trial of the test in a thread.
+ * No single trial is definitive, since the ThreadDeath
+ * exception might not land in the tested region of code.
+ */
+ public static void threadTest() throws InterruptedException {
+ Test8004741 t = new Test8004741();
+ t.start();
+ t.waitFor(RUNNING);
+ Thread.sleep(100);
+ System.out.println("stopping thread");
+ t.stop();
+ t.waitFor(STOPPING);
+ t.join();
}
public static void main(String[] args) throws Exception {
+ // Warm up "test"
+ // t will never be started.
for (int n = 0; n < 11000; n++) {
- test(2, 20);
+ test(2, 100);
+ }
+
+ // Will this sleep help ensure that the compiler is run?
+ Thread.sleep(500);
+ passed = 0;
+
+ try {
+ test(-1, 100);
+ System.out.println("Missing NegativeArraySizeException #1");
+ fail();
+ } catch ( java.lang.NegativeArraySizeException e ) {
+ System.out.println("Saw expected NegativeArraySizeException #1");
}
- // First test exception catch
- Test8004741 t = new Test8004741();
+ try {
+ test(100, -1);
+ fail();
+ System.out.println("Missing NegativeArraySizeException #2");
+ fail();
+ } catch ( java.lang.NegativeArraySizeException e ) {
+ System.out.println("Saw expected NegativeArraySizeException #2");
+ }
- passed = false;
- t.start();
- Thread.sleep(1000);
- t.stop();
+ /* Test repetitions. If the test succeeds-mostly, it succeeds,
+ * as long as it does not crash (the outcome if the exception range
+ * table entry for the array allocation is missing).
+ */
+ int N = 12;
+ for (int n = 0; n < N; n++) {
+ threadTest();
+ }
- Thread.sleep(5000);
- t.join();
- if (passed) {
+ if (passed > N/2) {
+ System.out.println("Saw " + passed + " out of " + N + " possible ThreadDeath hits");
System.out.println("PASSED");
} else {
- System.out.println("FAILED");
- System.exit(97);
+ System.out.println("Too few ThreadDeath hits; expected at least " + N/2 +
+ " but saw only " + passed);
+ fail();
}
}
+ static void fail() {
+ System.out.println("FAILED");
+ System.exit(97);
+ }
};
--- a/hotspot/test/runtime/7158988/FieldMonitor.java Tue Feb 12 09:58:21 2013 -0800
+++ b/hotspot/test/runtime/7158988/FieldMonitor.java Wed Feb 13 13:01:16 2013 -0800
@@ -24,8 +24,10 @@
/*
* @test FieldMonitor.java
* @bug 7158988
+ * @key regression
* @summary verify jvm does not crash while debugging
- * @run shell TestFieldMonitor.sh
+ * @run compile TestPostFieldModification.java
+ * @run main/othervm FieldMonitor
* @author axel.siebenborn@sap.com
*/
import java.io.BufferedReader;
--- a/hotspot/test/runtime/7158988/TestFieldMonitor.sh Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-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."
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin)
- NULL=/dev/null
- PS=":"
- FS="/"
- ;;
- Windows_95 | Windows_98 | Windows_ME )
- NULL=NUL
- PS=";"
- FS="\\"
- echo "Test skipped, only for WinNT"
- exit 0
- ;;
- Windows_NT )
- NULL=NUL
- PS=";"
- FS="\\"
- ;;
- CYGWIN_NT* )
- NULL=/dev/null
- PS=";"
- FS="/"
- ;;
- CYGWIN_* )
- NULL=/dev/null
- PS=";"
- FS="/"
- echo "Test skipped, only for WinNT"
- exit 0
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-#CLASSPATH=.${PS}${TESTCLASSES} ; export CLASSPATH
-
-cp ${TESTSRC}${FS}*.java .
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -fullversion
-
-${TESTJAVA}${FS}bin${FS}javac -classpath .${PS}$TESTJAVA${FS}lib${FS}tools.jar *.java
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath .${PS}$TESTJAVA${FS}lib${FS}tools.jar FieldMonitor > test.out
-
-grep "A fatal error has been detected" test.out > ${NULL}
-if [ $? = 0 ]; then
- cat test.out
- STATUS=1
-fi
-
-exit $STATUS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/8000968/Test8000968.sh Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,99 @@
+#
+# 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.
+#
+
+
+# @test Test8000968.sh
+# @bug 8000968
+# @summary NPG: UseCompressedKlassPointers asserts with ObjectAlignmentInBytes=32
+# @run shell Test8000968.sh
+#
+
+if [ "${TESTJAVA}" = "" ]
+then
+ PARENT=`dirname \`which java\``
+ TESTJAVA=`dirname ${PARENT}`
+ printf "TESTJAVA not set, selecting " ${TESTJAVA}
+ printf " If this is incorrect, try setting the variable manually.\n"
+fi
+
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+ Windows_* )
+ FS="\\"
+ NULL=NUL
+ ;;
+ * )
+ FS="/"
+ NULL=/dev/null
+ ;;
+esac
+
+JAVA=${TESTJAVA}${FS}bin${FS}java
+
+#
+# See if platform has 64 bit java.
+#
+${JAVA} ${TESTVMOPTS} -d64 -version 2>&1 | grep -i "does not support" > ${NULL}
+if [ "$?" != "1" ]
+then
+ printf "Platform is 32 bit, does not support -XX:ObjectAlignmentInBytes= option.\n"
+ printf "Passed.\n"
+ exit 0
+fi
+
+#
+# Test -XX:ObjectAlignmentInBytes with -XX:+UseCompressedKlassPointers -XX:+UseCompressedOops.
+#
+${JAVA} ${TESTVMOPTS} -d64 -XX:+UseCompressedKlassPointers -XX:+UseCompressedOops -XX:ObjectAlignmentInBytes=16 -version 2>&1 > ${NULL}
+if [ "$?" != "0" ]
+then
+ printf "FAILED: -XX:ObjectAlignmentInBytes=16 option did not work.\n"
+ exit 1
+fi
+
+${JAVA} ${TESTVMOPTS} -d64 -XX:+UseCompressedKlassPointers -XX:+UseCompressedOops -XX:ObjectAlignmentInBytes=32 -version 2>&1 > ${NULL}
+if [ "$?" != "0" ]
+then
+ printf "FAILED: -XX:ObjectAlignmentInBytes=32 option did not work.\n"
+ exit 1
+fi
+
+${JAVA} ${TESTVMOPTS} -d64 -XX:+UseCompressedKlassPointers -XX:+UseCompressedOops -XX:ObjectAlignmentInBytes=64 -version 2>&1 > ${NULL}
+if [ "$?" != "0" ]
+then
+ printf "FAILED: -XX:ObjectAlignmentInBytes=64 option did not work.\n"
+ exit 1
+fi
+
+${JAVA} ${TESTVMOPTS} -d64 -XX:+UseCompressedKlassPointers -XX:+UseCompressedOops -XX:ObjectAlignmentInBytes=128 -version 2>&1 > ${NULL}
+if [ "$?" != "0" ]
+then
+ printf "FAILED: -XX:ObjectAlignmentInBytes=128 option did not work.\n"
+ exit 1
+fi
+
+
+printf "Passed.\n"
+exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/8007475/StackMapFrameTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8007475
+ * @summary Test memory stomp in stack map test
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseMallocOnly StackMapFrameTest
+ */
+public class StackMapFrameTest {
+
+ public static void foo() {
+ Object o = new Object();
+ }
+
+ public static void main(String args[]) {
+ for (int i = 0; i < 25000; i++) {
+ foo();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/AllocTestType.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @summary Test consistency of NMT by leaking a few select allocations of the Test type and then verify visibility with jcmd
+ * @key nmt jcmd
+ * @library /testlibrary
+ * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI AllocTestType.java
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail AllocTestType
+ */
+
+import com.oracle.java.testlibrary.*;
+import sun.hotspot.WhiteBox;
+
+public class AllocTestType {
+
+ public static void main(String args[]) throws Exception {
+ OutputAnalyzer output;
+
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ ProcessBuilder pb = new ProcessBuilder();
+
+ // Use WB API to alloc with the mtTest type
+ if (!WhiteBox.getWhiteBox().NMTAllocTest()) {
+ throw new Exception("Call to WB API NMTAllocTest() failed");
+ }
+
+ // 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");
+ }
+
+ // 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("Test (reserved=512KB, committed=512KB)");
+
+ // Free the memory allocated by NMTAllocTest
+ if (!WhiteBox.getWhiteBox().NMTFreeTestMemory()) {
+ throw new Exception("Call to WB API NMTFreeTestMemory() failed");
+ }
+
+ // 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");
+ }
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("Test (reserved=");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/BaselineWithParameter.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8004802
+ * @key nmt jcmd regression
+ * @summary Regression test for invoking a jcmd with baseline=false, result was that the target VM crashed
+ * @library /testlibrary
+ * @run main/othervm -XX:NativeMemoryTracking=detail BaselineWithParameter
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class BaselineWithParameter {
+
+ 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=false'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=false"});
+ pb.start();
+
+ // Run 'jcmd <pid> VM.native_memory summary=false'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary=false"});
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("No command to execute");
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/CommandLineDetail.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+ /*
+ * @test
+ * @key nmt
+ * @summary Running with NMT detail should not result in an error or warning
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CommandLineDetail {
+
+ public static void main(String args[]) throws Exception {
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:NativeMemoryTracking=detail",
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("error");
+ output.shouldNotContain("warning");
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+ /*
+ * @test
+ * @key nmt
+ * @summary Empty argument to NMT should result in an informative error message
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CommandLineEmptyArgument {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:NativeMemoryTracking=");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]");
+ output.shouldHaveExitValue(1);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+ /*
+ * @test
+ * @key nmt
+ * @summary Invalid argument to NMT should result in an informative error message
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CommandLineInvalidArgument {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:NativeMemoryTracking=apa");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]");
+ output.shouldHaveExitValue(1);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/CommandLineSummary.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+ /*
+ * @test
+ * @key nmt
+ * @summary Running with NMT summary should not result in an error or warning
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CommandLineSummary {
+
+ public static void main(String args[]) throws Exception {
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:NativeMemoryTracking=summary",
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("error");
+ output.shouldNotContain("warning");
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+ /*
+ * @test
+ * @key nmt
+ * @summary Turning off NMT should not result in an error or warning
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CommandLineTurnOffNMT {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:NativeMemoryTracking=off",
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("error");
+ output.shouldNotContain("warning");
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/JcmdScale.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Test the NMT scale parameter
+ * @library /testlibrary
+ * @run main/othervm -XX:NativeMemoryTracking=summary JcmdScale
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class JcmdScale {
+
+ 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");
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Verify that jcmd correctly reports that NMT is not enabled
+ * @library /testlibrary
+ * First run without enabling NMT
+ * @run main/othervm JcmdWithNMTDisabled
+ * Then run with explicitly disabling NMT, should not be any difference
+ * @run main/othervm -XX:NativeMemoryTracking=off JcmdWithNMTDisabled
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class JcmdWithNMTDisabled {
+ static ProcessBuilder pb = new ProcessBuilder();
+ static String pid;
+
+ public static void main(String args[]) throws Exception {
+ // Grab my own PID
+ pid = Integer.toString(ProcessTools.getProcessId());
+
+ jcmdCommand("summary");
+ jcmdCommand("detail");
+ jcmdCommand("baseline");
+ jcmdCommand("summary.diff");
+ jcmdCommand("detail.diff");
+ jcmdCommand("scale=GB");
+ jcmdCommand("shutdown");
+ }
+
+ // Helper method for invoking different jcmd calls, all should fail with the same message saying NMT is not enabled
+ public static void jcmdCommand(String command) throws Exception {
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", command});
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ // Verify that jcmd reports that NMT is not enabled
+ output.shouldContain("Native memory tracking is not enabled");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/PrintNMTStatistics.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key nmt regression
+ * @bug 8005936
+ * @summary Make sure PrintNMTStatistics works on normal JVM exit
+ * @library /testlibrary
+ * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI PrintNMTStatistics.java
+ */
+
+import com.oracle.java.testlibrary.*;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import sun.hotspot.WhiteBox;
+
+public class PrintNMTStatistics {
+
+ public static void main(String args[]) throws Exception {
+
+ // 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;
+ }
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:NativeMemoryTracking=summary",
+ "+XX:+PrintNMTStatistics",
+ "PrintNMTStatistics",
+ "test");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Java Heap (reserved=");
+ output.shouldNotContain("error");
+ output.shouldNotContain("warning");
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+ /*
+ * @test
+ * @key nmt
+ * @summary Trying to enable PrintNMTStatistics should result in a warning
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class PrintNMTStatisticsWithNMTDisabled {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+PrintNMTStatistics",
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("warning: PrintNMTStatistics is disabled, because native memory tracking is not enabled");
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/ShutdownTwice.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Run shutdown twice
+ * @library /testlibrary
+ * @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class ShutdownTwice {
+
+ 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 shutdown'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "shutdown"});
+ 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");
+
+ // 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");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/SummaryAfterShutdown.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Verify that jcmd correctly reports that NMT is not enabled after a shutdown
+ * @library /testlibrary
+ * @run main/othervm -XX:NativeMemoryTracking=detail SummaryAfterShutdown
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class SummaryAfterShutdown {
+
+ public static void main(String args[]) throws Exception {
+ OutputAnalyzer output;
+ // Grab my own PID
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ ProcessBuilder pb = new ProcessBuilder();
+
+ // Run 'jcmd <pid> VM.native_memory shutdown'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "shutdown"});
+ 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");
+
+ // 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");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/NMT/SummarySanityCheck.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key nmt jcmd
+ * @summary Sanity check the output of NMT
+ * @library /testlibrary
+ * @run compile -J-XX:+UnlockDiagnosticVMOptions -J-XX:+WhiteBoxAPI SummarySanityCheck.java
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
+ */
+
+import com.oracle.java.testlibrary.*;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import sun.hotspot.WhiteBox;
+
+public class SummarySanityCheck {
+
+ private static String jcmdout;
+ public static void main(String args[]) throws Exception {
+ // 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'
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary", "scale=KB"});
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ jcmdout = output.getOutput();
+ // Split by '-' to get the 'groups'
+ String[] lines = jcmdout.split("\n");
+
+ if (lines.length == 0) {
+ throwTestException("Failed to parse jcmd output");
+ }
+
+ int totalCommitted = 0, totalReserved = 0;
+ int totalCommittedSum = 0, totalReservedSum = 0;
+
+ // 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");
+
+ 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) {
+ totalCommitted = Integer.parseInt(totalMemoryMatcher.group("committed"));
+ totalReserved = Integer.parseInt(totalMemoryMatcher.group("reserved"));
+ } else {
+ throwTestException("Failed to match the expected groups in 'Total' memory part");
+ }
+ } else if (lines[i].startsWith("-")) {
+ Matcher typeMatcher = mtTypePattern.matcher(lines[i]);
+ if (typeMatcher.matches()) {
+ int typeCommitted = Integer.parseInt(typeMatcher.group("committed"));
+ int typeReserved = Integer.parseInt(typeMatcher.group("reserved"));
+
+ // Make sure reserved is always less or equals
+ if (typeCommitted > typeReserved) {
+ throwTestException("Committed (" + typeCommitted + ") was more than Reserved ("
+ + typeReserved + ") for mtType: " + typeMatcher.group("typename"));
+ }
+
+ // Add to total and compare them in the end
+ totalCommittedSum += typeCommitted;
+ totalReservedSum += typeReserved;
+ } else {
+ throwTestException("Failed to match the group on line " + i);
+ }
+ }
+ }
+
+ // See if they add up correctly, rounding is a problem so make sure we're within +/- 8KB
+ int committedDiff = totalCommitted - totalCommittedSum;
+ if (committedDiff > 8 || committedDiff < -8) {
+ throwTestException("Total committed (" + totalCommitted + ") did not match the summarized committed (" + totalCommittedSum + ")" );
+ }
+
+ int reservedDiff = totalReserved - totalReservedSum;
+ if (reservedDiff > 8 || reservedDiff < -8) {
+ throwTestException("Total reserved (" + totalReserved + ") did not match the summarized reserved (" + totalReservedSum + ")" );
+ }
+ }
+
+ private static void throwTestException(String reason) throws Exception {
+ throw new Exception(reason + " . Stdout is :\n" + jcmdout);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/OutputAnalyzerTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @summary Test the OutputAnalyzer utility class
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+
+public class OutputAnalyzerTest {
+
+ public static void main(String args[]) throws Exception {
+
+ String stdout = "aaaaaa";
+ String stderr = "bbbbbb";
+
+ OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
+
+ if (!stdout.equals(output.getStdout())) {
+ throw new Exception("getStdout() returned '" + output.getStdout() + "', expected '" + stdout + "'");
+ }
+
+ if (!stderr.equals(output.getStderr())) {
+ throw new Exception("getStderr() returned '" + output.getStderr() + "', expected '" + stderr + "'");
+ }
+
+ try {
+ output.shouldContain(stdout);
+ output.stdoutShouldContain(stdout);
+ output.shouldContain(stderr);
+ output.stderrShouldContain(stderr);
+ } catch (RuntimeException e) {
+ throw new Exception("shouldContain() failed", e);
+ }
+
+ try {
+ output.shouldContain("cccc");
+ throw new Exception("shouldContain() failed to throw exception");
+ } catch (RuntimeException e) {
+ // expected
+ }
+
+ try {
+ output.stdoutShouldContain(stderr);
+ throw new Exception("stdoutShouldContain() failed to throw exception");
+ } catch (RuntimeException e) {
+ // expected
+ }
+
+ try {
+ output.stderrShouldContain(stdout);
+ throw new Exception("stdoutShouldContain() failed to throw exception");
+ } catch (RuntimeException e) {
+ // expected
+ }
+
+ try {
+ output.shouldNotContain("cccc");
+ output.stdoutShouldNotContain("cccc");
+ output.stderrShouldNotContain("cccc");
+ } catch (RuntimeException e) {
+ throw new Exception("shouldNotContain() failed", e);
+ }
+
+ try {
+ output.shouldNotContain(stdout);
+ throw new Exception("shouldContain() failed to throw exception");
+ } catch (RuntimeException e) {
+ // expected
+ }
+
+ try {
+ output.stdoutShouldNotContain(stdout);
+ throw new Exception("shouldContain() failed to throw exception");
+ } catch (RuntimeException e) {
+ // expected
+ }
+
+ try {
+ output.stderrShouldNotContain(stderr);
+ throw new Exception("shouldContain() failed to throw exception");
+ } catch (RuntimeException e) {
+ // expected
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.io.File;
+
+public final class JDKToolFinder {
+
+ private JDKToolFinder() {
+ }
+
+ /**
+ * Returns the full path to an executable in jdk/bin based on System property
+ * test.jdk (set by jtreg test suite)
+ *
+ * @return Full path to an executable in jdk/bin
+ */
+ public static String getJDKTool(String tool) {
+ String binPath = System.getProperty("test.jdk");
+ if (binPath == null) {
+ throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. "
+ + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
+ }
+
+ binPath += File.separatorChar + "bin" + File.separatorChar + tool;
+
+ return binPath;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,191 @@
+/*
+ * 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.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.io.IOException;
+
+public final class OutputAnalyzer {
+
+ private final String stdout;
+ private final String stderr;
+ private final int exitValue;
+
+ /**
+ * Create an OutputAnalyzer, a utility class for verifying output and exit
+ * value from a Process
+ *
+ * @param process Process to analyze
+ * @throws IOException If an I/O error occurs.
+ */
+ public OutputAnalyzer(Process process) throws IOException {
+ OutputBuffer output = ProcessTools.getOutput(process);
+ exitValue = process.exitValue();
+ this.stdout = output.getStdout();
+ this.stderr = output.getStderr();
+ }
+
+ /**
+ * Create an OutputAnalyzer, a utility class for verifying output
+ *
+ * @param buf String buffer to analyze
+ */
+ public OutputAnalyzer(String buf) {
+ this(buf, buf);
+ }
+
+ /**
+ * Create an OutputAnalyzer, a utility class for verifying output
+ *
+ * @param stdout stdout buffer to analyze
+ * @param stderr stderr buffer to analyze
+ */
+ public OutputAnalyzer(String stdout, String stderr) {
+ this.stdout = stdout;
+ this.stderr = stderr;
+ exitValue = -1;
+ }
+
+ /**
+ * Verify that the stdout and stderr contents of output buffer contains the string
+ *
+ * @param expectedString String that buffer should contain
+ * @throws RuntimeException If the string was not found
+ */
+ public void shouldContain(String expectedString) {
+ if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
+ throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr: [" + stdout + stderr + "]\n");
+ }
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer contains the string
+ *
+ * @param expectedString String that buffer should contain
+ * @throws RuntimeException If the string was not found
+ */
+ public void stdoutShouldContain(String expectedString) {
+ if (!stdout.contains(expectedString)) {
+ throw new RuntimeException("'" + expectedString + "' missing from stdout: [" + stdout + "]\n");
+ }
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer contains the string
+ *
+ * @param expectedString String that buffer should contain
+ * @throws RuntimeException If the string was not found
+ */
+ public void stderrShouldContain(String expectedString) {
+ if (!stderr.contains(expectedString)) {
+ throw new RuntimeException("'" + expectedString + "' missing from stderr: [" + stderr + "]\n");
+ }
+ }
+
+ /**
+ * Verify that the stdout and stderr contents of output buffer does not contain the string
+ *
+ * @param expectedString String that the buffer should not contain
+ * @throws RuntimeException If the string was found
+ */
+ public void shouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
+ throw new RuntimeException("'" + notExpectedString + "' found in stdout: [" + stdout + "]\n");
+ }
+ if (stderr.contains(notExpectedString)) {
+ throw new RuntimeException("'" + notExpectedString + "' found in stderr: [" + stderr + "]\n");
+ }
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer does not contain the string
+ *
+ * @param expectedString String that the buffer should not contain
+ * @throws RuntimeException If the string was found
+ */
+ public void stdoutShouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
+ throw new RuntimeException("'" + notExpectedString + "' found in stdout: [" + stdout + "]\n");
+ }
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer does not contain the string
+ *
+ * @param expectedString String that the buffer should not contain
+ * @throws RuntimeException If the string was found
+ */
+ public void stderrShouldNotContain(String notExpectedString) {
+ if (stderr.contains(notExpectedString)) {
+ throw new RuntimeException("'" + notExpectedString + "' found in stderr: [" + stderr + "]\n");
+ }
+ }
+
+ /**
+ * Verifiy the exit value of the process
+ *
+ * @param expectedExitValue Expected exit value from process
+ * @throws RuntimeException If the exit value from the process did not match the expected value
+ */
+ public void shouldHaveExitValue(int expectedExitValue) {
+ if (getExitValue() != expectedExitValue) {
+ throw new RuntimeException("Exit value " + getExitValue() + " , expected to get " + expectedExitValue);
+ }
+ }
+
+ /**
+ * Get the contents of the output buffer (stdout and stderr)
+ *
+ * @return Content of the output buffer
+ */
+ public String getOutput() {
+ return stdout + stderr;
+ }
+
+ /**
+ * Get the contents of the stdout buffer
+ *
+ * @return Content of the stdout buffer
+ */
+ public String getStdout() {
+ return stdout;
+ }
+
+ /**
+ * Get the contents of the stderr buffer
+ *
+ * @return Content of the stderr buffer
+ */
+ public String getStderr() {
+ return stderr;
+ }
+
+ /**
+ * Get the process exit value
+ *
+ * @return Process exit value
+ */
+ public int getExitValue() {
+ return exitValue;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputBuffer.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package com.oracle.java.testlibrary;
+
+public class OutputBuffer {
+ private final String stdout;
+ private final String stderr;
+
+ /**
+ * Create an OutputBuffer, a class for storing and managing stdout and stderr
+ * results separately
+ *
+ * @param stdout stdout result
+ * @param stderr stderr result
+ */
+ public OutputBuffer(String stdout, String stderr) {
+ this.stdout = stdout;
+ this.stderr = stderr;
+ }
+
+ /**
+ * Returns the stdout result
+ *
+ * @return stdout result
+ */
+ public String getStdout() {
+ return stdout;
+ }
+
+ /**
+ * Returns the stderr result
+ *
+ * @return stderr result
+ */
+ public String getStderr() {
+ return stderr;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+
+import sun.management.VMManagement;
+
+public final class ProcessTools {
+
+ private ProcessTools() {
+ }
+
+ /**
+ * Pumps stdout and stderr from running the process into a String.
+ *
+ * @param processHandler ProcessHandler to run.
+ * @return Output from process.
+ * @throws IOException If an I/O error occurs.
+ */
+ public static OutputBuffer getOutput(ProcessBuilder processBuilder) throws IOException {
+ return getOutput(processBuilder.start());
+ }
+
+ /**
+ * Pumps stdout and stderr the running process into a String.
+ *
+ * @param process Process to pump.
+ * @return Output from process.
+ * @throws IOException If an I/O error occurs.
+ */
+ public static OutputBuffer getOutput(Process process) throws IOException {
+ ByteArrayOutputStream stderrBuffer = new ByteArrayOutputStream();
+ ByteArrayOutputStream stdoutBuffer = new ByteArrayOutputStream();
+ StreamPumper outPumper = new StreamPumper(process.getInputStream(), stdoutBuffer);
+ StreamPumper errPumper = new StreamPumper(process.getErrorStream(), stderrBuffer);
+ Thread outPumperThread = new Thread(outPumper);
+ Thread errPumperThread = new Thread(errPumper);
+
+ outPumperThread.setDaemon(true);
+ errPumperThread.setDaemon(true);
+
+ outPumperThread.start();
+ errPumperThread.start();
+
+ try {
+ process.waitFor();
+ outPumperThread.join();
+ errPumperThread.join();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return null;
+ }
+
+ return new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString());
+ }
+
+ /**
+ * Get the process id of the current running Java process
+ *
+ * @return Process id
+ */
+ public static int getProcessId() throws Exception {
+
+ // Get the current process id using a reflection hack
+ RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
+ Field jvm = runtime.getClass().getDeclaredField("jvm");
+
+ jvm.setAccessible(true);
+ VMManagement mgmt = (sun.management.VMManagement) jvm.get(runtime);
+
+ Method pid_method = mgmt.getClass().getDeclaredMethod("getProcessId");
+
+ pid_method.setAccessible(true);
+
+ int pid = (Integer) pid_method.invoke(mgmt);
+
+ return pid;
+ }
+
+ /**
+ * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
+ *
+ * @return String[] with platform specific arguments, empty if there are none
+ */
+ public static String[] getPlatformSpecificVMArgs() {
+ String osName = System.getProperty("os.name");
+ String dataModel = System.getProperty("sun.arch.data.model");
+
+ if (osName.equals("SunOS") && dataModel.equals("64")) {
+ return new String[] { "-d64" };
+ }
+
+ return new String[] {};
+ }
+
+ /**
+ * Create ProcessBuilder using the java launcher from the jdk to be tested and
+ * with any platform specific arguments prepended
+ */
+ public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
+ String javapath = JDKToolFinder.getJDKTool("java");
+
+ ArrayList<String> args = new ArrayList<>();
+ args.add(javapath);
+ Collections.addAll(args, getPlatformSpecificVMArgs());
+ Collections.addAll(args, command);
+
+ return new ProcessBuilder(args.toArray(new String[args.size()]));
+
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/StreamPumper.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.io.OutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+
+public final class StreamPumper implements Runnable {
+
+ private static final int BUF_SIZE = 256;
+
+ private final OutputStream out;
+ private final InputStream in;
+
+ /**
+ * Create a StreamPumper that reads from in and writes to out.
+ *
+ * @param in The stream to read from.
+ * @param out The stream to write to.
+ */
+ public StreamPumper(InputStream in, OutputStream out) {
+ this.in = in;
+ this.out = out;
+ }
+
+ /**
+ * Implements Thread.run(). Continuously read from <code>in</code> and write
+ * to <code>out</code> until <code>in</code> has reached end of stream. Abort
+ * on interruption. Abort on IOExceptions.
+ */
+ @Override
+ public void run() {
+ int length;
+ InputStream localIn = in;
+ OutputStream localOut = out;
+ byte[] buffer = new byte[BUF_SIZE];
+
+ try {
+ while (!Thread.interrupted() && (length = localIn.read(buffer)) > 0) {
+ localOut.write(buffer, 0, length);
+ }
+ } catch (IOException e) {
+ // Just abort if something like this happens.
+ e.printStackTrace();
+ } finally {
+ try {
+ localOut.flush();
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--- a/jaxp/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/jaxp/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -196,3 +196,5 @@
bdf2af722a6b54fca47d8c51d17a1b8f41dd7a3e jdk8-b72
84946404d1e1de003ed2bf218ef8d48906a90e37 jdk8-b73
2087e24a4357eceb6432e94918e75fdc706a27d6 jdk8-b74
+ff0b73a6b3f6cea644d37d56d746a37743419fa7 jdk8-b75
+0c08593944d0cd30645f6e1e4946c51ff2b10c8c jdk8-b76
--- a/jaxp/makefiles/BuildJaxp.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jaxp/makefiles/BuildJaxp.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -30,8 +30,6 @@
include MakeBase.gmk
include JavaCompilation.gmk
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
# The generate new bytecode uses the new compiler for to generate bytecode
@@ -39,7 +37,7 @@
# cannot necessarily be run with the boot jdk.
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
--- a/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java Wed Feb 13 13:01:16 2013 -0800
@@ -68,7 +68,7 @@
// Use try/catch block to support applets
try {
debug = ss.getSystemProperty("jaxp.debug") != null;
- } catch (Exception _) {
+ } catch (Exception unused) {
debug = false;
}
}
@@ -113,7 +113,7 @@
debugPrintln("using thread context class loader ("+classLoader+") for search");
return;
}
- } catch( Throwable _ ) {
+ } catch( Throwable unused ) {
; // getContextClassLoader() undefined in JDK1.1
}
--- a/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java Wed Feb 13 13:01:16 2013 -0800
@@ -56,7 +56,7 @@
// Use try/catch block to support applets
try {
debug = ss.getSystemProperty("jaxp.debug") != null;
- } catch (Exception _) {
+ } catch (Exception unused) {
debug = false;
}
}
@@ -111,7 +111,7 @@
debugPrintln("using thread context class loader ("+classLoader+") for search");
return;
}
- } catch( Throwable _ ) {
+ } catch( Throwable unused ) {
; // getContextClassLoader() undefined in JDK1.1
}
--- a/jaxws/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/jaxws/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -196,3 +196,5 @@
d9707230294d54e695e745a90de6112909100f12 jdk8-b72
c606f644a5d9118c14b5822738bf23c300f14f24 jdk8-b73
12db3c5a3393b03eeb09ff26f418c4420c21aaab jdk8-b74
+966bf9f3c41a59ff5d86ff4275291c52f329f984 jdk8-b75
+c4853f3f0e89ac60aa5b517f5f224f0f60e08577 jdk8-b76
--- a/jaxws/makefiles/BuildJaxws.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jaxws/makefiles/BuildJaxws.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -30,8 +30,6 @@
include MakeBase.gmk
include JavaCompilation.gmk
-JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
# The generate new bytecode uses the new compiler for to generate bytecode
@@ -39,7 +37,7 @@
# cannot necessarily be run with the boot jdk.
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
--- a/jdk/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -197,3 +197,4 @@
733885f57e14cc27f5a5ff0dffe641d2fa3c704a jdk8-b73
57d5d954462831ac353a1f40d3bb05ddb4620952 jdk8-b74
4a67fdb752b7d6329d9be9c28d3f9d6cf7eb9a3c jdk8-b75
+3a263052866137b645ab86498a43693ff5c19e69 jdk8-b76
--- a/jdk/make/common/shared/Defs-solaris.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/make/common/shared/Defs-solaris.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -211,7 +211,9 @@
MAPFILE_EXCEPTIONS = \
(libjdgaSUNWafb|libjdgaSUNWcg6|libjdgaSUNWffb|libjdgaSUNWm64|libxinerama)
else
- MAPFILE_EXCEPTIONS = ()
+ # At present there are no exceptions for non
+ # SPARC. Use a harmless value.
+ MAPFILE_EXCEPTIONS = (NO_EXCEPTIONS)
endif
# Macro to check it's input file for banned dependencies and verify the
--- a/jdk/make/common/shared/Sanity.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/make/common/shared/Sanity.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -1486,26 +1486,6 @@
######################################################
sane-gcc-compiler:
ifndef OPENJDK
- ifeq ($(PLATFORM), solaris)
- @if [ -r $(GCC_COMPILER_PATH) ]; then \
- if [ ! "$(GCC_VER)" = $(REQUIRED_GCC_VER) ]; then \
- $(ECHO) "ERROR: The Solaris GCC compiler version must be $(REQUIRED_GCC_VER). \n" \
- " You are using the following compiler version: $(GCC_VER) \n" \
- " The compiler was obtained from the following location: \n" \
- " $(GCC_COMPILER_PATH) \n" \
- " Please change your compiler. \n" \
- "" >> $(ERROR_FILE) ; \
- fi \
- else \
- $(ECHO) "ERROR: You do not have a valid GCC_COMPILER_PATH setting. \n" \
- " Please check your access to \n" \
- " $(GCC_COMPILER_PATH) \n" \
- " and/or check your value of ALT_GCC_COMPILER_PATH. \n" \
- " This will affect you if you build the plugin target. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
-
ifeq ($(PLATFORM), linux)
ifeq ($(ARCH_DATA_MODEL), 32)
ifdef ALT_GCC29_COMPILER_PATH
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/common/architectures/arch-x86_64.properties Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2007, 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.
+#
+
+arch=x86_64
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/common/architectures/name-Macosx.properties Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2007, 2012, 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.
+#
+
+platform=macosx
--- a/jdk/make/netbeans/common/java-data-native.ent Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/make/netbeans/common/java-data-native.ent Wed Feb 13 13:01:16 2013 -0800
@@ -39,11 +39,11 @@
<classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
<built-to>${root}/build/${platform}-${arch}/classes</built-to>
<javadoc-built-to>${root}/build/${platform}-${arch}/docs/api</javadoc-built-to>
- <source-level>1.7</source-level>
+ <source-level>1.8</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${root}/test</package-root>
<unit-tests/>
- <source-level>1.7</source-level>
+ <source-level>1.8</source-level>
</compilation-unit>
</java-data>
--- a/jdk/make/netbeans/common/java-data-no-native.ent Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/make/netbeans/common/java-data-no-native.ent Wed Feb 13 13:01:16 2013 -0800
@@ -37,11 +37,11 @@
<classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
<built-to>${root}/build/${platform}-${arch}/classes</built-to>
<javadoc-built-to>${root}/build/${platform}-${arch}/docs/api</javadoc-built-to>
- <source-level>1.7</source-level>
+ <source-level>1.8</source-level>
</compilation-unit>
<compilation-unit>
<package-root>${root}/test</package-root>
<unit-tests/>
- <source-level>1.7</source-level>
+ <source-level>1.8</source-level>
</compilation-unit>
</java-data>
--- a/jdk/make/netbeans/common/make.xml Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/make/netbeans/common/make.xml Wed Feb 13 13:01:16 2013 -0800
@@ -33,7 +33,7 @@
<project name="make" basedir="..">
- <target name="-make.init" depends="-init,-pre-init.linux,-pre-init.solaris,-pre-init.windows">
+ <target name="-make.init" depends="-init,-pre-init.linux,-pre-init.macosx,-pre-init.solaris,-pre-init.windows,-pre-init.macosx">
<property name="make.options" value=""/> <!-- default, can be overridden per user or per project -->
</target>
@@ -42,6 +42,11 @@
<property name="make" value="make"/>
</target>
+ <target name="-pre-init.macosx" if="os.macosx">
+ <property name="platform" value="macosx"/>
+ <property name="make" value="make"/>
+ </target>
+
<target name="-pre-init.solaris" if="os.solaris">
<property name="platform" value="solaris"/>
<property name="make" value="gmake"/>
--- a/jdk/make/netbeans/common/shared.xml Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/make/netbeans/common/shared.xml Wed Feb 13 13:01:16 2013 -0800
@@ -85,6 +85,9 @@
<property name="includes" value="(nothing)"/>
<property name="excludes" value=""/>
<property name="javadoc.dir" location="${build.dir}/javadoc/${ant.project.name}"/>
+ <condition property="os.macosx">
+ <os family="mac"/>
+ </condition>
<condition property="os.linux">
<os name="linux"/>
</condition>
@@ -126,10 +129,6 @@
<javac srcdir="@{srcdir}" includes="@{includes}" excludes="@{excludes}" sourcepath=""
destdir="@{classesdir}" fork="true" executable="${bootstrap.javac}"
debug="${javac.debug}" debuglevel="${javac.debuglevel}">
- <compilerarg value="-source"/>
- <compilerarg value="1.5"/>
- <compilerarg value="-target"/>
- <compilerarg value="1.6"/> <!-- for usability of JDK 6 as snapshot; change to 1.7 when JSR 294 put back -->
<!-- Mandatory for compiling partial JDK sources against a snapshot; should NEVER be used for any other purpose: -->
<compilerarg value="-XDignore.symbol.file=true"/>
<compilerarg line="${javac.options}"/>
--- a/jdk/makefiles/CreateJars.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/makefiles/CreateJars.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -836,7 +836,7 @@
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
- $(JAVA) $(JAVAC_JARS) \
+ $(JAVA) $(NEW_JAVAC) \
-bootclasspath $(JDK_OUTPUTDIR)/classes \
-XDprocess.packages -proc:only \
-processor com.sun.tools.javac.sym.CreateSymbols \
--- a/jdk/makefiles/GensrcSwing.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/makefiles/GensrcSwing.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -71,7 +71,7 @@
$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS)
$(ECHO) Generating beaninfo
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
- $(JAVA) -Djava.awt.headless=true -jar $(JAVADOC_JARS) -doclet GenDocletBeanInfo \
+ $(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -doclet GenDocletBeanInfo \
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
-XDignore.symbol.file=true \
--- a/jdk/makefiles/Setup.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/makefiles/Setup.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -23,10 +23,6 @@
# questions.
#
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-JAVAH_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar
-JAVADOC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
-
DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
# The generate old bytecode javac setup uses the new compiler to compile for the
@@ -34,7 +30,7 @@
# Thus we force the target bytecode to 7.
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -43,8 +39,7 @@
# new jdk. This new bytecode might only be possible to run using the new jvm.
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
- JAVAH:=$(JAVAH_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -55,7 +50,7 @@
# (it will be in "make images") therefore we use classes instead.
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java Wed Feb 13 13:01:16 2013 -0800
@@ -88,40 +88,25 @@
DragGestureEvent trigger = getTrigger();
InputEvent triggerEvent = trigger.getTriggerEvent();
- Point dragOrigin = trigger.getDragOrigin();
+ Point dragOrigin = new Point(trigger.getDragOrigin());
int extModifiers = (triggerEvent.getModifiers() | triggerEvent.getModifiersEx());
long timestamp = triggerEvent.getWhen();
int clickCount = ((triggerEvent instanceof MouseEvent) ? (((MouseEvent) triggerEvent).getClickCount()) : 1);
- // Get drag source component and its peer:
Component component = trigger.getComponent();
- Point componentOffset = new Point();
- ComponentPeer peer = component.getPeer();
-
- // For a lightweight component traverse up the hierarchy to the first heavyweight
- // which will be used as the ComponentModel for the native drag source.
- if (component.isLightweight()) {
- Point loc = component.getLocation();
- componentOffset.translate(loc.x, loc.y);
-
- for (Component parent = component.getParent(); parent != null; parent = parent.getParent()) {
- if (parent.isLightweight() == false) {
- peer = parent.getPeer();
- break;
- }
-
- loc = parent.getLocation();
- componentOffset.translate(loc.x, loc.y);
- }
+ // For a lightweight component traverse up the hierarchy to the root
+ Point loc = component.getLocation();
+ Component rootComponent = component;
+ while (!(rootComponent instanceof Window)) {
+ dragOrigin.translate(loc.x, loc.y);
+ rootComponent = rootComponent.getParent();
+ loc = rootComponent.getLocation();
}
- // Make sure the drop target is a ComponentModel:
- if (!(peer instanceof LWComponentPeer))
- throw new IllegalArgumentException("DragSource's peer must be a ComponentModel.");
-
- // Get model pointer (CButton.m and such) and its native peer:
- LWComponentPeer model = (LWComponentPeer) peer;
- CPlatformWindow platformWindow = (CPlatformWindow) model.getPlatformWindow();
+ //It sure will be LWComponentPeer instance as rootComponent is a Window
+ LWComponentPeer peer = (LWComponentPeer)rootComponent.getPeer();
+ //Get a pointer to a native window
+ CPlatformWindow platformWindow = (CPlatformWindow) peer.getPlatformWindow();
long nativeWindowPtr = platformWindow.getNSWindowPtr();
// Get drag cursor:
@@ -155,7 +140,7 @@
try {
// Create native dragging source:
final long nativeDragSource = createNativeDragSource(component, peer, nativeWindowPtr, transferable, triggerEvent,
- (int) (dragOrigin.getX() + componentOffset.x), (int) (dragOrigin.getY() + componentOffset.y), extModifiers,
+ (int) (dragOrigin.getX()), (int) (dragOrigin.getY()), extModifiers,
clickCount, timestamp, cursor, fDragCImage, dragImageOffset.x, dragImageOffset.y,
getDragSourceContext().getSourceActions(), formats, formatMap);
@@ -165,8 +150,8 @@
setNativeContext(nativeDragSource);
CCursorManager.getInstance().startDrag(
- (int) (dragOrigin.getX() + componentOffset.x),
- (int) (dragOrigin.getY() + componentOffset.y));
+ (int) (dragOrigin.getX()),
+ (int) (dragOrigin.getY()));
}
catch (Exception e) {
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m Wed Feb 13 13:01:16 2013 -0800
@@ -813,9 +813,9 @@
if ([nsWindow isKeyWindow]) [window.javaMenuBar deactivate];
window.javaMenuBar = menuBar;
- // if ([self isKeyWindow]) {
- [CMenuBar activate:window.javaMenuBar modallyDisabled:NO];
- // }
+ if ([nsWindow isKeyWindow]) {
+ [CMenuBar activate:window.javaMenuBar modallyDisabled:NO];
+ }
}];
JNF_COCOA_EXIT(env);
--- a/jdk/src/macosx/native/sun/awt/CDragSource.m Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/macosx/native/sun/awt/CDragSource.m Wed Feb 13 13:01:16 2013 -0800
@@ -443,9 +443,9 @@
NSGraphicsContext* graphicsContext = [NSGraphicsContext graphicsContextWithWindow:window];
// Convert mouse coordinates to NS:
- NSPoint location = NSMakePoint(fDragPos.x, fDragPos.y);
- NSPoint eventLocation = [fView convertPoint:location toView:nil];
-
+ NSPoint eventLocation = [fView convertPoint:NSMakePoint(fDragPos.x, fDragPos.y) toView:nil];
+ eventLocation.y = [[fView window] frame].size.height - eventLocation.y;
+
// Convert fTriggerEventTimeStamp to NS - AWTEvent.h defines UTC(nsEvent) as ((jlong)[event timestamp] * 1000):
NSTimeInterval timeStamp = fTriggerEventTimeStamp / 1000;
@@ -497,12 +497,9 @@
NSImage* dragImage = fDragImage;
// Get drag origin and offset:
- NSPoint dragOrigin;
- dragOrigin.x = fDragPos.x;
- dragOrigin.y = fDragPos.y;
- dragOrigin = [view convertPoint:[dragEvent locationInWindow] fromView:nil];
+ NSPoint dragOrigin = [dragEvent locationInWindow];
dragOrigin.x += fDragImageOffset.x;
- dragOrigin.y += [dragImage size].height + fDragImageOffset.y;
+ dragOrigin.y -= fDragImageOffset.y + [dragImage size].height;
// Drag offset values don't seem to matter:
NSSize dragOffset = NSMakeSize(0, 0);
@@ -516,7 +513,6 @@
DLog5(@" - drag image: %f, %f (%f x %f)", fDragImageOffset.x, fDragImageOffset.y, [dragImage size].width, [dragImage size].height);
DLog3(@" - event point (window) %f, %f", [dragEvent locationInWindow].x, [dragEvent locationInWindow].y);
DLog3(@" - drag point (view) %f, %f", dragOrigin.x, dragOrigin.y);
-
// Set up the fDragKeyModifier, so we know if the operation has changed
// Set up the fDragMouseModifier, so we can |= it later (since CoreDrag doesn't tell us mouse states during a drag)
fDragKeyModifiers = [DnDUtilities extractJavaExtKeyModifiersFromJavaExtModifiers:fModifiers];
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Wed Feb 13 13:01:16 2013 -0800
@@ -1287,19 +1287,24 @@
if (localRef == 0) {
globalRef = null; // N.B. global null reference is -1
} else {
- globalRef = holder.getCPMap()[localRef];
- if (e.refKind == CONSTANT_Signature
+ Entry[] cpMap = holder.getCPMap();
+ globalRef = (localRef >= 0 && localRef < cpMap.length
+ ? cpMap[localRef]
+ : null);
+ byte tag = e.refKind;
+ if (globalRef != null && tag == CONSTANT_Signature
&& globalRef.getTag() == CONSTANT_Utf8) {
// Cf. ClassReader.readSignatureRef.
String typeName = globalRef.stringValue();
globalRef = ConstantPool.getSignatureEntry(typeName);
- } else if (e.refKind == CONSTANT_FieldSpecific) {
- assert(globalRef.getTag() >= CONSTANT_Integer);
- assert(globalRef.getTag() <= CONSTANT_String ||
- globalRef.getTag() >= CONSTANT_MethodHandle);
- assert(globalRef.getTag() <= CONSTANT_MethodType);
- } else if (e.refKind < CONSTANT_GroupFirst) {
- assert(e.refKind == globalRef.getTag());
+ }
+ String got = (globalRef == null
+ ? "invalid CP index"
+ : "type=" + ConstantPool.tagName(globalRef.tag));
+ if (globalRef == null || !globalRef.tagMatches(tag)) {
+ throw new IllegalArgumentException(
+ "Bad constant, expected type=" +
+ ConstantPool.tagName(tag) + " got " + got);
}
}
out.putRef(bandIndex, globalRef);
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -54,6 +54,7 @@
Package pkg;
Class cls;
long inPos;
+ long constantPoolLimit = -1;
DataInputStream in;
Map<Attribute.Layout, Attribute> attrDefs;
Map<Attribute.Layout, String> attrCommands;
@@ -117,15 +118,33 @@
private Entry readRef(byte tag) throws IOException {
Entry e = readRef();
- assert(e != null);
assert(!(e instanceof UnresolvedEntry));
- assert(e.tagMatches(tag));
+ checkTag(e, tag);
return e;
}
+ /** Throw a ClassFormatException if the entry does not match the expected tag type. */
+ private Entry checkTag(Entry e, byte tag) throws ClassFormatException {
+ if (e == null || !e.tagMatches(tag)) {
+ String where = (inPos == constantPoolLimit
+ ? " in constant pool"
+ : " at pos: " + inPos);
+ String got = (e == null
+ ? "null CP index"
+ : "type=" + ConstantPool.tagName(e.tag));
+ throw new ClassFormatException("Bad constant, expected type=" +
+ ConstantPool.tagName(tag) +
+ " got "+ got + ", in File: " + cls.file.nameString + where);
+ }
+ return e;
+ }
+ private Entry checkTag(Entry e, byte tag, boolean nullOK) throws ClassFormatException {
+ return nullOK && e == null ? null : checkTag(e, tag);
+ }
+
private Entry readRefOrNull(byte tag) throws IOException {
Entry e = readRef();
- assert(e == null || e.tagMatches(tag));
+ checkTag(e, tag, true);
return e;
}
@@ -143,8 +162,10 @@
private SignatureEntry readSignatureRef() throws IOException {
// The class file stores a Utf8, but we want a Signature.
- Entry e = readRef(CONSTANT_Utf8);
- return ConstantPool.getSignatureEntry(e.stringValue());
+ Entry e = readRef(CONSTANT_Signature);
+ return (e != null && e.getTag() == CONSTANT_Utf8)
+ ? ConstantPool.getSignatureEntry(e.stringValue())
+ : (SignatureEntry) e;
}
void read() throws IOException {
@@ -279,6 +300,7 @@
" at pos: " + inPos);
}
}
+ constantPoolLimit = inPos;
// Fix up refs, which might be out of order.
while (fptr > 0) {
@@ -311,25 +333,25 @@
case CONSTANT_Fieldref:
case CONSTANT_Methodref:
case CONSTANT_InterfaceMethodref:
- ClassEntry mclass = (ClassEntry) cpMap[ref];
- DescriptorEntry mdescr = (DescriptorEntry) cpMap[ref2];
+ ClassEntry mclass = (ClassEntry) checkTag(cpMap[ref], CONSTANT_Class);
+ DescriptorEntry mdescr = (DescriptorEntry) checkTag(cpMap[ref2], CONSTANT_NameandType);
cpMap[cpi] = ConstantPool.getMemberEntry((byte)tag, mclass, mdescr);
break;
case CONSTANT_NameandType:
- Utf8Entry mname = (Utf8Entry) cpMap[ref];
- Utf8Entry mtype = (Utf8Entry) cpMap[ref2];
+ Utf8Entry mname = (Utf8Entry) checkTag(cpMap[ref], CONSTANT_Utf8);
+ Utf8Entry mtype = (Utf8Entry) checkTag(cpMap[ref2], CONSTANT_Signature);
cpMap[cpi] = ConstantPool.getDescriptorEntry(mname, mtype);
break;
case CONSTANT_MethodType:
- cpMap[cpi] = ConstantPool.getMethodTypeEntry((Utf8Entry) cpMap[ref]);
+ cpMap[cpi] = ConstantPool.getMethodTypeEntry((Utf8Entry) checkTag(cpMap[ref], CONSTANT_Signature));
break;
case CONSTANT_MethodHandle:
byte refKind = (byte)(-1 ^ ref);
- MemberEntry memRef = (MemberEntry) cpMap[ref2];
+ MemberEntry memRef = (MemberEntry) checkTag(cpMap[ref2], CONSTANT_AnyMember);
cpMap[cpi] = ConstantPool.getMethodHandleEntry(refKind, memRef);
break;
case CONSTANT_InvokeDynamic:
- DescriptorEntry idescr = (DescriptorEntry) cpMap[ref2];
+ DescriptorEntry idescr = (DescriptorEntry) checkTag(cpMap[ref2], CONSTANT_NameandType);
cpMap[cpi] = new UnresolvedEntry((byte)tag, (-1 ^ ref), idescr);
// Note that ref must be resolved later, using the BootstrapMethods attribute.
break;
@@ -541,7 +563,8 @@
code.max_locals = readUnsignedShort();
code.bytes = new byte[readInt()];
in.readFully(code.bytes);
- Instruction.opcodeChecker(code.bytes);
+ Entry[] cpMap = cls.getCPMap();
+ Instruction.opcodeChecker(code.bytes, cpMap);
int nh = readUnsignedShort();
code.setHandlerCount(nh);
for (int i = 0; i < nh; i++) {
@@ -559,7 +582,7 @@
MethodHandleEntry bsmRef = (MethodHandleEntry) readRef(CONSTANT_MethodHandle);
Entry[] argRefs = new Entry[readUnsignedShort()];
for (int j = 0; j < argRefs.length; j++) {
- argRefs[j] = readRef();
+ argRefs[j] = readRef(CONSTANT_LoadableValue);
}
bsms[i] = ConstantPool.getBootstrapMethodEntry(bsmRef, argRefs);
}
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -243,8 +243,32 @@
return tag == CONSTANT_Double || tag == CONSTANT_Long;
}
- public final boolean tagMatches(int tag) {
- return (this.tag == tag);
+ public final boolean tagMatches(int matchTag) {
+ if (tag == matchTag)
+ return true;
+ byte[] allowedTags;
+ switch (matchTag) {
+ case CONSTANT_All:
+ return true;
+ case CONSTANT_Signature:
+ return tag == CONSTANT_Utf8; // format check also?
+ case CONSTANT_LoadableValue:
+ allowedTags = LOADABLE_VALUE_TAGS;
+ break;
+ case CONSTANT_AnyMember:
+ allowedTags = ANY_MEMBER_TAGS;
+ break;
+ case CONSTANT_FieldSpecific:
+ allowedTags = FIELD_SPECIFIC_TAGS;
+ break;
+ default:
+ return false;
+ }
+ for (byte b : allowedTags) {
+ if (b == tag)
+ return true;
+ }
+ return false;
}
public String toString() {
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -647,7 +647,7 @@
}
}
- public static void opcodeChecker(byte[] code) throws FormatException {
+ public static void opcodeChecker(byte[] code, ConstantPool.Entry[] cpMap) throws FormatException {
Instruction i = at(code, 0);
while (i != null) {
int opcode = i.getBC();
@@ -655,6 +655,16 @@
String message = "illegal opcode: " + opcode + " " + i;
throw new FormatException(message);
}
+ ConstantPool.Entry e = i.getCPRef(cpMap);
+ if (e != null) {
+ byte tag = i.getCPTag();
+ if (!e.tagMatches(tag)) {
+ String message = "illegal reference, expected type=" +
+ ConstantPool.tagName(tag) + ": " +
+ i.toString(cpMap);
+ throw new FormatException(message);
+ }
+ }
i = i.next();
}
}
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Wed Feb 13 13:01:16 2013 -0800
@@ -1618,6 +1618,16 @@
bc_which = null;
assert(false);
}
+ if (ref != null && bc_which.index != null && !bc_which.index.contains(ref)) {
+ // Crash and burn with a complaint if there are funny
+ // references for this bytecode instruction.
+ // Example: invokestatic of a CONSTANT_InterfaceMethodref.
+ String complaint = code.getMethod() +
+ " contains a bytecode " + i +
+ " with an unsupported constant reference; please use the pass-file option on this class.";
+ Utils.log.warning(complaint);
+ throw new IOException(complaint);
+ }
bc_codes.putByte(vbc);
bc_which.putRef(ref);
// handle trailing junk
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -180,6 +180,15 @@
}
unknownAttrCommand = uaMode.intern();
}
+ final String classFormatCommand;
+ {
+ String fmtMode = props.getProperty(Utils.CLASS_FORMAT_ERROR, Pack200.Packer.PASS);
+ if (!(Pack200.Packer.PASS.equals(fmtMode) ||
+ Pack200.Packer.ERROR.equals(fmtMode))) {
+ throw new RuntimeException("Bad option: " + Utils.CLASS_FORMAT_ERROR + " = " + fmtMode);
+ }
+ classFormatCommand = fmtMode.intern();
+ }
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -505,8 +514,7 @@
}
} else if (ioe instanceof ClassReader.ClassFormatException) {
ClassReader.ClassFormatException ce = (ClassReader.ClassFormatException) ioe;
- // %% TODO: Do we invent a new property for this or reuse %%
- if (unknownAttrCommand.equals(Pack200.Packer.PASS)) {
+ if (classFormatCommand.equals(Pack200.Packer.PASS)) {
Utils.log.info(ce.toString());
Utils.log.warning(message + " unknown class format: " +
fname);
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -112,6 +112,11 @@
// Pass through files with unrecognized attributes by default.
props.put(Pack200.Packer.UNKNOWN_ATTRIBUTE, Pack200.Packer.PASS);
+ // Pass through files with unrecognized format by default, also
+ // allow system property to be set
+ props.put(Utils.CLASS_FORMAT_ERROR,
+ System.getProperty(Utils.CLASS_FORMAT_ERROR, Pack200.Packer.PASS));
+
// Default effort is 5, midway between 1 and 9.
props.put(Pack200.Packer.EFFORT, "5");
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -122,6 +122,12 @@
*/
static final String PACK_ZIP_ARCHIVE_MARKER_COMMENT = "PACK200";
+ /*
+ * behaviour when we hit a class format error, but not necessarily
+ * an unknown attribute, by default it is allowed to PASS.
+ */
+ static final String CLASS_FORMAT_ERROR = COM_PREFIX+"class.format.error";
+
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
// to the engine code, especially the native code.
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Wed Feb 13 13:01:16 2013 -0800
@@ -50,8 +50,6 @@
import javax.management.NotCompliantMBeanException;
import com.sun.jmx.remote.util.EnvHelp;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import javax.management.AttributeNotFoundException;
--- a/jdk/src/share/classes/java/awt/Component.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/awt/Component.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -8994,7 +8994,10 @@
* to the individual objects which extend Component.
*/
- AccessibleContext accessibleContext = null;
+ /**
+ * The {@code AccessibleContext} associated with this {@code Component}.
+ */
+ protected AccessibleContext accessibleContext = null;
/**
* Gets the <code>AccessibleContext</code> associated
@@ -9034,6 +9037,13 @@
protected AccessibleAWTComponent() {
}
+ /**
+ * Number of PropertyChangeListener objects registered. It's used
+ * to add/remove ComponentListener and FocusListener to track
+ * target Component's state.
+ */
+ private volatile transient int propertyListenersCount = 0;
+
protected ComponentListener accessibleAWTComponentHandler = null;
protected FocusListener accessibleAWTFocusHandler = null;
@@ -9098,10 +9108,12 @@
public void addPropertyChangeListener(PropertyChangeListener listener) {
if (accessibleAWTComponentHandler == null) {
accessibleAWTComponentHandler = new AccessibleAWTComponentHandler();
- Component.this.addComponentListener(accessibleAWTComponentHandler);
}
if (accessibleAWTFocusHandler == null) {
accessibleAWTFocusHandler = new AccessibleAWTFocusHandler();
+ }
+ if (propertyListenersCount++ == 0) {
+ Component.this.addComponentListener(accessibleAWTComponentHandler);
Component.this.addFocusListener(accessibleAWTFocusHandler);
}
super.addPropertyChangeListener(listener);
@@ -9115,13 +9127,9 @@
* @param listener The PropertyChangeListener to be removed
*/
public void removePropertyChangeListener(PropertyChangeListener listener) {
- if (accessibleAWTComponentHandler != null) {
+ if (--propertyListenersCount == 0) {
Component.this.removeComponentListener(accessibleAWTComponentHandler);
- accessibleAWTComponentHandler = null;
- }
- if (accessibleAWTFocusHandler != null) {
Component.this.removeFocusListener(accessibleAWTFocusHandler);
- accessibleAWTFocusHandler = null;
}
super.removePropertyChangeListener(listener);
}
--- a/jdk/src/share/classes/java/awt/Container.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/awt/Container.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -3824,6 +3824,12 @@
return Container.this.getAccessibleAt(p);
}
+ /**
+ * Number of PropertyChangeListener objects registered. It's used
+ * to add/remove ContainerListener to track target Container's state.
+ */
+ private volatile transient int propertyListenersCount = 0;
+
protected ContainerListener accessibleContainerHandler = null;
/**
@@ -3859,11 +3865,27 @@
public void addPropertyChangeListener(PropertyChangeListener listener) {
if (accessibleContainerHandler == null) {
accessibleContainerHandler = new AccessibleContainerHandler();
+ }
+ if (propertyListenersCount++ == 0) {
Container.this.addContainerListener(accessibleContainerHandler);
}
super.addPropertyChangeListener(listener);
}
+ /**
+ * Remove a PropertyChangeListener from the listener list.
+ * This removes a PropertyChangeListener that was registered
+ * for all properties.
+ *
+ * @param listener the PropertyChangeListener to be removed
+ */
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ if (--propertyListenersCount == 0) {
+ Container.this.removeContainerListener(accessibleContainerHandler);
+ }
+ super.removePropertyChangeListener(listener);
+ }
+
} // inner class AccessibleAWTContainer
/**
--- a/jdk/src/share/classes/java/lang/Class.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/Class.java Wed Feb 13 13:01:16 2013 -0800
@@ -29,12 +29,14 @@
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Member;
import java.lang.reflect.Field;
+import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.AnnotatedType;
import java.lang.ref.SoftReference;
import java.io.InputStream;
import java.io.ObjectStreamField;
@@ -2325,6 +2327,11 @@
// Annotations handling
private native byte[] getRawAnnotations();
+ // Since 1.8
+ native byte[] getRawTypeAnnotations();
+ static byte[] getExecutableTypeAnnotationBytes(Executable ex) {
+ return getReflectionFactory().getExecutableTypeAnnotationBytes(ex);
+ }
native ConstantPool getConstantPool();
@@ -3068,21 +3075,12 @@
* @throws NullPointerException {@inheritDoc}
* @since 1.5
*/
+ @SuppressWarnings("unchecked")
public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
Objects.requireNonNull(annotationClass);
initAnnotationsIfNecessary();
- return AnnotationSupport.getOneAnnotation(annotations, annotationClass);
- }
-
- /**
- * @throws NullPointerException {@inheritDoc}
- * @since 1.5
- */
- public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
- Objects.requireNonNull(annotationClass);
-
- return getAnnotation(annotationClass) != null;
+ return (A) annotations.get(annotationClass);
}
/**
@@ -3101,18 +3099,19 @@
*/
public Annotation[] getAnnotations() {
initAnnotationsIfNecessary();
- return AnnotationSupport.unpackToArray(annotations);
+ return AnnotationParser.toArray(annotations);
}
/**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
+ @SuppressWarnings("unchecked")
public <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass) {
Objects.requireNonNull(annotationClass);
initAnnotationsIfNecessary();
- return AnnotationSupport.getOneAnnotation(declaredAnnotations, annotationClass);
+ return (A) declaredAnnotations.get(annotationClass);
}
/**
@@ -3131,17 +3130,7 @@
*/
public Annotation[] getDeclaredAnnotations() {
initAnnotationsIfNecessary();
- return AnnotationSupport.unpackToArray(declaredAnnotations);
- }
-
- /** Returns one "directly" present annotation or null */
- <A extends Annotation> A getDirectDeclaredAnnotation(Class<A> annotationClass) {
- Objects.requireNonNull(annotationClass);
-
- initAnnotationsIfNecessary();
- @SuppressWarnings("unchecked") // TODO check safe
- A ret = (A)declaredAnnotations.get(annotationClass);
- return ret;
+ return AnnotationParser.toArray(declaredAnnotations);
}
// Annotations cache
@@ -3196,4 +3185,53 @@
* Maintained by the ClassValue class.
*/
transient ClassValue.ClassValueMap classValueMap;
+
+ /**
+ * Returns an AnnotatedType object that represents the use of a type to specify
+ * the superclass of the entity represented by this Class. (The <em>use</em> of type
+ * Foo to specify the superclass in '... extends Foo' is distinct from the
+ * <em>declaration</em> of type Foo.)
+ *
+ * If this Class represents a class type whose declaration does not explicitly
+ * indicate an annotated superclass, the return value is null.
+ *
+ * If this Class represents either the Object class, an interface type, an
+ * array type, a primitive type, or void, the return value is null.
+ *
+ * @since 1.8
+ */
+ public AnnotatedType getAnnotatedSuperclass() {
+ return TypeAnnotationParser.buildAnnotatedSuperclass(getRawTypeAnnotations(), getConstantPool(), this);
}
+
+ /**
+ * Returns an array of AnnotatedType objects that represent the use of types to
+ * specify superinterfaces of the entity represented by this Class. (The <em>use</em>
+ * of type Foo to specify a superinterface in '... implements Foo' is
+ * distinct from the <em>declaration</em> of type Foo.)
+ *
+ * If this Class represents a class, the return value is an array
+ * containing objects representing the uses of interface types to specify
+ * interfaces implemented by the class. The order of the objects in the
+ * array corresponds to the order of the interface types used in the
+ * 'implements' clause of the declaration of this Class.
+ *
+ * If this Class represents an interface, the return value is an array
+ * containing objects representing the uses of interface types to specify
+ * interfaces directly extended by the interface. The order of the objects in
+ * the array corresponds to the order of the interface types used in the
+ * 'extends' clause of the declaration of this Class.
+ *
+ * If this Class represents a class or interface whose declaration does not
+ * explicitly indicate any annotated superinterfaces, the return value is an
+ * array of length 0.
+ *
+ * If this Class represents either the Object class, an array type, a
+ * primitive type, or void, the return value is an array of length 0.
+ *
+ * @since 1.8
+ */
+ public AnnotatedType[] getAnnotatedInterfaces() {
+ return TypeAnnotationParser.buildAnnotatedInterfaces(getRawTypeAnnotations(), getConstantPool(), this);
+ }
+}
--- a/jdk/src/share/classes/java/lang/Double.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/Double.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -289,7 +289,7 @@
return Double.toString(d);
else {
// Initialized to maximum size of output.
- StringBuffer answer = new StringBuffer(24);
+ StringBuilder answer = new StringBuilder(24);
if (Math.copySign(1.0, d) == -1.0) // value is negative,
answer.append("-"); // so append sign info
@@ -300,8 +300,7 @@
if(d == 0.0) {
answer.append("0.0p0");
- }
- else {
+ } else {
boolean subnormal = (d < DoubleConsts.MIN_NORMAL);
// Isolate significand bits and OR in a high-order bit
@@ -324,13 +323,14 @@
"0":
signif.replaceFirst("0{1,12}$", ""));
+ answer.append('p');
// If the value is subnormal, use the E_min exponent
// value for double; otherwise, extract and report d's
// exponent (the representation of a subnormal uses
// E_min -1).
- answer.append("p" + (subnormal ?
- DoubleConsts.MIN_EXPONENT:
- Math.getExponent(d) ));
+ answer.append(subnormal ?
+ DoubleConsts.MIN_EXPONENT:
+ Math.getExponent(d));
}
return answer.toString();
}
--- a/jdk/src/share/classes/java/lang/Package.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/Package.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -387,15 +387,6 @@
/**
* @throws NullPointerException {@inheritDoc}
- * @since 1.5
- */
- public boolean isAnnotationPresent(
- Class<? extends Annotation> annotationClass) {
- return getPackageInfo().isAnnotationPresent(annotationClass);
- }
-
- /**
- * @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
public <A extends Annotation> A[] getAnnotations(Class<A> annotationClass) {
--- a/jdk/src/share/classes/java/lang/System.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/System.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -25,7 +25,7 @@
package java.lang;
import java.io.*;
-import java.lang.annotation.Annotation;
+import java.lang.reflect.Executable;
import java.util.Properties;
import java.util.PropertyPermission;
import java.util.StringTokenizer;
@@ -1196,8 +1196,11 @@
public AnnotationType getAnnotationType(Class<?> klass) {
return klass.getAnnotationType();
}
- public <A extends Annotation> A getDirectDeclaredAnnotation(Class<?> klass, Class<A> anno) {
- return klass.getDirectDeclaredAnnotation(anno);
+ public byte[] getRawClassTypeAnnotations(Class<?> klass) {
+ return klass.getRawTypeAnnotations();
+ }
+ public byte[] getRawExecutableTypeAnnotations(Executable executable) {
+ return Class.getExecutableTypeAnnotationBytes(executable);
}
public <E extends Enum<E>>
E[] getEnumConstantsShared(Class<E> klass) {
--- a/jdk/src/share/classes/java/lang/annotation/ContainedBy.java Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +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. 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 java.lang.annotation;
-
-/**
- * The annotation type {@code java.lang.annotation.ContainedBy} is
- * used to indicate that the annotation type whose declaration it
- * (meta-)annotates is <em>repeatable</em>. The value of
- * {@code @ContainedBy} indicates the <em>containing annotation
- * type</em> for the repeatable annotation type.
- *
- * <p>The pair of annotation types {@code @ContainedBy} and
- * {@link java.lang.annotation.ContainerFor @ContainerFor} are used to
- * indicate that annotation types are repeatable. Specifically:
- *
- * <ul>
- * <li>The annotation type {@code @ContainedBy} is used on the
- * declaration of a repeatable annotation type (JLS 9.6) to indicate
- * its containing annotation type.
- *
- * <li>The annotation type {@code @ContainerFor} is used on the
- * declaration of a containing annotation type (JLS 9.6) to indicate
- * the repeatable annotation type for which it serves as the
- * containing annotation type.
- * </ul>
- *
- * <p>
- * An inconsistent pair of {@code @ContainedBy} and
- * {@code @ContainerFor} annotations on a repeatable annotation type
- * and its containing annotation type (JLS 9.6) will lead to
- * compile-time errors and runtime exceptions when using reflection to
- * read annotations of a repeatable type.
- *
- * @see java.lang.annotation.ContainerFor
- * @since 1.8
- * @jls 9.6 Annotation Types
- * @jls 9.7 Annotations
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface ContainedBy {
- /**
- * Indicates the <em>containing annotation type</em> for the
- * repeatable annotation type.
- */
- Class<? extends Annotation> value();
-}
--- a/jdk/src/share/classes/java/lang/annotation/ContainerFor.java Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +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. 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 java.lang.annotation;
-
-/**
- * The annotation type {@code java.lang.annotation.ContainerFor} is
- * used to indicate that the annotation type whose declaration it
- * (meta-)annotates is a <em>containing annotation type</em>. The
- * value of {@code @ContainerFor} indicates the <em>repeatable
- * annotation type</em> for the containing annotation type.
- *
- * <p>The pair of annotation types {@link
- * java.lang.annotation.ContainedBy @ContainedBy} and
- * {@code @ContainerFor} are used to indicate that annotation types
- * are repeatable. Specifically:
- *
- * <ul>
- * <li>The annotation type {@code @ContainedBy} is used on the
- * declaration of a repeatable annotation type (JLS 9.6) to indicate
- * its containing annotation type.
- *
- * <li>The annotation type {@code @ContainerFor} is used on the
- * declaration of a containing annotation type (JLS 9.6) to indicate
- * the repeatable annotation type for which it serves as the
- * containing annotation type.
- * </ul>
- *
- * <p>
- * An inconsistent pair of {@code @ContainedBy} and
- * {@code @ContainerFor} annotations on a repeatable annotation type
- * and its containing annotation type (JLS 9.6) will lead to
- * compile-time errors and runtime exceptions when using reflection to
- * read annotations of a repeatable type.
- *
- * @see java.lang.annotation.ContainedBy
- * @since 1.8
- * @jls 9.6 Annotation Types
- * @jls 9.7 Annotations
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface ContainerFor {
-
- /**
- * Indicates the repeatable annotation type for the containing
- * annotation type.
- */
- Class<? extends Annotation> value();
-}
--- a/jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,10 +27,9 @@
import java.util.Objects;
/**
- * Thrown to indicate that an annotation type whose declaration is
- * (meta-)annotated with a {@link ContainerFor} annotation is not, in
- * fact, the <em>containing annotation type of the type named by {@link
- * ContainerFor}</em>.
+ * Thrown to indicate that an annotation type expected to act as a
+ * container for another annotation type by virture of an @Repeatable
+ * annotation, does not act as a container.
*
* @see java.lang.reflect.AnnotatedElement
* @since 1.8
--- a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Wed Feb 13 13:01:16 2013 -0800
@@ -182,14 +182,6 @@
/**
* @throws NullPointerException {@inheritDoc}
- * @since 1.5
- */
- public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
- return getAnnotation(annotationClass) != null;
- }
-
- /**
- * @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
public <T extends Annotation> T[] getAnnotations(Class<T> annotationClass) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedArrayType.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,43 @@
+/*
+ * 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. 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 java.lang.reflect;
+
+
+/**
+ * AnnotatedArrayType represents the use of an array type, whose component
+ * type may itself represent the annotated use of a type.
+ *
+ * @since 1.8
+ */
+public interface AnnotatedArrayType extends AnnotatedType {
+
+ /**
+ * Returns the annotated generic component type of this array type.
+ *
+ * @return the annotated generic component type of this array type
+ */
+ AnnotatedType getAnnotatedGenericComponentType();
+}
--- a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -35,6 +35,24 @@
* arrays returned by accessors for array-valued enum members; it will
* have no affect on the arrays returned to other callers.
*
+ * <p>An annotation A is <em>directly present</em> on an element E if the
+ * RuntimeVisibleAnnotations or RuntimeVisibleParameterAnnotations attribute
+ * associated with E either:
+ * <ul>
+ * <li>contains A; or
+ * <li>for invocations of get[Declared]Annotations(Class<T>),
+ * contains A or exactly one annotation C whose type is the containing
+ * annotation type of A's type (JLS 9.6) and whose value element contains A
+ * </ul>
+ *
+ * <p>An annotation A is <em>present</em> on an element E if either:
+ * <ul>
+ * <li>A is <em>directly present</em> on E; or
+ * <li>There are no annotations of A's type which are <em>directly present</em>
+ * on E, and E is a class, and A's type is inheritable (JLS 9.6.3.3), and A is
+ * present on the superclass of E
+ * </ul>
+ *
* <p>If an annotation returned by a method in this interface contains
* (directly or indirectly) a {@link Class}-valued member referring to
* a class that is not accessible in this VM, attempting to read the class
@@ -50,7 +68,7 @@
* containing annotation type of T will result in an
* InvalidContainerAnnotationError.
*
- * <p>Finally, Attempting to read a member whose definition has evolved
+ * <p>Finally, attempting to read a member whose definition has evolved
* incompatibly will result in a {@link
* java.lang.annotation.AnnotationTypeMismatchException} or an
* {@link java.lang.annotation.IncompleteAnnotationException}.
@@ -70,6 +88,12 @@
* is present on this element, else false. This method
* is designed primarily for convenient access to marker annotations.
*
+ * <p>The truth value returned by this method is equivalent to:
+ * {@code getAnnotation(annotationClass) != null}
+ *
+ * <p>The body of the default method is specified to be the code
+ * above.
+ *
* @param annotationClass the Class object corresponding to the
* annotation type
* @return true if an annotation for the specified annotation
@@ -77,7 +101,9 @@
* @throws NullPointerException if the given annotation class is null
* @since 1.5
*/
- boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
+ default boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return getAnnotation(annotationClass) != null;
+ }
/**
* Returns this element's annotation for the specified type if
@@ -110,12 +136,15 @@
<T extends Annotation> T[] getAnnotations(Class<T> annotationClass);
/**
- * Returns all annotations present on this element. (Returns an array
- * of length zero if this element has no annotations.) The caller of
- * this method is free to modify the returned array; it will have no
- * effect on the arrays returned to other callers.
+ * Returns annotations that are <em>present</em> on this element.
+ *
+ * If there are no annotations <em>present</em> on this element, the return
+ * value is an array of length 0.
*
- * @return all annotations present on this element
+ * The caller of this method is free to modify the returned array; it will
+ * have no effect on the arrays returned to other callers.
+ *
+ * @return annotations present on this element
* @since 1.5
*/
Annotation[] getAnnotations();
@@ -157,14 +186,16 @@
<T extends Annotation> T[] getDeclaredAnnotations(Class<T> annotationClass);
/**
- * Returns all annotations that are directly present on this
- * element. This method ignores inherited annotations. (Returns
- * an array of length zero if no annotations are directly present
- * on this element.) The caller of this method is free to modify
- * the returned array; it will have no effect on the arrays
- * returned to other callers.
+ * Returns annotations that are <em>directly present</em> on this element.
+ * This method ignores inherited annotations.
*
- * @return All annotations directly present on this element
+ * If there are no annotations <em>directly present</em> on this element,
+ * the return value is an array of length 0.
+ *
+ * The caller of this method is free to modify the returned array; it will
+ * have no effect on the arrays returned to other callers.
+ *
+ * @return annotations directly present on this element
* @since 1.5
*/
Annotation[] getDeclaredAnnotations();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedParameterizedType.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,42 @@
+/*
+ * 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. 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 java.lang.reflect;
+
+/**
+ * AnnotatedParameterizedType represents the use of a parameterized type,
+ * whose type arguments may themselves represent annotated uses of types.
+ *
+ * @since 1.8
+ */
+public interface AnnotatedParameterizedType extends AnnotatedType {
+
+ /**
+ * Returns the annotated actual type arguments of this parameterized type.
+ *
+ * @return the annotated actual type arguments of this parameterized type
+ */
+ AnnotatedType[] getAnnotatedActualTypeArguments();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedType.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,44 @@
+/*
+ * 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. 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 java.lang.reflect;
+
+/**
+ * AnnotatedType represents the annotated use of a type in the program
+ * currently running in this VM. The use may be of any type in the Java
+ * programming language, including an array type, a parameterized type, a type
+ * variable, or a wildcard type.
+ *
+ * @since 1.8
+ */
+public interface AnnotatedType extends AnnotatedElement {
+
+ /**
+ * Returns the underlying type that this annotated type represents.
+ *
+ * @return the type this annotated type represents
+ */
+ public Type getType();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedTypeVariable.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,43 @@
+/*
+ * 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. 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 java.lang.reflect;
+
+/**
+ * AnnotatedTypeVariable represents the use of a type variable, whose
+ * declaration may have bounds which themselves represent annotated uses of
+ * types.
+ *
+ * @since 1.8
+ */
+public interface AnnotatedTypeVariable extends AnnotatedType {
+
+ /**
+ * Returns the annotated bounds of this type variable.
+ *
+ * @return the annotated bounds of this type variable
+ */
+ AnnotatedType[] getAnnotatedBounds();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedWildcardType.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,49 @@
+/*
+ * 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. 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 java.lang.reflect;
+
+/**
+ * AnnotatedWildcardType represents the use of a wildcard type argument, whose
+ * upper or lower bounds may themselves represent annotated uses of types.
+ *
+ * @since 1.8
+ */
+public interface AnnotatedWildcardType extends AnnotatedType {
+
+ /**
+ * Returns the annotated lower bounds of this wildcard type.
+ *
+ * @return the annotated lower bounds of this wildcard type
+ */
+ AnnotatedType[] getAnnotatedLowerBounds();
+
+ /**
+ * Returns the annotated upper bounds of this wildcard type.
+ *
+ * @return the annotated upper bounds of this wildcard type
+ */
+ AnnotatedType[] getAnnotatedUpperBounds();
+}
--- a/jdk/src/share/classes/java/lang/reflect/Constructor.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/Constructor.java Wed Feb 13 13:01:16 2013 -0800
@@ -154,6 +154,10 @@
byte[] getAnnotationBytes() {
return annotations;
}
+ @Override
+ byte[] getTypeAnnotationBytes() {
+ return typeAnnotations;
+ }
/**
* {@inheritDoc}
@@ -523,4 +527,12 @@
}
}
}
+
+ /**
+ * {@inheritDoc}
+ * @since 1.8
+ */
+ public AnnotatedType getAnnotatedReturnType() {
+ return getAnnotatedReturnType0(getDeclaringClass());
+ }
}
--- a/jdk/src/share/classes/java/lang/reflect/Executable.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/Executable.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,11 +26,12 @@
package java.lang.reflect;
import java.lang.annotation.*;
-import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import sun.reflect.annotation.AnnotationParser;
import sun.reflect.annotation.AnnotationSupport;
+import sun.reflect.annotation.TypeAnnotationParser;
+import sun.reflect.annotation.TypeAnnotation;
import sun.reflect.generics.repository.ConstructorRepository;
/**
@@ -50,6 +51,7 @@
* Accessor method to allow code sharing
*/
abstract byte[] getAnnotationBytes();
+ abstract byte[] getTypeAnnotationBytes();
/**
* Does the Executable have generic information.
@@ -435,8 +437,7 @@
*/
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
-
- return AnnotationSupport.getOneAnnotation(declaredAnnotations(), annotationClass);
+ return annotationClass.cast(declaredAnnotations().get(annotationClass));
}
/**
@@ -454,7 +455,7 @@
* {@inheritDoc}
*/
public Annotation[] getDeclaredAnnotations() {
- return AnnotationSupport.unpackToArray(declaredAnnotations());
+ return AnnotationParser.toArray(declaredAnnotations());
}
private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
@@ -470,4 +471,86 @@
return declaredAnnotations;
}
+
+ /* Helper for subclasses of Executable.
+ *
+ * Returns an AnnotatedType object that represents the use of a type to
+ * specify the return type of the method/constructor represented by this
+ * Executable.
+ *
+ * @since 1.8
+ */
+ AnnotatedType getAnnotatedReturnType0(Type returnType) {
+ return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes(),
+ sun.misc.SharedSecrets.getJavaLangAccess().
+ getConstantPool(getDeclaringClass()),
+ this,
+ getDeclaringClass(),
+ returnType,
+ TypeAnnotation.TypeAnnotationTarget.METHOD_RETURN_TYPE);
+ }
+
+ /**
+ * Returns an AnnotatedType object that represents the use of a type to
+ * specify the receiver type of the method/constructor represented by this
+ * Executable. The receiver type of a method/constructor is available only
+ * if the method/constructor declares a formal parameter called 'this'.
+ *
+ * Returns null if this Executable represents a constructor or instance
+ * method that either declares no formal parameter called 'this', or
+ * declares a formal parameter called 'this' with no annotations on its
+ * type.
+ *
+ * Returns null if this Executable represents a static method.
+ *
+ * @since 1.8
+ */
+ public AnnotatedType getAnnotatedReceiverType() {
+ return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes(),
+ sun.misc.SharedSecrets.getJavaLangAccess().
+ getConstantPool(getDeclaringClass()),
+ this,
+ getDeclaringClass(),
+ getDeclaringClass(),
+ TypeAnnotation.TypeAnnotationTarget.METHOD_RECEIVER_TYPE);
+ }
+
+ /**
+ * Returns an array of AnnotatedType objects that represent the use of
+ * types to specify formal parameter types of the method/constructor
+ * represented by this Executable. The order of the objects in the array
+ * corresponds to the order of the formal parameter types in the
+ * declaration of the method/constructor.
+ *
+ * Returns an array of length 0 if the method/constructor declares no
+ * parameters.
+ *
+ * @since 1.8
+ */
+ public AnnotatedType[] getAnnotatedParameterTypes() {
+ throw new UnsupportedOperationException("Not yet");
+ }
+
+ /**
+ * Returns an array of AnnotatedType objects that represent the use of
+ * types to specify the declared exceptions of the method/constructor
+ * represented by this Executable. The order of the objects in the array
+ * corresponds to the order of the exception types in the declaration of
+ * the method/constructor.
+ *
+ * Returns an array of length 0 if the method/constructor declares no
+ * exceptions.
+ *
+ * @since 1.8
+ */
+ public AnnotatedType[] getAnnotatedExceptionTypes() {
+ return TypeAnnotationParser.buildAnnotatedTypes(getTypeAnnotationBytes(),
+ sun.misc.SharedSecrets.getJavaLangAccess().
+ getConstantPool(getDeclaringClass()),
+ this,
+ getDeclaringClass(),
+ getGenericExceptionTypes(),
+ TypeAnnotation.TypeAnnotationTarget.THROWS);
+ }
+
}
--- a/jdk/src/share/classes/java/lang/reflect/Field.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/Field.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -36,7 +36,8 @@
import java.util.Objects;
import sun.reflect.annotation.AnnotationParser;
import sun.reflect.annotation.AnnotationSupport;
-
+import sun.reflect.annotation.TypeAnnotation;
+import sun.reflect.annotation.TypeAnnotationParser;
/**
* A {@code Field} provides information about, and dynamic access to, a
@@ -1020,8 +1021,7 @@
*/
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
-
- return AnnotationSupport.getOneAnnotation(declaredAnnotations(), annotationClass);
+ return annotationClass.cast(declaredAnnotations().get(annotationClass));
}
/**
@@ -1039,7 +1039,7 @@
* {@inheritDoc}
*/
public Annotation[] getDeclaredAnnotations() {
- return AnnotationSupport.unpackToArray(declaredAnnotations());
+ return AnnotationParser.toArray(declaredAnnotations());
}
private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
@@ -1053,4 +1053,20 @@
}
return declaredAnnotations;
}
+
+ /**
+ * Returns an AnnotatedType object that represents the use of a type to specify
+ * the declared type of the field represented by this Field.
+ *
+ * @since 1.8
+ */
+ public AnnotatedType getAnnotatedType() {
+ return TypeAnnotationParser.buildAnnotatedType(typeAnnotations,
+ sun.misc.SharedSecrets.getJavaLangAccess().
+ getConstantPool(getDeclaringClass()),
+ this,
+ getDeclaringClass(),
+ getGenericType(),
+ TypeAnnotation.TypeAnnotationTarget.FIELD_TYPE);
}
+}
--- a/jdk/src/share/classes/java/lang/reflect/Method.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/Method.java Wed Feb 13 13:01:16 2013 -0800
@@ -165,6 +165,10 @@
byte[] getAnnotationBytes() {
return annotations;
}
+ @Override
+ byte[] getTypeAnnotationBytes() {
+ return typeAnnotations;
+ }
/**
* {@inheritDoc}
@@ -621,6 +625,14 @@
return sharedGetParameterAnnotations(parameterTypes, parameterAnnotations);
}
+ /**
+ * {@inheritDoc}
+ * @since 1.8
+ */
+ public AnnotatedType getAnnotatedReturnType() {
+ return getAnnotatedReturnType0(getGenericReturnType());
+ }
+
@Override
void handleParameterNumberMismatch(int resultLength, int numParameters) {
throw new AnnotationFormatError("Parameter annotations don't match number of parameters");
--- a/jdk/src/share/classes/java/lang/reflect/Parameter.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/Parameter.java Wed Feb 13 13:01:16 2013 -0800
@@ -233,8 +233,7 @@
*/
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
-
- return AnnotationSupport.getOneAnnotation(declaredAnnotations(), annotationClass);
+ return annotationClass.cast(declaredAnnotations().get(annotationClass));
}
/**
@@ -281,14 +280,6 @@
return getDeclaredAnnotations();
}
- /**
- * @throws NullPointerException {@inheritDoc}
- */
- public boolean isAnnotationPresent(
- Class<? extends Annotation> annotationClass) {
- return getAnnotation(annotationClass) != null;
- }
-
private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
private synchronized Map<Class<? extends Annotation>, Annotation> declaredAnnotations() {
--- a/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -128,6 +128,10 @@
return c.getRawParameterAnnotations();
}
+ public byte[] getExecutableTypeAnnotationBytes(Executable ex) {
+ return ex.getTypeAnnotationBytes();
+ }
+
//
// Copying routines, needed to quickly fabricate new Field,
// Method, and Constructor objects from templates
--- a/jdk/src/share/classes/java/lang/reflect/TypeVariable.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/TypeVariable.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -86,4 +86,16 @@
* @return the name of this type variable, as it appears in the source code
*/
String getName();
+
+ /**
+ * Returns an array of AnnotatedType objects that represent the use of
+ * types to denote the upper bounds of the type parameter represented by
+ * this TypeVariable. The order of the objects in the array corresponds to
+ * the order of the bounds in the declaration of the type parameter.
+ *
+ * Returns an array of length 0 if the type parameter declares no bounds.
+ *
+ * @since 1.8
+ */
+ AnnotatedType[] getAnnotatedBounds();
}
--- a/jdk/src/share/classes/java/math/BigDecimal.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/math/BigDecimal.java Wed Feb 13 13:01:16 2013 -0800
@@ -3537,13 +3537,25 @@
else
return expandBigIntegerTenPowers(n);
}
- // BigInteger.pow is slow, so make 10**n by constructing a
- // BigInteger from a character string (still not very fast)
- char tenpow[] = new char[n + 1];
- tenpow[0] = '1';
- for (int i = 1; i <= n; i++)
- tenpow[i] = '0';
- return new BigInteger(tenpow,1, tenpow.length);
+
+ if (n < 1024*524288) {
+ // BigInteger.pow is slow, so make 10**n by constructing a
+ // BigInteger from a character string (still not very fast)
+ // which occupies no more than 1GB (!) of memory.
+ char tenpow[] = new char[n + 1];
+ tenpow[0] = '1';
+ for (int i = 1; i <= n; i++) {
+ tenpow[i] = '0';
+ }
+ return new BigInteger(tenpow, 1, tenpow.length);
+ }
+
+ if ((n & 0x1) == 0x1) {
+ return BigInteger.TEN.multiply(bigTenToThe(n - 1));
+ } else {
+ BigInteger tmp = bigTenToThe(n/2);
+ return tmp.multiply(tmp);
+ }
}
/**
--- a/jdk/src/share/classes/java/util/Base64.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/util/Base64.java Wed Feb 13 13:01:16 2013 -0800
@@ -64,7 +64,8 @@
* RFC 2045 for encoding and decoding operation. The encoded output
* must be represented in lines of no more than 76 characters each
* and uses a carriage return {@code '\r'} followed immediately by
- * a linefeed {@code '\n'} as the line separator. All line separators
+ * a linefeed {@code '\n'} as the line separator. No line separator
+ * is added to the end of the encoded output. All line separators
* or other characters not found in the base64 alphabet table are
* ignored in decoding operation.</p></li>
* </ul>
@@ -413,6 +414,7 @@
* specified Base64 encoded format
*/
public OutputStream wrap(OutputStream os) {
+ Objects.requireNonNull(os);
return new EncOutputStream(os, isURL ? toBase64URL : toBase64,
newline, linemax);
}
@@ -613,6 +615,13 @@
* This class implements a decoder for decoding byte data using the
* Base64 encoding scheme as specified in RFC 4648 and RFC 2045.
*
+ * <p> The Base64 padding character {@code '='} is accepted and
+ * interpreted as the end of the encoded byte data, but is not
+ * required. So if the final unit of the encoded byte data only has
+ * two or three Base64 characters (without the corresponding padding
+ * character(s) padded), they are decoded as if followed by padding
+ * character(s).
+ *
* <p> Instances of {@link Decoder} class are safe for use by
* multiple concurrent threads.
*
@@ -695,7 +704,7 @@
* using the {@link Base64} encoding scheme.
*
* <p> An invocation of this method has exactly the same effect as invoking
- * {@code return decode(src.getBytes(StandardCharsets.ISO_8859_1))}
+ * {@code decode(src.getBytes(StandardCharsets.ISO_8859_1))}
*
* @param src
* the string to decode
@@ -856,6 +865,9 @@
/**
* Returns an input stream for decoding {@link Base64} encoded byte stream.
*
+ * <p> The {@code read} methods of the returned {@code InputStream} will
+ * throw {@code IOException} when reading bytes that cannot be decoded.
+ *
* <p> Closing the returned input stream will close the underlying
* input stream.
*
@@ -866,6 +878,7 @@
* byte stream
*/
public InputStream wrap(InputStream is) {
+ Objects.requireNonNull(is);
return new DecInputStream(is, isURL ? fromBase64URL : fromBase64, isMIME);
}
@@ -881,13 +894,16 @@
int dl = dst.arrayOffset() + dst.limit();
int dp0 = dp;
int mark = sp;
- boolean padding = false;
try {
while (sp < sl) {
int b = sa[sp++] & 0xff;
if ((b = base64[b]) < 0) {
if (b == -2) { // padding byte
- padding = true;
+ if (shiftto == 6 && (sp == sl || sa[sp++] != '=') ||
+ shiftto == 18) {
+ throw new IllegalArgumentException(
+ "Input byte array has wrong 4-byte ending unit");
+ }
break;
}
if (isMIME) // skip if for rfc2045
@@ -913,24 +929,23 @@
if (shiftto == 6) {
if (dl - dp < 1)
return dp - dp0;
- if (padding && (sp + 1 != sl || sa[sp++] != '='))
- throw new IllegalArgumentException(
- "Input buffer has wrong 4-byte ending unit");
da[dp++] = (byte)(bits >> 16);
- mark = sp;
} else if (shiftto == 0) {
if (dl - dp < 2)
return dp - dp0;
- if (padding && sp != sl)
- throw new IllegalArgumentException(
- "Input buffer has wrong 4-byte ending unit");
da[dp++] = (byte)(bits >> 16);
da[dp++] = (byte)(bits >> 8);
- mark = sp;
- } else if (padding || shiftto != 18) {
+ } else if (shiftto == 12) {
throw new IllegalArgumentException(
"Last unit does not have enough valid bits");
}
+ while (sp < sl) {
+ if (isMIME && base64[sa[sp++]] < 0)
+ continue;
+ throw new IllegalArgumentException(
+ "Input byte array has incorrect ending byte at " + sp);
+ }
+ mark = sp;
return dp - dp0;
} finally {
src.position(mark);
@@ -948,14 +963,16 @@
int dl = dst.limit();
int dp0 = dp;
int mark = sp;
- boolean padding = false;
-
try {
while (sp < sl) {
int b = src.get(sp++) & 0xff;
if ((b = base64[b]) < 0) {
if (b == -2) { // padding byte
- padding = true;
+ if (shiftto == 6 && (sp == sl || src.get(sp++) != '=') ||
+ shiftto == 18) {
+ throw new IllegalArgumentException(
+ "Input byte array has wrong 4-byte ending unit");
+ }
break;
}
if (isMIME) // skip if for rfc2045
@@ -981,24 +998,23 @@
if (shiftto == 6) {
if (dl - dp < 1)
return dp - dp0;
- if (padding && (sp + 1 != sl || src.get(sp++) != '='))
- throw new IllegalArgumentException(
- "Input buffer has wrong 4-byte ending unit");
dst.put(dp++, (byte)(bits >> 16));
- mark = sp;
} else if (shiftto == 0) {
if (dl - dp < 2)
return dp - dp0;
- if (padding && sp != sl)
- throw new IllegalArgumentException(
- "Input buffer has wrong 4-byte ending unit");
dst.put(dp++, (byte)(bits >> 16));
dst.put(dp++, (byte)(bits >> 8));
- mark = sp;
- } else if (padding || shiftto != 18) {
+ } else if (shiftto == 12) {
throw new IllegalArgumentException(
"Last unit does not have enough valid bits");
}
+ while (sp < sl) {
+ if (isMIME && base64[src.get(sp++)] < 0)
+ continue;
+ throw new IllegalArgumentException(
+ "Input byte array has incorrect ending byte at " + sp);
+ }
+ mark = sp;
return dp - dp0;
} finally {
src.position(mark);
@@ -1012,9 +1028,12 @@
int len = sl - sp;
if (len == 0)
return 0;
- if (len < 2)
+ if (len < 2) {
+ if (isMIME && base64[0] == -1)
+ return 0;
throw new IllegalArgumentException(
"Input byte[] should at least have 2 bytes for base64 bytes");
+ }
if (src[sl - 1] == '=') {
paddings++;
if (src[sl - 2] == '=')
@@ -1043,12 +1062,20 @@
int dp = 0;
int bits = 0;
int shiftto = 18; // pos of first byte of 4-byte atom
- boolean padding = false;
while (sp < sl) {
int b = src[sp++] & 0xff;
if ((b = base64[b]) < 0) {
- if (b == -2) { // padding byte
- padding = true;
+ if (b == -2) { // padding byte '='
+ // xx= shiftto==6&&sp==sl missing last =
+ // xx=y shiftto==6 last is not =
+ // = shiftto==18 unnecessary padding
+ // x= shiftto==12 be taken care later
+ // together with single x, invalid anyway
+ if (shiftto == 6 && (sp == sl || src[sp++] != '=') ||
+ shiftto == 18) {
+ throw new IllegalArgumentException(
+ "Input byte array has wrong 4-byte ending unit");
+ }
break;
}
if (isMIME) // skip if for rfc2045
@@ -1068,22 +1095,23 @@
bits = 0;
}
}
- // reach end of byte arry or hit padding '=' characters.
- // if '=' presents, they must be the last one or two.
- if (shiftto == 6) { // xx==
- if (padding && (sp + 1 != sl || src[sp] != '='))
- throw new IllegalArgumentException(
- "Input byte array has wrong 4-byte ending unit");
+ // reached end of byte array or hit padding '=' characters.
+ if (shiftto == 6) {
dst[dp++] = (byte)(bits >> 16);
- } else if (shiftto == 0) { // xxx=
- if (padding && sp != sl)
- throw new IllegalArgumentException(
- "Input byte array has wrong 4-byte ending unit");
+ } else if (shiftto == 0) {
dst[dp++] = (byte)(bits >> 16);
dst[dp++] = (byte)(bits >> 8);
- } else if (padding || shiftto != 18) {
- throw new IllegalArgumentException(
- "last unit does not have enough bytes");
+ } else if (shiftto == 12) {
+ throw new IllegalArgumentException(
+ "Last unit does not have enough valid bits");
+ }
+ // anything left is invalid, if is not MIME.
+ // if MIME, ignore all non-base64 character
+ while (sp < sl) {
+ if (isMIME && base64[src[sp++]] < 0)
+ continue;
+ throw new IllegalArgumentException(
+ "Input byte array has incorrect ending byte at " + sp);
}
return dp;
}
@@ -1247,8 +1275,22 @@
int v = is.read();
if (v == -1) {
eof = true;
- if (nextin != 18)
- throw new IOException("Base64 stream has un-decoded dangling byte(s).");
+ if (nextin != 18) {
+ if (nextin == 12)
+ throw new IOException("Base64 stream has one un-decoded dangling byte.");
+ // treat ending xx/xxx without padding character legal.
+ // same logic as v == 'v' below
+ b[off++] = (byte)(bits >> (16));
+ len--;
+ if (nextin == 0) { // only one padding byte
+ if (len == 0) { // no enough output space
+ bits >>= 8; // shift to lowest byte
+ nextout = 0;
+ } else {
+ b[off++] = (byte) (bits >> 8);
+ }
+ }
+ }
if (off == oldOff)
return -1;
else
--- a/jdk/src/share/classes/java/util/Formatter.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/java/util/Formatter.java Wed Feb 13 13:01:16 2013 -0800
@@ -351,7 +351,9 @@
* <tr><td valign="top">{@code 'a'}, {@code 'A'}
* <td valign="top"> floating point
* <td> The result is formatted as a hexadecimal floating-point number with
- * a significand and an exponent
+ * a significand and an exponent. This conversion is <b>not</b> supported
+ * for the {@code BigDecimal} type despite the latter's being in the
+ * <i>floating point</i> argument category.
*
* <tr><td valign="top">{@code 't'}, {@code 'T'}
* <td valign="top"> date/time
--- a/jdk/src/share/classes/javax/swing/JComponent.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/javax/swing/JComponent.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -3644,26 +3644,6 @@
}
/**
- * The <code>AccessibleContext</code> associated with this
- * <code>JComponent</code>.
- */
- protected AccessibleContext accessibleContext = null;
-
- /**
- * Returns the <code>AccessibleContext</code> associated with this
- * <code>JComponent</code>. The method implemented by this base
- * class returns null. Classes that extend <code>JComponent</code>
- * should implement this method to return the
- * <code>AccessibleContext</code> associated with the subclass.
- *
- * @return the <code>AccessibleContext</code> of this
- * <code>JComponent</code>
- */
- public AccessibleContext getAccessibleContext() {
- return accessibleContext;
- }
-
- /**
* Inner class of JComponent used to provide default support for
* accessibility. This class is not meant to be used directly by
* application developers, but is instead meant only to be
@@ -3689,7 +3669,18 @@
super();
}
- protected ContainerListener accessibleContainerHandler = null;
+ /**
+ * Number of PropertyChangeListener objects registered. It's used
+ * to add/remove ContainerListener and FocusListener to track
+ * target JComponent's state
+ */
+ private volatile transient int propertyListenersCount = 0;
+
+ /**
+ * This field duplicates the one in java.awt.Component.AccessibleAWTComponent,
+ * so it has been deprecated.
+ */
+ @Deprecated
protected FocusListener accessibleFocusHandler = null;
/**
@@ -3747,10 +3738,12 @@
public void addPropertyChangeListener(PropertyChangeListener listener) {
if (accessibleFocusHandler == null) {
accessibleFocusHandler = new AccessibleFocusHandler();
- JComponent.this.addFocusListener(accessibleFocusHandler);
}
if (accessibleContainerHandler == null) {
accessibleContainerHandler = new AccessibleContainerHandler();
+ }
+ if (propertyListenersCount++ == 0) {
+ JComponent.this.addFocusListener(accessibleFocusHandler);
JComponent.this.addContainerListener(accessibleContainerHandler);
}
super.addPropertyChangeListener(listener);
@@ -3764,9 +3757,9 @@
* @param listener the PropertyChangeListener to be removed
*/
public void removePropertyChangeListener(PropertyChangeListener listener) {
- if (accessibleFocusHandler != null) {
+ if (--propertyListenersCount == 0) {
JComponent.this.removeFocusListener(accessibleFocusHandler);
- accessibleFocusHandler = null;
+ JComponent.this.removeContainerListener(accessibleContainerHandler);
}
super.removePropertyChangeListener(listener);
}
--- a/jdk/src/share/classes/sun/management/Agent.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/management/Agent.java Wed Feb 13 13:01:16 2013 -0800
@@ -22,7 +22,6 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package sun.management;
import java.io.BufferedInputStream;
@@ -31,49 +30,55 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-
+import java.lang.management.ManagementFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.management.ManagementFactory;
-
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
import java.text.MessageFormat;
-
import java.util.MissingResourceException;
import java.util.Properties;
import java.util.ResourceBundle;
import javax.management.remote.JMXConnectorServer;
+import javax.management.remote.JMXServiceURL;
import static sun.management.AgentConfigurationError.*;
import sun.management.jmxremote.ConnectorBootstrap;
+import sun.management.jdp.JdpController;
+import sun.management.jdp.JdpException;
import sun.misc.VMSupport;
/**
- * This Agent is started by the VM when -Dcom.sun.management.snmp
- * or -Dcom.sun.management.jmxremote is set. This class will be
- * loaded by the system class loader. Also jmx framework could
- * be started by jcmd
+ * This Agent is started by the VM when -Dcom.sun.management.snmp or
+ * -Dcom.sun.management.jmxremote is set. This class will be loaded by the
+ * system class loader. Also jmx framework could be started by jcmd
*/
public class Agent {
// management properties
+
private static Properties mgmtProps;
private static ResourceBundle messageRB;
-
private static final String CONFIG_FILE =
- "com.sun.management.config.file";
+ "com.sun.management.config.file";
private static final String SNMP_PORT =
- "com.sun.management.snmp.port";
+ "com.sun.management.snmp.port";
private static final String JMXREMOTE =
- "com.sun.management.jmxremote";
+ "com.sun.management.jmxremote";
private static final String JMXREMOTE_PORT =
- "com.sun.management.jmxremote.port";
+ "com.sun.management.jmxremote.port";
+ private static final String RMI_PORT =
+ "com.sun.management.jmxremote.rmi.port";
private static final String ENABLE_THREAD_CONTENTION_MONITORING =
- "com.sun.management.enableThreadContentionMonitoring";
+ "com.sun.management.enableThreadContentionMonitoring";
private static final String LOCAL_CONNECTOR_ADDRESS_PROP =
- "com.sun.management.jmxremote.localConnectorAddress";
+ "com.sun.management.jmxremote.localConnectorAddress";
+ private static final String SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME =
+ "sun.management.snmp.AdaptorBootstrap";
- private static final String SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME =
- "sun.management.snmp.AdaptorBootstrap";
+ private static final String JDP_DEFAULT_ADDRESS = "239.255.255.225";
+ private static final int JDP_DEFAULT_PORT = 7095;
// The only active agent allowed
private static JMXConnectorServer jmxServer = null;
@@ -81,26 +86,25 @@
// Parse string com.sun.management.prop=xxx,com.sun.management.prop=yyyy
// and return property set if args is null or empty
// return empty property set
- private static Properties parseString(String args){
+ private static Properties parseString(String args) {
Properties argProps = new Properties();
if (args != null) {
- for (String option : args.split(",")) {
- String s[] = option.split("=", 2);
- String name = s[0].trim();
- String value = (s.length > 1) ? s[1].trim() : "";
+ for (String option : args.split(",")) {
+ String s[] = option.split("=", 2);
+ String name = s[0].trim();
+ String value = (s.length > 1) ? s[1].trim() : "";
- if (!name.startsWith("com.sun.management.")) {
- error(INVALID_OPTION, name);
- }
+ if (!name.startsWith("com.sun.management.")) {
+ error(INVALID_OPTION, name);
+ }
- argProps.setProperty(name, value);
- }
+ argProps.setProperty(name, value);
+ }
}
return argProps;
}
-
// invoked by -javaagent or -Dcom.sun.management.agent.class
public static void premain(String args) throws Exception {
agentmain(args);
@@ -115,18 +119,18 @@
Properties arg_props = parseString(args);
// Read properties from the config file
- Properties config_props = new Properties();
- String fname = arg_props.getProperty(CONFIG_FILE);
- readConfiguration(fname, config_props);
+ Properties config_props = new Properties();
+ String fname = arg_props.getProperty(CONFIG_FILE);
+ readConfiguration(fname, config_props);
- // Arguments override config file
- config_props.putAll(arg_props);
- startAgent(config_props);
+ // Arguments override config file
+ config_props.putAll(arg_props);
+ startAgent(config_props);
}
// jcmd ManagementAgent.start_local entry point
// Also called due to command-line via startAgent()
- private static synchronized void startLocalManagementAgent(){
+ private static synchronized void startLocalManagementAgent() {
Properties agentProps = VMSupport.getAgentProperties();
// start local connector if not started
@@ -156,7 +160,7 @@
throw new RuntimeException(getText(INVALID_STATE, "Agent already started"));
}
- Properties argProps = parseString(args);
+ Properties argProps = parseString(args);
Properties configProps = new Properties();
// Load the management properties from the config file
@@ -169,7 +173,7 @@
// management properties can be overridden by system properties
// which take precedence
Properties sysProps = System.getProperties();
- synchronized(sysProps){
+ synchronized (sysProps) {
configProps.putAll(sysProps);
}
@@ -190,21 +194,26 @@
// can specify this property inside config file, so enable optional
// monitoring functionality if this property is set
final String enableThreadContentionMonitoring =
- configProps.getProperty(ENABLE_THREAD_CONTENTION_MONITORING);
+ configProps.getProperty(ENABLE_THREAD_CONTENTION_MONITORING);
if (enableThreadContentionMonitoring != null) {
ManagementFactory.getThreadMXBean().
- setThreadContentionMonitoringEnabled(true);
+ setThreadContentionMonitoringEnabled(true);
}
String jmxremotePort = configProps.getProperty(JMXREMOTE_PORT);
if (jmxremotePort != null) {
jmxServer = ConnectorBootstrap.
- startRemoteConnectorServer(jmxremotePort, configProps);
+ startRemoteConnectorServer(jmxremotePort, configProps);
+
+ startDiscoveryService(configProps);
}
}
private static synchronized void stopRemoteManagementAgent() throws Exception {
+
+ JdpController.stopDiscoveryService();
+
if (jmxServer != null) {
ConnectorBootstrap.unexportRegistry();
@@ -222,15 +231,15 @@
// Enable optional monitoring functionality if requested
final String enableThreadContentionMonitoring =
- props.getProperty(ENABLE_THREAD_CONTENTION_MONITORING);
+ props.getProperty(ENABLE_THREAD_CONTENTION_MONITORING);
if (enableThreadContentionMonitoring != null) {
ManagementFactory.getThreadMXBean().
- setThreadContentionMonitoringEnabled(true);
+ setThreadContentionMonitoringEnabled(true);
}
try {
if (snmpPort != null) {
- loadSnmpAgent(snmpPort, props);
+ loadSnmpAgent(snmpPort, props);
}
/*
@@ -242,13 +251,14 @@
* of this "local" server is exported as a counter to the jstat
* instrumentation buffer.
*/
- if (jmxremote != null || jmxremotePort != null) {
+ if (jmxremote != null || jmxremotePort != null) {
if (jmxremotePort != null) {
- jmxServer = ConnectorBootstrap.
- startRemoteConnectorServer(jmxremotePort, props);
+ jmxServer = ConnectorBootstrap.
+ startRemoteConnectorServer(jmxremotePort, props);
+ startDiscoveryService(props);
}
startLocalManagementAgent();
- }
+ }
} catch (AgentConfigurationError e) {
error(e.getError(), e.getParams());
@@ -257,6 +267,73 @@
}
}
+ private static void startDiscoveryService(Properties props)
+ throws IOException {
+ // Start discovery service if requested
+ String discoveryPort = props.getProperty("com.sun.management.jdp.port");
+ String discoveryAddress = props.getProperty("com.sun.management.jdp.address");
+ String discoveryShouldStart = props.getProperty("com.sun.management.jmxremote.autodiscovery");
+
+ // Decide whether we should start autodicovery service.
+ // To start autodiscovery following conditions should be met:
+ // autodiscovery==true OR (autodicovery==null AND jdp.port != NULL)
+
+ boolean shouldStart = false;
+ if (discoveryShouldStart == null){
+ shouldStart = (discoveryPort != null);
+ }
+ else{
+ try{
+ shouldStart = Boolean.parseBoolean(discoveryShouldStart);
+ } catch (NumberFormatException e) {
+ throw new AgentConfigurationError("Couldn't parse autodiscovery argument");
+ }
+ }
+
+ if (shouldStart) {
+ // port and address are required arguments and have no default values
+ InetAddress address;
+ try {
+ address = (discoveryAddress == null) ?
+ InetAddress.getByName(JDP_DEFAULT_ADDRESS) : InetAddress.getByName(discoveryAddress);
+ } catch (UnknownHostException e) {
+ throw new AgentConfigurationError("Unable to broadcast to requested address", e);
+ }
+
+ int port = JDP_DEFAULT_PORT;
+ if (discoveryPort != null) {
+ try {
+ port = Integer.parseInt(discoveryPort);
+ } catch (NumberFormatException e) {
+ throw new AgentConfigurationError("Couldn't parse JDP port argument");
+ }
+ }
+
+ // Rebuilding service URL to broadcast it
+ String jmxremotePort = props.getProperty(JMXREMOTE_PORT);
+ String rmiPort = props.getProperty(RMI_PORT);
+
+ JMXServiceURL url = jmxServer.getAddress();
+ String hostname = url.getHost();
+
+ String jmxUrlStr = (rmiPort != null)
+ ? String.format(
+ "service:jmx:rmi://%s:%s/jndi/rmi://%s:%s/jmxrmi",
+ hostname, rmiPort, hostname, jmxremotePort)
+ : String.format(
+ "service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi", hostname, jmxremotePort);
+
+ String instanceName = System.getProperty("com.sun.management.jdp.name");
+
+ try{
+ JdpController.startDiscoveryService(address, port, instanceName, jmxUrlStr);
+ }
+ catch(JdpException e){
+ throw new AgentConfigurationError("Couldn't start JDP service", e);
+ }
+ }
+ }
+
public static Properties loadManagementProperties() {
Properties props = new Properties();
@@ -268,22 +345,22 @@
// management properties can be overridden by system properties
// which take precedence
Properties sysProps = System.getProperties();
- synchronized(sysProps){
+ synchronized (sysProps) {
props.putAll(sysProps);
}
return props;
- }
+ }
- public static synchronized Properties getManagementProperties() {
+ public static synchronized Properties getManagementProperties() {
if (mgmtProps == null) {
String configFile = System.getProperty(CONFIG_FILE);
String snmpPort = System.getProperty(SNMP_PORT);
String jmxremote = System.getProperty(JMXREMOTE);
String jmxremotePort = System.getProperty(JMXREMOTE_PORT);
- if (configFile == null && snmpPort == null &&
- jmxremote == null && jmxremotePort == null) {
+ if (configFile == null && snmpPort == null
+ && jmxremote == null && jmxremotePort == null) {
// return if out-of-the-management option is not specified
return null;
}
@@ -297,22 +374,23 @@
// invoke the following through reflection:
// AdaptorBootstrap.initialize(snmpPort, props);
final Class<?> adaptorClass =
- Class.forName(SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME,true,null);
+ Class.forName(SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME, true, null);
final Method initializeMethod =
adaptorClass.getMethod("initialize",
- String.class, Properties.class);
- initializeMethod.invoke(null,snmpPort,props);
+ String.class, Properties.class);
+ initializeMethod.invoke(null, snmpPort, props);
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException x) {
// snmp runtime doesn't exist - initialization fails
- throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT,x);
+ throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT, x);
} catch (InvocationTargetException x) {
final Throwable cause = x.getCause();
- if (cause instanceof RuntimeException)
+ if (cause instanceof RuntimeException) {
throw (RuntimeException) cause;
- else if (cause instanceof Error)
+ } else if (cause instanceof Error) {
throw (Error) cause;
+ }
// should not happen...
- throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT,cause);
+ throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT, cause);
}
}
@@ -353,8 +431,8 @@
} catch (IOException e) {
error(CONFIG_FILE_CLOSE_FAILED, fname);
}
- }
- }
+ }
+ }
}
public static void startAgent() throws Exception {
@@ -389,9 +467,9 @@
// invoke the premain(String args) method
Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(cname);
Method premain = clz.getMethod("premain",
- new Class<?>[] { String.class });
+ new Class<?>[]{String.class});
premain.invoke(null, /* static */
- new Object[] { args });
+ new Object[]{args});
} catch (ClassNotFoundException ex) {
error(AGENT_CLASS_NOT_FOUND, "\"" + cname + "\"");
} catch (NoSuchMethodException ex) {
@@ -400,8 +478,8 @@
error(AGENT_CLASS_ACCESS_DENIED);
} catch (Exception ex) {
String msg = (ex.getCause() == null
- ? ex.getMessage()
- : ex.getCause().getMessage());
+ ? ex.getMessage()
+ : ex.getCause().getMessage());
error(AGENT_CLASS_FAILED, msg);
}
}
@@ -425,7 +503,6 @@
}
}
-
public static void error(String key, String message) {
String keyText = getText(key);
System.err.print(getText("agent.err.error") + ": " + keyText);
@@ -447,7 +524,7 @@
private static void initResource() {
try {
messageRB =
- ResourceBundle.getBundle("sun.management.resources.agent");
+ ResourceBundle.getBundle("sun.management.resources.agent");
} catch (MissingResourceException e) {
throw new Error("Fatal: Resource for management agent is missing");
}
@@ -470,10 +547,9 @@
}
String format = messageRB.getString(key);
if (format == null) {
- format = "missing resource key: key = \"" + key + "\", " +
- "arguments = \"{0}\", \"{1}\", \"{2}\"";
+ format = "missing resource key: key = \"" + key + "\", "
+ + "arguments = \"{0}\", \"{1}\", \"{2}\"";
}
return MessageFormat.format(format, (Object[]) args);
}
-
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpBroadcaster.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.ProtocolFamily;
+import java.net.StandardProtocolFamily;
+import java.net.StandardSocketOptions;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.UnsupportedAddressTypeException;
+
+/**
+ * JdpBroadcaster is responsible for sending pre-built JDP packet across a Net
+ *
+ * <p> Multicast group address, port number and ttl have to be chosen on upper
+ * level and passed to broadcaster constructor. Also it's possible to specify
+ * source address to broadcast from. </p>
+ *
+ * <p>JdpBradcaster doesn't perform any validation on a supplied {@code port} and {@code ttl} because
+ * the allowed values depend on an operating system setup</p>
+ *
+ */
+public final class JdpBroadcaster {
+
+ private final InetAddress addr;
+ private final int port;
+ private final DatagramChannel channel;
+
+ /**
+ * Create a new broadcaster
+ *
+ * @param address - multicast group address
+ * @param srcAddress - address of interface we should use to broadcast.
+ * @param port - udp port to use
+ * @param ttl - packet ttl
+ * @throws IOException
+ */
+ public JdpBroadcaster(InetAddress address, InetAddress srcAddress, int port, int ttl)
+ throws IOException, JdpException {
+ this.addr = address;
+ this.port = port;
+
+ ProtocolFamily family = (address instanceof Inet6Address)
+ ? StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
+
+ channel = DatagramChannel.open(family);
+ channel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
+ channel.setOption(StandardSocketOptions.IP_MULTICAST_TTL, ttl);
+
+ // with srcAddress equal to null, this constructor do exactly the same as
+ // if srcAddress is not passed
+ if (srcAddress != null) {
+ // User requests particular interface to bind to
+ NetworkInterface interf = NetworkInterface.getByInetAddress(srcAddress);
+ try {
+ channel.bind(new InetSocketAddress(srcAddress, 0));
+ } catch (UnsupportedAddressTypeException ex) {
+ throw new JdpException("Unable to bind to source address");
+ }
+ channel.setOption(StandardSocketOptions.IP_MULTICAST_IF, interf);
+ }
+ }
+
+ /**
+ * Create a new broadcaster
+ *
+ * @param address - multicast group address
+ * @param port - udp port to use
+ * @param ttl - packet ttl
+ * @throws IOException
+ */
+ public JdpBroadcaster(InetAddress address, int port, int ttl)
+ throws IOException, JdpException {
+ this(address, null, port, ttl);
+ }
+
+ /**
+ * Broadcast pre-built packet
+ *
+ * @param packet - instance of JdpPacket
+ * @throws IOException
+ */
+ public void sendPacket(JdpPacket packet)
+ throws IOException {
+ byte[] data = packet.getPacketData();
+ // Unlike allocate/put wrap don't need a flip afterward
+ ByteBuffer b = ByteBuffer.wrap(data);
+ channel.send(b, new InetSocketAddress(addr, port));
+ }
+
+ /**
+ * Shutdown broadcaster and close underlying socket channel
+ *
+ * @throws IOException
+ */
+ public void shutdown() throws IOException {
+ channel.close();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpController.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,196 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.UUID;
+
+/**
+ * JdpController is responsible to create and manage a broadcast loop
+ *
+ * <p> Other part of code has no access to broadcast loop and have to use
+ * provided static methods
+ * {@link #startDiscoveryService(InetAddress,int,String,String) startDiscoveryService}
+ * and {@link #stopDiscoveryService() stopDiscoveryService}</p>
+ * <p>{@link #startDiscoveryService(InetAddress,int,String,String) startDiscoveryService} could be called multiple
+ * times as it stops the running service if it is necessary. Call to {@link #stopDiscoveryService() stopDiscoveryService}
+ * ignored if service isn't run</p>
+ *
+ *
+ * </p>
+ *
+ * <p> System properties below could be used to control broadcast loop behavior.
+ * Property below have to be set explicitly in command line. It's not possible to
+ * set it in management.config file. Careless changes of these properties could
+ * lead to security or network issues.
+ * <ul>
+ * <li>com.sun.management.jdp.ttl - set ttl for broadcast packet</li>
+ * <li>com.sun.management.jdp.pause - set broadcast interval in seconds</li>
+ * <li>com.sun.management.jdp.source_addr - an address of interface to use for broadcast</li>
+ * </ul>
+ </p>
+ * <p>null parameters values are filtered out on {@link JdpPacketWriter} level and
+ * corresponding keys are not placed to packet.</p>
+ */
+public final class JdpController {
+
+ private static class JDPControllerRunner implements Runnable {
+
+ private final JdpJmxPacket packet;
+ private final JdpBroadcaster bcast;
+ private final int pause;
+ private volatile boolean shutdown = false;
+
+ private JDPControllerRunner(JdpBroadcaster bcast, JdpJmxPacket packet, int pause) {
+ this.bcast = bcast;
+ this.packet = packet;
+ this.pause = pause;
+ }
+
+ @Override
+ public void run() {
+ try {
+ while (!shutdown) {
+ bcast.sendPacket(packet);
+ try {
+ Thread.sleep(this.pause);
+ } catch (InterruptedException e) {
+ // pass
+ }
+ }
+
+ } catch (IOException e) {
+ // pass;
+ }
+
+ // It's not possible to re-use controller,
+ // nevertheless reset shutdown variable
+ try {
+ stop();
+ bcast.shutdown();
+ } catch (IOException ex) {
+ // pass - ignore IOException during shutdown
+ }
+ }
+
+ public void stop() {
+ shutdown = true;
+ }
+ }
+ private static JDPControllerRunner controller = null;
+
+ private JdpController(){
+ // Don't allow to instantiate this class.
+ }
+
+ // Utility to handle optional system properties
+ // Parse an integer from string or return default if provided string is null
+ private static int getInteger(String val, int dflt, String msg) throws JdpException {
+ try {
+ return (val == null) ? dflt : Integer.parseInt(val);
+ } catch (NumberFormatException ex) {
+ throw new JdpException(msg);
+ }
+ }
+
+ // Parse an inet address from string or return default if provided string is null
+ private static InetAddress getInetAddress(String val, InetAddress dflt, String msg) throws JdpException {
+ try {
+ return (val == null) ? dflt : InetAddress.getByName(val);
+ } catch (UnknownHostException ex) {
+ throw new JdpException(msg);
+ }
+ }
+
+ /**
+ * Starts discovery service
+ *
+ * @param address - multicast group address
+ * @param port - udp port to use
+ * @param instanceName - name of running JVM instance
+ * @param url - JMX service url
+ * @throws IOException
+ */
+ public static synchronized void startDiscoveryService(InetAddress address, int port, String instanceName, String url)
+ throws IOException, JdpException {
+
+ // Limit packet to local subnet by default
+ int ttl = getInteger(
+ System.getProperty("com.sun.management.jdp.ttl"), 1,
+ "Invalid jdp packet ttl");
+
+ // Broadcast once a 5 seconds by default
+ int pause = getInteger(
+ System.getProperty("com.sun.management.jdp.pause"), 5,
+ "Invalid jdp pause");
+
+ // Converting seconds to milliseconds
+ pause = pause * 1000;
+
+ // Allow OS to choose broadcast source
+ InetAddress sourceAddress = getInetAddress(
+ System.getProperty("com.sun.management.jdp.source_addr"), null,
+ "Invalid source address provided");
+
+ // Generate session id
+ UUID id = UUID.randomUUID();
+
+ JdpJmxPacket packet = new JdpJmxPacket(id, url);
+
+ // Don't broadcast whole command line for security reason.
+ // Strip everything after first space
+ String javaCommand = System.getProperty("sun.java.command");
+ if (javaCommand != null) {
+ String[] arr = javaCommand.split(" ", 2);
+ packet.setMainClass(arr[0]);
+ }
+
+ // Put optional explicit java instance name to packet, if user doesn't specify
+ // it the key is skipped. PacketWriter is responsible to skip keys having null value.
+ packet.setInstanceName(instanceName);
+
+ JdpBroadcaster bcast = new JdpBroadcaster(address, sourceAddress, port, ttl);
+
+ // Stop discovery service if it's already running
+ stopDiscoveryService();
+
+ controller = new JDPControllerRunner(bcast, packet, pause);
+
+ Thread t = new Thread(controller, "JDP broadcaster");
+ t.setDaemon(true);
+ t.start();
+ }
+
+ /**
+ * Stop running discovery service,
+ * it's safe to attempt to stop not started service
+ */
+ public static synchronized void stopDiscoveryService() {
+ if ( controller != null ){
+ controller.stop();
+ controller = null;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpException.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+/**
+ * An Exception thrown if a JDP implementation encounters a problem.
+ */
+public final class JdpException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct a new JDP exception with a meaningful message
+ *
+ * @param msg - message
+ */
+ public JdpException(String msg) {
+ super(msg);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpGenericPacket.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+/**
+ * JdpGenericPacket responsible to provide fields
+ * common for all Jdp packets
+ */
+public abstract class JdpGenericPacket implements JdpPacket {
+
+ /**
+ * JDP protocol magic. Magic allows a reader to quickly select
+ * JDP packets from a bunch of broadcast packets addressed to the same port
+ * and broadcast group. Any packet intended to be parsed by JDP client
+ * has to start from this magic.
+ */
+ private static final int MAGIC = 0xC0FFEE42;
+
+ /**
+ * Current version of protocol. Any implementation of this protocol has to
+ * conform with the packet structure and the flow described in JEP-168
+ */
+ private static final short PROTOCOL_VERSION = 1;
+
+ /**
+ * Default do-nothing constructor
+ */
+ protected JdpGenericPacket(){
+ // do nothing
+ }
+
+
+ /**
+ * Validate protocol header magic field
+ *
+ * @param magic - value to validate
+ * @throws JdpException
+ */
+ public static void checkMagic(int magic)
+ throws JdpException {
+ if (magic != MAGIC) {
+ throw new JdpException("Invalid JDP magic header: " + magic);
+ }
+ }
+
+ /**
+ * Validate protocol header version field
+ *
+ * @param version - value to validate
+ * @throws JdpException
+ */
+ public static void checkVersion(short version)
+ throws JdpException {
+
+ if (version > PROTOCOL_VERSION) {
+ throw new JdpException("Unsupported protocol version: " + version);
+ }
+ }
+
+ /**
+ *
+ * @return protocol magic
+ */
+ public static int getMagic() {
+ return MAGIC;
+ }
+
+ /**
+ *
+ * @return current protocol version
+ */
+ public static short getVersion() {
+ return PROTOCOL_VERSION;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpJmxPacket.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,196 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * A packet to broadcasts JMX URL
+ *
+ * Fields:
+ *
+ * <ul>
+ * <li>UUID - broadcast session ID, changed every time when we start/stop
+ * discovery service</li>
+ * <li>JMX_URL - URL to connect to JMX service</li>
+ * <li>MAIN_CLASS - optional name of main class, filled from sun.java.command stripped for
+ * security reason to first space</li>
+ * <li>INSTANCE_NAME - optional custom name of particular instance as provided by customer</li>
+ * </ul>
+ */
+public final class JdpJmxPacket
+ extends JdpGenericPacket
+ implements JdpPacket {
+
+ /**
+ * Session ID
+ */
+ public final static String UUID_KEY = "DISCOVERABLE_SESSION_UUID";
+ /**
+ * Name of main class
+ */
+ public final static String MAIN_CLASS_KEY = "MAIN_CLASS";
+ /**
+ * JMX service URL
+ */
+ public final static String JMX_SERVICE_URL_KEY = "JMX_SERVICE_URL";
+ /**
+ * Name of Java instance
+ */
+ public final static String INSTANCE_NAME_KEY = "INSTANCE_NAME";
+
+ private UUID id;
+ private String mainClass;
+ private String jmxServiceUrl;
+ private String instanceName;
+
+ /**
+ * Create new instance from user provided data. Set mandatory fields
+ *
+ * @param id - java instance id
+ * @param jmxServiceUrl - JMX service url
+ */
+ public JdpJmxPacket(UUID id, String jmxServiceUrl) {
+ this.id = id;
+ this.jmxServiceUrl = jmxServiceUrl;
+ }
+
+ /**
+ * Create new instance from network data Parse packet and set fields.
+ *
+ * @param data - raw packet data as it came from a Net
+ * @throws JdpException
+ */
+ public JdpJmxPacket(byte[] data)
+ throws JdpException {
+ JdpPacketReader reader;
+
+ reader = new JdpPacketReader(data);
+ Map<String, String> p = reader.getDiscoveryDataAsMap();
+
+ String sId = p.get(UUID_KEY);
+ this.id = (sId == null) ? null : UUID.fromString(sId);
+ this.jmxServiceUrl = p.get(JMX_SERVICE_URL_KEY);
+ this.mainClass = p.get(MAIN_CLASS_KEY);
+ this.instanceName = p.get(INSTANCE_NAME_KEY);
+ }
+
+ /**
+ * Set main class field
+ *
+ * @param mainClass - main class of running app
+ */
+ public void setMainClass(String mainClass) {
+ this.mainClass = mainClass;
+ }
+
+ /**
+ * Set instance name field
+ *
+ * @param instanceName - name of instance as provided by customer
+ */
+ public void setInstanceName(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ /**
+ * @return id of discovery session
+ */
+ public UUID getId() {
+ return id;
+ }
+
+ /**
+ *
+ * @return main class field
+ */
+ public String getMainClass() {
+ return mainClass;
+ }
+
+ /**
+ *
+ * @return JMX service URL
+ */
+ public String getJmxServiceUrl() {
+ return jmxServiceUrl;
+ }
+
+ /**
+ *
+ * @return instance name
+ */
+ public String getInstanceName() {
+ return instanceName;
+ }
+
+ /**
+ *
+ * @return assembled packet ready to be sent across a Net
+ * @throws IOException
+ */
+ @Override
+ public byte[] getPacketData() throws IOException {
+ // Assemble packet from fields to byte array
+ JdpPacketWriter writer;
+ writer = new JdpPacketWriter();
+ writer.addEntry(UUID_KEY, (id == null) ? null : id.toString());
+ writer.addEntry(MAIN_CLASS_KEY, mainClass);
+ writer.addEntry(JMX_SERVICE_URL_KEY, jmxServiceUrl);
+ writer.addEntry(INSTANCE_NAME_KEY, instanceName);
+ return writer.getPacketBytes();
+ }
+
+ /**
+ *
+ * @return packet hash code
+ */
+ @Override
+ public int hashCode() {
+ int hash = 1;
+ hash = hash * 31 + id.hashCode();
+ hash = hash * 31 + jmxServiceUrl.hashCode();
+ return hash;
+ }
+
+ /**
+ * Compare two packets
+ *
+ * @param o - packet to compare
+ * @return either packet equals or not
+ */
+ @Override
+ public boolean equals(Object o) {
+
+ if (o == null || ! (o instanceof JdpJmxPacket) ){
+ return false;
+ }
+
+ JdpJmxPacket p = (JdpJmxPacket) o;
+ return Objects.equals(id, p.getId()) && Objects.equals(jmxServiceUrl, p.getJmxServiceUrl());
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpPacket.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package sun.management.jdp;
+
+import java.io.IOException;
+
+/**
+ * Packet to broadcast
+ *
+ * <p>Each packet have to contain MAGIC and PROTOCOL_VERSION in order to be
+ * recognized as a valid JDP packet.</p>
+ *
+ * <p>Default implementation build packet as a set of UTF-8 encoded Key/Value pairs
+ * are stored as an ordered list of values, and are sent to the server
+ * in that order.</p>
+ *
+ * <p>
+ * Packet structure:
+ *
+ * 4 bytes JDP magic (0xC0FFE42)
+ * 2 bytes JDP protocol version (01)
+ *
+ * 2 bytes size of key
+ * x bytes key (UTF-8 encoded)
+ * 2 bytes size of value
+ * x bytes value (UTF-8 encoded)
+ *
+ * repeat as many times as necessary ...
+ * </p>
+ */
+public interface JdpPacket {
+
+ /**
+ * This method responsible to assemble packet and return a byte array
+ * ready to be sent across a Net.
+ *
+ * @return assembled packet as an array of bytes
+ * @throws IOException
+ */
+ public byte[] getPacketData() throws IOException;
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * JdpPacketReader responsible for reading a packet <p>This class gets a byte
+ * array as it came from a Net, validates it and breaks a part </p>
+ */
+public final class JdpPacketReader {
+
+ private final DataInputStream pkt;
+ private Map<String, String> pmap = null;
+
+ /**
+ * Create packet reader, extract and check magic and version
+ *
+ * @param packet - packet received from a Net
+ * @throws JdpException
+ */
+ public JdpPacketReader(byte[] packet)
+ throws JdpException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(packet);
+ pkt = new DataInputStream(bais);
+
+ try {
+ int magic = pkt.readInt();
+ JdpGenericPacket.checkMagic(magic);
+ } catch (IOException e) {
+ throw new JdpException("Invalid JDP packet received, bad magic");
+ }
+
+ try {
+ short version = pkt.readShort();
+ JdpGenericPacket.checkVersion(version);
+ } catch (IOException e) {
+ throw new JdpException("Invalid JDP packet received, bad protocol version");
+ }
+ }
+
+ /**
+ * Get next entry from packet
+ *
+ * @return the entry
+ * @throws EOFException
+ * @throws JdpException
+ */
+ public String getEntry()
+ throws EOFException, JdpException {
+
+ try {
+ short len = pkt.readShort();
+ // Artificial setting the "len" field to Short.MAX_VALUE may cause a reader to allocate
+ // to much memory. Prevent this possible DOS attack.
+ if (len < 1 && len > pkt.available()) {
+ throw new JdpException("Broken JDP packet. Invalid entry length field.");
+ }
+
+ byte[] b = new byte[len];
+ if (pkt.read(b) != len) {
+ throw new JdpException("Broken JDP packet. Unable to read entry.");
+ }
+ return new String(b, "UTF-8");
+
+ } catch (EOFException e) {
+ throw e;
+ } catch (UnsupportedEncodingException ex) {
+ throw new JdpException("Broken JDP packet. Unable to decode entry.");
+ } catch (IOException e) {
+ throw new JdpException("Broken JDP packet. Unable to read entry.");
+ }
+
+
+ }
+
+ /**
+ * return packet content as a key/value map
+ *
+ * @return map containing packet entries pair of entries treated as
+ * key,value
+ * @throws IOException
+ * @throws JdpException
+ */
+ public Map<String, String> getDiscoveryDataAsMap()
+ throws JdpException {
+ // return cached map if possible
+ if (pmap != null) {
+ return pmap;
+ }
+
+ String key = null, value = null;
+
+ final Map<String, String> tmpMap = new HashMap<>();
+ try {
+ while (true) {
+ key = getEntry();
+ value = getEntry();
+ tmpMap.put(key, value);
+ }
+ } catch (EOFException e) {
+ // EOF reached on reading value, report broken packet
+ // otherwise ignore it.
+ if (value == null) {
+ throw new JdpException("Broken JDP packet. Key without value." + key);
+ }
+ }
+
+ pmap = Collections.unmodifiableMap(tmpMap);
+ return pmap;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/JdpPacketWriter.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+package sun.management.jdp;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * JdpPacketWriter responsible for writing a packet
+ * <p>This class assembles a set of key/value pairs to valid JDP packet,
+ * ready to be sent across a Net</p>
+ */
+public final class JdpPacketWriter {
+
+ private final ByteArrayOutputStream baos;
+ private final DataOutputStream pkt;
+
+ /**
+ * Create a JDP packet, add mandatory magic and version headers
+ *
+ * @throws IOException
+ */
+ public JdpPacketWriter()
+ throws IOException {
+ baos = new ByteArrayOutputStream();
+ pkt = new DataOutputStream(baos);
+
+ pkt.writeInt(JdpGenericPacket.getMagic());
+ pkt.writeShort(JdpGenericPacket.getVersion());
+ }
+
+ /**
+ * Put string entry to packet
+ *
+ * @param entry - string to put (utf-8 encoded)
+ * @throws IOException
+ */
+ public void addEntry(String entry)
+ throws IOException {
+ pkt.writeShort(entry.length());
+ byte[] b = entry.getBytes("UTF-8");
+ pkt.write(b);
+ }
+
+ /**
+ * Put key/value pair to packet
+ *
+ * @param key - key to put (utf-8 encoded)
+ * @param val - value to put (utf-8 encoded)
+ * @throws IOException
+ */
+ public void addEntry(String key, String val)
+ throws IOException {
+ /* Silently skip key if value is null.
+ * We don't need to distinguish between key missing
+ * and key has no value cases
+ */
+ if (val != null) {
+ addEntry(key);
+ addEntry(val);
+ }
+ }
+
+ /**
+ * Return assembled packet as a byte array
+ *
+ * @return packet bytes
+ */
+ public byte[] getPacketBytes() {
+ return baos.toByteArray();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/management/jdp/package-info.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,55 @@
+/**
+ * Summary
+ * -------
+ *
+ * Define a lightweight network protocol for discovering running and
+ * manageable Java processes within a network subnet.
+ *
+ *
+ * Description
+ * -----------
+ *
+ * The protocol is lightweight multicast based, and works like a beacon,
+ * broadcasting the JMXService URL needed to connect to the external JMX
+ * agent if an application is started with appropriate parameters.
+ *
+ * The payload is structured like this:
+ *
+ * 4 bytes JDP magic (0xC0FFEE42)
+ * 2 bytes JDP protocol version (1)
+ * 2 bytes size of the next entry
+ * x bytes next entry (UTF-8 encoded)
+ * 2 bytes size of next entry
+ * ... Rinse and repeat...
+ *
+ * The payload will be parsed as even entries being keys, odd entries being
+ * values.
+ *
+ * The standard JDP packet contains four entries:
+ *
+ * - `DISCOVERABLE_SESSION_UUID` -- Unique id of the instance; this id changes every time
+ * the discovery protocol starts and stops
+ *
+ * - `MAIN_CLASS` -- The value of the `sun.java.command` property
+ *
+ * - `JMX_SERVICE_URL` -- The URL to connect to the JMX agent
+ *
+ * - `INSTANCE_NAME` -- The user-provided name of the running instance
+ *
+ * The protocol sends packets to 239.255.255.225:7095 by default.
+ *
+ * The protocol uses system properties to control it's behaviour:
+ * - `com.sun.management.jdp.port` -- override default port
+ *
+ * - `com.sun.management.jdp.address` -- override default address
+ *
+ * - `com.sun.management.jmxremote.autodiscovery` -- whether we should start autodiscovery or
+ * not. Autodiscovery starts if and only if following conditions are met: (autodiscovery is
+ * true OR (autodiscovery is not set AND jdp.port is set))
+ *
+ * - `com.sun.management.jdp.ttl` -- set ttl for broadcast packet, default is 1
+ * - `com.sun.management.jdp.pause` -- set broadcast interval in seconds default is 5
+ * - `com.sun.management.jdp.source_addr` -- an address of interface to use for broadcast
+ */
+
+package sun.management.jdp;
--- a/jdk/src/share/classes/sun/misc/JavaLangAccess.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/misc/JavaLangAccess.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
package sun.misc;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Executable;
import sun.reflect.ConstantPool;
import sun.reflect.annotation.AnnotationType;
import sun.nio.ch.Interruptible;
@@ -47,6 +48,18 @@
AnnotationType getAnnotationType(Class<?> klass);
/**
+ * Get the array of bytes that is the class-file representation
+ * of this Class' type annotations.
+ */
+ byte[] getRawClassTypeAnnotations(Class<?> klass);
+
+ /**
+ * Get the array of bytes that is the class-file representation
+ * of this Executable's type annotations.
+ */
+ byte[] getRawExecutableTypeAnnotations(Executable executable);
+
+ /**
* Returns the elements of an enum class or null if the
* Class object does not represent an enum type;
* the result is uncloned, cached, and shared by all callers.
@@ -84,9 +97,4 @@
* Returns the ith StackTraceElement for the given throwable.
*/
StackTraceElement getStackTraceElement(Throwable t, int i);
-
- /**
- * Returns a directly present annotation.
- */
- public <A extends Annotation> A getDirectDeclaredAnnotation(Class<?> klass, Class<A> anno);
}
--- a/jdk/src/share/classes/sun/reflect/LangReflectAccess.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/reflect/LangReflectAccess.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -81,6 +81,9 @@
public void setConstructorAccessor(Constructor<?> c,
ConstructorAccessor accessor);
+ /** Gets the byte[] that encodes TypeAnnotations on an Executable. */
+ public byte[] getExecutableTypeAnnotationBytes(Executable ex);
+
/** Gets the "slot" field from a Constructor (used for serialization) */
public int getConstructorSlot(Constructor<?> c);
--- a/jdk/src/share/classes/sun/reflect/ReflectionFactory.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/reflect/ReflectionFactory.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -26,6 +26,7 @@
package sun.reflect;
import java.lang.reflect.Field;
+import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
@@ -314,6 +315,12 @@
return langReflectAccess().copyConstructor(arg);
}
+ /** Gets the byte[] that encodes TypeAnnotations on an executable.
+ */
+ public byte[] getExecutableTypeAnnotationBytes(Executable ex) {
+ return langReflectAccess().getExecutableTypeAnnotationBytes(ex);
+ }
+
//--------------------------------------------------------------------------
//
// Routines used by serialization
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,315 @@
+/*
+ * 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 sun.reflect.annotation;
+
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static sun.reflect.annotation.TypeAnnotation.*;
+
+public class AnnotatedTypeFactory {
+ /**
+ * Create an AnnotatedType.
+ *
+ * @param type the type this AnnotatedType corresponds to
+ * @param currentLoc the location this AnnotatedType corresponds to
+ * @param actualTypeAnnos the type annotations this AnnotatedType has
+ * @param allOnSameTarget all type annotation on the same TypeAnnotationTarget
+ * as the AnnotatedType being built
+ * @param decl the declaration having the type use this AnnotatedType
+ * corresponds to
+ */
+ public static AnnotatedType buildAnnotatedType(Type type,
+ LocationInfo currentLoc,
+ TypeAnnotation[] actualTypeAnnos,
+ TypeAnnotation[] allOnSameTarget,
+ AnnotatedElement decl) {
+ if (type == null) {
+ return EMPTY_ANNOTATED_TYPE;
+ }
+ if (isArray(type))
+ return new AnnotatedArrayTypeImpl(type,
+ currentLoc,
+ actualTypeAnnos,
+ allOnSameTarget,
+ decl);
+ if (type instanceof Class) {
+ return new AnnotatedTypeBaseImpl(type,
+ addNesting(type, currentLoc),
+ actualTypeAnnos,
+ allOnSameTarget,
+ decl);
+ } else if (type instanceof TypeVariable) {
+ return new AnnotatedTypeVariableImpl((TypeVariable)type,
+ currentLoc,
+ actualTypeAnnos,
+ allOnSameTarget,
+ decl);
+ } else if (type instanceof ParameterizedType) {
+ return new AnnotatedParameterizedTypeImpl((ParameterizedType)type,
+ addNesting(type, currentLoc),
+ actualTypeAnnos,
+ allOnSameTarget,
+ decl);
+ } else if (type instanceof WildcardType) {
+ return new AnnotatedWildcardTypeImpl((WildcardType) type,
+ currentLoc,
+ actualTypeAnnos,
+ allOnSameTarget,
+ decl);
+ }
+ throw new AssertionError("Unknown instance of Type: " + type + "\nThis should not happen.");
+ }
+
+ private static LocationInfo addNesting(Type type, LocationInfo addTo) {
+ if (isArray(type))
+ return addTo;
+ if (type instanceof Class) {
+ Class<?> clz = (Class)type;
+ if (clz.getEnclosingClass() == null)
+ return addTo;
+ return addNesting(clz.getEnclosingClass(), addTo.pushInner());
+ } else if (type instanceof ParameterizedType) {
+ ParameterizedType t = (ParameterizedType)type;
+ if (t.getOwnerType() == null)
+ return addTo;
+ return addNesting(t.getOwnerType(), addTo.pushInner());
+ }
+ return addTo;
+ }
+
+ private static boolean isArray(Type t) {
+ if (t instanceof Class) {
+ Class<?> c = (Class)t;
+ if (c.isArray())
+ return true;
+ } else if (t instanceof GenericArrayType) {
+ return true;
+ }
+ return false;
+ }
+
+ static final AnnotatedType EMPTY_ANNOTATED_TYPE = new AnnotatedTypeBaseImpl(null, LocationInfo.BASE_LOCATION,
+ new TypeAnnotation[0], new TypeAnnotation[0], null);
+
+ private static class AnnotatedTypeBaseImpl implements AnnotatedType {
+ private final Type type;
+ private final AnnotatedElement decl;
+ private final LocationInfo location;
+ private final TypeAnnotation[] allOnSameTargetTypeAnnotations;
+ private final Map<Class <? extends Annotation>, Annotation> annotations;
+
+ AnnotatedTypeBaseImpl(Type type, LocationInfo location,
+ TypeAnnotation[] actualTypeAnnotations, TypeAnnotation[] allOnSameTargetTypeAnnotations,
+ AnnotatedElement decl) {
+ this.type = type;
+ this.decl = decl;
+ this.location = location;
+ this.allOnSameTargetTypeAnnotations = allOnSameTargetTypeAnnotations;
+ this.annotations = TypeAnnotationParser.mapTypeAnnotations(location.filter(actualTypeAnnotations));
+ }
+
+ // AnnotatedElement
+ @Override
+ public final Annotation[] getAnnotations() {
+ return getDeclaredAnnotations();
+ }
+
+ @Override
+ public final <T extends Annotation> T getAnnotation(Class<T> annotation) {
+ return getDeclaredAnnotation(annotation);
+ }
+
+ @Override
+ public final <T extends Annotation> T[] getAnnotations(Class<T> annotation) {
+ return getDeclaredAnnotations(annotation);
+ }
+
+ @Override
+ public Annotation[] getDeclaredAnnotations() {
+ return annotations.values().toArray(new Annotation[0]);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T extends Annotation> T getDeclaredAnnotation(Class<T> annotation) {
+ return (T)annotations.get(annotation);
+ }
+
+ @Override
+ public <T extends Annotation> T[] getDeclaredAnnotations(Class<T> annotation) {
+ return AnnotationSupport.getMultipleAnnotations(annotations, annotation);
+ }
+
+ // AnnotatedType
+ @Override
+ public Type getType() {
+ return type;
+ }
+
+ // Implementation details
+ LocationInfo getLocation() {
+ return location;
+ }
+ TypeAnnotation[] getTypeAnnotations() {
+ return allOnSameTargetTypeAnnotations;
+ }
+ AnnotatedElement getDecl() {
+ return decl;
+ }
+ }
+
+ private static class AnnotatedArrayTypeImpl extends AnnotatedTypeBaseImpl implements AnnotatedArrayType {
+ AnnotatedArrayTypeImpl(Type type, LocationInfo location,
+ TypeAnnotation[] actualTypeAnnotations, TypeAnnotation[] allOnSameTargetTypeAnnotations,
+ AnnotatedElement decl) {
+ super(type, location, actualTypeAnnotations, allOnSameTargetTypeAnnotations, decl);
+ }
+
+ @Override
+ public AnnotatedType getAnnotatedGenericComponentType() {
+ return AnnotatedTypeFactory.buildAnnotatedType(getComponentType(),
+ getLocation().pushArray(),
+ getTypeAnnotations(),
+ getTypeAnnotations(),
+ getDecl());
+ }
+
+ private Type getComponentType() {
+ Type t = getType();
+ if (t instanceof Class) {
+ Class<?> c = (Class)t;
+ return c.getComponentType();
+ }
+ return ((GenericArrayType)t).getGenericComponentType();
+ }
+ }
+
+ private static class AnnotatedTypeVariableImpl extends AnnotatedTypeBaseImpl implements AnnotatedTypeVariable {
+ AnnotatedTypeVariableImpl(TypeVariable<?> type, LocationInfo location,
+ TypeAnnotation[] actualTypeAnnotations, TypeAnnotation[] allOnSameTargetTypeAnnotations,
+ AnnotatedElement decl) {
+ super(type, location, actualTypeAnnotations, allOnSameTargetTypeAnnotations, decl);
+ }
+
+ @Override
+ public AnnotatedType[] getAnnotatedBounds() {
+ return getTypeVariable().getAnnotatedBounds();
+ }
+
+ private TypeVariable<?> getTypeVariable() {
+ return (TypeVariable)getType();
+ }
+ }
+
+ private static class AnnotatedParameterizedTypeImpl extends AnnotatedTypeBaseImpl implements AnnotatedParameterizedType {
+ AnnotatedParameterizedTypeImpl(ParameterizedType type, LocationInfo location,
+ TypeAnnotation[] actualTypeAnnotations, TypeAnnotation[] allOnSameTargetTypeAnnotations,
+ AnnotatedElement decl) {
+ super(type, location, actualTypeAnnotations, allOnSameTargetTypeAnnotations, decl);
+ }
+
+ @Override
+ public AnnotatedType[] getAnnotatedActualTypeArguments() {
+ Type[] arguments = getParameterizedType().getActualTypeArguments();
+ AnnotatedType[] res = new AnnotatedType[arguments.length];
+ Arrays.fill(res, EMPTY_ANNOTATED_TYPE);
+ int initialCapacity = getTypeAnnotations().length;
+ for (int i = 0; i < res.length; i++) {
+ List<TypeAnnotation> l = new ArrayList<>(initialCapacity);
+ LocationInfo newLoc = getLocation().pushTypeArg((byte)i);
+ for (TypeAnnotation t : getTypeAnnotations())
+ if (t.getLocationInfo().isSameLocationInfo(newLoc))
+ l.add(t);
+ res[i] = buildAnnotatedType(arguments[i],
+ newLoc,
+ l.toArray(new TypeAnnotation[0]),
+ getTypeAnnotations(),
+ getDecl());
+ }
+ return res;
+ }
+
+ private ParameterizedType getParameterizedType() {
+ return (ParameterizedType)getType();
+ }
+ }
+
+ private static class AnnotatedWildcardTypeImpl extends AnnotatedTypeBaseImpl implements AnnotatedWildcardType {
+ private final boolean hasUpperBounds;
+ AnnotatedWildcardTypeImpl(WildcardType type, LocationInfo location,
+ TypeAnnotation[] actualTypeAnnotations, TypeAnnotation[] allOnSameTargetTypeAnnotations,
+ AnnotatedElement decl) {
+ super(type, location, actualTypeAnnotations, allOnSameTargetTypeAnnotations, decl);
+ hasUpperBounds = (type.getLowerBounds().length == 0);
+ }
+
+ @Override
+ public AnnotatedType[] getAnnotatedUpperBounds() {
+ if (!hasUpperBounds())
+ return new AnnotatedType[0];
+ return getAnnotatedBounds(getWildcardType().getUpperBounds());
+ }
+
+ @Override
+ public AnnotatedType[] getAnnotatedLowerBounds() {
+ if (hasUpperBounds)
+ return new AnnotatedType[0];
+ return getAnnotatedBounds(getWildcardType().getLowerBounds());
+ }
+
+ private AnnotatedType[] getAnnotatedBounds(Type[] bounds) {
+ AnnotatedType[] res = new AnnotatedType[bounds.length];
+ Arrays.fill(res, EMPTY_ANNOTATED_TYPE);
+ LocationInfo newLoc = getLocation().pushWildcard();
+ int initialCapacity = getTypeAnnotations().length;
+ for (int i = 0; i < res.length; i++) {
+ List<TypeAnnotation> l = new ArrayList<>(initialCapacity);
+ for (TypeAnnotation t : getTypeAnnotations())
+ if (t.getLocationInfo().isSameLocationInfo(newLoc))
+ l.add(t);
+ res[i] = buildAnnotatedType(bounds[i],
+ newLoc,
+ l.toArray(new TypeAnnotation[0]),
+ getTypeAnnotations(),
+ getDecl());
+ }
+ return res;
+ }
+
+ private WildcardType getWildcardType() {
+ return (WildcardType)getType();
+ }
+
+ private boolean hasUpperBounds() {
+ return hasUpperBounds;
+ }
+ }
+}
--- a/jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -188,7 +188,7 @@
* available at runtime
*/
@SuppressWarnings("unchecked")
- private static Annotation parseAnnotation(ByteBuffer buf,
+ static Annotation parseAnnotation(ByteBuffer buf,
ConstantPool constPool,
Class<?> container,
boolean exceptionOnMissingAnnotationClass) {
--- a/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,63 +27,29 @@
import java.lang.annotation.*;
import java.lang.reflect.*;
-import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
-import sun.reflect.Reflection;
-import sun.misc.JavaLangAccess;
public final class AnnotationSupport {
- private static final JavaLangAccess javaLangAccess = sun.misc.SharedSecrets.getJavaLangAccess();
-
- /**
- * Finds and returns _one_ annotation of the type indicated by
- * {@code annotationClass} from the {@code Map} {@code
- * annotationMap}. Looks into containers of the {@code
- * annotationClass} (as specified by an the {@code
- * annotationClass} type being meta-annotated with an {@code
- * ContainedBy} annotation).
- *
- * @param annotationMap the {@code Map} used to store annotations and indexed by their type
- * @param annotationClass the type of annotation to search for
- *
- * @return in instance of {@code annotationClass} or {@code null} if none were found
- */
- public static <A extends Annotation> A getOneAnnotation(final Map<Class<? extends Annotation>, Annotation> annotationMap,
- final Class<A> annotationClass) {
- @SuppressWarnings("unchecked")
- final A candidate = (A)annotationMap.get(annotationClass);
- if (candidate != null) {
- return candidate;
- }
-
- final Class<? extends Annotation> containerClass = getContainer(annotationClass);
- if (containerClass != null) {
- return unpackOne(annotationMap.get(containerClass), annotationClass);
- }
-
- return null; // found none
- }
-
/**
* Finds and returns all annotation of the type indicated by
* {@code annotationClass} from the {@code Map} {@code
* annotationMap}. Looks into containers of the {@code
* annotationClass} (as specified by an the {@code
* annotationClass} type being meta-annotated with an {@code
- * ContainedBy} annotation).
+ * Repeatable} annotation).
*
* @param annotationMap the {@code Map} used to store annotations indexed by their type
* @param annotationClass the type of annotation to search for
*
* @return an array of instances of {@code annotationClass} or an empty array if none were found
*/
- public static <A extends Annotation> A[] getMultipleAnnotations(final Map<Class<? extends Annotation>, Annotation> annotationMap,
- final Class<A> annotationClass) {
- final ArrayList<A> res = new ArrayList<A>();
+ public static <A extends Annotation> A[] getMultipleAnnotations(
+ final Map<Class<? extends Annotation>, Annotation> annotationMap,
+ final Class<A> annotationClass) {
+ final List<A> res = new ArrayList<A>();
@SuppressWarnings("unchecked")
final A candidate = (A)annotationMap.get(annotationClass);
@@ -101,49 +67,10 @@
return res.isEmpty() ? emptyTemplateArray : res.toArray(emptyTemplateArray);
}
- /**
- * Unpacks the {@code annotationMap} parameter into an array of
- * {@code Annotation}s. This method will unpack all repeating
- * annotations containers (once). An annotation type is marked as a
- * container by meta-annotating it the with the {@code
- * ContainerFor} annotation.
- *
- * @param annotationMap the {@code Map} from where the annotations are unpacked
- *
- * @return an array of Annotation
- */
- public static Annotation[] unpackToArray(Map<Class<? extends Annotation>, Annotation> annotationMap) {
- List<Annotation> res = new ArrayList<>();
- for (Map.Entry<Class<? extends Annotation>, Annotation> e : annotationMap.entrySet()) {
- Class<? extends Annotation> annotationClass = e.getKey();
- Annotation annotationInstance = e.getValue();
- Class<? extends Annotation> containee = getContainee(e.getKey());
- boolean isContainer = javaLangAccess.getDirectDeclaredAnnotation(annotationClass, ContainerFor.class) != null;
-
- if (isContainer) {
- res.addAll(unpackAll(annotationInstance, containee));
- } else {
- res.add(annotationInstance);
- }
- }
-
- return res.isEmpty()
- ? AnnotationParser.getEmptyAnnotationArray()
- : res.toArray(AnnotationParser.getEmptyAnnotationArray());
- }
-
/** Helper to get the container, or null if none, of an annotation. */
private static <A extends Annotation> Class<? extends Annotation> getContainer(Class<A> annotationClass) {
- ContainedBy containerAnnotation =
- javaLangAccess.getDirectDeclaredAnnotation(annotationClass, ContainedBy.class);
- return (containerAnnotation == null) ? null : containerAnnotation.value();
- }
-
- /** Helper to get the containee, or null if this isn't a container, of a possible container annotation. */
- private static <A extends Annotation> Class<? extends Annotation> getContainee(Class<A> annotationClass) {
- ContainerFor containerAnnotation =
- javaLangAccess.getDirectDeclaredAnnotation(annotationClass, ContainerFor.class);
- return (containerAnnotation == null) ? null : containerAnnotation.value();
+ Repeatable containingAnnotation = annotationClass.getDeclaredAnnotation(Repeatable.class);
+ return (containingAnnotation == null) ? null : containingAnnotation.value();
}
/** Reflectively look up and get the returned array from the the
@@ -156,14 +83,15 @@
// value element. Get the AnnotationType, get the "value" element
// and invoke it to get the contents.
- Class<?> containerClass = containerInstance.annotationType();
- AnnotationType annoType = javaLangAccess.getAnnotationType(containerClass);
+ Class<? extends Annotation> containerClass = containerInstance.annotationType();
+ AnnotationType annoType = AnnotationType.getInstance(containerClass);
if (annoType == null)
throw new InvalidContainerAnnotationError(containerInstance + " is an invalid container for repeating annotations");
Method m = annoType.members().get("value");
if (m == null)
- throw new InvalidContainerAnnotationError(containerInstance + " is an invalid container for repeating annotations");
+ throw new InvalidContainerAnnotationError(containerInstance +
+ " is an invalid container for repeating annotations");
m.setAccessible(true);
@SuppressWarnings("unchecked") // not provably safe, but we catch the ClassCastException
@@ -175,32 +103,11 @@
IllegalArgumentException | // parameters doesn't match
InvocationTargetException | // the value method threw an exception
ClassCastException e) { // well, a cast failed ...
- throw new InvalidContainerAnnotationError(containerInstance + " is an invalid container for repeating annotations",
- e,
- containerInstance,
- null);
- }
- }
-
- /* Sanity check type of and return the first annotation instance
- * of type {@code annotationClass} from {@code
- * containerInstance}.
- */
- private static <A extends Annotation> A unpackOne(Annotation containerInstance, Class<A> annotationClass) {
- if (containerInstance == null) {
- return null;
- }
-
- try {
- return annotationClass.cast(getValueArray(containerInstance)[0]);
- } catch (ArrayIndexOutOfBoundsException | // empty array
- ClassCastException | // well, a cast failed ...
- NullPointerException e) { // can this NP? for good meassure
- throw new InvalidContainerAnnotationError(String.format("%s is an invalid container for repeating annotations of type: %s",
- containerInstance, annotationClass),
- e,
- containerInstance,
- annotationClass);
+ throw new InvalidContainerAnnotationError(
+ containerInstance + " is an invalid container for repeating annotations",
+ e,
+ containerInstance,
+ null);
}
}
@@ -208,24 +115,26 @@
* instances of type {@code annotationClass} from {@code
* containerInstance}.
*/
- private static <A extends Annotation> List<A> unpackAll(Annotation containerInstance, Class<A> annotationClass) {
+ private static <A extends Annotation> List<A> unpackAll(Annotation containerInstance,
+ Class<A> annotationClass) {
if (containerInstance == null) {
return Collections.emptyList(); // container not present
}
try {
A[] a = getValueArray(containerInstance);
- ArrayList<A> l = new ArrayList<>(a.length);
+ List<A> l = new ArrayList<>(a.length);
for (int i = 0; i < a.length; i++)
l.add(annotationClass.cast(a[i]));
return l;
} catch (ClassCastException |
NullPointerException e) {
- throw new InvalidContainerAnnotationError(String.format("%s is an invalid container for repeating annotations of type: %s",
- containerInstance, annotationClass),
- e,
- containerInstance,
- annotationClass);
+ throw new InvalidContainerAnnotationError(
+ String.format("%s is an invalid container for repeating annotations of type: %s",
+ containerInstance, annotationClass),
+ e,
+ containerInstance,
+ annotationClass);
}
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,227 @@
+/*
+ * 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 sun.reflect.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.AnnotationFormatError;
+import java.lang.reflect.AnnotatedElement;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A TypeAnnotation contains all the information needed to transform type
+ * annotations on declarations in the class file to actual Annotations in
+ * AnnotatedType instances.
+ *
+ * TypeAnnotaions contain a base Annotation, location info (which lets you
+ * distinguish between '@A Inner.@B Outer' in for example nested types),
+ * target info and the declaration the TypeAnnotaiton was parsed from.
+ */
+public class TypeAnnotation {
+ private final TypeAnnotationTargetInfo targetInfo;
+ private final LocationInfo loc;
+ private final Annotation annotation;
+ private final AnnotatedElement baseDeclaration;
+
+ public TypeAnnotation(TypeAnnotationTargetInfo targetInfo,
+ LocationInfo loc,
+ Annotation annotation,
+ AnnotatedElement baseDeclaration) {
+ this.targetInfo = targetInfo;
+ this.loc = loc;
+ this.annotation = annotation;
+ this.baseDeclaration = baseDeclaration;
+ }
+
+ public TypeAnnotationTargetInfo getTargetInfo() {
+ return targetInfo;
+ }
+ public Annotation getAnnotation() {
+ return annotation;
+ }
+ public AnnotatedElement getBaseDeclaration() {
+ return baseDeclaration;
+ }
+ public LocationInfo getLocationInfo() {
+ return loc;
+ }
+
+ public static List<TypeAnnotation> filter(TypeAnnotation[] typeAnnotations,
+ TypeAnnotationTarget predicate) {
+ ArrayList<TypeAnnotation> typeAnnos = new ArrayList<>(typeAnnotations.length);
+ for (TypeAnnotation t : typeAnnotations)
+ if (t.getTargetInfo().getTarget() == predicate)
+ typeAnnos.add(t);
+ typeAnnos.trimToSize();
+ return typeAnnos;
+ }
+
+ public static enum TypeAnnotationTarget {
+ CLASS_TYPE_PARAMETER,
+ METHOD_TYPE_PARAMETER,
+ CLASS_EXTENDS,
+ CLASS_IMPLEMENTS,
+ CLASS_PARAMETER_BOUND,
+ METHOD_PARAMETER_BOUND,
+ METHOD_RETURN_TYPE,
+ METHOD_RECEIVER_TYPE,
+ FIELD_TYPE,
+ THROWS;
+ }
+ public static class TypeAnnotationTargetInfo {
+ private final TypeAnnotationTarget target;
+ private final int count;
+ private final int secondaryIndex;
+ private static final int UNUSED_INDEX = -2; // this is not a valid index in the 308 spec
+
+ public TypeAnnotationTargetInfo(TypeAnnotationTarget target) {
+ this(target, UNUSED_INDEX, UNUSED_INDEX);
+ }
+
+ public TypeAnnotationTargetInfo(TypeAnnotationTarget target,
+ int count) {
+ this(target, count, UNUSED_INDEX);
+ }
+
+ public TypeAnnotationTargetInfo(TypeAnnotationTarget target,
+ int count,
+ int secondaryIndex) {
+ this.target = target;
+ this.count = count;
+ this.secondaryIndex = secondaryIndex;
+ }
+
+ public TypeAnnotationTarget getTarget() {
+ return target;
+ }
+ public int getCount() {
+ return count;
+ }
+ public int getSecondaryIndex() {
+ return secondaryIndex;
+ }
+
+ @Override
+ public String toString() {
+ return "" + target + ": " + count + ", " + secondaryIndex;
+ }
+ }
+
+ public static class LocationInfo {
+ private final int depth;
+ private final Location[] locations;
+
+ private LocationInfo() {
+ this(0, new Location[0]);
+ }
+ private LocationInfo(int depth, Location[] locations) {
+ this.depth = depth;
+ this.locations = locations;
+ }
+
+ public static final LocationInfo BASE_LOCATION = new LocationInfo();
+
+ public static LocationInfo parseLocationInfo(ByteBuffer buf) {
+ int depth = buf.get();
+ if (depth == 0)
+ return BASE_LOCATION;
+ Location[] locations = new Location[depth];
+ for (int i = 0; i < depth; i++) {
+ byte tag = buf.get();
+ byte index = buf.get();
+ if (!(tag == 0 || tag == 1 | tag == 2 || tag == 3))
+ throw new AnnotationFormatError("Bad Location encoding in Type Annotation");
+ if (tag != 3 && index != 0)
+ throw new AnnotationFormatError("Bad Location encoding in Type Annotation");
+ locations[i] = new Location(tag, index);
+ }
+ return new LocationInfo(depth, locations);
+ }
+
+ public LocationInfo pushArray() {
+ return pushLocation((byte)0, (byte)0);
+ }
+
+ public LocationInfo pushInner() {
+ return pushLocation((byte)1, (byte)0);
+ }
+
+ public LocationInfo pushWildcard() {
+ return pushLocation((byte) 2, (byte) 0);
+ }
+
+ public LocationInfo pushTypeArg(byte index) {
+ return pushLocation((byte) 3, index);
+ }
+
+ public LocationInfo pushLocation(byte tag, byte index) {
+ int newDepth = this.depth + 1;
+ Location[] res = new Location[newDepth];
+ System.arraycopy(this.locations, 0, res, 0, depth);
+ res[newDepth - 1] = new Location(tag, index);
+ return new LocationInfo(newDepth, res);
+ }
+
+ public TypeAnnotation[] filter(TypeAnnotation[] ta) {
+ ArrayList<TypeAnnotation> l = new ArrayList<>(ta.length);
+ for (TypeAnnotation t : ta) {
+ if (isSameLocationInfo(t.getLocationInfo()))
+ l.add(t);
+ }
+ return l.toArray(new TypeAnnotation[0]);
+ }
+
+ boolean isSameLocationInfo(LocationInfo other) {
+ if (depth != other.depth)
+ return false;
+ for (int i = 0; i < depth; i++)
+ if (!locations[i].isSameLocation(other.locations[i]))
+ return false;
+ return true;
+ }
+
+ public static class Location {
+ public final byte tag;
+ public final byte index;
+
+ boolean isSameLocation(Location other) {
+ return tag == other.tag && index == other.index;
+ }
+
+ public Location(byte tag, byte index) {
+ this.tag = tag;
+ this.index = index;
+ }
+ }
+ }
+
+ @Override
+ public String toString() {
+ return annotation.toString() + " with Targetnfo: " +
+ targetInfo.toString() + " on base declaration: " +
+ baseDeclaration.toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,491 @@
+/*
+ * 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 sun.reflect.annotation;
+
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.nio.ByteBuffer;
+import java.nio.BufferUnderflowException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import sun.misc.JavaLangAccess;
+import sun.reflect.ConstantPool;
+import static sun.reflect.annotation.TypeAnnotation.*;
+
+/**
+ * TypeAnnotationParser implements the logic needed to parse
+ * TypeAnnotations from an array of bytes.
+ */
+public class TypeAnnotationParser {
+ private static final TypeAnnotation[] EMPTY_TYPE_ANNOTATION_ARRAY = new TypeAnnotation[0];
+
+ /**
+ * Build an AnnotatedType from the parameters supplied.
+ *
+ * This method and {@code buildAnnotatedTypes} are probably
+ * the entry points you are looking for.
+ *
+ * @param rawAnnotations the byte[] encoding of all type annotations on this declaration
+ * @param cp the ConstantPool needed to parse the embedded Annotation
+ * @param decl the dclaration this type annotation is on
+ * @param container the Class this type annotation is on (may be the same as decl)
+ * @param type the type the AnnotatedType corresponds to
+ * @param filter the type annotation targets included in this AnnotatedType
+ */
+ public static AnnotatedType buildAnnotatedType(byte[] rawAnnotations,
+ ConstantPool cp,
+ AnnotatedElement decl,
+ Class<?> container,
+ Type type,
+ TypeAnnotationTarget filter) {
+ TypeAnnotation[] tas = parseTypeAnnotations(rawAnnotations,
+ cp,
+ decl,
+ container);
+ List<TypeAnnotation> l = new ArrayList<>(tas.length);
+ for (TypeAnnotation t : tas) {
+ TypeAnnotationTargetInfo ti = t.getTargetInfo();
+ if (ti.getTarget() == filter)
+ l.add(t);
+ }
+ TypeAnnotation[] typeAnnotations = l.toArray(new TypeAnnotation[0]);
+ return AnnotatedTypeFactory.buildAnnotatedType(type,
+ LocationInfo.BASE_LOCATION,
+ typeAnnotations,
+ typeAnnotations,
+ decl);
+ }
+
+ /**
+ * Build an array of AnnotatedTypes from the parameters supplied.
+ *
+ * This method and {@code buildAnnotatedType} are probably
+ * the entry points you are looking for.
+ *
+ * @param rawAnnotations the byte[] encoding of all type annotations on this declaration
+ * @param cp the ConstantPool needed to parse the embedded Annotation
+ * @param decl the declaration this type annotation is on
+ * @param container the Class this type annotation is on (may be the same as decl)
+ * @param types the Types the AnnotatedTypes corresponds to
+ * @param filter the type annotation targets that included in this AnnotatedType
+ */
+ public static AnnotatedType[] buildAnnotatedTypes(byte[] rawAnnotations,
+ ConstantPool cp,
+ AnnotatedElement decl,
+ Class<?> container,
+ Type[] types,
+ TypeAnnotationTarget filter) {
+ int size = types.length;
+ AnnotatedType[] result = new AnnotatedType[size];
+ Arrays.fill(result, AnnotatedTypeFactory.EMPTY_ANNOTATED_TYPE);
+ @SuppressWarnings("rawtypes")
+ ArrayList[] l = new ArrayList[size]; // array of ArrayList<TypeAnnotation>
+
+ TypeAnnotation[] tas = parseTypeAnnotations(rawAnnotations,
+ cp,
+ decl,
+ container);
+ for (TypeAnnotation t : tas) {
+ TypeAnnotationTargetInfo ti = t.getTargetInfo();
+ if (ti.getTarget() == filter) {
+ int pos = ti.getCount();
+ if (l[pos] == null) {
+ ArrayList<TypeAnnotation> tmp = new ArrayList<>(tas.length);
+ l[pos] = tmp;
+ }
+ @SuppressWarnings("unchecked")
+ ArrayList<TypeAnnotation> tmp = l[pos];
+ tmp.add(t);
+ }
+ }
+ for (int i = 0; i < size; i++) {
+ @SuppressWarnings("unchecked")
+ ArrayList<TypeAnnotation> list = l[i];
+ if (list != null) {
+ TypeAnnotation[] typeAnnotations = list.toArray(new TypeAnnotation[0]);
+ result[i] = AnnotatedTypeFactory.buildAnnotatedType(types[i],
+ LocationInfo.BASE_LOCATION,
+ typeAnnotations,
+ typeAnnotations,
+ decl);
+ }
+ }
+ return result;
+ }
+
+ // Class helpers
+
+ /**
+ * Build an AnnotatedType for the class decl's supertype.
+ *
+ * @param rawAnnotations the byte[] encoding of all type annotations on this declaration
+ * @param cp the ConstantPool needed to parse the embedded Annotation
+ * @param decl the Class which annotated supertype is being built
+ */
+ public static AnnotatedType buildAnnotatedSuperclass(byte[] rawAnnotations,
+ ConstantPool cp,
+ Class<?> decl) {
+ Type supertype = decl.getGenericSuperclass();
+ if (supertype == null)
+ return AnnotatedTypeFactory.EMPTY_ANNOTATED_TYPE;
+ return buildAnnotatedType(rawAnnotations,
+ cp,
+ decl,
+ decl,
+ supertype,
+ TypeAnnotationTarget.CLASS_EXTENDS);
+ }
+
+ /**
+ * Build an array of AnnotatedTypes for the class decl's implemented
+ * interfaces.
+ *
+ * @param rawAnnotations the byte[] encoding of all type annotations on this declaration
+ * @param cp the ConstantPool needed to parse the embedded Annotation
+ * @param decl the Class whose annotated implemented interfaces is being built
+ */
+ public static AnnotatedType[] buildAnnotatedInterfaces(byte[] rawAnnotations,
+ ConstantPool cp,
+ Class<?> decl) {
+ return buildAnnotatedTypes(rawAnnotations,
+ cp,
+ decl,
+ decl,
+ decl.getGenericInterfaces(),
+ TypeAnnotationTarget.CLASS_IMPLEMENTS);
+ }
+
+ // TypeVariable helpers
+
+ /**
+ * Parse regular annotations on a TypeVariable declared on genericDecl.
+ *
+ * Regular Annotations on TypeVariables are stored in the type
+ * annotation byte[] in the class file.
+ *
+ * @param genericsDecl the declaration declaring the type variable
+ * @param typeVarIndex the 0-based index of this type variable in the declaration
+ */
+ public static <D extends GenericDeclaration> Annotation[] parseTypeVariableAnnotations(D genericDecl,
+ int typeVarIndex) {
+ AnnotatedElement decl;
+ TypeAnnotationTarget predicate;
+ if (genericDecl instanceof Class) {
+ decl = (Class<?>)genericDecl;
+ predicate = TypeAnnotationTarget.CLASS_TYPE_PARAMETER;
+ } else if (genericDecl instanceof Executable) {
+ decl = (Executable)genericDecl;
+ predicate = TypeAnnotationTarget.METHOD_TYPE_PARAMETER;
+ } else {
+ throw new AssertionError("Unknown GenericDeclaration " + genericDecl + "\nthis should not happen.");
+ }
+ List<TypeAnnotation> typeVarAnnos = TypeAnnotation.filter(parseAllTypeAnnotations(decl),
+ predicate);
+ List<Annotation> res = new ArrayList<>(typeVarAnnos.size());
+ for (TypeAnnotation t : typeVarAnnos)
+ if (t.getTargetInfo().getCount() == typeVarIndex)
+ res.add(t.getAnnotation());
+ return res.toArray(new Annotation[0]);
+ }
+
+ /**
+ * Build an array of AnnotatedTypes for the declaration decl's bounds.
+ *
+ * @param bounds the bounds corresponding to the annotated bounds
+ * @param decl the declaration whose annotated bounds is being built
+ * @param typeVarIndex the index of this type variable on the decl
+ */
+ public static <D extends GenericDeclaration> AnnotatedType[] parseAnnotatedBounds(Type[] bounds,
+ D decl,
+ int typeVarIndex) {
+ return parseAnnotatedBounds(bounds, decl, typeVarIndex, LocationInfo.BASE_LOCATION);
+ }
+ //helper for above
+ static <D extends GenericDeclaration> AnnotatedType[] parseAnnotatedBounds(Type[] bounds,
+ D decl,
+ int typeVarIndex,
+ LocationInfo loc) {
+ List<TypeAnnotation> candidates = fetchBounds(decl);
+ if (bounds != null) {
+ int startIndex = 0;
+ AnnotatedType[] res = new AnnotatedType[bounds.length];
+ Arrays.fill(res, AnnotatedTypeFactory.EMPTY_ANNOTATED_TYPE);
+
+ // Adjust bounds index
+ //
+ // Figure out if the type annotations for this bound starts with 0
+ // or 1. The spec says within a bound the 0:th type annotation will
+ // always be on an bound of a Class type (not Interface type). So
+ // if the programmer starts with an Interface type for the first
+ // (and following) bound(s) the implicit Object bound is considered
+ // the first (that is 0:th) bound and type annotations start on
+ // index 1.
+ if (bounds.length > 0) {
+ Type b0 = bounds[0];
+ if (!(b0 instanceof Class<?>)) {
+ startIndex = 1;
+ } else {
+ Class<?> c = (Class<?>)b0;
+ if (c.isInterface()) {
+ startIndex = 1;
+ }
+ }
+ }
+
+ for (int i = 0; i < bounds.length; i++) {
+ List<TypeAnnotation> l = new ArrayList<>(candidates.size());
+ for (TypeAnnotation t : candidates) {
+ TypeAnnotationTargetInfo tInfo = t.getTargetInfo();
+ if (tInfo.getSecondaryIndex() == i + startIndex &&
+ tInfo.getCount() == typeVarIndex) {
+ l.add(t);
+ }
+ res[i] = AnnotatedTypeFactory.buildAnnotatedType(bounds[i],
+ loc,
+ l.toArray(new TypeAnnotation[0]),
+ candidates.toArray(new TypeAnnotation[0]),
+ (AnnotatedElement)decl);
+ }
+ }
+ return res;
+ }
+ return new AnnotatedType[0];
+ }
+ private static <D extends GenericDeclaration> List<TypeAnnotation> fetchBounds(D decl) {
+ AnnotatedElement boundsDecl;
+ TypeAnnotationTarget target;
+ if (decl instanceof Class) {
+ target = TypeAnnotationTarget.CLASS_PARAMETER_BOUND;
+ boundsDecl = (Class)decl;
+ } else {
+ target = TypeAnnotationTarget.METHOD_PARAMETER_BOUND;
+ boundsDecl = (Executable)decl;
+ }
+ return TypeAnnotation.filter(TypeAnnotationParser.parseAllTypeAnnotations(boundsDecl), target);
+ }
+
+ /*
+ * Parse all type annotations on the declaration supplied. This is needed
+ * when you go from for example an annotated return type on a method that
+ * is a type variable declared on the class. In this case you need to
+ * 'jump' to the decl of the class and parse all type annotations there to
+ * find the ones that are applicable to the type variable.
+ */
+ static TypeAnnotation[] parseAllTypeAnnotations(AnnotatedElement decl) {
+ Class<?> container;
+ byte[] rawBytes;
+ JavaLangAccess javaLangAccess = sun.misc.SharedSecrets.getJavaLangAccess();
+ if (decl instanceof Class) {
+ container = (Class<?>)decl;
+ rawBytes = javaLangAccess.getRawClassTypeAnnotations(container);
+ } else if (decl instanceof Executable) {
+ container = ((Executable)decl).getDeclaringClass();
+ rawBytes = javaLangAccess.getRawExecutableTypeAnnotations((Executable)decl);
+ } else {
+ // Should not reach here. Assert?
+ return EMPTY_TYPE_ANNOTATION_ARRAY;
+ }
+ return parseTypeAnnotations(rawBytes, javaLangAccess.getConstantPool(container),
+ decl, container);
+ }
+
+ /* Parse type annotations encoded as an array of bytes */
+ private static TypeAnnotation[] parseTypeAnnotations(byte[] rawAnnotations,
+ ConstantPool cp,
+ AnnotatedElement baseDecl,
+ Class<?> container) {
+ if (rawAnnotations == null)
+ return EMPTY_TYPE_ANNOTATION_ARRAY;
+
+ ByteBuffer buf = ByteBuffer.wrap(rawAnnotations);
+ int annotationCount = buf.getShort() & 0xFFFF;
+ List<TypeAnnotation> typeAnnotations = new ArrayList<>(annotationCount);
+
+ // Parse each TypeAnnotation
+ for (int i = 0; i < annotationCount; i++) {
+ TypeAnnotation ta = parseTypeAnnotation(buf, cp, baseDecl, container);
+ if (ta != null)
+ typeAnnotations.add(ta);
+ }
+
+ return typeAnnotations.toArray(EMPTY_TYPE_ANNOTATION_ARRAY);
+ }
+
+
+ // Helper
+ static Map<Class<? extends Annotation>, Annotation> mapTypeAnnotations(TypeAnnotation[] typeAnnos) {
+ Map<Class<? extends Annotation>, Annotation> result =
+ new LinkedHashMap<>();
+ for (TypeAnnotation t : typeAnnos) {
+ Annotation a = t.getAnnotation();
+ Class<? extends Annotation> klass = a.annotationType();
+ AnnotationType type = AnnotationType.getInstance(klass);
+ if (type.retention() == RetentionPolicy.RUNTIME)
+ if (result.put(klass, a) != null)
+ throw new AnnotationFormatError("Duplicate annotation for class: "+klass+": " + a);
+ }
+ return result;
+ }
+
+ // Position codes
+ // Regular type parameter annotations
+ private static final byte CLASS_TYPE_PARAMETER = 0x00;
+ private static final byte METHOD_TYPE_PARAMETER = 0x01;
+ // Type Annotations outside method bodies
+ private static final byte CLASS_EXTENDS = 0x10;
+ private static final byte CLASS_TYPE_PARAMETER_BOUND = 0x11;
+ private static final byte METHOD_TYPE_PARAMETER_BOUND = 0x12;
+ private static final byte FIELD = 0x13;
+ private static final byte METHOD_RETURN = 0x14;
+ private static final byte METHOD_RECEIVER = 0x15;
+ private static final byte METHOD_FORMAL_PARAMETER = 0x16;
+ private static final byte THROWS = 0x17;
+ // Type Annotations inside method bodies
+ private static final byte LOCAL_VARIABLE = (byte)0x40;
+ private static final byte RESOURCE_VARIABLE = (byte)0x41;
+ private static final byte EXCEPTION_PARAMETER = (byte)0x42;
+ private static final byte CAST = (byte)0x43;
+ private static final byte INSTANCEOF = (byte)0x44;
+ private static final byte NEW = (byte)0x45;
+ private static final byte CONSTRUCTOR_REFERENCE_RECEIVER = (byte)0x46;
+ private static final byte METHOD_REFERENCE_RECEIVER = (byte)0x47;
+ private static final byte LAMBDA_FORMAL_PARAMETER = (byte)0x48;
+ private static final byte METHOD_REFERENCE = (byte)0x49;
+ private static final byte METHOD_REFERENCE_TYPE_ARGUMENT = (byte)0x50;
+
+ private static TypeAnnotation parseTypeAnnotation(ByteBuffer buf,
+ ConstantPool cp,
+ AnnotatedElement baseDecl,
+ Class<?> container) {
+ TypeAnnotationTargetInfo ti = parseTargetInfo(buf);
+ LocationInfo locationInfo = LocationInfo.parseLocationInfo(buf);
+ Annotation a = AnnotationParser.parseAnnotation(buf, cp, container, false);
+ if (ti == null) // Inside a method for example
+ return null;
+ return new TypeAnnotation(ti, locationInfo, a, baseDecl);
+ }
+
+ private static TypeAnnotationTargetInfo parseTargetInfo(ByteBuffer buf) {
+ byte posCode = buf.get();
+ switch(posCode) {
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER: {
+ byte index = buf.get();
+ TypeAnnotationTargetInfo res;
+ if (posCode == CLASS_TYPE_PARAMETER)
+ res = new TypeAnnotationTargetInfo(TypeAnnotationTarget.CLASS_TYPE_PARAMETER,
+ index);
+ else
+ res = new TypeAnnotationTargetInfo(TypeAnnotationTarget.METHOD_TYPE_PARAMETER,
+ index);
+ return res;
+ } // unreachable break;
+ case CLASS_EXTENDS: {
+ short index = buf.getShort();
+ if (index == -1) {
+ return new TypeAnnotationTargetInfo(TypeAnnotationTarget.CLASS_EXTENDS);
+ } else if (index >= 0) {
+ TypeAnnotationTargetInfo res = new TypeAnnotationTargetInfo(TypeAnnotationTarget.CLASS_IMPLEMENTS,
+ index);
+ return res;
+ }} break;
+ case CLASS_TYPE_PARAMETER_BOUND:
+ return parse2ByteTarget(TypeAnnotationTarget.CLASS_PARAMETER_BOUND, buf);
+ case METHOD_TYPE_PARAMETER_BOUND:
+ return parse2ByteTarget(TypeAnnotationTarget.METHOD_PARAMETER_BOUND, buf);
+ case FIELD:
+ return new TypeAnnotationTargetInfo(TypeAnnotationTarget.FIELD_TYPE);
+ case METHOD_RETURN:
+ return new TypeAnnotationTargetInfo(TypeAnnotationTarget.METHOD_RETURN_TYPE);
+ case METHOD_RECEIVER:
+ return new TypeAnnotationTargetInfo(TypeAnnotationTarget.METHOD_RECEIVER_TYPE);
+ case METHOD_FORMAL_PARAMETER: {
+ // Todo
+ byte index = buf.get();
+ } break;
+ case THROWS:
+ return parseShortTarget(TypeAnnotationTarget.THROWS, buf);
+
+ /*
+ * The ones below are inside method bodies, we don't care about them for core reflection
+ * other than adjusting for them in the byte stream.
+ */
+ case LOCAL_VARIABLE:
+ case RESOURCE_VARIABLE:
+ short length = buf.getShort();
+ for (int i = 0; i < length; ++i) {
+ short offset = buf.getShort();
+ short varLength = buf.getShort();
+ short index = buf.getShort();
+ }
+ break;
+ case EXCEPTION_PARAMETER: {
+ byte index = buf.get();
+ } break;
+ case CAST:
+ case INSTANCEOF:
+ case NEW: {
+ short offset = buf.getShort();
+ } break;
+ case CONSTRUCTOR_REFERENCE_RECEIVER:
+ case METHOD_REFERENCE_RECEIVER: {
+ short offset = buf.getShort();
+ byte index = buf.get();
+ } break;
+ case LAMBDA_FORMAL_PARAMETER: {
+ byte index = buf.get();
+ } break;
+ case METHOD_REFERENCE:
+ // This one isn't in the spec yet
+ break;
+ case METHOD_REFERENCE_TYPE_ARGUMENT: {
+ short offset = buf.getShort();
+ byte index = buf.get();
+ } break;
+
+ default:
+ // will throw error below
+ break;
+ }
+ throw new AnnotationFormatError("Could not parse bytes for type annotations");
+ }
+
+ private static TypeAnnotationTargetInfo parseShortTarget(TypeAnnotationTarget target, ByteBuffer buf) {
+ short index = buf.getShort();
+ return new TypeAnnotationTargetInfo(target, index);
+ }
+ private static TypeAnnotationTargetInfo parse2ByteTarget(TypeAnnotationTarget target, ByteBuffer buf) {
+ byte count = buf.get();
+ byte secondaryIndex = buf.get();
+ return new TypeAnnotationTargetInfo(target,
+ count,
+ secondaryIndex);
+ }
+}
--- a/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,13 +25,18 @@
package sun.reflect.generics.reflectiveObjects;
-import java.lang.annotation.Annotation;
+import java.lang.annotation.*;
+import java.lang.reflect.AnnotatedType;
import java.lang.reflect.Array;
import java.lang.reflect.GenericDeclaration;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Objects;
-
+import sun.reflect.annotation.AnnotationSupport;
+import sun.reflect.annotation.TypeAnnotationParser;
+import sun.reflect.annotation.AnnotationType;
import sun.reflect.generics.factory.GenericsFactory;
import sun.reflect.generics.tree.FieldTypeSignature;
import sun.reflect.generics.visitor.Reifier;
@@ -182,45 +187,70 @@
return genericDeclaration.hashCode() ^ name.hashCode();
}
- // Currently vacuous implementations of AnnotatedElement methods.
- public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
- Objects.requireNonNull(annotationClass);
- return false;
- }
-
+ // Implementations of AnnotatedElement methods.
+ @SuppressWarnings("unchecked")
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
- return null;
+ // T is an Annotation type, the return value of get will be an annotation
+ return (T)mapAnnotations(getAnnotations()).get(annotationClass);
}
public <T extends Annotation> T getDeclaredAnnotation(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
- return null;
+ return getAnnotation(annotationClass);
}
- @SuppressWarnings("unchecked")
public <T extends Annotation> T[] getAnnotations(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
- // safe because annotationClass is the class for T
- return (T[])Array.newInstance(annotationClass, 0);
+ return AnnotationSupport.getMultipleAnnotations(mapAnnotations(getAnnotations()), annotationClass);
}
- @SuppressWarnings("unchecked")
public <T extends Annotation> T[] getDeclaredAnnotations(Class<T> annotationClass) {
Objects.requireNonNull(annotationClass);
- // safe because annotationClass is the class for T
- return (T[])Array.newInstance(annotationClass, 0);
+ return getAnnotations(annotationClass);
}
public Annotation[] getAnnotations() {
- // Since zero-length, don't need defensive clone
- return EMPTY_ANNOTATION_ARRAY;
+ int myIndex = typeVarIndex();
+ if (myIndex < 0)
+ throw new AssertionError("Index must be non-negative.");
+ return TypeAnnotationParser.parseTypeVariableAnnotations(getGenericDeclaration(), myIndex);
}
public Annotation[] getDeclaredAnnotations() {
- // Since zero-length, don't need defensive clone
- return EMPTY_ANNOTATION_ARRAY;
+ return getAnnotations();
+ }
+
+ public AnnotatedType[] getAnnotatedBounds() {
+ return TypeAnnotationParser.parseAnnotatedBounds(getBounds(),
+ getGenericDeclaration(),
+ typeVarIndex());
}
private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
+
+ // Helpers for annotation methods
+ private int typeVarIndex() {
+ TypeVariable<?>[] tVars = getGenericDeclaration().getTypeParameters();
+ int i = -1;
+ for (TypeVariable<?> v : tVars) {
+ i++;
+ if (equals(v))
+ return i;
+ }
+ return -1;
+ }
+
+ private static Map<Class<? extends Annotation>, Annotation> mapAnnotations(Annotation[] annos) {
+ Map<Class<? extends Annotation>, Annotation> result =
+ new LinkedHashMap<>();
+ for (Annotation a : annos) {
+ Class<? extends Annotation> klass = a.annotationType();
+ AnnotationType type = AnnotationType.getInstance(klass);
+ if (type.retention() == RetentionPolicy.RUNTIME)
+ if (result.put(klass, a) != null)
+ throw new AnnotationFormatError("Duplicate annotation for class: "+klass+": " + a);
+ }
+ return result;
+ }
}
--- a/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Wed Feb 13 13:01:16 2013 -0800
@@ -1116,7 +1116,7 @@
if (privateKeyCount > 0 || secretKeyCount > 0) {
if (debug != null) {
- debug.println("Storing " + privateKeyCount +
+ debug.println("Storing " + (privateKeyCount + secretKeyCount) +
" protected key(s) in a PKCS#7 data content-type");
}
@@ -2122,6 +2122,7 @@
SecretKeyEntry kEntry = new SecretKeyEntry();
kEntry.protectedSecretKey = secretValue.getOctetString();
bagItem = kEntry;
+ secretKeyCount++;
} else {
if (debug != null) {
@@ -2220,6 +2221,10 @@
if (bagItem instanceof PrivateKeyEntry) {
keyList.add((PrivateKeyEntry) entry);
}
+ if (entry.attributes == null) {
+ entry.attributes = new HashSet<>();
+ }
+ entry.attributes.addAll(attributes);
if (alias == null) {
alias = getUnfriendlyName();
}
--- a/jdk/src/share/javavm/export/jvm.h Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/javavm/export/jvm.h Wed Feb 13 13:01:16 2013 -0800
@@ -465,6 +465,12 @@
JNIEXPORT jbyteArray JNICALL
JVM_GetClassAnnotations(JNIEnv *env, jclass cls);
+/* Type use annotations support (JDK 1.8) */
+
+JNIEXPORT jbyteArray JNICALL
+JVM_GetClassTypeAnnotations(JNIEnv *env, jclass cls);
+
+
/*
* New (JDK 1.4) reflection implementation
*/
--- a/jdk/src/share/native/java/lang/Class.c Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/share/native/java/lang/Class.c Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -75,7 +75,8 @@
{"getRawAnnotations", "()" BA, (void *)&JVM_GetClassAnnotations},
{"getConstantPool", "()" CPL, (void *)&JVM_GetClassConstantPool},
{"desiredAssertionStatus0","("CLS")Z",(void *)&JVM_DesiredAssertionStatus},
- {"getEnclosingMethod0", "()[" OBJ, (void *)&JVM_GetEnclosingMethodInfo}
+ {"getEnclosingMethod0", "()[" OBJ, (void *)&JVM_GetEnclosingMethodInfo},
+ {"getRawTypeAnnotations", "()" BA, (void *)&JVM_GetClassTypeAnnotations},
};
#undef OBJ
--- a/jdk/src/solaris/native/java/net/linux_close.c Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/solaris/native/java/net/linux_close.c Wed Feb 13 13:01:16 2013 -0800
@@ -192,17 +192,6 @@
{
/*
- * Send a wakeup signal to all threads blocked on this
- * file descriptor.
- */
- threadEntry_t *curr = fdEntry->threads;
- while (curr != NULL) {
- curr->intr = 1;
- pthread_kill( curr->thr, sigWakeup );
- curr = curr->next;
- }
-
- /*
* And close/dup the file descriptor
* (restart if interrupted by signal)
*/
@@ -214,6 +203,16 @@
}
} while (rv == -1 && errno == EINTR);
+ /*
+ * Send a wakeup signal to all threads blocked on this
+ * file descriptor.
+ */
+ threadEntry_t *curr = fdEntry->threads;
+ while (curr != NULL) {
+ curr->intr = 1;
+ pthread_kill( curr->thr, sigWakeup );
+ curr = curr->next;
+ }
}
/*
--- a/jdk/src/windows/bin/cmdtoargs.c Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/src/windows/bin/cmdtoargs.c Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -104,6 +104,11 @@
case ' ':
case '\t':
+ if (prev == '\\') {
+ for (i = 0 ; i < slashes; i++) {
+ *dest++ = prev;
+ }
+ }
if (quotes % 2 == 1) {
*dest++ = ch;
} else {
@@ -591,6 +596,12 @@
// v->disable();
vectors[i++] = v;
+ v= new Vector(argv[0], "a b\\\\ d");
+ v->add("a", FALSE);
+ v->add("b\\\\", FALSE);
+ v->add("d", FALSE);
+ vectors[i++] = v;
+
dotest(vectors);
printf("All tests pass [%d]\n", i);
doexit(0);
--- a/jdk/test/ProblemList.txt Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/ProblemList.txt Wed Feb 13 13:01:16 2013 -0800
@@ -321,12 +321,12 @@
tools/pack200/CommandLineTests.java generic-all
tools/pack200/Pack200Test.java generic-all
-# 8001163
-tools/pack200/AttributeTests.java generic-all
-
# 7150569
tools/launcher/UnicodeTest.java macosx-all
+# 8007410
+tools/launcher/FXLauncherTest.java linux-all
+
############################################################################
# jdk_jdi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/annotation/TypeAnnotationReflection.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,428 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8004698
+ * @summary Unit test for type annotations
+ */
+
+import java.util.*;
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.io.Serializable;
+
+public class TypeAnnotationReflection {
+ public static void main(String[] args) throws Exception {
+ testSuper();
+ testInterfaces();
+ testReturnType();
+ testNested();
+ testArray();
+ testRunException();
+ testClassTypeVarBounds();
+ testMethodTypeVarBounds();
+ testFields();
+ testClassTypeVar();
+ testMethodTypeVar();
+ testParameterizedType();
+ testNestedParameterizedType();
+ testWildcardType();
+ }
+
+ private static void check(boolean b) {
+ if (!b)
+ throw new RuntimeException();
+ }
+
+ private static void testSuper() throws Exception {
+ check(Object.class.getAnnotatedSuperclass().getAnnotations().length == 0);
+ check(Class.class.getAnnotatedSuperclass().getAnnotations().length == 0);
+
+ AnnotatedType a;
+ a = TestClassArray.class.getAnnotatedSuperclass();
+ Annotation[] annos = a.getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("extends"));
+ check(((TypeAnno2)annos[1]).value().equals("extends2"));
+ }
+
+ private static void testInterfaces() throws Exception {
+ AnnotatedType[] as;
+ as = TestClassArray.class.getAnnotatedInterfaces();
+ check(as.length == 3);
+ check(as[1].getAnnotations().length == 0);
+
+ Annotation[] annos;
+ annos = as[0].getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("implements serializable"));
+ check(((TypeAnno2)annos[1]).value().equals("implements2 serializable"));
+
+ annos = as[2].getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("implements cloneable"));
+ check(((TypeAnno2)annos[1]).value().equals("implements2 cloneable"));
+ }
+
+ private static void testReturnType() throws Exception {
+ Method m = TestClassArray.class.getDeclaredMethod("foo", (Class<?>[])null);
+ Annotation[] annos = m.getAnnotatedReturnType().getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("return1"));
+ }
+
+ private static void testNested() throws Exception {
+ Method m = TestClassNested.class.getDeclaredMethod("foo", (Class<?>[])null);
+ Annotation[] annos = m.getAnnotatedReturnType().getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("array"));
+
+ AnnotatedType t = m.getAnnotatedReturnType();
+ t = ((AnnotatedArrayType)t).getAnnotatedGenericComponentType();
+ annos = t.getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("Inner"));
+ }
+
+ private static void testArray() throws Exception {
+ Method m = TestClassArray.class.getDeclaredMethod("foo", (Class<?>[])null);
+ AnnotatedArrayType t = (AnnotatedArrayType) m.getAnnotatedReturnType();
+ Annotation[] annos = t.getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("return1"));
+
+ t = (AnnotatedArrayType)t.getAnnotatedGenericComponentType();
+ annos = t.getAnnotations();
+ check(annos.length == 0);
+
+ t = (AnnotatedArrayType)t.getAnnotatedGenericComponentType();
+ annos = t.getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("return3"));
+
+ AnnotatedType tt = t.getAnnotatedGenericComponentType();
+ check(!(tt instanceof AnnotatedArrayType));
+ annos = tt.getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("return4"));
+ }
+
+ private static void testRunException() throws Exception {
+ Method m = TestClassException.class.getDeclaredMethod("foo", (Class<?>[])null);
+ AnnotatedType[] ts = m.getAnnotatedExceptionTypes();
+ check(ts.length == 3);
+
+ AnnotatedType t;
+ Annotation[] annos;
+ t = ts[0];
+ annos = t.getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("RE"));
+ check(((TypeAnno2)annos[1]).value().equals("RE2"));
+
+ t = ts[1];
+ annos = t.getAnnotations();
+ check(annos.length == 0);
+
+ t = ts[2];
+ annos = t.getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("AIOOBE"));
+ }
+
+ private static void testClassTypeVarBounds() throws Exception {
+ Method m = TestClassTypeVarAndField.class.getDeclaredMethod("foo", (Class<?>[])null);
+ AnnotatedType ret = m.getAnnotatedReturnType();
+ Annotation[] annos = ret.getAnnotations();
+ check(annos.length == 2);
+
+ AnnotatedType[] annotatedBounds = ((AnnotatedTypeVariable)ret).getAnnotatedBounds();
+ check(annotatedBounds.length == 2);
+
+ annos = annotatedBounds[0].getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("Object1"));
+
+ annos = annotatedBounds[1].getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("Runnable1"));
+ check(((TypeAnno2)annos[1]).value().equals("Runnable2"));
+ }
+
+ private static void testMethodTypeVarBounds() throws Exception {
+ Method m2 = TestClassTypeVarAndField.class.getDeclaredMethod("foo2", (Class<?>[])null);
+ AnnotatedType ret2 = m2.getAnnotatedReturnType();
+ AnnotatedType[] annotatedBounds2 = ((AnnotatedTypeVariable)ret2).getAnnotatedBounds();
+ check(annotatedBounds2.length == 1);
+
+ Annotation[] annos = annotatedBounds2[0].getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("M Runnable"));
+ }
+
+ private static void testFields() throws Exception {
+ Field f1 = TestClassTypeVarAndField.class.getDeclaredField("field1");
+ AnnotatedType at;
+ Annotation[] annos;
+
+ at = f1.getAnnotatedType();
+ annos = at.getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("T1 field"));
+ check(((TypeAnno2)annos[1]).value().equals("T2 field"));
+
+ Field f2 = TestClassTypeVarAndField.class.getDeclaredField("field2");
+ at = f2.getAnnotatedType();
+ annos = at.getAnnotations();
+ check(annos.length == 0);
+
+ Field f3 = TestClassTypeVarAndField.class.getDeclaredField("field3");
+ at = f3.getAnnotatedType();
+ annos = at.getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("Object field"));
+ }
+
+ private static void testClassTypeVar() throws Exception {
+ TypeVariable[] typeVars = TestClassTypeVarAndField.class.getTypeParameters();
+ Annotation[] annos;
+ check(typeVars.length == 2);
+
+ // First TypeVar
+ AnnotatedType[] annotatedBounds = typeVars[0].getAnnotatedBounds();
+ check(annotatedBounds.length == 2);
+
+ annos = annotatedBounds[0].getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("Object1"));
+
+ annos = annotatedBounds[1].getAnnotations();
+ check(annos.length == 2);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(annos[1].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno)annos[0]).value().equals("Runnable1"));
+ check(((TypeAnno2)annos[1]).value().equals("Runnable2"));
+
+ // second TypeVar regular anno
+ Annotation[] regularAnnos = typeVars[1].getAnnotations();
+ check(regularAnnos.length == 1);
+ check(typeVars[1].getAnnotation(TypeAnno.class).value().equals("EE"));
+
+ // second TypeVar
+ annotatedBounds = typeVars[1].getAnnotatedBounds();
+ check(annotatedBounds.length == 1);
+
+ annos = annotatedBounds[0].getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno2.class));
+ check(((TypeAnno2)annos[0]).value().equals("EEBound"));
+ }
+
+ private static void testMethodTypeVar() throws Exception {
+ Method m2 = TestClassTypeVarAndField.class.getDeclaredMethod("foo2", (Class<?>[])null);
+ TypeVariable[] t = m2.getTypeParameters();
+ check(t.length == 1);
+ Annotation[] annos = t[0].getAnnotations();
+ check(annos.length == 0);
+
+ AnnotatedType[] annotatedBounds2 = t[0].getAnnotatedBounds();
+ check(annotatedBounds2.length == 1);
+
+ annos = annotatedBounds2[0].getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("M Runnable"));
+
+ // Second method
+ m2 = TestClassTypeVarAndField.class.getDeclaredMethod("foo3", (Class<?>[])null);
+ t = m2.getTypeParameters();
+ check(t.length == 1);
+ annos = t[0].getAnnotations();
+ check(annos.length == 1);
+ check(annos[0].annotationType().equals(TypeAnno.class));
+ check(((TypeAnno)annos[0]).value().equals("K"));
+
+ annotatedBounds2 = t[0].getAnnotatedBounds();
+ check(annotatedBounds2.length == 1);
+
+ annos = annotatedBounds2[0].getAnnotations();
+ check(annos.length == 0);
+ }
+
+ private static void testParameterizedType() {
+ // Base
+ AnnotatedType[] as;
+ as = TestParameterizedType.class.getAnnotatedInterfaces();
+ check(as.length == 1);
+ check(as[0].getAnnotations().length == 1);
+ check(as[0].getAnnotation(TypeAnno.class).value().equals("M"));
+
+ Annotation[] annos;
+ as = ((AnnotatedParameterizedType)as[0]).getAnnotatedActualTypeArguments();
+ check(as.length == 2);
+ annos = as[0].getAnnotations();
+ check(annos.length == 1);
+ check(as[0].getAnnotation(TypeAnno.class).value().equals("S"));
+ check(as[0].getAnnotation(TypeAnno2.class) == null);
+
+ annos = as[1].getAnnotations();
+ check(annos.length == 2);
+ check(((TypeAnno)annos[0]).value().equals("I"));
+ check(as[1].getAnnotation(TypeAnno2.class).value().equals("I2"));
+ }
+
+ private static void testNestedParameterizedType() throws Exception {
+ Method m = TestParameterizedType.class.getDeclaredMethod("foo2", (Class<?>[])null);
+ AnnotatedType ret = m.getAnnotatedReturnType();
+ Annotation[] annos;
+ annos = ret.getAnnotations();
+ check(annos.length == 1);
+ check(((TypeAnno)annos[0]).value().equals("I"));
+
+ AnnotatedType[] args = ((AnnotatedParameterizedType)ret).getAnnotatedActualTypeArguments();
+ check(args.length == 1);
+ annos = args[0].getAnnotations();
+ check(annos.length == 2);
+ check(((TypeAnno)annos[0]).value().equals("I1"));
+ check(args[0].getAnnotation(TypeAnno2.class).value().equals("I2"));
+ }
+
+ private static void testWildcardType() throws Exception {
+ Method m = TestWildcardType.class.getDeclaredMethod("foo", (Class<?>[])null);
+ AnnotatedType ret = m.getAnnotatedReturnType();
+ AnnotatedType[] t;
+ t = ((AnnotatedParameterizedType)ret).getAnnotatedActualTypeArguments();
+ check(t.length == 1);
+ ret = t[0];
+
+ Field f = TestWildcardType.class.getDeclaredField("f1");
+ AnnotatedWildcardType w = (AnnotatedWildcardType)((AnnotatedParameterizedType)f
+ .getAnnotatedType()).getAnnotatedActualTypeArguments()[0];
+ t = w.getAnnotatedLowerBounds();
+ check(t.length == 0);
+ t = w.getAnnotatedUpperBounds();
+ check(t.length == 1);
+ Annotation[] annos;
+ annos = t[0].getAnnotations();
+ check(annos.length == 1);
+ check(((TypeAnno)annos[0]).value().equals("2"));
+
+ f = TestWildcardType.class.getDeclaredField("f2");
+ w = (AnnotatedWildcardType)((AnnotatedParameterizedType)f
+ .getAnnotatedType()).getAnnotatedActualTypeArguments()[0];
+ t = w.getAnnotatedUpperBounds();
+ check(t.length == 0);
+ t = w.getAnnotatedLowerBounds();
+ check(t.length == 1);
+ }
+}
+
+abstract class TestWildcardType {
+ public <T> List<? super T> foo() { return null;}
+ public Class<@TypeAnno("1") ? extends @TypeAnno("2") Annotation> f1;
+ public Class<@TypeAnno("3") ? super @TypeAnno("4") Annotation> f2;
+}
+
+abstract class TestParameterizedType implements @TypeAnno("M") Map<@TypeAnno("S")String, @TypeAnno("I") @TypeAnno2("I2")Integer> {
+ public ParameterizedOuter<String>.ParameterizedInner<Integer> foo() {return null;}
+ public @TypeAnno("O") ParameterizedOuter<@TypeAnno("S1") @TypeAnno2("S2") String>.
+ @TypeAnno("I") ParameterizedInner<@TypeAnno("I1") @TypeAnno2("I2")Integer> foo2() {
+ return null;
+ }
+}
+
+class ParameterizedOuter <T> {
+ class ParameterizedInner <U> {}
+}
+
+abstract class TestClassArray extends @TypeAnno("extends") @TypeAnno2("extends2") Object
+ implements @TypeAnno("implements serializable") @TypeAnno2("implements2 serializable") Serializable,
+ Readable,
+ @TypeAnno("implements cloneable") @TypeAnno2("implements2 cloneable") Cloneable {
+ public @TypeAnno("return4") Object @TypeAnno("return1") [][] @TypeAnno("return3")[] foo() { return null; }
+}
+
+abstract class TestClassNested {
+ public @TypeAnno("Outer") Outer.@TypeAnno("Inner")Inner @TypeAnno("array")[] foo() { return null; }
+}
+
+class Outer {
+ class Inner {
+ }
+}
+
+abstract class TestClassException {
+ public Object foo() throws @TypeAnno("RE") @TypeAnno2("RE2") RuntimeException,
+ NullPointerException,
+ @TypeAnno("AIOOBE") ArrayIndexOutOfBoundsException {
+ return null;
+ }
+}
+
+abstract class TestClassTypeVarAndField <T extends @TypeAnno("Object1") Object
+ & @TypeAnno("Runnable1") @TypeAnno2("Runnable2") Runnable,
+ @TypeAnno("EE")EE extends @TypeAnno2("EEBound") Runnable > {
+ @TypeAnno("T1 field") @TypeAnno2("T2 field") T field1;
+ T field2;
+ @TypeAnno("Object field") Object field3;
+
+ public @TypeAnno("t1") @TypeAnno2("t2") T foo(){ return null; }
+ public <M extends @TypeAnno("M Runnable") Runnable> M foo2() {return null;}
+ public <@TypeAnno("K") K extends Cloneable> K foo3() {return null;}
+}
+
+@Target(ElementType.TYPE_USE)
+@Retention(RetentionPolicy.RUNTIME)
+@interface TypeAnno {
+ String value();
+}
+
+@Target(ElementType.TYPE_USE)
+@Retention(RetentionPolicy.RUNTIME)
+@interface TypeAnno2 {
+ String value();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/annotation/TypeParamAnnotation.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8004698
+ * @summary Unit test for annotations on TypeVariables
+ */
+
+import java.util.*;
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.io.Serializable;
+
+public class TypeParamAnnotation {
+ public static void main(String[] args) throws Exception {
+ testOnClass();
+ testOnMethod();
+ testGetAnno();
+ testGetAnnos();
+ }
+
+ private static void check(boolean b) {
+ if (!b)
+ throw new RuntimeException();
+ }
+
+ private static void testOnClass() {
+ TypeVariable<?>[] ts = TypeParam.class.getTypeParameters();
+ check(ts.length == 3);
+
+ Annotation[] as;
+
+ as = ts[0].getAnnotations();
+ check(as.length == 2);
+ check(((ParamAnno)as[0]).value().equals("t"));
+ check(((ParamAnno2)as[1]).value() == 1);
+
+ as = ts[1].getAnnotations();
+ check(as.length == 0);
+
+ as = ts[2].getAnnotations();
+ check(as.length == 2);
+ check(((ParamAnno)as[0]).value().equals("v"));
+ check(((ParamAnno2)as[1]).value() == 2);
+ }
+ private static void testOnMethod() throws Exception {
+ TypeVariable<?>[] ts = TypeParam.class.getDeclaredMethod("foo").getTypeParameters();
+ check(ts.length == 3);
+
+ Annotation[] as;
+
+ as = ts[0].getAnnotations();
+ check(as.length == 2);
+ check(((ParamAnno)as[0]).value().equals("x"));
+ check(((ParamAnno2)as[1]).value() == 3);
+
+ as = ts[1].getAnnotations();
+ check(as.length == 0);
+
+ as = ts[2].getAnnotations();
+ check(as.length == 2);
+ check(((ParamAnno)as[0]).value().equals("z"));
+ check(((ParamAnno2)as[1]).value() == 4);
+ }
+
+ private static void testGetAnno() {
+ TypeVariable<?>[] ts = TypeParam.class.getTypeParameters();
+ ParamAnno a;
+ a = ts[0].getAnnotation(ParamAnno.class);
+ check(a.value().equals("t"));
+ }
+ private static void testGetAnnos() throws Exception {
+ TypeVariable<?>[] ts = TypeParam.class.getDeclaredMethod("foo").getTypeParameters();
+ ParamAnno2[] as;
+ as = ts[0].getAnnotations(ParamAnno2.class);
+ check(as.length == 1);
+ check(as[0].value() == 3);
+ }
+}
+
+class TypeParam <@ParamAnno("t") @ParamAnno2(1) T,
+ U,
+ @ParamAnno("v") @ParamAnno2(2) V extends Runnable> {
+ public <@ParamAnno("x") @ParamAnno2(3) X,
+ Y,
+ @ParamAnno("z") @ParamAnno2(4) Z extends Cloneable> void foo() {}
+}
+
+@Target(ElementType.TYPE_PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@interface ParamAnno {
+ String value();
+}
+
+@Target(ElementType.TYPE_PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@interface ParamAnno2 {
+ int value();
+}
--- a/jdk/test/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/lang/annotation/repeatingAnnotations/RepeatedUnitTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7154390
+ * @bug 7154390 8005712
* @summary Unit test for repeated annotation reflection
*
* @compile RepeatedUnitTest.java subpackage/package-info.java subpackage/Container.java subpackage/Containee.java subpackage/NonRepeated.java subpackage/InheritedContainee.java subpackage/InheritedContainer.java subpackage/InheritedNonRepeated.java
@@ -58,7 +58,7 @@
checkMultiplier(Me1.class.getField("foo"), 1);
// METHOD
- checkMultiplier(Me1.class.getDeclaredMethod("mee", null), 100);
+ checkMultiplier(Me1.class.getDeclaredMethod("mee", (Class<?>[])null), 100);
// INNER CLASS
checkMultiplier(Me1.MiniMee.class, 1000);
@@ -84,8 +84,7 @@
static void packageRepeated(AnnotatedElement e) {
Containee c = e.getAnnotation(Containee.class);
- check(c.value() == 1);
-
+ check(c == null);
check(2 == countAnnotation(e, Containee.class));
c = e.getAnnotations(Containee.class)[0];
@@ -93,7 +92,7 @@
c = e.getAnnotations(Containee.class)[1];
check(c.value() == 2);
- check(2 == containsAnnotationOfType(e.getAnnotations(), Containee.class));
+ check(0 == containsAnnotationOfType(e.getAnnotations(), Containee.class));
}
static void packageContainer(AnnotatedElement e) {
@@ -161,14 +160,26 @@
}
static void checkMultiplier(AnnotatedElement e, int m) {
+ // Basic sanity of non-repeating getAnnotation(Class)
check(e.getAnnotation(NonRepeated.class).value() == 5 * m);
+ // Check count of annotations returned from getAnnotations(Class)
check(4 == countAnnotation(e, Containee.class));
check(1 == countAnnotation(e, Container.class));
check(1 == countAnnotation(e, NonRepeated.class));
+ // Check contents of array returned from getAnnotations(Class)
check(e.getAnnotations(Containee.class)[2].value() == 3 * m);
check(e.getAnnotations(NonRepeated.class)[0].value() == 5 * m);
+
+ // Check getAnnotation(Class)
+ check(e.getAnnotation(Containee.class) == null);
+ check(e.getAnnotation(Container.class) != null);
+
+ // Check count of annotations returned from getAnnotations()
+ check(0 == containsAnnotationOfType(e.getAnnotations(), Containee.class));
+ check(1 == containsAnnotationOfType(e.getAnnotations(), Container.class));
+ check(1 == containsAnnotationOfType(e.getAnnotations(), NonRepeated.class));
}
static void check(Boolean b) {
--- a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Containee.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,7 +26,6 @@
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(Container.class)
@Repeatable(Container.class)
public @interface Containee {
int value();
--- a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Container.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/Container.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,7 +26,6 @@
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
-@ContainerFor(Containee.class)
public @interface Container {
Containee[] value();
}
--- a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainee.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,7 +27,6 @@
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(InheritedContainer.class)
@Repeatable(InheritedContainer.class)
public @interface InheritedContainee {
int value();
--- a/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/lang/annotation/repeatingAnnotations/subpackage/InheritedContainer.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,7 +27,6 @@
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-@ContainerFor(InheritedContainee.class)
public @interface InheritedContainer {
InheritedContainee[] value();
}
--- a/jdk/test/java/lang/reflect/Parameter/WithoutParameters.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/lang/reflect/Parameter/WithoutParameters.java Wed Feb 13 13:01:16 2013 -0800
@@ -23,163 +23,152 @@
/*
* @test
+ * @bug 8004729
* @summary javac should generate method parameters correctly.
*/
import java.lang.*;
import java.lang.reflect.*;
+import java.lang.annotation.*;
import java.util.List;
+import java.util.Objects;
+
+import static java.lang.annotation.ElementType.*;
public class WithoutParameters {
+ int errors = 0;
- private static final Class<?>[] qux_types = {
- int.class,
- Foo.class,
- List.class,
- List.class,
- List.class,
- String[].class
- };
+ private WithoutParameters() {}
public static void main(String argv[]) throws Exception {
- int error = 0;
- Method[] methods = Foo.class.getMethods();
- for(Method m : methods) {
- System.err.println("Inspecting method " + m);
- Parameter[] parameters = m.getParameters();
- if(parameters == null)
- throw new Exception("getParameters should never be null");
- for(int i = 0; i < parameters.length; i++) {
- Parameter p = parameters[i];
- if(!p.getDeclaringExecutable().equals(m)) {
- System.err.println(p + ".getDeclaringExecutable != " + m);
- error++;
- }
- if(null == p.getType()) {
- System.err.println(p + ".getType() == null");
- error++;
- }
- if(null == p.getParameterizedType()) {
- System.err.println(p + ".getParameterizedType == null");
- error++;
- }
- }
- if(m.getName().equals("qux")) {
- if(6 != parameters.length) {
- System.err.println("Wrong number of parameters for qux");
- error++;
- }
- for(int i = 0; i < parameters.length; i++) {
- Parameter p = parameters[i];
- // The getType family work with or without
- // parameter attributes compiled in.
- if(!parameters[i].getType().equals(qux_types[i])) {
- System.err.println("Wrong parameter type for " + parameters[0] + ": expected " + qux_types[i] + ", but got " + parameters[i].getType());
- error++;
+ WithoutParameters wp = new WithoutParameters();
+ wp.runTests(Foo.class.getMethods());
+ wp.runTests(Foo.Inner.class.getConstructors());
+ wp.checkForErrors();
+ }
+
+ void runTests(Method[] methods) throws Exception {
+ for(Method m : methods) {runTest(m);}
+ }
+
+ void runTests(Constructor[] constructors) throws Exception {
+ for(Constructor c : constructors) {runTest(c);}
+ }
+
+ void runTest(Executable e) throws Exception {
+ System.err.println("Inspecting executable " + e);
+ Parameter[] parameters = e.getParameters();
+ Objects.requireNonNull(parameters, "getParameters should never be null");
+
+ ExpectedParameterInfo epi = e.getAnnotation(ExpectedParameterInfo.class);
+ if (epi != null) {
+ abortIfTrue(epi.parameterCount() != e.getParameterCount(), "Bad parameter count for "+ e);
+ abortIfTrue(epi.isVarArgs() != e.isVarArgs(),"Bad varargs value for "+ e);
+ }
+ abortIfTrue(e.getParameterCount() != parameters.length, "Mismatched of parameter counts.");
+
+ for(int i = 0; i < parameters.length; i++) {
+ Parameter p = parameters[i];
+ errorIfTrue(!p.getDeclaringExecutable().equals(e), p + ".getDeclaringExecutable != " + e);
+ Objects.requireNonNull(p.getType(), "getType() should not be null");
+ Objects.requireNonNull(p.getParameterizedType(), "getParameterizedType() should not be null");
+
+ if (epi != null) {
+ Class<?> expectedParameterType = epi.parameterTypes()[i];
+ errorIfTrue(!p.getType().equals(expectedParameterType),
+ "Wrong parameter type for " + p + ": expected " + expectedParameterType +
+ ", but got " + p.getType());
+
+ ParameterizedInfo[] expectedParameterizedTypes = epi.parameterizedTypes();
+ if (expectedParameterizedTypes.length > 0) {
+ Type parameterizedType = p.getParameterizedType();
+ Class<? extends Type> expectedParameterziedTypeType = expectedParameterizedTypes[i].value();
+ errorIfTrue(!expectedParameterziedTypeType.isAssignableFrom(parameterizedType.getClass()),
+ "Wrong class of parameteried type of " + p + ": expected " + expectedParameterziedTypeType +
+ ", but got " + parameterizedType.getClass());
+
+ if (expectedParameterziedTypeType.equals(Class.class)) {
+ errorIfTrue(!parameterizedType.equals(expectedParameterType),
+ "Wrong parameteried type for " + p + ": expected " + expectedParameterType +
+ ", but got " + parameterizedType);
+ } else {
+ if (expectedParameterziedTypeType.equals(ParameterizedType.class)) {
+ ParameterizedType ptype = (ParameterizedType)parameterizedType;
+ errorIfTrue(!ptype.getRawType().equals(expectedParameterType),
+ "Wrong raw type for " + p + ": expected " + expectedParameterType +
+ ", but got " + ptype.getRawType());
+ }
+
+ // Check string representation
+ String expectedStringOfType = epi.parameterizedTypes()[i].string();
+ errorIfTrue(!expectedStringOfType.equals(parameterizedType.toString()),
+ "Bad type string" + p + ": expected " + expectedStringOfType +
+ ", but got " + parameterizedType.toString());
}
}
- if(!parameters[0].getParameterizedType().equals(int.class)) {
- System.err.println("getParameterizedType for quux is wrong");
- error++;
- }
- if(!parameters[1].getParameterizedType().equals(Foo.class)) {
- System.err.println("getParameterizedType for quux is wrong");
- error++;
- }
- if(!(parameters[2].getParameterizedType() instanceof
- ParameterizedType)) {
- System.err.println("getParameterizedType for l is wrong");
- error++;
- } else {
- ParameterizedType pt =
- (ParameterizedType) parameters[2].getParameterizedType();
- if(!pt.getRawType().equals(List.class)) {
- System.err.println("Raw type for l is wrong");
- error++;
- }
- if(1 != pt.getActualTypeArguments().length) {
- System.err.println("Number of type parameters for l is wrong");
- error++;
- }
- if(!(pt.getActualTypeArguments()[0] instanceof WildcardType)) {
- System.err.println("Type parameter for l is wrong");
- error++;
- }
- }
- if(!(parameters[3].getParameterizedType() instanceof
- ParameterizedType)) {
- System.err.println("getParameterizedType for l2 is wrong");
- error++;
- } else {
- ParameterizedType pt =
- (ParameterizedType) parameters[3].getParameterizedType();
- if(!pt.getRawType().equals(List.class)) {
- System.err.println("Raw type for l2 is wrong");
- error++;
- }
- if(1 != pt.getActualTypeArguments().length) {
- System.err.println("Number of type parameters for l2 is wrong");
- error++;
- }
- if(!(pt.getActualTypeArguments()[0].equals(Foo.class))) {
- System.err.println("Type parameter for l2 is wrong");
- error++;
- }
- }
- if(!(parameters[4].getParameterizedType() instanceof
- ParameterizedType)) {
- System.err.println("getParameterizedType for l3 is wrong");
- error++;
- } else {
- ParameterizedType pt =
- (ParameterizedType) parameters[4].getParameterizedType();
- if(!pt.getRawType().equals(List.class)) {
- System.err.println("Raw type for l3 is wrong");
- error++;
- }
- if(1 != pt.getActualTypeArguments().length) {
- System.err.println("Number of type parameters for l3 is wrong");
- error++;
- }
- if(!(pt.getActualTypeArguments()[0] instanceof WildcardType)) {
- System.err.println("Type parameter for l3 is wrong");
- error++;
- } else {
- WildcardType wt = (WildcardType)
- pt.getActualTypeArguments()[0];
- if(!wt.getUpperBounds()[0].equals(Foo.class)) {
- System.err.println("Upper bounds on type parameter fol l3 is wrong");
- error++;
- }
- }
- }
- if(!parameters[5].isVarArgs()) {
- System.err.println("isVarArg for rest is wrong");
- error++;
- }
- if(!(parameters[5].getParameterizedType().equals(String[].class))) {
- System.err.println("getParameterizedType for rest is wrong");
- error++;
- }
-
}
}
- if(0 != error)
- throw new Exception("Failed " + error + " tests");
+ }
+
+ private void checkForErrors() {
+ if (errors > 0)
+ throw new RuntimeException("Failed " + errors + " tests");
+ }
+
+ private void errorIfTrue(boolean predicate, String errMessage) {
+ if (predicate) {
+ errors++;
+ System.err.println(errMessage);
+ }
+ }
+
+ private void abortIfTrue(boolean predicate, String errMessage) {
+ if (predicate) {
+ throw new RuntimeException(errMessage);
+ }
+ }
+
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target({METHOD, CONSTRUCTOR})
+ @interface ExpectedParameterInfo {
+ int parameterCount() default 0;
+ Class<?>[] parameterTypes() default {};
+ ParameterizedInfo[] parameterizedTypes() default {};
+ boolean isVarArgs() default false;
+ }
+
+ @Target({})
+ @interface ParameterizedInfo {
+ Class<? extends Type> value() default Class.class;
+ String string() default "";
}
public class Foo {
int thing;
+ @ExpectedParameterInfo(parameterCount = 6,
+ parameterTypes =
+ {int.class, Foo.class,
+ List.class, List.class,
+ List.class, String[].class},
+ parameterizedTypes =
+ {@ParameterizedInfo(Class.class),
+ @ParameterizedInfo(Class.class),
+ @ParameterizedInfo(value=ParameterizedType.class, string="java.util.List<?>"),
+ @ParameterizedInfo(value=ParameterizedType.class, string="java.util.List<WithoutParameters$Foo>"),
+ @ParameterizedInfo(value=ParameterizedType.class, string="java.util.List<? extends WithoutParameters$Foo>"),
+ @ParameterizedInfo(Class.class)},
+ isVarArgs = true)
public void qux(int quux, Foo quuux,
List<?> l, List<Foo> l2,
List<? extends Foo> l3,
String... rest) {}
public class Inner {
int thang;
+ @ExpectedParameterInfo(parameterCount = 2,
+ parameterTypes = {Foo.class, int.class})
public Inner(int theng) {
thang = theng + thing;
}
}
}
-
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/Socket/asyncClose/Race.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8006395
+ * @summary Race in async socket close on Linux
+ */
+
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.concurrent.Phaser;
+
+// Racey test, will not always fail, but if it does then we have a problem.
+
+public class Race {
+ final static int THREADS = 100;
+
+ public static void main(String[] args) throws Exception {
+ try (ServerSocket ss = new ServerSocket(0)) {
+ final int port = ss.getLocalPort();
+ final Phaser phaser = new Phaser(THREADS + 1);
+ for (int i=0; i<100; i++) {
+ final Socket s = new Socket("localhost", port);
+ s.setSoLinger(false, 0);
+ try (Socket sa = ss.accept()) {
+ sa.setSoLinger(false, 0);
+ final InputStream is = s.getInputStream();
+ Thread[] threads = new Thread[THREADS];
+ for (int j=0; j<THREADS; j++) {
+ threads[j] = new Thread() {
+ public void run() {
+ try {
+ phaser.arriveAndAwaitAdvance();
+ while (is.read() != -1)
+ Thread.sleep(50);
+ } catch (Exception x) {
+ if (!(x instanceof SocketException
+ && x.getMessage().equals("Socket closed")))
+ x.printStackTrace();
+ // ok, expect Socket closed
+ }
+ }};
+ }
+ for (int j=0; j<100; j++)
+ threads[j].start();
+ phaser.arriveAndAwaitAdvance();
+ s.close();
+ for (int j=0; j<100; j++)
+ threads[j].join();
+ }
+ }
+ }
+ }
+}
--- a/jdk/test/java/net/URL/Constructor.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/net/URL/Constructor.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -21,71 +21,235 @@
* questions.
*/
-/* This is no longer run directly. See runconstructor.sh
- *
- *
- *
+/*
+ * @test
+ * @bug 4393671
+ * @summary URL constructor URL(URL context, String spec) FAILED with specific input
+ */
+
+/*
* This program tests the URL parser in the URL constructor. It
* tries to construct a variety of valid URLs with a given context
* (which may be null) and a variety of specs. It then compares the
* result with an expected value.
- *
- * It expects that a data file named "urls" be available in the
- * current directory, from which it will get its testing data. The
- * format of the file is:
- *
- * URL: null
- * spec: jar:http://www.foo.com/dir1/jar.jar!/
- * expected: jar:http://www.foo.com/dir1/jar.jar!/
- *
- * where URL is the context, spec is the spec and expected is the
- * expected result. The first : must be followed by a space. Each test
- * entry should be followed by a blank line.
*/
-import java.io.*;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
public class Constructor {
public static void main(String[] args) throws Exception {
- URL url = null;
- String urls = "jar_urls";
- if (args.length > 0 && args[0] != null) {
- urls = args[0];
- }
+ List<Entry> entries = new ArrayList<>();
+ entries.addAll(Arrays.asList(fileURLs));
+ entries.addAll(Arrays.asList(jarURLs));
+ entries.addAll(Arrays.asList(normalHttpURLs));
+ entries.addAll(Arrays.asList(abnormalHttpURLs));
+ if (hasFtp())
+ entries.addAll(Arrays.asList(ftpURLs));
+ URL url;
- File f = new File(urls);
- InputStream file = new FileInputStream(f);
- BufferedReader in = new BufferedReader(new InputStreamReader(file));
- while(true) {
- String context = in.readLine();
- if (context == null) {
- break;
- }
- context = getValue(context);
- String spec = getValue(in.readLine());
- String expected = getValue(in.readLine());
+ for (Entry e : entries) {
+ if (e.context == null)
+ url = new URL(e.spec);
+ else
+ url = new URL(new URL(e.context), e.spec);
- if (context.equals("null")) {
- url = new URL(spec);
- } else {
- url = new URL(new URL(context), spec);
- }
- if (!(url.toString().equals(expected))) {
- throw new RuntimeException("error for: \n\tURL:" + context +
- "\n\tspec: " + spec +
- "\n\texpected: " + expected +
+ if (!(url.toString().equals(e.expected))) {
+ throw new RuntimeException("error for: \n\tURL:" + e.context +
+ "\n\tspec: " + e.spec +
+ "\n\texpected: " + e.expected +
"\n\tactual: " + url.toString());
} else {
- System.out.println("success for: " + url + "\n");
+ //debug
+ //System.out.println("success for: " + url);
}
- in.readLine();
+ }
+ }
+
+ private static boolean hasFtp() {
+ try {
+ return new java.net.URL("ftp://") != null;
+ } catch (java.net.MalformedURLException x) {
+ System.out.println("FTP not supported by this runtime.");
+ return false;
}
- in.close();
+ }
+
+ static class Entry {
+ final String context;
+ final String spec;
+ final String expected;
+ Entry(String context, String spec, String expected) {
+ this.context = context;
+ this.spec =spec;
+ this.expected = expected;
+ }
}
- private static String getValue(String value) {
- return value.substring(value.indexOf(':') + 2);
- }
+ static Entry[] fileURLs = new Entry[] {
+ new Entry(null,
+ "file://JavaSoft/Test",
+ "file://JavaSoft/Test"),
+ new Entry(null,
+ "file:///JavaSoft/Test",
+ "file:/JavaSoft/Test"),
+ new Entry(null,
+ "file:/JavaSoft/Test",
+ "file:/JavaSoft/Test"),
+ new Entry(null,
+ "file:/c:/JavaSoft/Test",
+ "file:/c:/JavaSoft/Test"),
+ new Entry(null,
+ "file:/c:/JavaSoft/Test:something",
+ "file:/c:/JavaSoft/Test:something"),
+ new Entry(null,
+ "file:/c:/JavaSoft/Test#anchor",
+ "file:/c:/JavaSoft/Test#anchor"),
+ new Entry("file://JavaSoft/Test",
+ "Test#bar",
+ "file://JavaSoft/Test#bar"),
+ new Entry("file://codrus/c:/jdk/eng/index.html",
+ "pulsar.html",
+ "file://codrus/c:/jdk/eng/pulsar.html"),
+ new Entry("file:///c:/jdk/eng/index.html",
+ "pulsar.html",
+ "file:/c:/jdk/eng/pulsar.html"),
+ new Entry("file:///jdk/eng/index.html",
+ "pulsar.html",
+ "file:/jdk/eng/pulsar.html"),
+ new Entry("file://JavaSoft/Test",
+ "file://radartoad.com/Test#bar",
+ "file://radartoad.com/Test#bar"),
+ new Entry("file://JavaSoft/Test",
+ "/c:/Test#bar",
+ "file://JavaSoft/c:/Test#bar"),
+ };
+
+ static Entry[] jarURLs = new Entry[] {
+ new Entry(null,
+ "jar:http://www.foo.com/dir1/jar.jar!/dir2/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir2/entry.txt"),
+ new Entry(null,
+ "jar:http://www.foo.com/dir1/jar.jar!/",
+ "jar:http://www.foo.com/dir1/jar.jar!/"),
+ new Entry(null,
+ "jar:http://www.foo.com/dir1/jar.jar!/",
+ "jar:http://www.foo.com/dir1/jar.jar!/"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "dir1/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "/dir1/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/dir1/",
+ "entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/dir2/dir3/entry2.txt",
+ "/dir1/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "/dir1/foo/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/foo/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/dir1/dir2/dir3/",
+ "dir4/foo/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/dir2/dir3/dir4/foo/entry.txt"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/",
+ "/dir1/foo/entry.txt",
+ "jar:http://www.foo.com/dir1/jar.jar!/dir1/foo/entry.txt"),
+ new Entry(null,
+ "jar:http://www.foo.com/dir1/jar.jar!/foo.txt#anchor",
+ "jar:http://www.foo.com/dir1/jar.jar!/foo.txt#anchor"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/foo.txt",
+ "#anchor",
+ "jar:http://www.foo.com/dir1/jar.jar!/foo.txt#anchor"),
+ new Entry("jar:http://www.foo.com/dir1/jar.jar!/foo/bar/",
+ "baz/quux#anchor",
+ "jar:http://www.foo.com/dir1/jar.jar!/foo/bar/baz/quux#anchor"),
+ new Entry("jar:http://balloo.com/olle.jar!/",
+ "p2",
+ "jar:http://balloo.com/olle.jar!/p2")
+ };
+
+ static Entry[] normalHttpURLs = new Entry[] {
+ new Entry("http://a/b/c/d;p?q", "g", "http://a/b/c/g"),
+ new Entry("http://a/b/c/d;p?q", "./g", "http://a/b/c/g"),
+ new Entry("http://a/b/c/d;p?q", "g/", "http://a/b/c/g/"),
+ new Entry("http://a/b/c/d;p?q", "/g", "http://a/g"),
+ new Entry("http://a/b/c/d;p?q", "//g", "http://g"),
+ new Entry("http://a/b/c/d;p?q", "?y", "http://a/b/c/?y"),
+ new Entry("http://a/b/c/d;p?q", "g?y", "http://a/b/c/g?y"),
+ new Entry("http://a/b/c/d;p?q", "g#s", "http://a/b/c/g#s"),
+ new Entry("http://a/b/c/d;p?q", "g?y#s", "http://a/b/c/g?y#s"),
+ new Entry("http://a/b/c/d;p?q", ";x", "http://a/b/c/;x"),
+ new Entry("http://a/b/c/d;p?q", "g;x", "http://a/b/c/g;x"),
+ new Entry("http://a/b/c/d;p?q", "g;x?y#s", "http://a/b/c/g;x?y#s"),
+ new Entry("http://a/b/c/d;p?q", ".", "http://a/b/c/"),
+ new Entry("http://a/b/c/d;p?q", "./", "http://a/b/c/"),
+ new Entry("http://a/b/c/d;p?q", "..", "http://a/b/"),
+ new Entry("http://a/b/c/d;p?q", "../", "http://a/b/"),
+ new Entry("http://a/b/c/d;p?q", "../g", "http://a/b/g"),
+ new Entry("http://a/b/c/d;p?q", "../..", "http://a/"),
+ new Entry("http://a/b/c/d;p?q", "../../", "http://a/"),
+ new Entry("http://a/b/c/d;p?q", "../../g", "http://a/g"),
+ new Entry(null,
+ "http://www.javasoft.com/jdc/community/chat/index.html#javalive?frontpage-jdc",
+ "http://www.javasoft.com/jdc/community/chat/index.html#javalive?frontpage-jdc")
+ };
+
+ static Entry[] abnormalHttpURLs = new Entry[] {
+ new Entry("http://a/b/c/d;p?q", "../../../g", "http://a/../g"),
+ new Entry("http://a/b/c/d;p?q", "../../../../g", "http://a/../../g"),
+ new Entry("http://a/b/c/d;p?q", "/./g", "http://a/./g"),
+ new Entry("http://a/b/c/d;p?q", "/../g", "http://a/../g"),
+ new Entry("http://a/b/c/d;p?q", ".g", "http://a/b/c/.g"),
+ new Entry("http://a/b/c/d;p?q", "g.", "http://a/b/c/g."),
+ new Entry("http://a/b/c/d;p?q", "./../g", "http://a/b/g"),
+ new Entry("http://a/b/c/d;p?q", "./g/.", "http://a/b/c/g/"),
+ new Entry("http://a/b/c/d;p?q", "g/./h", "http://a/b/c/g/h"),
+ new Entry("http://a/b/c/d;p?q", "g;x=1/./y", "http://a/b/c/g;x=1/y"),
+ new Entry("http://a/b/c/d;p?q", "g;x=1/../y", "http://a/b/c/y")
+ };
+
+ static Entry[] ftpURLs = new Entry[] {
+ new Entry(null,
+ "ftp://ftp.foo.com/dir1/entry.txt",
+ "ftp://ftp.foo.com/dir1/entry.txt"),
+ new Entry(null,
+ "ftp://br:pwd@ftp.foo.com/dir1/jar.jar",
+ "ftp://br:pwd@ftp.foo.com/dir1/jar.jar"),
+ new Entry("ftp://ftp.foo.com/dir1/foo.txt",
+ "bar.txt",
+ "ftp://ftp.foo.com/dir1/bar.txt"),
+ new Entry("ftp://ftp.foo.com/dir1/jar.jar",
+ "/entry.txt",
+ "ftp://ftp.foo.com/entry.txt"),
+ new Entry("ftp://ftp.foo.com/dir1/jar.jar",
+ "dir1/entry.txt",
+ "ftp://ftp.foo.com/dir1/dir1/entry.txt"),
+ new Entry("ftp://ftp.foo.com/dir1/jar.jar",
+ "/dir1/entry.txt",
+ "ftp://ftp.foo.com/dir1/entry.txt"),
+ new Entry("ftp://br:pwd@ftp.foo.com/dir1/jar.jar",
+ "/dir1/entry.txt",
+ "ftp://br:pwd@ftp.foo.com/dir1/entry.txt")
+ };
}
--- a/jdk/test/java/net/URL/HandlerLoop.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/net/URL/HandlerLoop.java Wed Feb 13 13:01:16 2013 -0800
@@ -36,7 +36,7 @@
public static void main(String args[]) throws Exception {
URL.setURLStreamHandlerFactory(
new HandlerFactory("sun.net.www.protocol"));
- URL url = new URL("file://bogus/index.html");
+ URL url = new URL("file:///bogus/index.html");
System.out.println("url = " + url);
url.openConnection();
}
--- a/jdk/test/java/net/URL/Test.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/net/URL/Test.java Wed Feb 13 13:01:16 2013 -0800
@@ -310,7 +310,14 @@
throw new RuntimeException("Test failed");
}
-
+ private static boolean hasFtp() {
+ try {
+ return new java.net.URL("ftp://") != null;
+ } catch (java.net.MalformedURLException x) {
+ System.out.println("FTP not supported by this runtime.");
+ return false;
+ }
+ }
// -- Tests --
@@ -319,8 +326,9 @@
header("RFC2396: Basic examples");
- test("ftp://ftp.is.co.za/rfc/rfc1808.txt")
- .s("ftp").h("ftp.is.co.za").p("/rfc/rfc1808.txt").z();
+ if (hasFtp())
+ test("ftp://ftp.is.co.za/rfc/rfc1808.txt")
+ .s("ftp").h("ftp.is.co.za").p("/rfc/rfc1808.txt").z();
test("http://www.math.uio.no/faq/compression-faq/part1.html")
.s("http").h("www.math.uio.no").p("/faq/compression-faq/part1.html").z();
@@ -328,8 +336,9 @@
test("http://www.w3.org/Addressing/")
.s("http").h("www.w3.org").p("/Addressing/").z();
- test("ftp://ds.internic.net/rfc/")
- .s("ftp").h("ds.internic.net").p("/rfc/").z();
+ if (hasFtp())
+ test("ftp://ds.internic.net/rfc/")
+ .s("ftp").h("ds.internic.net").p("/rfc/").z();
test("http://www.ics.uci.edu/pub/ietf/url/historical.html#WARNING")
.s("http").h("www.ics.uci.edu").p("/pub/ietf/url/historical.html")
--- a/jdk/test/java/net/URL/URIToURLTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/net/URL/URIToURLTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -28,20 +28,22 @@
*/
import java.net.*;
+import java.util.ArrayList;
+import java.util.List;
public class URIToURLTest {
public static void main(String args[]) throws Exception {
- String[] uris = {
- "http://jag:cafebabe@java.sun.com:94/b/c/d?q#g",
- "http://[1080:0:0:0:8:800:200C:417A]/index.html",
- "http://a/b/c/d;p?q",
- "ftp://ftp.is.co.za/rfc/rfc1808.txt",
- "mailto:mduerst@ifi.unizh.ch", // opaque url
- "http:comp.infosystems.www.servers.unix" //opaque url
- };
+ List<String> uris = new ArrayList<>();
+ uris.add("http://jag:cafebabe@java.sun.com:94/b/c/d?q#g");
+ uris.add("http://[1080:0:0:0:8:800:200C:417A]/index.html");
+ uris.add("http://a/b/c/d;p?q");
+ uris.add("mailto:mduerst@ifi.unizh.ch");
+ uris.add("http:comp.infosystems.www.servers.unix");
+ if (hasFtp())
+ uris.add("ftp://ftp.is.co.za/rfc/rfc1808.txt");
- for (int i = 0; i < uris.length; i++) {
- URI uri = new URI(uris[i]);
+ for (String uriStr : uris) {
+ URI uri = new URI(uriStr);
URL url = uri.toURL();
String scheme = uri.getScheme();
boolean schemeCheck = scheme == null? url.getProtocol() == null :
@@ -111,4 +113,13 @@
url.getRef());
}
}
+
+ private static boolean hasFtp() {
+ try {
+ return new java.net.URL("ftp://") != null;
+ } catch (java.net.MalformedURLException x) {
+ System.out.println("FTP not supported by this runtime.");
+ return false;
+ }
+ }
}
--- a/jdk/test/java/net/URL/abnormal_http_urls Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-URL: http://a/b/c/d;p?q
-spec: ../../../g
-expected: http://a/../g
-
-URL: http://a/b/c/d;p?q
-spec: ../../../../g
-expected: http://a/../../g
-
-URL: http://a/b/c/d;p?q
-spec: /./g
-expected: http://a/./g
-
-URL: http://a/b/c/d;p?q
-spec: /../g
-expected: http://a/../g
-
-URL: http://a/b/c/d;p?q
-spec: .g
-expected: http://a/b/c/.g
-
-URL: http://a/b/c/d;p?q
-spec: g.
-expected: http://a/b/c/g.
-
-URL: http://a/b/c/d;p?q
-spec: ./../g
-expected: http://a/b/g
-
-URL: http://a/b/c/d;p?q
-spec: ./g/.
-expected: http://a/b/c/g/
-
-URL: http://a/b/c/d;p?q
-spec: g/./h
-expected: http://a/b/c/g/h
-
-URL: http://a/b/c/d;p?q
-spec: g;x=1/./y
-expected: http://a/b/c/g;x=1/y
-
-URL: http://a/b/c/d;p?q
-spec: g;x=1/../y
-expected: http://a/b/c/y
--- a/jdk/test/java/net/URL/ftp_urls Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-URL: null
-spec: ftp://ftp.foo.com/dir1/entry.txt
-expected: ftp://ftp.foo.com/dir1/entry.txt
-
-URL: null
-spec: ftp://br:pwd@ftp.foo.com/dir1/jar.jar
-expected: ftp://br:pwd@ftp.foo.com/dir1/jar.jar
-
-URL: ftp://ftp.foo.com/dir1/foo.txt
-spec: bar.txt
-expected: ftp://ftp.foo.com/dir1/bar.txt
-
-URL: ftp://ftp.foo.com/dir1/jar.jar
-spec: /entry.txt
-expected: ftp://ftp.foo.com/entry.txt
-
-URL: ftp://ftp.foo.com/dir1/jar.jar
-spec: dir1/entry.txt
-expected: ftp://ftp.foo.com/dir1/dir1/entry.txt
-
-URL: ftp://ftp.foo.com/dir1/jar.jar
-spec: /dir1/entry.txt
-expected: ftp://ftp.foo.com/dir1/entry.txt
-
-URL: ftp://br:pwd@ftp.foo.com/dir1/jar.jar
-spec: /dir1/entry.txt
-expected: ftp://br:pwd@ftp.foo.com/dir1/entry.txt
--- a/jdk/test/java/net/URL/jar_urls Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-URL: null
-spec: jar:http://www.foo.com/dir1/jar.jar!/dir2/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir2/entry.txt
-
-URL: null
-spec: jar:http://www.foo.com/dir1/jar.jar!/
-expected: jar:http://www.foo.com/dir1/jar.jar!/
-
-URL: null
-spec: jar:http://www.foo.com/dir1/jar.jar!/
-expected: jar:http://www.foo.com/dir1/jar.jar!/
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: /entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: dir1/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: /dir1/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: /entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: /entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/dir1/
-spec: entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/dir2/dir3/entry2.txt
-spec: /dir1/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: /dir1/foo/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/foo/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/dir1/dir2/dir3/
-spec: dir4/foo/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/dir2/dir3/dir4/foo/entry.txt
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/
-spec: /dir1/foo/entry.txt
-expected: jar:http://www.foo.com/dir1/jar.jar!/dir1/foo/entry.txt
-
-URL: null
-spec: jar:http://www.foo.com/dir1/jar.jar!/foo.txt#anchor
-expected: jar:http://www.foo.com/dir1/jar.jar!/foo.txt#anchor
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/foo.txt
-spec: #anchor
-expected: jar:http://www.foo.com/dir1/jar.jar!/foo.txt#anchor
-
-URL: jar:http://www.foo.com/dir1/jar.jar!/foo/bar/
-spec: baz/quux#anchor
-expected: jar:http://www.foo.com/dir1/jar.jar!/foo/bar/baz/quux#anchor
-
-URL: jar:http://balloo.com/olle.jar!/
-spec: p2
-expected: jar:http://balloo.com/olle.jar!/p2
--- a/jdk/test/java/net/URL/normal_http_urls Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-URL: http://a/b/c/d;p?q
-spec: g
-expected: http://a/b/c/g
-
-URL: http://a/b/c/d;p?q
-spec: ./g
-expected: http://a/b/c/g
-
-URL: http://a/b/c/d;p?q
-spec: g/
-expected: http://a/b/c/g/
-
-URL: http://a/b/c/d;p?q
-spec: /g
-expected: http://a/g
-
-URL: http://a/b/c/d;p?q
-spec: //g
-expected: http://g
-
-URL: http://a/b/c/d;p?q
-spec: ?y
-expected: http://a/b/c/?y
-
-URL: http://a/b/c/d;p?q
-spec: g?y
-expected: http://a/b/c/g?y
-
-URL: http://a/b/c/d;p?q
-spec: g#s
-expected: http://a/b/c/g#s
-
-URL: http://a/b/c/d;p?q
-spec: g?y#s
-expected: http://a/b/c/g?y#s
-
-URL: http://a/b/c/d;p?q
-spec: ;x
-expected: http://a/b/c/;x
-
-URL: http://a/b/c/d;p?q
-spec: g;x
-expected: http://a/b/c/g;x
-
-URL: http://a/b/c/d;p?q
-spec: g;x?y#s
-expected: http://a/b/c/g;x?y#s
-
-URL: http://a/b/c/d;p?q
-spec: .
-expected: http://a/b/c/
-
-URL: http://a/b/c/d;p?q
-spec: ./
-expected: http://a/b/c/
-
-URL: http://a/b/c/d;p?q
-spec: ..
-expected: http://a/b/
-
-URL: http://a/b/c/d;p?q
-spec: ../
-expected: http://a/b/
-
-URL: http://a/b/c/d;p?q
-spec: ../g
-expected: http://a/b/g
-
-URL: http://a/b/c/d;p?q
-spec: ../..
-expected: http://a/
-
-URL: http://a/b/c/d;p?q
-spec: ../../
-expected: http://a/
-
-URL: http://a/b/c/d;p?q
-spec: ../../g
-expected: http://a/g
-
-URL: null
-spec: http://www.javasoft.com/jdc/community/chat/index.html#javalive?frontpage-jdc
-expected: http://www.javasoft.com/jdc/community/chat/index.html#javalive?frontpage-jdc
--- a/jdk/test/java/net/URL/runconstructor.sh Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2000, 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 4393671
-# @summary URL constructor URL(URL context, String spec) FAILED with specific input in merlin
-#
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin )
- PS=":"
- FS="/"
- ;;
- CYGWIN* )
- PS=";"
- FS="/"
- ;;
- Windows* )
- PS=";"
- FS="\\"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
- ${TESTSRC}${FS}Constructor.java
-
-failures=0
-
-go() {
- echo ''
- ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Constructor $1
- if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-}
-
-go ${TESTSRC}${FS}share_file_urls
-go ${TESTSRC}${FS}jar_urls
-go ${TESTSRC}${FS}normal_http_urls
-go ${TESTSRC}${FS}ftp_urls
-go ${TESTSRC}${FS}abnormal_http_urls
-
-if [ "$failures" != "0" ]; then
- echo $failures tests failed
- exit 1;
-fi
--- a/jdk/test/java/net/URL/share_file_urls Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-URL: null
-spec: file://JavaSoft/Test
-expected: file://JavaSoft/Test
-
-URL: null
-spec: file:///JavaSoft/Test
-expected: file:/JavaSoft/Test
-
-URL: null
-spec: file:/JavaSoft/Test
-expected: file:/JavaSoft/Test
-
-URL: null
-spec: file:/c:/JavaSoft/Test
-expected: file:/c:/JavaSoft/Test
-
-URL: null
-spec: file:/c:/JavaSoft/Test:something
-expected: file:/c:/JavaSoft/Test:something
-
-URL: null
-spec: file:/c:/JavaSoft/Test#anchor
-expected: file:/c:/JavaSoft/Test#anchor
-
-URL: null
-spec: file:/JavaSoft/Test
-expected: file:/JavaSoft/Test
-
-URL: file://JavaSoft/Test
-spec: Test#bar
-expected: file://JavaSoft/Test#bar
-
-URL: file://codrus/c:/jdk/eng/index.html
-spec: pulsar.html
-expected: file://codrus/c:/jdk/eng/pulsar.html
-
-URL: file:///c:/jdk/eng/index.html
-spec: pulsar.html
-expected: file:/c:/jdk/eng/pulsar.html
-
-URL: file:///jdk/eng/index.html
-spec: pulsar.html
-expected: file:/jdk/eng/pulsar.html
-
-URL: file://JavaSoft/Test
-spec: file://radartoad.com/Test#bar
-expected: file://radartoad.com/Test#bar
-
-URL: file://JavaSoft/Test
-spec: /c:/Test#bar
-expected: file://JavaSoft/c:/Test#bar
\ No newline at end of file
--- a/jdk/test/java/net/URL/win32_file_urls Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-URL: null
-spec: file://c:\JavaSoft\Test
-expected: file://c:/JavaSoft/Test
-
-URL: null
-spec: file:/c:\JavaSoft\Test
-expected: file:/c:/JavaSoft/Test
-
-URL: null
-spec: file:/c:\JavaSoft\Test:something#anchor
-expected: file:/c:/JavaSoft/Test:something#anchor
-
-URL: file:///c:\jdk\eng\index.html
-spec: pulsar.html
-expected: file:/c:/jdk/eng/pulsar.html
\ No newline at end of file
--- a/jdk/test/java/net/URLConnection/RequestProperties.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/net/URLConnection/RequestProperties.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -28,90 +28,55 @@
*/
import java.net.*;
+import java.util.ArrayList;
+import java.util.List;
public class RequestProperties {
+ static int failed;
+
public static void main (String args[]) throws Exception {
- URL url0 = new URL ("http://foo.com/bar/");
- URL url1 = new URL ("file:/etc/passwd");
- URL url2 = new URL ("ftp://foo:bar@foobar.com/etc/passwd");
- URL url3 = new URL ("jar:http://foo.com/bar.html!/foo/bar");
- URLConnection urlc0 = url0.openConnection ();
- URLConnection urlc1 = url1.openConnection ();
- URLConnection urlc2 = url2.openConnection ();
- URLConnection urlc3 = url3.openConnection ();
- int count = 0;
- String s = null;
- try {
- urlc0.setRequestProperty (null, null);
- System.out.println ("http: setRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
+ List<String> urls = new ArrayList<>();
+ urls.add("http://foo.com/bar/");
+ urls.add("jar:http://foo.com/bar.html!/foo/bar");
+ urls.add("file:/etc/passwd");
+ if (hasFtp())
+ urls.add("ftp://foo:bar@foobar.com/etc/passwd");
+
+ for (String urlStr : urls)
+ test(new URL(urlStr));
+
+ if (failed != 0)
+ throw new RuntimeException(failed + " errors") ;
+ }
+
+ static void test(URL url) throws Exception {
+ URLConnection urlc = url.openConnection();
try {
- urlc0.addRequestProperty (null, null);
- System.out.println ("http: addRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
+ urlc.setRequestProperty(null, null);
+ System.out.println(url.getProtocol()
+ + ": setRequestProperty(null,) did not throw NPE");
+ failed++;
+ } catch (NullPointerException e) { /* Expected */ }
try {
- urlc1.setRequestProperty (null, null);
- System.out.println ("file: setRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
- try {
- urlc1.addRequestProperty (null, null);
- System.out.println ("file: addRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
- try {
- urlc2.setRequestProperty (null, null);
- System.out.println ("ftp: setRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
+ urlc.addRequestProperty(null, null);
+ System.out.println(url.getProtocol()
+ + ": addRequestProperty(null,) did not throw NPE");
+ failed++;
+ } catch (NullPointerException e) { /* Expected */ }
+
+ if (urlc.getRequestProperty(null) != null) {
+ System.out.println(url.getProtocol()
+ + ": getRequestProperty(null,) did not return null");
+ failed++;
}
- try {
- urlc2.addRequestProperty (null, null);
- System.out.println ("ftp: addRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
- try {
- urlc3.setRequestProperty (null, null);
- System.out.println ("jar: setRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
+ }
+
+ private static boolean hasFtp() {
try {
- urlc3.addRequestProperty (null, null);
- System.out.println ("jar: addRequestProperty (null,) did not throw NPE");
- } catch (NullPointerException e) {
- count ++;
- }
- if (urlc0.getRequestProperty (null) != null) {
- System.out.println ("http: getRequestProperty (null,) did not return null");
- } else {
- count ++;
- }
- if (urlc1.getRequestProperty (null) != null) {
- System.out.println ("file: getRequestProperty (null,) did not return null");
- } else {
- count ++;
- }
- if (urlc2.getRequestProperty (null) != null) {
- System.out.println ("ftp: getRequestProperty (null,) did not return null");
- } else {
- count ++;
- }
- if (urlc2.getRequestProperty (null) != null) {
- System.out.println ("jar: getRequestProperty (null,) did not return null");
- } else {
- count ++;
- }
-
- if (count != 12) {
- throw new RuntimeException ((12 -count) + " errors") ;
+ return new java.net.URL("ftp://") != null;
+ } catch (java.net.MalformedURLException x) {
+ System.out.println("FTP not supported by this runtime.");
+ return false;
}
}
}
--- a/jdk/test/java/net/URLConnection/RequestPropertyValues.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/net/URLConnection/RequestPropertyValues.java Wed Feb 13 13:01:16 2013 -0800
@@ -27,8 +27,11 @@
* @summary Test URLConnection Request Proterties
*/
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
/**
* Part1:
@@ -45,28 +48,29 @@
}
public static void part1() throws Exception {
- URL[] urls = { new URL("http://localhost:8088"),
- new URL("file:/etc/passwd"),
- new URL("ftp://foo:bar@foobar.com/etc/passwd"),
- new URL("jar:http://foo.com/bar.html!/foo/bar")
- };
+ List<URL> urls = new ArrayList<>();
+ urls.add(new URL("http://localhost:8088"));
+ urls.add(new URL("file:/etc/passwd"));
+ urls.add(new URL("jar:http://foo.com/bar.html!/foo/bar"));
+ if (hasFtp())
+ urls.add(new URL("ftp://foo:bar@foobar.com/etc/passwd"));
boolean failed = false;
- for (int proto = 0; proto < urls.length; proto++) {
- URLConnection uc = (URLConnection) urls[proto].openConnection();
+ for (URL url : urls) {
+ URLConnection uc = url.openConnection();
try {
uc.setRequestProperty("TestHeader", null);
} catch (NullPointerException npe) {
System.out.println("setRequestProperty is throwing NPE" +
- " for url: " + urls[proto]);
+ " for url: " + url);
failed = true;
}
try {
uc.addRequestProperty("TestHeader", null);
} catch (NullPointerException npe) {
System.out.println("addRequestProperty is throwing NPE" +
- " for url: " + urls[proto]);
+ " for url: " + url);
failed = true;
}
}
@@ -110,4 +114,12 @@
}
}
+ private static boolean hasFtp() {
+ try {
+ return new java.net.URL("ftp://") != null;
+ } catch (java.net.MalformedURLException x) {
+ System.out.println("FTP not supported by this runtime.");
+ return false;
+ }
+ }
}
--- a/jdk/test/java/security/KeyStore/PBETest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/security/KeyStore/PBETest.java Wed Feb 13 13:01:16 2013 -0800
@@ -58,45 +58,46 @@
new File(NEW_KEYSTORE).delete();
- try {
- KeyStore keystore = load(KEYSTORE_TYPE, KEYSTORE, PASSWORD);
- KeyStore.Entry entry =
- keystore.getEntry(ALIAS,
- new KeyStore.PasswordProtection(PASSWORD));
- System.out.println("Retrieved entry named '" + ALIAS + "'");
+ KeyStore keystore = load(KEYSTORE_TYPE, KEYSTORE, PASSWORD);
+ KeyStore.Entry entry =
+ keystore.getEntry(ALIAS,
+ new KeyStore.PasswordProtection(PASSWORD));
+ System.out.println("Retrieved entry named '" + ALIAS + "'");
- // Set entry
- KeyStore keystore2 = load(NEW_KEYSTORE_TYPE, null, null);
- keystore2.setEntry(ALIAS, entry,
- new KeyStore.PasswordProtection(PASSWORD, PBE_ALGO,
- new PBEParameterSpec(SALT, ITERATION_COUNT,
- new IvParameterSpec(IV))));
- System.out.println("Encrypted entry using: " + PBE_ALGO);
+ // Set entry
+ KeyStore keystore2 = load(NEW_KEYSTORE_TYPE, null, null);
+ keystore2.setEntry(ALIAS, entry,
+ new KeyStore.PasswordProtection(PASSWORD, PBE_ALGO,
+ new PBEParameterSpec(SALT, ITERATION_COUNT,
+ new IvParameterSpec(IV))));
+ System.out.println("Encrypted entry using: " + PBE_ALGO);
+ try (FileOutputStream outStream = new FileOutputStream(NEW_KEYSTORE)) {
System.out.println("Storing keystore to: " + NEW_KEYSTORE);
- keystore2.store(new FileOutputStream(NEW_KEYSTORE), PASSWORD);
+ keystore2.store(outStream, PASSWORD);
+ }
- keystore2 = load(NEW_KEYSTORE_TYPE, NEW_KEYSTORE, PASSWORD);
- entry = keystore2.getEntry(ALIAS,
- new KeyStore.PasswordProtection(PASSWORD));
- System.out.println("Retrieved entry named '" + ALIAS + "'");
-
- } finally {
- new File(NEW_KEYSTORE).delete();
- System.out.println("Deleted keystore: " + NEW_KEYSTORE);
- }
+ keystore2 = load(NEW_KEYSTORE_TYPE, NEW_KEYSTORE, PASSWORD);
+ entry = keystore2.getEntry(ALIAS,
+ new KeyStore.PasswordProtection(PASSWORD));
+ System.out.println("Retrieved entry named '" + ALIAS + "'");
}
private static KeyStore load(String type, String path, char[] password)
throws Exception {
+ KeyStore keystore = KeyStore.getInstance(type);
- FileInputStream stream = null;
if (path != null) {
- stream = new FileInputStream(path);
+
+ try (FileInputStream inStream = new FileInputStream(path)) {
+ System.out.println("Loading keystore from: " + path);
+ keystore.load(inStream, password);
+ System.out.println("Loaded keystore with " + keystore.size() +
+ " entries");
+ }
+ } else {
+ keystore.load(null, null);
}
- KeyStore keystore = KeyStore.getInstance(type);
- System.out.println("Loading keystore from: " + path);
- keystore.load(stream, password);
return keystore;
}
--- a/jdk/test/java/util/Base64/TestBase64.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/util/Base64/TestBase64.java Wed Feb 13 13:01:16 2013 -0800
@@ -22,7 +22,7 @@
*/
/**
- * @test 4235519 8004212
+ * @test 4235519 8004212 8005394 8007298 8006295 8006315 8006530
* @summary tests java.util.Base64
*/
@@ -109,6 +109,15 @@
// test return value from decode(ByteBuffer, ByteBuffer)
testDecBufRet();
+
+ // test single-non-base64 character for mime decoding
+ testSingleNonBase64MimeDec();
+
+ // test decoding of unpadded data
+ testDecodeUnpadded();
+
+ // test mime decoding with ignored character after padding
+ testDecodeIgnoredAfterPadding();
}
private static sun.misc.BASE64Encoder sunmisc = new sun.misc.BASE64Encoder();
@@ -295,6 +304,7 @@
checkNull(new Runnable() { public void run() { enc.encode(bb_null); }});
checkNull(new Runnable() { public void run() { enc.encode(bb_null, ByteBuffer.allocate(10), 0); }});
checkNull(new Runnable() { public void run() { enc.encode(ByteBuffer.allocate(10), bb_null, 0); }});
+ checkNull(new Runnable() { public void run() { enc.wrap(null); }});
}
private static void testNull(final Base64.Decoder dec) {
@@ -305,6 +315,7 @@
checkNull(new Runnable() { public void run() { dec.decode(bb_null); }});
checkNull(new Runnable() { public void run() { dec.decode(bb_null, ByteBuffer.allocate(10)); }});
checkNull(new Runnable() { public void run() { dec.decode(ByteBuffer.allocate(10), bb_null); }});
+ checkNull(new Runnable() { public void run() { dec.wrap(null); }});
}
private static interface Testable {
@@ -354,6 +365,94 @@
} catch (IllegalArgumentException iae) {}
}
+ private static void testDecodeIgnoredAfterPadding() throws Throwable {
+ for (byte nonBase64 : new byte[] {'#', '(', '!', '\\', '-', '_', '\n', '\r'}) {
+ byte[][] src = new byte[][] {
+ "A".getBytes("ascii"),
+ "AB".getBytes("ascii"),
+ "ABC".getBytes("ascii"),
+ "ABCD".getBytes("ascii"),
+ "ABCDE".getBytes("ascii")
+ };
+ Base64.Encoder encM = Base64.getMimeEncoder();
+ Base64.Decoder decM = Base64.getMimeDecoder();
+ Base64.Encoder enc = Base64.getEncoder();
+ Base64.Decoder dec = Base64.getDecoder();
+ for (int i = 0; i < src.length; i++) {
+ // decode(byte[])
+ byte[] encoded = encM.encode(src[i]);
+ encoded = Arrays.copyOf(encoded, encoded.length + 1);
+ encoded[encoded.length - 1] = nonBase64;
+ checkEqual(decM.decode(encoded), src[i], "Non-base64 char is not ignored");
+ try {
+ dec.decode(encoded);
+ throw new RuntimeException("No IAE for non-base64 char");
+ } catch (IllegalArgumentException iae) {}
+
+ // decode(ByteBuffer[], ByteBuffer[])
+ ByteBuffer encodedBB = ByteBuffer.wrap(encoded);
+ ByteBuffer decodedBB = ByteBuffer.allocate(100);
+ int ret = decM.decode(encodedBB, decodedBB);
+ byte[] buf = new byte[ret];
+ decodedBB.flip();
+ decodedBB.get(buf);
+ checkEqual(buf, src[i], "Non-base64 char is not ignored");
+ try {
+ encodedBB.rewind();
+ decodedBB.clear();
+ dec.decode(encodedBB, decodedBB);
+ throw new RuntimeException("No IAE for non-base64 char");
+ } catch (IllegalArgumentException iae) {}
+ // direct
+ encodedBB.rewind();
+ decodedBB = ByteBuffer.allocateDirect(100);
+ ret = decM.decode(encodedBB, decodedBB);
+ buf = new byte[ret];
+ decodedBB.flip();
+ decodedBB.get(buf);
+ checkEqual(buf, src[i], "Non-base64 char is not ignored");
+ try {
+ encodedBB.rewind();
+ decodedBB.clear();
+ dec.decode(encodedBB, decodedBB);
+ throw new RuntimeException("No IAE for non-base64 char");
+ } catch (IllegalArgumentException iae) {}
+ }
+ }
+ }
+
+ private static void testDecodeUnpadded() throws Throwable {
+ byte[] srcA = new byte[] { 'Q', 'Q' };
+ byte[] srcAA = new byte[] { 'Q', 'Q', 'E'};
+ Base64.Decoder dec = Base64.getDecoder();
+ byte[] ret = dec.decode(srcA);
+ if (ret[0] != 'A')
+ throw new RuntimeException("Decoding unpadding input A failed");
+ ret = dec.decode(srcAA);
+ if (ret[0] != 'A' && ret[1] != 'A')
+ throw new RuntimeException("Decoding unpadding input AA failed");
+ ret = new byte[10];
+ if (dec.wrap(new ByteArrayInputStream(srcA)).read(ret) != 1 &&
+ ret[0] != 'A')
+ throw new RuntimeException("Decoding unpadding input A from stream failed");
+ if (dec.wrap(new ByteArrayInputStream(srcA)).read(ret) != 2 &&
+ ret[0] != 'A' && ret[1] != 'A')
+ throw new RuntimeException("Decoding unpadding input AA from stream failed");
+ }
+
+ // single-non-base64-char should be ignored for mime decoding, but
+ // iae for basic decoding
+ private static void testSingleNonBase64MimeDec() throws Throwable {
+ for (String nonBase64 : new String[] {"#", "(", "!", "\\", "-", "_"}) {
+ if (Base64.getMimeDecoder().decode(nonBase64).length != 0) {
+ throw new RuntimeException("non-base64 char is not ignored");
+ }
+ try {
+ Base64.getDecoder().decode(nonBase64);
+ throw new RuntimeException("No IAE for single non-base64 char");
+ } catch (IllegalArgumentException iae) {}
+ }
+ }
private static void testDecBufRet() throws Throwable {
Random rnd = new java.util.Random();
--- a/jdk/test/java/util/Formatter/Basic-X.java.template Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/util/Formatter/Basic-X.java.template Wed Feb 13 13:01:16 2013 -0800
@@ -1103,6 +1103,15 @@
test("%.5f", "1.99999", val);
test("%.6f", "1.999990", val);
+ val = new BigDecimal(0.9996);
+ test("%.0f", "1", val);
+ test("%.1f", "1.0", val);
+ test("%.2f", "1.00", val);
+ test("%.3f", "1.000", val);
+ test("%.4f", "0.9996", val);
+ test("%.5f", "0.99960", val);
+ test("%.6f", "0.999600", val);
+
#end[BigDecimal]
#if[float]
--- a/jdk/test/java/util/Formatter/BasicBigDecimal.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/java/util/Formatter/BasicBigDecimal.java Wed Feb 13 13:01:16 2013 -0800
@@ -1103,6 +1103,15 @@
test("%.5f", "1.99999", val);
test("%.6f", "1.999990", val);
+ val = new BigDecimal(0.9996);
+ test("%.0f", "1", val);
+ test("%.1f", "1.0", val);
+ test("%.2f", "1.00", val);
+ test("%.3f", "1.000", val);
+ test("%.4f", "0.9996", val);
+ test("%.5f", "0.99960", val);
+ test("%.6f", "0.999600", val);
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/HashMap/HashMapCloneLeak.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 7042126
+ * @summary Verify that we do not leak contents when we clone a HashMap
+ * @author david.buck@oracle.com
+ * @run main/othervm HashMapCloneLeak
+ * @run main/othervm -XX:+AggressiveOpts HashMapCloneLeak
+ */
+
+import java.util.HashMap;
+import java.lang.ref.WeakReference;
+
+public class HashMapCloneLeak {
+
+ static WeakReference<Object> wr = null;
+
+ // helper method to keep testObject and map out of main method's scope
+ private static HashMap<Integer, Object> makeMap() {
+ HashMap<Integer, Object> map = new HashMap<Integer, Object>();
+ Object testObject = new Object();
+ wr = new WeakReference<Object>(testObject);
+ map.put(42, testObject);
+ return map;
+ }
+
+ public static void main(String[] args) throws Exception {
+ HashMap<Integer, Object> hm = makeMap();
+ hm = (HashMap<Integer, Object>)hm.clone();
+ hm.clear();
+ // There should no longer be a strong reference to testObject
+ // the WeakReference should be nulled out by GC. If not,
+ // we will hang here until timed out by the test harness.
+ Object[] chain = null;
+ while (wr.get() != null) {
+ try {
+ Object[] allocate = new Object[1000000];
+ allocate[0] = chain;
+ chain = allocate;
+ } catch (OutOfMemoryError oome) {
+ chain = null;
+ }
+ System.gc();
+ Thread.sleep(100);
+ }
+ }
+
+}
--- a/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/javax/management/remote/mandatory/notif/DeadListenerTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -31,6 +31,7 @@
import com.sun.jmx.remote.internal.ServerNotifForwarder;
import java.io.IOException;
import java.lang.management.ManagementFactory;
+import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -86,20 +87,26 @@
Map<ObjectName, Set<?>> listenerMap = (Map<ObjectName, Set<?>>) listenerMapF.get(serverNotifForwarder);
assertTrue("Server listenerMap initially empty", mapWithoutKey(listenerMap, delegateName).isEmpty());
- CountListener count1 = new CountListener();
+ final AtomicInteger count1Val = new AtomicInteger();
+ CountListener count1 = new CountListener(count1Val);
mbsc.addNotificationListener(name, count1, null, null);
+ WeakReference<CountListener> count1Ref = new WeakReference<>(count1);
+ count1 = null;
- CountListener count2 = new CountListener();
+ final AtomicInteger count2Val = new AtomicInteger();
+ CountListener count2 = new CountListener(count2Val);
NotificationFilterSupport dummyFilter = new NotificationFilterSupport();
dummyFilter.enableType("");
mbsc.addNotificationListener(name, count2, dummyFilter, "noddy");
+ WeakReference<CountListener> count2Ref = new WeakReference<>(count2);
+ count2 = null;
assertTrue("One entry in listenerMap for two listeners on same MBean", mapWithoutKey(listenerMap, delegateName).size() == 1);
Set<?> set = listenerMap.get(name);
assertTrue("Set in listenerMap for MBean has two elements", set != null && set.size() == 2);
- assertTrue("Initial value of count1 == 0", count1.count() == 0);
- assertTrue("Initial value of count2 == 0", count2.count() == 0);
+ assertTrue("Initial value of count1 == 0", count1Val.get() == 0);
+ assertTrue("Initial value of count2 == 0", count2Val.get() == 0);
Notification notif = new Notification("type", name, 0);
@@ -107,11 +114,11 @@
// Make sure notifs are working normally.
long deadline = System.currentTimeMillis() + 2000;
- while ((count1.count() != 1 || count2.count() != 1) && System.currentTimeMillis() < deadline) {
+ while ((count1Val.get() != 1 || count2Val.get() != 1) && System.currentTimeMillis() < deadline) {
Thread.sleep(10);
}
- assertTrue("New value of count1 == 1", count1.count() == 1);
- assertTrue("Initial value of count2 == 1", count2.count() == 1);
+ assertTrue("New value of count1 == 1", count1Val.get() == 1);
+ assertTrue("Initial value of count2 == 1", count2Val.get() == 1);
// Make sure that removing a nonexistent listener from an existent MBean produces ListenerNotFoundException
CountListener count3 = new CountListener();
@@ -136,28 +143,29 @@
mbs.unregisterMBean(name);
mbean.sendNotification(notif);
Thread.sleep(200);
- assertTrue("New value of count1 == 1", count1.count() == 1);
- assertTrue("Initial value of count2 == 1", count2.count() == 1);
+
+ assertTrue("New value of count1 == 1", count1Val.get() == 1);
+ assertTrue("Initial value of count2 == 1", count2Val.get() == 1);
+
+ // wait for the listener cleanup to take place upon processing notifications
+ int countdown = 50; // waiting max. 5 secs
+ while (countdown-- > 0 &&
+ (count1Ref.get() != null ||
+ count2Ref.get() != null)) {
+ System.gc();
+ Thread.sleep(100);
+ System.gc();
+ }
+ // listener has been removed or the wait has timed out
+
+ assertTrue("count1 notification listener has not been cleaned up", count1Ref.get() == null);
+ assertTrue("count2 notification listener has not been cleaned up", count2Ref.get() == null);
// Check that there is no trace of the listeners any more in ServerNotifForwarder.listenerMap.
// THIS DEPENDS ON JMX IMPLEMENTATION DETAILS.
// If the JMX implementation changes, the code here may have to change too.
Set<?> setForUnreg = listenerMap.get(name);
assertTrue("No trace of unregistered MBean: " + setForUnreg, setForUnreg == null);
-
- // Remove attempts should fail.
- try {
- mbsc.removeNotificationListener(name, count1);
- assertTrue("Remove of count1 listener should have failed", false);
- } catch (ListenerNotFoundException e) {
- // OK: expected
- }
- try {
- mbsc.removeNotificationListener(name, count2, dummyFilter, "noddy");
- assertTrue("Remove of count2 listener should have failed", false);
- } catch (ListenerNotFoundException e) {
- // OK: expected
- }
}
private static <K, V> Map<K, V> mapWithoutKey(Map<K, V> map, K key) {
@@ -173,6 +181,10 @@
public static class CountListener implements NotificationListener {
final AtomicInteger count;
+ public CountListener(AtomicInteger i) {
+ count = i;
+ }
+
public CountListener() {
this.count = new AtomicInteger();
}
--- a/jdk/test/javax/swing/JSlider/4252173/bug4252173.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/javax/swing/JSlider/4252173/bug4252173.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,11 +22,11 @@
*/
/* @test
- @bug 4252173
- @summary Inability to reuse the HorizontalSliderThumbIcon
- @author Pavel Porvatov
- @run main bug4252173
-*/
+ * @bug 4252173 7077259
+ * @summary Inability to reuse the HorizontalSliderThumbIcon
+ * @author Pavel Porvatov
+ * @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel bug4252173
+ */
import javax.swing.*;
import javax.swing.plaf.metal.DefaultMetalTheme;
--- a/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -22,10 +22,11 @@
*/
/* @test
- @bug 6532833
- @summary PIT: Metal LAF - The right side border is not shown for the Spinner after the removing the buttons
- @author Pavel Porvatov
-*/
+ * @bug 6532833 7077259
+ * @summary PIT: Metal LAF - The right side border is not shown for the Spinner after the removing the buttons
+ * @author Pavel Porvatov
+ * @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel bug6532833
+ */
import javax.swing.*;
import java.awt.*;
--- a/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -23,22 +23,21 @@
/*
* @test
- * @bug 6657026
+ * @bug 6657026 7077259
* @summary Tests shared MetalSliderUI in different application contexts
* @author Sergey Malenkov
+ * @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel Test6657026
*/
-import sun.awt.SunToolkit;
-
import javax.swing.JSlider;
import javax.swing.UIManager;
import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.plaf.metal.MetalSliderUI;
+import sun.awt.SunToolkit;
public class Test6657026 extends MetalSliderUI implements Runnable {
public static void main(String[] args) throws Exception {
- UIManager.setLookAndFeel(new MetalLookAndFeel());
JSlider slider = new JSlider();
test(slider);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jdp/JdpClient.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.ProtocolFamily;
+import java.net.StandardProtocolFamily;
+import java.net.StandardSocketOptions;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.util.Collections;
+import java.util.Enumeration;
+import sun.management.jdp.JdpException;
+import sun.management.jdp.JdpJmxPacket;
+
+public class JdpClient {
+
+ private static class PacketListener implements Runnable {
+
+ private static final int BUFFER_LENGTH = 4096;
+ private final DatagramChannel channel;
+ private static int maxPacketCount = 1;
+ private static int maxEmptyPacketCount = 10;
+
+
+ PacketListener(DatagramChannel channel) {
+ this.channel = channel;
+ }
+
+ @java.lang.Override
+ public void run() {
+ try {
+ Selector sel;
+ sel = Selector.open();
+ channel.configureBlocking(false);
+ channel.register(sel, SelectionKey.OP_READ);
+ ByteBuffer buf = ByteBuffer.allocate(1024);
+
+ int count = 1;
+ int emptyPacketsCount = 1;
+
+ try {
+ while (true) {
+
+ sel.selectedKeys().clear();
+ buf.rewind();
+
+ sel.select(10 * 1000);
+ channel.receive(buf);
+
+ if (buf.position() == 0 ){
+ if (JdpDoSomething.getVerbose()){
+ System.err.println("Empty packet received");
+ }
+ if (++emptyPacketsCount > maxEmptyPacketCount){
+ throw new RuntimeException("Test failed, maxEmptyPacketCount reached");
+ }
+
+ continue;
+ }
+
+ buf.flip();
+ byte[] dgramData = new byte[buf.remaining()];
+ buf.get(dgramData);
+
+ try {
+ JdpJmxPacket packet = new JdpJmxPacket(dgramData);
+ JdpDoSomething.printJdpPacket(packet);
+ if(++count > maxPacketCount){
+ break;
+ }
+ } catch (JdpException e) {
+ e.printStackTrace();
+ throw new RuntimeException("Test failed");
+ }
+
+ }
+
+ System.out.println("OK: Test passed");
+
+ } finally {
+ sel.close();
+ channel.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException("Test failed");
+ }
+ }
+ }
+
+ public static void main(String[] args) {
+ try {
+ String discoveryPort = System.getProperty("com.sun.management.jdp.port");
+ String discoveryAddress = System.getProperty("com.sun.management.jdp.address");
+ if (discoveryAddress == null || discoveryPort == null) {
+ System.out.println("Test failed. address and port must be specified");
+ return;
+ }
+
+ int port = Integer.parseInt(discoveryPort);
+ InetAddress address = InetAddress.getByName(discoveryAddress);
+
+
+ ProtocolFamily family = (address instanceof Inet6Address)
+ ? StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
+
+ DatagramChannel channel;
+
+ channel = DatagramChannel.open(family);
+ channel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
+ channel.bind(new InetSocketAddress(port));
+
+ Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
+ for (NetworkInterface interf : Collections.list(nets)) {
+ if (interf.supportsMulticast()) {
+ try {
+ channel.join(address, interf);
+ } catch (IOException e) {
+ // Skip not configured interfaces
+ }
+ }
+ }
+
+ PacketListener listener = new PacketListener(channel);
+ new Thread(listener, "Jdp Client").start();
+
+ } catch (RuntimeException e){
+ System.out.println("Test failed.");
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.out.println("Test failed. unexpected error " + e);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jdp/JdpDoSomething.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.Objects;
+
+import sun.management.jdp.JdpJmxPacket;
+import sun.management.jdp.JdpException;
+
+public class JdpDoSomething {
+
+ private static final String lockFileName = "JdpDoSomething.lck";
+ private static final boolean verbose=false;
+
+ public static boolean getVerbose(){
+ return verbose;
+ }
+
+ public static void printJdpPacket(JdpJmxPacket p) {
+ if (getVerbose()) {
+ try {
+ RandomAccessFile f = new RandomAccessFile("out.dmp", "rw");
+ f.write(p.getPacketData());
+ f.close();
+ } catch (IOException e) {
+ System.out.println("Can't write a dump file: " + e);
+ }
+
+ System.out.println("Id: " + p.getId());
+ System.out.println("Jmx: " + p.getJmxServiceUrl());
+ System.out.println("Main: " + p.getMainClass());
+ System.out.println("InstanceName: " + p.getInstanceName());
+
+ System.out.flush();
+ }
+ }
+
+ public static void compaireJdpPacketEx(JdpJmxPacket p1, JdpJmxPacket p2)
+ throws JdpException {
+
+ if (!Objects.equals(p1, p1)) {
+ throw new JdpException("Packet mismatch error");
+ }
+
+ if (!Objects.equals(p1.getMainClass(), p2.getMainClass())) {
+ throw new JdpException("Packet mismatch error (main class)");
+ }
+
+ if (!Objects.equals(p1.getInstanceName(), p2.getInstanceName())) {
+ throw new JdpException("Packet mismatch error (instance name)");
+ }
+ }
+
+ public static void doSomething() {
+ try {
+ File lockFile = new File(lockFileName);
+ lockFile.createNewFile();
+
+ while (lockFile.exists()) {
+ long datetime = lockFile.lastModified();
+ long epoch = System.currentTimeMillis() / 1000;
+
+ // Don't allow test app to run more than an hour
+ if (epoch - datetime > 3600) {
+ System.err.println("Lock is too old. Aborting");
+ return;
+ }
+ Thread.sleep(1);
+ }
+
+ } catch (Throwable e) {
+ System.err.println("Something bad happens:" + e);
+ }
+ }
+
+ public static void main(String args[]) throws Exception {
+ System.err.println("main enter");
+ doSomething();
+ System.err.println("main exit");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jdp/JdpTest.sh Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,323 @@
+#!/bin/sh
+
+# 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.
+#
+# 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 7169888
+# @build JdpUnitTest JdpClient JdpDoSomething
+# @run shell JdpTest.sh --jtreg --no-compile
+# @summary No word Failed expected in the test output
+
+_verbose=no
+_jtreg=no
+_compile=yes
+
+# temporary disable jcmd related tests
+# _testsuite="01,02,03,04,05"
+_testsuite="01,02,04"
+
+_pwd=`pwd`
+
+_testclasses=".classes"
+_testsrc="${_pwd}"
+_lockFileName="JdpDoSomething.lck"
+
+_logname=".classes/output.txt"
+_last_pid=""
+
+
+_compile(){
+
+ if [ ! -e ${_testclasses} ]
+ then
+ mkdir -p ${_testclasses}
+ fi
+
+ rm -f ${_testclasses}/*.class
+
+ # Compile testcase
+ ${TESTJAVA}/bin/javac -d ${_testclasses} JdpUnitTest.java \
+ JdpDoSomething.java \
+ JdpClient.java
+
+
+ if [ ! -e ${_testclasses}/JdpDoSomething.class -o ! -e ${_testclasses}/JdpClient.class -o ! -e ${_testclasses}/JdpUnitTest.class ]
+ then
+ echo "ERROR: Can't compile"
+ exit -1
+ fi
+}
+
+
+_app_start(){
+
+ testappname=$1
+ shift
+
+ ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} ${testappname} >> ${_logname} 2>&1 &
+ _last_pid=$!
+
+ npid=`_get_pid`
+ if [ "${npid}" = "" ]
+ then
+ echo "ERROR: Test app not started"
+ if [ "${_jtreg}" = "yes" ]
+ then
+ exit -1
+ fi
+ fi
+}
+
+_get_pid(){
+ ${TESTJAVA}/bin/jps | sed -n "/Jdp/s/ .*//p"
+}
+
+_app_stop(){
+ rm ${_lockFileName}
+
+# wait until VM is actually shuts down
+ while true
+ do
+ npid=`_get_pid`
+ if [ "${npid}" = "" ]
+ then
+ break
+ fi
+ sleep 1
+ done
+}
+
+_testme(){
+ ${TESTJAVA}/bin/java \
+ -cp ${_testclasses} \
+ $* \
+ -Dcom.sun.management.jdp.port=7095 \
+ -Dcom.sun.management.jdp.address=239.255.255.225 \
+ JdpClient
+
+}
+
+
+_jcmd(){
+ ${TESTJAVA}/bin/jcmd JdpDoSomething $* > /dev/null 2>/dev/null
+}
+
+
+_echo(){
+ echo "$*"
+ echo "$*" >> ${_logname}
+}
+
+# ============= TESTS ======================================
+
+test_01(){
+
+ _echo "**** Test one ****"
+
+ _app_start JdpUnitTest \
+ -Dcom.sun.management.jdp.port=7095 \
+ -Dcom.sun.management.jdp.address=239.255.255.225 \
+ -Dcom.sun.management.jdp.pause=5
+
+ res=`_testme`
+
+ case "${res}" in
+ OK*)
+ _echo "Passed"
+ ;;
+ *)
+ _echo "Failed!"
+ ;;
+ esac
+
+ _app_stop
+}
+
+test_02(){
+
+ _echo "**** Test two ****"
+
+ _app_start JdpDoSomething \
+ -Dcom.sun.management.jdp.port=7095 \
+ -Dcom.sun.management.jdp.address=239.255.255.225 \
+ -Dcom.sun.management.jdp.pause=5 \
+ -Dcom.sun.management.jmxremote.port=4545 \
+ -Dcom.sun.management.jmxremote.authenticate=false \
+ -Dcom.sun.management.jmxremote.ssl=false
+
+ res=`_testme`
+
+ case "${res}" in
+ OK*)
+ _echo "Passed"
+ ;;
+ *)
+ _echo "Failed!"
+ ;;
+ esac
+
+ _app_stop
+}
+
+test_03(){
+
+ _echo "**** Test three ****"
+
+ _app_start JdpDoSomething
+
+ _jcmd ManagementAgent.start\
+ jdp.port=7095 \
+ jdp.address=239.255.255.225 \
+ jdp.pause=5 \
+ jmxremote.port=4545 \
+ jmxremote.authenticate=false \
+ jmxremote.ssl=false
+
+ res=`_testme`
+
+ case "${res}" in
+ OK*)
+ _echo "Passed"
+ ;;
+ *)
+ _echo "Failed!"
+ ;;
+ esac
+
+ _app_stop
+}
+
+test_04(){
+
+ _echo "**** Test four ****"
+
+ _app_start JdpDoSomething \
+ -Dcom.sun.management.jmxremote.autodiscovery=true \
+ -Dcom.sun.management.jmxremote.port=4545 \
+ -Dcom.sun.management.jmxremote.authenticate=false \
+ -Dcom.sun.management.jmxremote.ssl=false
+
+ res=`_testme`
+
+ case "${res}" in
+ OK*)
+ _echo "Passed"
+ ;;
+ *)
+ _echo "Failed!"
+ ;;
+ esac
+
+ _app_stop
+}
+
+test_05(){
+
+ _echo "**** Test five ****"
+
+ _app_start JdpDoSomething
+
+ _jcmd ManagementAgent.start\
+ jmxremote.autodiscovery=true \
+ jmxremote.port=4545 \
+ jmxremote.authenticate=false \
+ jmxremote.ssl=false
+
+
+ res=`_testme`
+
+ case "${res}" in
+ OK*)
+ _echo "Passed"
+ ;;
+ *)
+ _echo "Failed!"
+ ;;
+ esac
+
+ _app_stop
+}
+
+
+# ============= MAIN =======================================
+
+if [ "x${TESTJAVA}" = "x" ]
+then
+ echo "TESTJAVA env have to be set"
+ exit
+fi
+
+#------------------------------------------------------------------------------
+# reading parameters
+
+for parm in "$@"
+do
+ case $parm in
+ --verbose) _verbose=yes ;;
+ --jtreg) _jtreg=yes ;;
+ --no-compile) _compile=no ;;
+ --testsuite=*) _testsuite=`_echo $parm | sed "s,^--.*=\(.*\),\1,"` ;;
+ *)
+ echo "Undefined parameter $parm. Try --help for help"
+ exit
+ ;;
+ esac
+done
+
+if [ ${_compile} = "yes" ]
+then
+ _compile
+fi
+
+if [ ${_jtreg} = "yes" ]
+then
+ _testclasses=${TESTCLASSES}
+ _testsrc=${TESTSRC}
+ _logname="output.txt"
+fi
+
+# Make sure _tesclasses is absolute path
+tt=`echo ${_testclasses} | sed -e 's,/,,'`
+if [ ${tt} = ${_testclasses} ]
+then
+ _testclasses="${_pwd}/${_testclasses}"
+fi
+
+_policyname="${_testclasses}/policy"
+
+rm -f ${_logname}
+rm -f ${_policyname}
+
+if [ -e ${_testsrc}/policy.tpl ]
+then
+
+cat ${_testsrc}/policy.tpl | \
+ sed -e "s,@_TESTCLASSES@,${_testclasses},g" -e "s,@TESTJAVA@,${TESTJAVA},g" \
+ > ${_policyname}
+
+fi
+
+# Local mode tests
+for i in `echo ${_testsuite} | sed -e "s/,/ /g"`
+do
+ test_${i}
+done
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jdp/JdpUnitTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.UUID;
+
+import sun.management.jdp.JdpController;
+import sun.management.jdp.JdpPacket;
+import sun.management.jdp.JdpJmxPacket;
+import sun.management.jdp.JdpException;
+
+public class JdpUnitTest {
+
+ /**
+ * This test tests that complete packet is build correctly
+ */
+ public static void PacketBuilderTest()
+ throws IOException, JdpException {
+
+ /* Complete packet test */
+ {
+ JdpJmxPacket p1 = new JdpJmxPacket(UUID.randomUUID(), "fake://unit-test");
+ p1.setMainClass("FakeUnitTest");
+ p1.setInstanceName("Fake");
+ byte[] b = p1.getPacketData();
+
+ JdpJmxPacket p2 = new JdpJmxPacket(b);
+ JdpDoSomething.printJdpPacket(p1);
+ JdpDoSomething.compaireJdpPacketEx(p1, p2);
+ }
+
+ /*Missed field packet test*/
+ {
+ JdpJmxPacket p1 = new JdpJmxPacket(UUID.randomUUID(), "fake://unit-test");
+ p1.setMainClass("FakeUnitTest");
+ p1.setInstanceName(null);
+ byte[] b = p1.getPacketData();
+
+ JdpJmxPacket p2 = new JdpJmxPacket(b);
+ JdpDoSomething.printJdpPacket(p1);
+ JdpDoSomething.compaireJdpPacketEx(p1, p2);
+ }
+
+ System.out.println("OK: Test passed");
+
+ }
+
+ public static void startFakeDiscoveryService()
+ throws IOException, JdpException {
+
+ String discoveryPort = System.getProperty("com.sun.management.jdp.port");
+ String discoveryAddress = System.getProperty("com.sun.management.jdp.address");
+ InetAddress address = InetAddress.getByName(discoveryAddress);
+ int port = Integer.parseInt(discoveryPort);
+ JdpController.startDiscoveryService(address, port, "FakeDiscovery", "fake://unit-test");
+ }
+
+ public static void main(String[] args) {
+ try {
+ PacketBuilderTest();
+ startFakeDiscoveryService();
+ JdpDoSomething.doSomething();
+
+ } catch (Throwable e) {
+ e.printStackTrace();
+ System.out.println("Test failed. unexpected error " + e);
+ }
+ }
+}
Binary file jdk/test/sun/net/ftp/EncDec.doc has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/net/ftp/MarkResetTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,455 @@
+/*
+ * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/*
+ *
+ * run from MarkResetTest.sh
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.regex.*;
+
+public class MarkResetTest {
+
+ /**
+ * A class that simulates, on a separate, an FTP server.
+ */
+ private class FtpServer extends Thread {
+ private ServerSocket server;
+ private int port;
+ private boolean done = false;
+ private boolean pasvEnabled = true;
+ private boolean portEnabled = true;
+ private boolean extendedEnabled = true;
+
+ /**
+ * This Inner class will handle ONE client at a time.
+ * That's where 99% of the protocol handling is done.
+ */
+
+ private class FtpServerHandler extends Thread {
+ BufferedReader in;
+ PrintWriter out;
+ Socket client;
+ private final int ERROR = 0;
+ private final int USER = 1;
+ private final int PASS = 2;
+ private final int CWD = 3;
+ private final int TYPE = 4;
+ private final int RETR = 5;
+ private final int PASV = 6;
+ private final int PORT = 7;
+ private final int QUIT = 8;
+ private final int EPSV = 9;
+ String[] cmds = { "USER", "PASS", "CWD",
+ "TYPE", "RETR", "PASV",
+ "PORT", "QUIT", "EPSV"};
+ private String arg = null;
+ private ServerSocket pasv = null;
+ private int data_port = 0;
+ private InetAddress data_addr = null;
+
+ /**
+ * Parses a line to match it with one of the supported FTP commands.
+ * Returns the command number.
+ */
+
+ private int parseCmd(String cmd) {
+ if (cmd == null || cmd.length() < 3)
+ return ERROR;
+ int blank = cmd.indexOf(' ');
+ if (blank < 0)
+ blank = cmd.length();
+ if (blank < 3)
+ return ERROR;
+ String s = cmd.substring(0, blank);
+ if (cmd.length() > blank+1)
+ arg = cmd.substring(blank+1, cmd.length());
+ else
+ arg = null;
+ for (int i = 0; i < cmds.length; i++) {
+ if (s.equalsIgnoreCase(cmds[i]))
+ return i+1;
+ }
+ return ERROR;
+ }
+
+ public FtpServerHandler(Socket cl) {
+ client = cl;
+ }
+
+ protected boolean isPasvSet() {
+ if (pasv != null && !pasvEnabled) {
+ try {
+ pasv.close();
+ } catch (IOException ex) {
+ }
+ pasv = null;
+ }
+ if (pasvEnabled && pasv != null)
+ return true;
+ return false;
+ }
+
+ /**
+ * Open the data socket with the client. This can be the
+ * result of a "PASV" or "PORT" command.
+ */
+
+ protected OutputStream getOutDataStream() {
+ try {
+ if (isPasvSet()) {
+ Socket s = pasv.accept();
+ return s.getOutputStream();
+ }
+ if (data_addr != null) {
+ Socket s = new Socket(data_addr, data_port);
+ data_addr = null;
+ data_port = 0;
+ return s.getOutputStream();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ protected InputStream getInDataStream() {
+ try {
+ if (isPasvSet()) {
+ Socket s = pasv.accept();
+ return s.getInputStream();
+ }
+ if (data_addr != null) {
+ Socket s = new Socket(data_addr, data_port);
+ data_addr = null;
+ data_port = 0;
+ return s.getInputStream();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * Handles the protocol exchange with the client.
+ */
+
+ public void run() {
+ boolean done = false;
+ String str;
+ int res;
+ boolean logged = false;
+ boolean waitpass = false;
+
+ try {
+ in = new BufferedReader(new InputStreamReader(
+ client.getInputStream()));
+ out = new PrintWriter(client.getOutputStream(), true);
+ out.println("220 tatooine FTP server (SunOS 5.8) ready.");
+ } catch (Exception ex) {
+ return;
+ }
+ while (!done) {
+ try {
+ str = in.readLine();
+ res = parseCmd(str);
+ if ((res > PASS && res != QUIT) && !logged) {
+ out.println("530 Not logged in.");
+ continue;
+ }
+ switch (res) {
+ case ERROR:
+ out.println("500 '" + str +
+ "': command not understood.");
+ break;
+ case USER:
+ if (!logged && !waitpass) {
+ out.println("331 Password required for " + arg);
+ waitpass = true;
+ } else {
+ out.println("503 Bad sequence of commands.");
+ }
+ break;
+ case PASS:
+ if (!logged && waitpass) {
+ out.println("230-Welcome to the FTP server!");
+ out.println("ab");
+ out.println("230 Guest login ok, " +
+ "access restrictions apply.");
+ logged = true;
+ waitpass = false;
+ } else
+ out.println("503 Bad sequence of commands.");
+ break;
+ case QUIT:
+ out.println("221 Goodbye.");
+ out.flush();
+ out.close();
+ if (pasv != null)
+ pasv.close();
+ done = true;
+ break;
+ case TYPE:
+ out.println("200 Type set to " + arg + ".");
+ break;
+ case CWD:
+ out.println("250 CWD command successful.");
+ break;
+ case EPSV:
+ if (!extendedEnabled || !pasvEnabled) {
+ out.println("500 EPSV is disabled, " +
+ "use PORT instead.");
+ continue;
+ }
+ if ("all".equalsIgnoreCase(arg)) {
+ out.println("200 EPSV ALL command successful.");
+ continue;
+ }
+ try {
+ if (pasv == null)
+ pasv = new ServerSocket(0);
+ int port = pasv.getLocalPort();
+ out.println("229 Entering Extended" +
+ " Passive Mode (|||" + port + "|)");
+ } catch (IOException ssex) {
+ out.println("425 Can't build data connection:" +
+ " Connection refused.");
+ }
+ break;
+
+ case PASV:
+ if (!pasvEnabled) {
+ out.println("500 PASV is disabled, " +
+ "use PORT instead.");
+ continue;
+ }
+ try {
+ if (pasv == null)
+ pasv = new ServerSocket(0);
+ int port = pasv.getLocalPort();
+
+ // Parenthesis are optional, so let's be
+ // nasty and don't put them
+ out.println("227 Entering Passive Mode" +
+ " 127,0,0,1," +
+ (port >> 8) + "," + (port & 0xff));
+ } catch (IOException ssex) {
+ out.println("425 Can't build data connection:" +
+ "Connection refused.");
+ }
+ break;
+ case PORT:
+ if (!portEnabled) {
+ out.println("500 PORT is disabled, " +
+ "use PASV instead");
+ continue;
+ }
+ StringBuffer host;
+ int i = 0, j = 4;
+ while (j > 0) {
+ i = arg.indexOf(',', i + 1);
+ if (i < 0)
+ break;
+ j--;
+ }
+ if (j != 0) {
+ out.println("500 '" + arg + "':" +
+ " command not understood.");
+ continue;
+ }
+ try {
+ host = new StringBuffer(arg.substring(0, i));
+ for (j = 0; j < host.length(); j++)
+ if (host.charAt(j) == ',')
+ host.setCharAt(j, '.');
+ String ports = arg.substring(i+1);
+ i = ports.indexOf(',');
+ data_port = Integer.parseInt(
+ ports.substring(0, i)) << 8;
+ data_port += (Integer.parseInt(
+ ports.substring(i+1)));
+ data_addr = InetAddress.getByName(
+ host.toString());
+ out.println("200 Command okay.");
+ } catch (Exception ex3) {
+ data_port = 0;
+ data_addr = null;
+ out.println("500 '" + arg + "':" +
+ " command not understood.");
+ }
+ break;
+ case RETR:
+ {
+ File file = new File(arg);
+ if (!file.exists()) {
+ System.out.println("File not found");
+ out.println("200 Command okay.");
+ out.println("550 '" + arg +
+ "' No such file or directory.");
+ break;
+ }
+ FileInputStream fin = new FileInputStream(file);
+ OutputStream dout = getOutDataStream();
+ if (dout != null) {
+ out.println("150 Binary data connection" +
+ " for " + arg +
+ " (" + client.getInetAddress().
+ getHostAddress() + ") (" +
+ file.length() + " bytes).");
+ int c;
+ int len = 0;
+ while ((c = fin.read()) != -1) {
+ dout.write(c);
+ len++;
+ }
+ dout.flush();
+ dout.close();
+ fin.close();
+ out.println("226 Binary Transfer complete.");
+ } else {
+ out.println("425 Can't build data" +
+ " connection: Connection refused.");
+ }
+ }
+ break;
+ }
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ try {
+ out.close();
+ } catch (Exception ex2) {
+ }
+ done = true;
+ }
+ }
+ }
+ }
+
+ public FtpServer(int port) {
+ this.port = port;
+ }
+
+ public FtpServer() {
+ this(21);
+ }
+
+ public int getPort() {
+ if (server != null)
+ return server.getLocalPort();
+ return 0;
+ }
+
+ /**
+ * A way to tell the server that it can stop.
+ */
+ synchronized public void terminate() {
+ done = true;
+ }
+
+
+ /*
+ * All we got to do here is create a ServerSocket and wait for a
+ * connection. When a connection happens, we just have to create
+ * a thread that will handle it.
+ */
+ public void run() {
+ try {
+ server = new ServerSocket(port);
+ Socket client;
+ client = server.accept();
+ (new FtpServerHandler(client)).start();
+ server.close();
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ MarkResetTest test = new MarkResetTest();
+ }
+
+ public MarkResetTest() {
+ FtpServer server = null;
+ try {
+ server = new FtpServer(0);
+ server.start();
+ int port = 0;
+ while (port == 0) {
+ Thread.sleep(500);
+ port = server.getPort();
+ }
+
+ String filename = "EncDec.doc";
+ URL url = new URL("ftp://localhost:" + port + "/" +
+ filename);
+
+ URLConnection con = url.openConnection();
+ System.out.println("getContent: " + con.getContent());
+ System.out.println("getContent-length: " + con.getContentLength());
+
+ InputStream is = con.getInputStream();
+
+ /**
+ * guessContentTypeFromStream method calls mark and reset methods
+ * on the given stream. Make sure that calling
+ * guessContentTypeFromStream repeatedly does not affect
+ * reading from the stream afterwards
+ */
+ System.out.println("Call GuessContentTypeFromStream()" +
+ " several times..");
+ for (int i = 0; i < 5; i++) {
+ System.out.println((i + 1) + " mime-type: " +
+ con.guessContentTypeFromStream(is));
+ }
+
+ int len = 0;
+ int c;
+ while ((c = is.read()) != -1) {
+ len++;
+ }
+ is.close();
+ System.out.println("read: " + len + " bytes of the file");
+
+ // We're done!
+ server.terminate();
+ server.interrupt();
+
+ // Did we pass ?
+ if (len != (new File(filename)).length()) {
+ throw new Exception("Failed to read the file correctly");
+ }
+ System.out.println("PASSED: File read correctly");
+ } catch (Exception e) {
+ e.printStackTrace();
+ try {
+ server.terminate();
+ server.interrupt();
+ } catch (Exception ex) {
+ }
+ throw new RuntimeException("FTP support error: " + e.getMessage());
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/net/ftp/MarkResetTest.sh Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2002, 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 4673103
+# @run shell/timeout=140 MarkResetTest.sh
+# @summary URLConnection.getContent() hangs over FTP for DOC, PPT, XLS files
+
+OS=`uname -s`
+case "$OS" in
+ SunOS | Linux | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+ CYGWIN* )
+ PS=";"
+ FS="/"
+ ;;
+ Windows* )
+ PS=";"
+ FS="\\"
+ ;;
+ * )
+ echo "Unrecognized system!"
+ exit 1;
+ ;;
+esac
+
+${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}MarkResetTest.java
+
+# ftp server used by the test requires the file to be present
+# in this directory
+cp ${TESTSRC}${FS}EncDec.doc .
+
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} MarkResetTest
Binary file jdk/test/sun/net/www/EncDec.doc has changed
--- a/jdk/test/sun/net/www/MarkResetTest.java Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,455 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- *
- * run from MarkResetTest.sh
- */
-
-import java.io.*;
-import java.net.*;
-import java.util.regex.*;
-
-public class MarkResetTest {
-
- /**
- * A class that simulates, on a separate, an FTP server.
- */
- private class FtpServer extends Thread {
- private ServerSocket server;
- private int port;
- private boolean done = false;
- private boolean pasvEnabled = true;
- private boolean portEnabled = true;
- private boolean extendedEnabled = true;
-
- /**
- * This Inner class will handle ONE client at a time.
- * That's where 99% of the protocol handling is done.
- */
-
- private class FtpServerHandler extends Thread {
- BufferedReader in;
- PrintWriter out;
- Socket client;
- private final int ERROR = 0;
- private final int USER = 1;
- private final int PASS = 2;
- private final int CWD = 3;
- private final int TYPE = 4;
- private final int RETR = 5;
- private final int PASV = 6;
- private final int PORT = 7;
- private final int QUIT = 8;
- private final int EPSV = 9;
- String[] cmds = { "USER", "PASS", "CWD",
- "TYPE", "RETR", "PASV",
- "PORT", "QUIT", "EPSV"};
- private String arg = null;
- private ServerSocket pasv = null;
- private int data_port = 0;
- private InetAddress data_addr = null;
-
- /**
- * Parses a line to match it with one of the supported FTP commands.
- * Returns the command number.
- */
-
- private int parseCmd(String cmd) {
- if (cmd == null || cmd.length() < 3)
- return ERROR;
- int blank = cmd.indexOf(' ');
- if (blank < 0)
- blank = cmd.length();
- if (blank < 3)
- return ERROR;
- String s = cmd.substring(0, blank);
- if (cmd.length() > blank+1)
- arg = cmd.substring(blank+1, cmd.length());
- else
- arg = null;
- for (int i = 0; i < cmds.length; i++) {
- if (s.equalsIgnoreCase(cmds[i]))
- return i+1;
- }
- return ERROR;
- }
-
- public FtpServerHandler(Socket cl) {
- client = cl;
- }
-
- protected boolean isPasvSet() {
- if (pasv != null && !pasvEnabled) {
- try {
- pasv.close();
- } catch (IOException ex) {
- }
- pasv = null;
- }
- if (pasvEnabled && pasv != null)
- return true;
- return false;
- }
-
- /**
- * Open the data socket with the client. This can be the
- * result of a "PASV" or "PORT" command.
- */
-
- protected OutputStream getOutDataStream() {
- try {
- if (isPasvSet()) {
- Socket s = pasv.accept();
- return s.getOutputStream();
- }
- if (data_addr != null) {
- Socket s = new Socket(data_addr, data_port);
- data_addr = null;
- data_port = 0;
- return s.getOutputStream();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- protected InputStream getInDataStream() {
- try {
- if (isPasvSet()) {
- Socket s = pasv.accept();
- return s.getInputStream();
- }
- if (data_addr != null) {
- Socket s = new Socket(data_addr, data_port);
- data_addr = null;
- data_port = 0;
- return s.getInputStream();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- /**
- * Handles the protocol exchange with the client.
- */
-
- public void run() {
- boolean done = false;
- String str;
- int res;
- boolean logged = false;
- boolean waitpass = false;
-
- try {
- in = new BufferedReader(new InputStreamReader(
- client.getInputStream()));
- out = new PrintWriter(client.getOutputStream(), true);
- out.println("220 tatooine FTP server (SunOS 5.8) ready.");
- } catch (Exception ex) {
- return;
- }
- while (!done) {
- try {
- str = in.readLine();
- res = parseCmd(str);
- if ((res > PASS && res != QUIT) && !logged) {
- out.println("530 Not logged in.");
- continue;
- }
- switch (res) {
- case ERROR:
- out.println("500 '" + str +
- "': command not understood.");
- break;
- case USER:
- if (!logged && !waitpass) {
- out.println("331 Password required for " + arg);
- waitpass = true;
- } else {
- out.println("503 Bad sequence of commands.");
- }
- break;
- case PASS:
- if (!logged && waitpass) {
- out.println("230-Welcome to the FTP server!");
- out.println("ab");
- out.println("230 Guest login ok, " +
- "access restrictions apply.");
- logged = true;
- waitpass = false;
- } else
- out.println("503 Bad sequence of commands.");
- break;
- case QUIT:
- out.println("221 Goodbye.");
- out.flush();
- out.close();
- if (pasv != null)
- pasv.close();
- done = true;
- break;
- case TYPE:
- out.println("200 Type set to " + arg + ".");
- break;
- case CWD:
- out.println("250 CWD command successful.");
- break;
- case EPSV:
- if (!extendedEnabled || !pasvEnabled) {
- out.println("500 EPSV is disabled, " +
- "use PORT instead.");
- continue;
- }
- if ("all".equalsIgnoreCase(arg)) {
- out.println("200 EPSV ALL command successful.");
- continue;
- }
- try {
- if (pasv == null)
- pasv = new ServerSocket(0);
- int port = pasv.getLocalPort();
- out.println("229 Entering Extended" +
- " Passive Mode (|||" + port + "|)");
- } catch (IOException ssex) {
- out.println("425 Can't build data connection:" +
- " Connection refused.");
- }
- break;
-
- case PASV:
- if (!pasvEnabled) {
- out.println("500 PASV is disabled, " +
- "use PORT instead.");
- continue;
- }
- try {
- if (pasv == null)
- pasv = new ServerSocket(0);
- int port = pasv.getLocalPort();
-
- // Parenthesis are optional, so let's be
- // nasty and don't put them
- out.println("227 Entering Passive Mode" +
- " 127,0,0,1," +
- (port >> 8) + "," + (port & 0xff));
- } catch (IOException ssex) {
- out.println("425 Can't build data connection:" +
- "Connection refused.");
- }
- break;
- case PORT:
- if (!portEnabled) {
- out.println("500 PORT is disabled, " +
- "use PASV instead");
- continue;
- }
- StringBuffer host;
- int i = 0, j = 4;
- while (j > 0) {
- i = arg.indexOf(',', i + 1);
- if (i < 0)
- break;
- j--;
- }
- if (j != 0) {
- out.println("500 '" + arg + "':" +
- " command not understood.");
- continue;
- }
- try {
- host = new StringBuffer(arg.substring(0, i));
- for (j = 0; j < host.length(); j++)
- if (host.charAt(j) == ',')
- host.setCharAt(j, '.');
- String ports = arg.substring(i+1);
- i = ports.indexOf(',');
- data_port = Integer.parseInt(
- ports.substring(0, i)) << 8;
- data_port += (Integer.parseInt(
- ports.substring(i+1)));
- data_addr = InetAddress.getByName(
- host.toString());
- out.println("200 Command okay.");
- } catch (Exception ex3) {
- data_port = 0;
- data_addr = null;
- out.println("500 '" + arg + "':" +
- " command not understood.");
- }
- break;
- case RETR:
- {
- File file = new File(arg);
- if (!file.exists()) {
- System.out.println("File not found");
- out.println("200 Command okay.");
- out.println("550 '" + arg +
- "' No such file or directory.");
- break;
- }
- FileInputStream fin = new FileInputStream(file);
- OutputStream dout = getOutDataStream();
- if (dout != null) {
- out.println("150 Binary data connection" +
- " for " + arg +
- " (" + client.getInetAddress().
- getHostAddress() + ") (" +
- file.length() + " bytes).");
- int c;
- int len = 0;
- while ((c = fin.read()) != -1) {
- dout.write(c);
- len++;
- }
- dout.flush();
- dout.close();
- fin.close();
- out.println("226 Binary Transfer complete.");
- } else {
- out.println("425 Can't build data" +
- " connection: Connection refused.");
- }
- }
- break;
- }
- } catch (IOException ioe) {
- ioe.printStackTrace();
- try {
- out.close();
- } catch (Exception ex2) {
- }
- done = true;
- }
- }
- }
- }
-
- public FtpServer(int port) {
- this.port = port;
- }
-
- public FtpServer() {
- this(21);
- }
-
- public int getPort() {
- if (server != null)
- return server.getLocalPort();
- return 0;
- }
-
- /**
- * A way to tell the server that it can stop.
- */
- synchronized public void terminate() {
- done = true;
- }
-
-
- /*
- * All we got to do here is create a ServerSocket and wait for a
- * connection. When a connection happens, we just have to create
- * a thread that will handle it.
- */
- public void run() {
- try {
- server = new ServerSocket(port);
- Socket client;
- client = server.accept();
- (new FtpServerHandler(client)).start();
- server.close();
- } catch (Exception e) {
- }
- }
- }
-
- public static void main(String[] args) throws Exception {
- MarkResetTest test = new MarkResetTest();
- }
-
- public MarkResetTest() {
- FtpServer server = null;
- try {
- server = new FtpServer(0);
- server.start();
- int port = 0;
- while (port == 0) {
- Thread.sleep(500);
- port = server.getPort();
- }
-
- String filename = "EncDec.doc";
- URL url = new URL("ftp://localhost:" + port + "/" +
- filename);
-
- URLConnection con = url.openConnection();
- System.out.println("getContent: " + con.getContent());
- System.out.println("getContent-length: " + con.getContentLength());
-
- InputStream is = con.getInputStream();
-
- /**
- * guessContentTypeFromStream method calls mark and reset methods
- * on the given stream. Make sure that calling
- * guessContentTypeFromStream repeatedly does not affect
- * reading from the stream afterwards
- */
- System.out.println("Call GuessContentTypeFromStream()" +
- " several times..");
- for (int i = 0; i < 5; i++) {
- System.out.println((i + 1) + " mime-type: " +
- con.guessContentTypeFromStream(is));
- }
-
- int len = 0;
- int c;
- while ((c = is.read()) != -1) {
- len++;
- }
- is.close();
- System.out.println("read: " + len + " bytes of the file");
-
- // We're done!
- server.terminate();
- server.interrupt();
-
- // Did we pass ?
- if (len != (new File(filename)).length()) {
- throw new Exception("Failed to read the file correctly");
- }
- System.out.println("PASSED: File read correctly");
- } catch (Exception e) {
- e.printStackTrace();
- try {
- server.terminate();
- server.interrupt();
- } catch (Exception ex) {
- }
- throw new RuntimeException("FTP support error: " + e.getMessage());
- }
- }
-}
--- a/jdk/test/sun/net/www/MarkResetTest.sh Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2002, 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 4673103
-# @run shell/timeout=140 MarkResetTest.sh
-# @summary URLConnection.getContent() hangs over FTP for DOC, PPT, XLS files
-
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin )
- PS=":"
- FS="/"
- ;;
- CYGWIN* )
- PS=";"
- FS="/"
- ;;
- Windows* )
- PS=";"
- FS="\\"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}MarkResetTest.java
-
-# ftp server used by the test requires the file to be present
-# in this directory
-cp ${TESTSRC}${FS}EncDec.doc .
-
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} MarkResetTest
--- a/jdk/test/sun/net/www/http/HttpClient/ProxyTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/sun/net/www/http/HttpClient/ProxyTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -161,8 +161,18 @@
}
}
+ private static boolean hasFtp() {
+ try {
+ return new java.net.URL("ftp://") != null;
+ } catch (java.net.MalformedURLException x) {
+ System.out.println("FTP not supported by this runtime.");
+ return false;
+ }
+ }
+
public static void main(String[] args) throws Exception {
- ProxyTest test = new ProxyTest();
+ if (hasFtp())
+ new ProxyTest();
}
public ProxyTest() throws Exception {
--- a/jdk/test/sun/security/pkcs12/StorePasswordTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/sun/security/pkcs12/StorePasswordTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -47,40 +47,49 @@
new File(KEYSTORE).delete();
- try {
-
- KeyStore keystore = KeyStore.getInstance("PKCS12");
- keystore.load(null, null);
+ KeyStore keystore = KeyStore.getInstance("PKCS12");
+ keystore.load(null, null);
- // Set entry
- keystore.setEntry(ALIAS,
- new KeyStore.SecretKeyEntry(convertPassword(USER_PASSWORD)),
- new KeyStore.PasswordProtection(PASSWORD));
+ // Set entry
+ Set<KeyStore.Entry.Attribute> attrs = new HashSet<>();
+ attrs.add(new PKCS12Attribute("1.3.5.7.9", "printable1"));
+ attrs.add(new PKCS12Attribute("2.4.6.8.10", "1F:2F:3F:4F:5F"));
+ int originalAttrCount = attrs.size() + 2;
+ keystore.setEntry(ALIAS,
+ new KeyStore.SecretKeyEntry(convertPassword(USER_PASSWORD), attrs),
+ new KeyStore.PasswordProtection(PASSWORD));
+ try (FileOutputStream outStream = new FileOutputStream(KEYSTORE)) {
System.out.println("Storing keystore to: " + KEYSTORE);
- keystore.store(new FileOutputStream(KEYSTORE), PASSWORD);
+ keystore.store(outStream, PASSWORD);
+ }
+ try (FileInputStream inStream = new FileInputStream(KEYSTORE)) {
System.out.println("Loading keystore from: " + KEYSTORE);
- keystore.load(new FileInputStream(KEYSTORE), PASSWORD);
+ keystore.load(inStream, PASSWORD);
System.out.println("Loaded keystore with " + keystore.size() +
" entries");
- KeyStore.Entry entry = keystore.getEntry(ALIAS,
- new KeyStore.PasswordProtection(PASSWORD));
- System.out.println("Retrieved entry: " + entry);
+ }
+
+ KeyStore.Entry entry = keystore.getEntry(ALIAS,
+ new KeyStore.PasswordProtection(PASSWORD));
+ int attrCount = entry.getAttributes().size();
+ System.out.println("Retrieved entry with " + attrCount + " attrs: " +
+ entry);
+ if (attrCount != originalAttrCount) {
+ throw new Exception("Failed to recover all the entry attributes");
+ }
- SecretKey key = (SecretKey) keystore.getKey(ALIAS, PASSWORD);
- SecretKeyFactory factory =
- SecretKeyFactory.getInstance(key.getAlgorithm());
- PBEKeySpec keySpec =
- (PBEKeySpec) factory.getKeySpec(key, PBEKeySpec.class);
- char[] pwd = keySpec.getPassword();
- System.out.println("Recovered credential: " + new String(pwd));
+ SecretKey key = (SecretKey) keystore.getKey(ALIAS, PASSWORD);
+ SecretKeyFactory factory =
+ SecretKeyFactory.getInstance(key.getAlgorithm());
+ PBEKeySpec keySpec =
+ (PBEKeySpec) factory.getKeySpec(key, PBEKeySpec.class);
+ char[] pwd = keySpec.getPassword();
+ System.out.println("Recovered credential: " + new String(pwd));
- if (!Arrays.equals(USER_PASSWORD.toCharArray(), pwd)) {
- throw new Exception("Failed to recover the stored password");
- }
- } finally {
- new File(KEYSTORE).delete();
+ if (!Arrays.equals(USER_PASSWORD.toCharArray(), pwd)) {
+ throw new Exception("Failed to recover the stored password");
}
}
--- a/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -53,35 +53,34 @@
new File(KEYSTORE).delete();
- try {
+ KeyStore keystore = KeyStore.getInstance("PKCS12");
+ keystore.load(null, null);
- KeyStore keystore = KeyStore.getInstance("PKCS12");
- keystore.load(null, null);
+ // Set entry
+ keystore.setEntry(ALIAS,
+ new KeyStore.SecretKeyEntry(generateSecretKey("AES", 128)),
+ new KeyStore.PasswordProtection(PASSWORD));
- // Set entry
- keystore.setEntry(ALIAS,
- new KeyStore.SecretKeyEntry(generateSecretKey("AES", 128)),
- new KeyStore.PasswordProtection(PASSWORD));
+ try (FileOutputStream outStream = new FileOutputStream(KEYSTORE)) {
+ System.out.println("Storing keystore to: " + KEYSTORE);
+ keystore.store(outStream, PASSWORD);
+ }
- System.out.println("Storing keystore to: " + KEYSTORE);
- keystore.store(new FileOutputStream(KEYSTORE), PASSWORD);
-
+ try (FileInputStream inStream = new FileInputStream(KEYSTORE)) {
System.out.println("Loading keystore from: " + KEYSTORE);
- keystore.load(new FileInputStream(KEYSTORE), PASSWORD);
+ keystore.load(inStream, PASSWORD);
System.out.println("Loaded keystore with " + keystore.size() +
" entries");
- KeyStore.Entry entry = keystore.getEntry(ALIAS,
- new KeyStore.PasswordProtection(PASSWORD));
- System.out.println("Retrieved entry: " + entry);
+ }
- if (entry instanceof KeyStore.SecretKeyEntry) {
- System.out.println("Retrieved secret key entry: " +
- entry);
- } else {
- throw new Exception("Not a secret key entry");
- }
- } finally {
- new File(KEYSTORE).delete();
+ KeyStore.Entry entry = keystore.getEntry(ALIAS,
+ new KeyStore.PasswordProtection(PASSWORD));
+ System.out.println("Retrieved entry: " + entry);
+
+ if (entry instanceof KeyStore.SecretKeyEntry) {
+ System.out.println("Retrieved secret key entry: " + entry);
+ } else {
+ throw new Exception("Not a secret key entry");
}
}
--- a/jdk/test/sun/security/pkcs12/StoreTrustedCertTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/sun/security/pkcs12/StoreTrustedCertTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -49,59 +49,57 @@
new File(KEYSTORE).delete();
- try {
- KeyStore keystore = KeyStore.getInstance("PKCS12");
- keystore.load(null, null);
+ KeyStore keystore = KeyStore.getInstance("PKCS12");
+ keystore.load(null, null);
- Certificate cert = loadCertificate(CERT);
- Set<KeyStore.Entry.Attribute> attributes = new HashSet<>();
- attributes.add(new PKCS12Attribute("1.3.5.7.9", "that's odd"));
- attributes.add(new PKCS12Attribute("2.4.6.8.10", "that's even"));
+ Certificate cert = loadCertificate(CERT);
+ Set<KeyStore.Entry.Attribute> attributes = new HashSet<>();
+ attributes.add(new PKCS12Attribute("1.3.5.7.9", "that's odd"));
+ attributes.add(new PKCS12Attribute("2.4.6.8.10", "that's even"));
+
+ // Set trusted certificate entry
+ keystore.setEntry(ALIAS,
+ new KeyStore.TrustedCertificateEntry(cert), null);
- // Set trusted certificate entry
- keystore.setEntry(ALIAS,
- new KeyStore.TrustedCertificateEntry(cert), null);
+ // Set trusted certificate entry with attributes
+ keystore.setEntry(ALIAS2,
+ new KeyStore.TrustedCertificateEntry(cert, attributes), null);
- // Set trusted certificate entry with attributes
- keystore.setEntry(ALIAS2,
- new KeyStore.TrustedCertificateEntry(cert, attributes), null);
-
+ try (FileOutputStream outStream = new FileOutputStream(KEYSTORE)) {
System.out.println("Storing keystore to: " + KEYSTORE);
- keystore.store(new FileOutputStream(KEYSTORE), PASSWORD);
+ keystore.store(outStream, PASSWORD);
+ }
+ try (FileInputStream inStream = new FileInputStream(KEYSTORE)) {
System.out.println("Loading keystore from: " + KEYSTORE);
- keystore.load(new FileInputStream(KEYSTORE), PASSWORD);
+ keystore.load(inStream, PASSWORD);
System.out.println("Loaded keystore with " + keystore.size() +
" entries");
+ }
- KeyStore.Entry entry = keystore.getEntry(ALIAS, null);
- if (entry instanceof KeyStore.TrustedCertificateEntry) {
- System.out.println("Retrieved trusted certificate entry: " +
- entry);
- } else {
- throw new Exception("Not a trusted certificate entry");
- }
- System.out.println();
+ KeyStore.Entry entry = keystore.getEntry(ALIAS, null);
+ if (entry instanceof KeyStore.TrustedCertificateEntry) {
+ System.out.println("Retrieved trusted certificate entry: " + entry);
+ } else {
+ throw new Exception("Not a trusted certificate entry");
+ }
+ System.out.println();
- entry = keystore.getEntry(ALIAS2, null);
- if (entry instanceof KeyStore.TrustedCertificateEntry) {
- KeyStore.TrustedCertificateEntry trustedEntry =
- (KeyStore.TrustedCertificateEntry) entry;
- Set<KeyStore.Entry.Attribute> entryAttributes =
- trustedEntry.getAttributes();
+ entry = keystore.getEntry(ALIAS2, null);
+ if (entry instanceof KeyStore.TrustedCertificateEntry) {
+ KeyStore.TrustedCertificateEntry trustedEntry =
+ (KeyStore.TrustedCertificateEntry) entry;
+ Set<KeyStore.Entry.Attribute> entryAttributes =
+ trustedEntry.getAttributes();
- if (entryAttributes.containsAll(attributes)) {
- System.out.println("Retrieved trusted certificate entry " +
- "with attributes: " + entry);
- } else {
- throw new Exception("Failed to retrieve entry attributes");
- }
+ if (entryAttributes.containsAll(attributes)) {
+ System.out.println("Retrieved trusted certificate entry " +
+ "with attributes: " + entry);
} else {
- throw new Exception("Not a trusted certificate entry");
+ throw new Exception("Failed to retrieve entry attributes");
}
-
- } finally {
- new File(KEYSTORE).delete();
+ } else {
+ throw new Exception("Not a trusted certificate entry");
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/util/Oid/S11N.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,246 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4811968 6908628 8006564
+ * @run main S11N check
+ * @summary Serialization compatibility with old versions (and fixes)
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import sun.misc.BASE64Encoder;
+import sun.security.util.ObjectIdentifier;
+
+public class S11N {
+ static String[] SMALL= {
+ "0.0",
+ "1.1",
+ "2.2",
+ "1.2.3456",
+ "1.2.2147483647.4",
+ "1.2.268435456.4",
+ };
+
+ static String[] HUGE = {
+ "2.16.764.1.3101555394.1.0.100.2.1",
+ "1.2.2147483648.4",
+ "2.3.4444444444444444444444",
+ "1.2.8888888888888888.33333333333333333.44444444444444",
+ };
+
+ // Do not use j.u.Base64, the test needs to run in jdk6
+ static BASE64Encoder encoder = new BASE64Encoder() {
+ @Override
+ protected int bytesPerLine() {
+ return 48;
+ }
+ };
+
+ public static void main(String[] args) throws Exception {
+ if (args[0].equals("check")) {
+ int version = Integer.valueOf(System.getProperty("java.version")
+ .split("\\.")[1]);
+ System.out.println("version is " + version);
+ if (version >= 7) {
+ for (String oid: SMALL) {
+ // 7 -> 7
+ check(out(oid), oid);
+ // 6 -> 7
+ check(out6(oid), oid);
+ }
+ for (String oid: HUGE) {
+ // 7 -> 7
+ check(out(oid), oid);
+ }
+ } else {
+ for (String oid: SMALL) {
+ // 6 -> 6
+ check(out(oid), oid);
+ // 7 -> 6
+ check(out7(oid), oid);
+ }
+ for (String oid: HUGE) {
+ // 7 -> 6 fails for HUGE oids
+ boolean ok = false;
+ try {
+ check(out7(oid), oid);
+ ok = true;
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ if (ok) {
+ throw new Exception();
+ }
+ }
+ }
+ } else {
+ // Generates the JDK6 serialized string inside this test, call
+ // $JDK7/bin/java S11N dump7
+ // $JDK6/bin/java S11N dump6
+ // and paste the output at the end of this test.
+ dump(args[0], SMALL);
+ // For jdk6, the following line will throw an exception, ignore it
+ dump(args[0], HUGE);
+ }
+ }
+
+ // Gets the serialized form for jdk6
+ private static byte[] out6(String oid) throws Exception {
+ return new sun.misc.BASE64Decoder().decodeBuffer(dump6.get(oid));
+ }
+
+ // Gets the serialized form for jdk7
+ private static byte[] out7(String oid) throws Exception {
+ return new sun.misc.BASE64Decoder().decodeBuffer(dump7.get(oid));
+ }
+
+ // Gets the serialized form for this java
+ private static byte[] out(String oid) throws Exception {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ new ObjectOutputStream(bout).writeObject(new ObjectIdentifier(oid));
+ return bout.toByteArray();
+ }
+
+ // Makes sure serialized form can be deserialized
+ private static void check(byte[] in, String oid) throws Exception {
+ ObjectIdentifier o = (ObjectIdentifier) (
+ new ObjectInputStream(new ByteArrayInputStream(in)).readObject());
+ if (!o.toString().equals(oid)) {
+ throw new Exception("Read Fail " + o + ", not " + oid);
+ }
+ }
+
+ // dump serialized form to java code style text
+ private static void dump(String title, String[] oids) throws Exception {
+ for (String oid: oids) {
+ String[] base64 = encoder.encodeBuffer(out(oid)).split("\n");
+ System.out.println(" " + title + ".put(\"" + oid + "\",");
+ for (int i = 0; i<base64.length; i++) {
+ System.out.print(" \"" + base64[i] + "\"");
+ if (i == base64.length - 1) {
+ System.out.println(");");
+ } else {
+ System.out.println(" +");
+ }
+ }
+ }
+ }
+
+ // Do not use diamond operator, this test is also meant to run in jdk6
+ private static Map<String,String> dump7 = new HashMap<String,String>();
+ private static Map<String,String> dump6 = new HashMap<String,String>();
+
+ static {
+ ////////////// PASTE BEGIN //////////////
+ dump7.put("0.0",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhwAAAAAnVyAAJbSU26YCZ26rKlAgAAeHAA" +
+ "AAACAAAAAAAAAAB1cgACW0Ks8xf4BghU4AIAAHhwAAAAAQB4");
+ dump7.put("1.1",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhwAAAAAnVyAAJbSU26YCZ26rKlAgAAeHAA" +
+ "AAACAAAAAQAAAAF1cgACW0Ks8xf4BghU4AIAAHhwAAAAASl4");
+ dump7.put("2.2",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhwAAAAAnVyAAJbSU26YCZ26rKlAgAAeHAA" +
+ "AAACAAAAAgAAAAJ1cgACW0Ks8xf4BghU4AIAAHhwAAAAAVJ4");
+ dump7.put("1.2.3456",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhwAAAAA3VyAAJbSU26YCZ26rKlAgAAeHAA" +
+ "AAADAAAAAQAAAAIAAA2AdXIAAltCrPMX+AYIVOACAAB4cAAAAAMqmwB4");
+ dump7.put("1.2.2147483647.4",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhwAAAABHVyAAJbSU26YCZ26rKlAgAAeHAA" +
+ "AAAEAAAAAQAAAAJ/////AAAABHVyAAJbQqzzF/gGCFTgAgAAeHAAAAAHKof///9/" +
+ "BHg=");
+ dump7.put("1.2.268435456.4",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhwAAAABHVyAAJbSU26YCZ26rKlAgAAeHAA" +
+ "AAAEAAAAAQAAAAIQAAAAAAAABHVyAAJbQqzzF/gGCFTgAgAAeHAAAAAHKoGAgIAA" +
+ "BHg=");
+ dump7.put("2.16.764.1.3101555394.1.0.100.2.1",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhw/////3NyAD5zdW4uc2VjdXJpdHkudXRp" +
+ "bC5PYmplY3RJZGVudGlmaWVyJEh1Z2VPaWROb3RTdXBwb3J0ZWRCeU9sZEpESwAA" +
+ "AAAAAAABAgAAeHB1cgACW0Ks8xf4BghU4AIAAHhwAAAADmCFfAGLxvf1QgEAZAIB" +
+ "eA==");
+ dump7.put("1.2.2147483648.4",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhw/////3NyAD5zdW4uc2VjdXJpdHkudXRp" +
+ "bC5PYmplY3RJZGVudGlmaWVyJEh1Z2VPaWROb3RTdXBwb3J0ZWRCeU9sZEpESwAA" +
+ "AAAAAAABAgAAeHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAByqIgICAAAR4");
+ dump7.put("2.3.4444444444444444444444",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhw/////3NyAD5zdW4uc2VjdXJpdHkudXRp" +
+ "bC5PYmplY3RJZGVudGlmaWVyJEh1Z2VPaWROb3RTdXBwb3J0ZWRCeU9sZEpESwAA" +
+ "AAAAAAABAgAAeHB1cgACW0Ks8xf4BghU4AIAAHhwAAAADFOD4e+HpNG968eOHHg=");
+ dump7.put("1.2.8888888888888888.33333333333333333.44444444444444",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4DAANJAAxjb21wb25lbnRMZW5MAApjb21wb25lbnRzdAASTGphdmEvbGFuZy9P" +
+ "YmplY3Q7WwAIZW5jb2Rpbmd0AAJbQnhw/////3NyAD5zdW4uc2VjdXJpdHkudXRp" +
+ "bC5PYmplY3RJZGVudGlmaWVyJEh1Z2VPaWROb3RTdXBwb3J0ZWRCeU9sZEpESwAA" +
+ "AAAAAAABAgAAeHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAGCqP5Yzbxa6cOLubj9ek" +
+ "japVio3AusuOHHg=");
+
+ dump6.put("0.0",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4CAAJJAAxjb21wb25lbnRMZW5bAApjb21wb25lbnRzdAACW0l4cAAAAAJ1cgAC" +
+ "W0lNumAmduqypQIAAHhwAAAAAgAAAAAAAAAA");
+ dump6.put("1.1",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4CAAJJAAxjb21wb25lbnRMZW5bAApjb21wb25lbnRzdAACW0l4cAAAAAJ1cgAC" +
+ "W0lNumAmduqypQIAAHhwAAAAAgAAAAEAAAAB");
+ dump6.put("2.2",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4CAAJJAAxjb21wb25lbnRMZW5bAApjb21wb25lbnRzdAACW0l4cAAAAAJ1cgAC" +
+ "W0lNumAmduqypQIAAHhwAAAAAgAAAAIAAAAC");
+ dump6.put("1.2.3456",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4CAAJJAAxjb21wb25lbnRMZW5bAApjb21wb25lbnRzdAACW0l4cAAAAAN1cgAC" +
+ "W0lNumAmduqypQIAAHhwAAAAAwAAAAEAAAACAAANgA==");
+ dump6.put("1.2.2147483647.4",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4CAAJJAAxjb21wb25lbnRMZW5bAApjb21wb25lbnRzdAACW0l4cAAAAAR1cgAC" +
+ "W0lNumAmduqypQIAAHhwAAAABAAAAAEAAAACf////wAAAAQ=");
+ dump6.put("1.2.268435456.4",
+ "rO0ABXNyACJzdW4uc2VjdXJpdHkudXRpbC5PYmplY3RJZGVudGlmaWVyeLIO7GQX" +
+ "fy4CAAJJAAxjb21wb25lbnRMZW5bAApjb21wb25lbnRzdAACW0l4cAAAAAR1cgAC" +
+ "W0lNumAmduqypQIAAHhwAAAABAAAAAEAAAACEAAAAAAAAAQ=");
+ ////////////// PASTE END //////////////
+ }
+}
--- a/jdk/test/sun/security/util/Oid/S11N.sh Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +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 4811968 6908628
-# @summary Serialization compatibility with old versions (and fix)
-# @author Weijun Wang
-#
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-
-if [ "${TESTSRC}" = "" ] ; then
- TESTSRC="."
-fi
-if [ "${TESTCLASSES}" = "" ] ; then
- TESTCLASSES="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
- echo "TESTJAVA not set. Test cannot execute."
- echo "FAILED!!!"
- exit 1
-fi
-if [ "${COMPILEJAVA}" = "" ]; then
- COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-PF=""
-
-OS=`uname -s`
-case "$OS" in
- SunOS )
- FS="/"
- ARCH=`isainfo`
- case "$ARCH" in
- sparc* )
- PF="solaris-sparc"
- ;;
- i[3-6]86 )
- PF="solaris-i586"
- ;;
- amd64* )
- PF="solaris-amd64"
- ;;
- * )
- echo "Unsupported System: Solaris ${ARCH}"
- exit 0;
- ;;
- esac
- ;;
- Linux )
- ARCH=`uname -m`
- FS="/"
- case "$ARCH" in
- i[3-6]86 )
- PF="linux-i586"
- ;;
- amd64* | x86_64 )
- PF="linux-amd64"
- ;;
- * )
- echo "Unsupported System: Linux ${ARCH}"
- exit 0;
- ;;
- esac
- ;;
- Windows* )
- FS="\\"
- PF="windows-i586"
-
- # 'uname -m' does not give us enough information -
- # should rely on $PROCESSOR_IDENTIFIER (as is done in Defs-windows.gmk),
- # but JTREG does not pass this env variable when executing a shell script.
- #
- # execute test program - rely on it to exit if platform unsupported
-
- ;;
- * )
- echo "Unsupported System: ${OS}"
- exit 0;
- ;;
-esac
-
-echo "==================================================="
-echo "Try to set ALT_JAVA_RE_JDK if you see timeout error"
-echo "==================================================="
-
-# the test code
-
-${COMPILEJAVA}${FS}bin${FS}javac -target 1.4 -source 1.4 \
- -d . ${TESTSRC}${FS}SerialTest.java || exit 10
-
-# You can set ALT_JAVA_RE_JDK to another location that contains the
-# binaries for older JDK releases. You can set it to a non-existent
-# directory to skip the interop tests between different versions.
-
-if [ "$ALT_JAVA_RE_JDK" = "" ]; then
- JAVA_RE_JDK=/java/re/j2se
-else
- JAVA_RE_JDK=$ALT_JAVA_RE_JDK
-fi
-
-OLDJAVA="
- $JAVA_RE_JDK/1.6.0/latest/binaries/${PF}
- $JAVA_RE_JDK/1.5.0/latest/binaries/${PF}
- $JAVA_RE_JDK/1.4.2/latest/binaries/${PF}
-"
-
-SMALL="
- 0.0
- 1.1
- 2.2
- 1.2.3456
- 1.2.2147483647.4
- 1.2.268435456.4
-"
-
-HUGE="
- 2.16.764.1.3101555394.1.0.100.2.1
- 1.2.2147483648.4
- 2.3.4444444444444444444444
- 1.2.888888888888888888.111111111111111.2222222222222.33333333333333333.44444444444444
-"
-
-for oid in ${SMALL}; do
- echo ${oid}
- # new ->
- ${TESTJAVA}${FS}bin${FS}java SerialTest out ${oid} > tmp.oid.serial || exit 1
- # -> new
- ${TESTJAVA}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial || exit 2
- for oldj in ${OLDJAVA}; do
- if [ -d ${oldj} ]; then
- echo ${oldj}
- # -> old
- ${oldj}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial || exit 3
- # old ->
- ${oldj}${FS}bin${FS}java SerialTest out ${oid} > tmp.oid.serial.old || exit 4
- # -> new
- ${TESTJAVA}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial.old || exit 5
- fi
- done
-done
-
-for oid in ${HUGE}; do
- echo ${oid}
- # new ->
- ${TESTJAVA}${FS}bin${FS}java SerialTest out ${oid} > tmp.oid.serial || exit 1
- # -> new
- ${TESTJAVA}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial || exit 2
- for oldj in ${OLDJAVA}; do
- if [ -d ${oldj} ]; then
- echo ${oldj}
- # -> old
- ${oldj}${FS}bin${FS}java SerialTest badin < tmp.oid.serial || exit 3
- fi
- done
-done
-
-rm -f tmp.oid.serial
-rm -f tmp.oid.serial.old
-rm -f SerialTest.class
-
-for oldj in ${OLDJAVA}; do
- if [ ! -d ${oldj} ]; then
- echo WARNING: ${oldj} is missing. Test incomplete! > /dev/stderr
- fi
-done
-
-exit 0
--- a/jdk/test/sun/security/util/Oid/SerialTest.java Tue Feb 12 09:58:21 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * read S11.sh
- */
-import java.io.*;
-import sun.security.util.*;
-
-/**
- * Test OID serialization between versions
- *
- * java SerialTest out oid // write a OID into System.out
- * java SerialTest in oid // read from System.in and compare it with oid
- * java SerialTest badin // make sure *cannot* read from System.in
- */
-class SerialTest {
- public static void main(String[] args) throws Exception {
- if (args[0].equals("out"))
- out(args[1]);
- else if (args[0].equals("in"))
- in(args[1]);
- else
- badin();
- }
-
- static void in(String oid) throws Exception {
- ObjectIdentifier o = (ObjectIdentifier) (new ObjectInputStream(System.in).readObject());
- if (!o.toString().equals(oid))
- throw new Exception("Read Fail " + o + ", not " + oid);
- }
-
- static void badin() throws Exception {
- boolean pass = true;
- try {
- new ObjectInputStream(System.in).readObject();
- } catch (Exception e) {
- pass = false;
- }
- if (pass) throw new Exception("Should fail but not");
- }
-
- static void out(String oid) throws Exception {
- new ObjectOutputStream(System.out).writeObject(new ObjectIdentifier(oid));
- }
-}
--- a/jdk/test/tools/launcher/Arrrghs.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/tools/launcher/Arrrghs.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -309,6 +309,7 @@
checkArgumentParsing("../../*", "../../*");
checkArgumentParsing("..\\..\\", "..\\..\\");
checkArgumentParsing("../../", "../../");
+ checkArgumentParsing("a b\\ c", "a", "b\\", "c");
}
private void initEmptyDir(File emptyDir) throws IOException {
--- a/jdk/test/tools/launcher/VersionCheck.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/tools/launcher/VersionCheck.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -42,6 +42,7 @@
// tools that do not accept -J-option
static final String[] BLACKLIST_JOPTION = {
"controlpanel",
+ "jabswitch",
"java-rmi",
"java-rmi.cgi",
"java",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/tools/pack200/InstructionTests.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import static java.nio.file.StandardOpenOption.*;
+import java.util.regex.Pattern;
+
+/*
+ * @test
+ * @bug 8003549
+ * @summary tests class files instruction formats introduced in JSR-335
+ * @compile -XDignore.symbol.file Utils.java InstructionTests.java
+ * @run main InstructionTests
+ * @author ksrini
+ */
+public class InstructionTests {
+ public static void main(String... args) throws Exception {
+ testInvokeOpCodes();
+ }
+ /*
+ * the following should produce invokestatic and invokespecial
+ * on InterfaceMethodRefs vs. MethodRefs, packer/unpacker should work
+ */
+ static void testInvokeOpCodes() throws Exception {
+ List<String> scratch = new ArrayList<>();
+ final String fname = "A";
+ String javaFileName = fname + Utils.JAVA_FILE_EXT;
+ scratch.add("interface IntIterator {");
+ scratch.add(" default void forEach(){}");
+ scratch.add(" static void next() {}");
+ scratch.add("}");
+ scratch.add("class A implements IntIterator {");
+ scratch.add("public void forEach(Object o){");
+ scratch.add("IntIterator.super.forEach();");
+ scratch.add("IntIterator.next();");
+ scratch.add("}");
+ scratch.add("}");
+ File cwd = new File(".");
+ File javaFile = new File(cwd, javaFileName);
+ Files.write(javaFile.toPath(), scratch, Charset.defaultCharset(),
+ CREATE, TRUNCATE_EXISTING);
+
+ // make sure we have -g so that we compare LVT and LNT entries
+ Utils.compiler("-g", javaFile.getName());
+
+ // jar the file up
+ File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
+ Utils.jar("cvf", testjarFile.getName(), ".");
+
+ // pack using --repack
+ File outjarFile = new File(cwd, "out" + Utils.JAR_FILE_EXT);
+ scratch.clear();
+ scratch.add(Utils.getPack200Cmd());
+ scratch.add("-J-ea");
+ scratch.add("-J-esa");
+ scratch.add("--repack");
+ scratch.add(outjarFile.getName());
+ scratch.add(testjarFile.getName());
+ List<String> output = Utils.runExec(scratch);
+ // TODO remove this when we get bc escapes working correctly
+ // this test anyhow would fail at that time
+ findString("WARNING: Passing.*" + fname + Utils.CLASS_FILE_EXT,
+ output);
+
+ Utils.doCompareVerify(testjarFile, outjarFile);
+ }
+
+ static boolean findString(String str, List<String> list) {
+ Pattern p = Pattern.compile(str);
+ for (String x : list) {
+ if (p.matcher(x).matches())
+ return true;
+ }
+ throw new RuntimeException("Error: " + str + " not found in output");
+ }
+}
--- a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java Tue Feb 12 09:58:21 2013 -0800
+++ b/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java Wed Feb 13 13:01:16 2013 -0800
@@ -57,8 +57,10 @@
import com.sun.tools.classfile.Opcode;
import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleParameterAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
import com.sun.tools.classfile.Signature_attribute;
import com.sun.tools.classfile.SourceDebugExtension_attribute;
import com.sun.tools.classfile.SourceFile_attribute;
@@ -1214,6 +1216,21 @@
p.add(e);
return null;
}
+
+ /*
+ * TODO
+ * add these two for now to keep the compiler happy, we will implement
+ * these along with the JSR-308 changes.
+ */
+ @Override
+ public Element visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute rvta, Element p) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Element visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute rita, Element p) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
class StackMapVisitor implements StackMapTable_attribute.stack_map_frame.Visitor<Element, Void> {
--- a/langtools/.hgtags Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/.hgtags Wed Feb 13 13:01:16 2013 -0800
@@ -196,3 +196,5 @@
6f0986ed9b7e11d6eb06618f27e20b18f19fb797 jdk8-b72
8d0baee36c7184d55c80354b45704c37d6b7ac79 jdk8-b73
56c97aff46bb577b8668874154c24115a7e8a3e8 jdk8-b74
+c2e11e2ec4a3682513e566849e5562f31ded8c65 jdk8-b75
+e81839b3233792415daaab051698edc6067f1a16 jdk8-b76
--- a/langtools/make/Makefile-classic Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/make/Makefile-classic Wed Feb 13 13:01:16 2013 -0800
@@ -241,6 +241,7 @@
javax/annotation/processing \
javax/lang/model \
javax/tools \
+ jdk/ \
com/sun/source \
com/sun/tools/javac
--- a/langtools/make/build.properties Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/make/build.properties Wed Feb 13 13:01:16 2013 -0800
@@ -116,6 +116,7 @@
javax/annotation/processing/ \
javax/lang/model/ \
javax/tools/ \
+ jdk/ \
com/sun/source/ \
com/sun/tools/javac/ \
com/sun/tools/doclint/
--- a/langtools/makefiles/BuildLangtools.gmk Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/makefiles/BuildLangtools.gmk Wed Feb 13 13:01:16 2013 -0800
@@ -112,23 +112,7 @@
$(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
- JARMAIN:=com.sun.tools.javac.Main))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\
- JARMAIN:=com.sun.tools.javah.Main))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\
- JARMAIN:=com.sun.tools.javap.Main))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
- SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
- JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
- SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
- JARMAIN:=com.sun.tools.javadoc.Main))
+ SUFFIXES:=.class $(RESOURCE_SUFFIXES)))
# GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
# yet built. It is currently not needed but might be again in the future. The following
@@ -176,7 +160,8 @@
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
JVM:=$(JAVA),\
JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
+ -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ com.sun.tools.javac.Main,\
FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -201,11 +186,7 @@
all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
-
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
endif
endif
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -196,10 +196,7 @@
protected void addOverviewComment(Content htmltree) {
if (root.inlineTags().length > 0) {
htmltree.addContent(getMarkerAnchor("overview_description"));
- HtmlTree div = new HtmlTree(HtmlTag.DIV);
- div.addStyle(HtmlStyle.subTitle);
- addInlineComment(root, div);
- htmltree.addContent(div);
+ addInlineComment(root, htmltree);
}
}
@@ -211,7 +208,7 @@
*/
protected void addOverview(Content body) throws IOException {
HtmlTree div = new HtmlTree(HtmlTag.DIV);
- div.addStyle(HtmlStyle.footer);
+ div.addStyle(HtmlStyle.contentContainer);
addOverviewComment(div);
addTagsInfo(root, div);
body.addContent(div);
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Wed Feb 13 13:01:16 2013 -0800
@@ -496,9 +496,9 @@
return l.toList();
}
- public static class DelegatedSymbol extends Symbol {
- protected Symbol other;
- public DelegatedSymbol(Symbol other) {
+ public static class DelegatedSymbol<T extends Symbol> extends Symbol {
+ protected T other;
+ public DelegatedSymbol(T other) {
super(other.kind, other.flags_field, other.name, other.type, other.owner);
this.other = other;
}
@@ -532,6 +532,10 @@
public <R, P> R accept(Symbol.Visitor<R, P> v, P p) {
return v.visitSymbol(other, p);
}
+
+ public T getUnderlyingSymbol() {
+ return other;
+ }
}
/** A class for type symbols. Type variables are represented by instances
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Wed Feb 13 13:01:16 2013 -0800
@@ -570,10 +570,19 @@
* @param flags The class symbol's flags
* @param owner The class symbol's owner
*/
- ClassSymbol makeEmptyClass(long flags, ClassSymbol owner) {
+ JCClassDecl makeEmptyClass(long flags, ClassSymbol owner) {
+ return makeEmptyClass(flags, owner, null, true);
+ }
+
+ JCClassDecl makeEmptyClass(long flags, ClassSymbol owner, Name flatname,
+ boolean addToDefs) {
// Create class symbol.
ClassSymbol c = reader.defineClass(names.empty, owner);
- c.flatname = chk.localClassName(c);
+ if (flatname != null) {
+ c.flatname = flatname;
+ } else {
+ c.flatname = chk.localClassName(c);
+ }
c.sourcefile = owner.sourcefile;
c.completer = null;
c.members_field = new Scope(c);
@@ -597,9 +606,8 @@
cdef.type = c.type;
// Append class definition tree to owner's definitions.
- odef.defs = odef.defs.prepend(cdef);
-
- return c;
+ if (addToDefs) odef.defs = odef.defs.prepend(cdef);
+ return cdef;
}
/**************************************************************************
@@ -706,7 +714,7 @@
* and synthethise a class (with makeEmptyClass) if one is not available.
* However, there is a small possibility that an existing class will not
* be generated as expected if it is inside a conditional with a constant
- * expression. If that is found to be the case, create an empty class here.
+ * expression. If that is found to be the case, create an empty class tree here.
*/
private void checkAccessConstructorTags() {
for (List<ClassSymbol> l = accessConstrTags; l.nonEmpty(); l = l.tail) {
@@ -714,14 +722,10 @@
if (isTranslatedClassAvailable(c))
continue;
// Create class definition tree.
- JCClassDecl cdef = make.ClassDef(
- make.Modifiers(STATIC | SYNTHETIC), names.empty,
- List.<JCTypeParameter>nil(),
- null, List.<JCExpression>nil(), List.<JCTree>nil());
- cdef.sym = c;
- cdef.type = c.type;
- // add it to the list of classes to be generated
- translated.append(cdef);
+ JCClassDecl cdec = makeEmptyClass(STATIC | SYNTHETIC,
+ c.outermostClass(), c.flatname, false);
+ swapAccessConstructorTag(c, cdec.sym);
+ translated.append(cdec);
}
}
// where
@@ -735,6 +739,19 @@
return false;
}
+ void swapAccessConstructorTag(ClassSymbol oldCTag, ClassSymbol newCTag) {
+ for (MethodSymbol methodSymbol : accessConstrs.values()) {
+ Assert.check(methodSymbol.type.hasTag(METHOD));
+ MethodType oldMethodType =
+ (MethodType)methodSymbol.type;
+ if (oldMethodType.argtypes.head.tsym == oldCTag)
+ methodSymbol.type =
+ types.createMethodTypeWithParameters(oldMethodType,
+ oldMethodType.getParameterTypes().tail
+ .prepend(newCTag.erasure(types)));
+ }
+ }
+
/**************************************************************************
* Access methods
*************************************************************************/
@@ -1211,7 +1228,7 @@
"1");
ClassSymbol ctag = chk.compiled.get(flatname);
if (ctag == null)
- ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass);
+ ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym;
// keep a record of all tags, to verify that all are generated as required
accessConstrTags = accessConstrTags.prepend(ctag);
return ctag;
@@ -1778,7 +1795,7 @@
if (e.sym.kind == TYP &&
e.sym.name == names.empty &&
(e.sym.flags() & INTERFACE) == 0) return (ClassSymbol) e.sym;
- return makeEmptyClass(STATIC | SYNTHETIC, clazz);
+ return makeEmptyClass(STATIC | SYNTHETIC, clazz).sym;
}
/** Return symbol for "class$" method. If there is no method definition
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Wed Feb 13 13:01:16 2013 -0800
@@ -482,10 +482,8 @@
while (i < pool.pp) {
Object value = pool.pool[i];
Assert.checkNonNull(value);
- if (value instanceof Method)
- value = ((Method)value).m;
- else if (value instanceof Variable)
- value = ((Variable)value).v;
+ if (value instanceof Method || value instanceof Variable)
+ value = ((DelegatedSymbol)value).getUnderlyingSymbol();
if (value instanceof MethodSymbol) {
MethodSymbol m = (MethodSymbol)value;
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -140,23 +140,23 @@
return n == null ? -1 : n.intValue();
}
- static class Method extends DelegatedSymbol {
- MethodSymbol m;
+ static class Method extends DelegatedSymbol<MethodSymbol> {
UniqueType uniqueType;
Method(MethodSymbol m, Types types) {
super(m);
- this.m = m;
this.uniqueType = new UniqueType(m.type, types);
}
- public boolean equals(Object other) {
- if (!(other instanceof Method)) return false;
- MethodSymbol o = ((Method)other).m;
+ public boolean equals(Object any) {
+ if (!(any instanceof Method)) return false;
+ MethodSymbol o = ((Method)any).other;
+ MethodSymbol m = this.other;
return
o.name == m.name &&
o.owner == m.owner &&
- ((Method)other).uniqueType.equals(uniqueType);
+ ((Method)any).uniqueType.equals(uniqueType);
}
public int hashCode() {
+ MethodSymbol m = this.other;
return
m.name.hashCode() * 33 +
m.owner.hashCode() * 9 +
@@ -173,21 +173,21 @@
}
@Override
- public boolean equals(Object other) {
- if (!super.equals(other)) return false;
- if (!(other instanceof DynamicMethod)) return false;
- DynamicMethodSymbol dm1 = (DynamicMethodSymbol)m;
- DynamicMethodSymbol dm2 = (DynamicMethodSymbol)((DynamicMethod)other).m;
+ public boolean equals(Object any) {
+ if (!super.equals(any)) return false;
+ if (!(any instanceof DynamicMethod)) return false;
+ DynamicMethodSymbol dm1 = (DynamicMethodSymbol)other;
+ DynamicMethodSymbol dm2 = (DynamicMethodSymbol)((DynamicMethod)any).other;
return dm1.bsm == dm2.bsm &&
dm1.bsmKind == dm2.bsmKind &&
Arrays.equals(uniqueStaticArgs,
- ((DynamicMethod)other).uniqueStaticArgs);
+ ((DynamicMethod)any).uniqueStaticArgs);
}
@Override
public int hashCode() {
int hash = super.hashCode();
- DynamicMethodSymbol dm = (DynamicMethodSymbol)m;
+ DynamicMethodSymbol dm = (DynamicMethodSymbol)other;
hash += dm.bsmKind * 7 +
dm.bsm.hashCode() * 11;
for (int i = 0; i < dm.staticArgs.length; i++) {
@@ -209,23 +209,23 @@
}
}
- static class Variable extends DelegatedSymbol {
- VarSymbol v;
+ static class Variable extends DelegatedSymbol<VarSymbol> {
UniqueType uniqueType;
Variable(VarSymbol v, Types types) {
super(v);
- this.v = v;
this.uniqueType = new UniqueType(v.type, types);
}
- public boolean equals(Object other) {
- if (!(other instanceof Variable)) return false;
- VarSymbol o = ((Variable)other).v;
+ public boolean equals(Object any) {
+ if (!(any instanceof Variable)) return false;
+ VarSymbol o = ((Variable)any).other;
+ VarSymbol v = other;
return
o.name == v.name &&
o.owner == v.owner &&
- ((Variable)other).uniqueType.equals(uniqueType);
+ ((Variable)any).uniqueType.equals(uniqueType);
}
public int hashCode() {
+ VarSymbol v = other;
return
v.name.hashCode() * 33 +
v.owner.hashCode() * 9 +
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Wed Feb 13 13:01:16 2013 -0800
@@ -629,6 +629,8 @@
if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.PARSE, filename);
taskListener.started(e);
+ keepComments = true;
+ genEndPos = true;
}
Parser parser = parserFactory.newParser(content, keepComments(), genEndPos, lineDebugInfo);
tree = parser.parseCompilationUnit();
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -279,13 +279,7 @@
try {
nextChar();
if (isIdentifierStart(ch)) {
- int namePos = bp;
- nextChar();
- while (isIdentifierPart(ch))
- nextChar();
- int nameLen = bp - namePos;
-
- Name name = names.fromChars(buf, namePos, nameLen);
+ Name name = readIdentifier();
TagParser tp = tagParsers.get(name);
if (tp == null) {
List<DCTree> content = blockContent();
@@ -334,14 +328,9 @@
try {
nextChar();
if (isIdentifierStart(ch)) {
- int namePos = bp;
- nextChar();
- while (isIdentifierPart(ch))
- nextChar();
- int nameLen = bp - namePos;
+ Name name = readIdentifier();
skipWhitespace();
- Name name = names.fromChars(buf, namePos, nameLen);
TagParser tp = tagParsers.get(name);
if (tp == null) {
DCTree text = inlineText();
@@ -575,10 +564,8 @@
int pos = bp;
if (isJavaIdentifierStart(ch)) {
- nextChar();
- while (isJavaIdentifierPart(ch))
- nextChar();
- return m.at(pos).Identifier(names.fromChars(buf, pos, bp - pos));
+ Name name = readJavaIdentifier();
+ return m.at(pos).Identifier(name);
}
throw new ParseException("dc.identifier.expected");
@@ -703,39 +690,36 @@
protected DCTree entity() {
int p = bp;
nextChar();
- int namep = bp;
+ Name name = null;
boolean checkSemi = false;
if (ch == '#') {
+ int namep = bp;
nextChar();
if (isDecimalDigit(ch)) {
nextChar();
while (isDecimalDigit(ch))
nextChar();
- checkSemi = true;
+ name = names.fromChars(buf, namep, bp - namep);
} else if (ch == 'x' || ch == 'X') {
nextChar();
if (isHexDigit(ch)) {
nextChar();
while (isHexDigit(ch))
nextChar();
- checkSemi = true;
+ name = names.fromChars(buf, namep, bp - namep);
}
}
} else if (isIdentifierStart(ch)) {
- nextChar();
- while (isIdentifierPart(ch))
- nextChar();
- checkSemi = true;
+ name = readIdentifier();
}
- if (checkSemi && ch == ';') {
+ if (name == null)
+ return erroneous("dc.bad.entity", p);
+ else {
+ if (ch != ';')
+ return erroneous("dc.missing.semicolon", p);
nextChar();
- return m.at(p).Entity(names.fromChars(buf, namep, bp - namep - 1));
- } else {
- String code = checkSemi
- ? "dc.missing.semicolon"
- : "dc.bad.entity";
- return erroneous(code, p);
+ return m.at(p).Entity(name);
}
}
@@ -747,11 +731,7 @@
int p = bp;
nextChar();
if (isIdentifierStart(ch)) {
- int namePos = bp;
- nextChar();
- while (isIdentifierPart(ch))
- nextChar();
- int nameLen = bp - namePos;
+ Name name = readIdentifier();
List<DCTree> attrs = htmlAttrs();
if (attrs != null) {
boolean selfClosing = false;
@@ -761,22 +741,16 @@
}
if (ch == '>') {
nextChar();
- Name name = names.fromChars(buf, namePos, nameLen);
return m.at(p).StartElement(name, attrs, selfClosing);
}
}
} else if (ch == '/') {
nextChar();
if (isIdentifierStart(ch)) {
- int namePos = bp;
- nextChar();
- while (isIdentifierPart(ch))
- nextChar();
- int nameLen = bp - namePos;
+ Name name = readIdentifier();
skipWhitespace();
if (ch == '>') {
nextChar();
- Name name = names.fromChars(buf, namePos, nameLen);
return m.at(p).EndElement(name);
}
}
@@ -822,10 +796,7 @@
loop:
while (isIdentifierStart(ch)) {
int namePos = bp;
- nextChar();
- while (isIdentifierPart(ch))
- nextChar();
- int nameLen = bp - namePos;
+ Name name = readIdentifier();
skipWhitespace();
List<DCTree> value = null;
ValueKind vkind = ValueKind.EMPTY;
@@ -862,7 +833,6 @@
skipWhitespace();
value = v.toList();
}
- Name name = names.fromChars(buf, namePos, nameLen);
DCAttribute attr = m.at(namePos).Attribute(name, vkind, value);
attrs.add(attr);
}
@@ -897,7 +867,7 @@
protected DCErroneous erroneous(String code, int pos) {
int i = bp - 1;
loop:
- while (i > 0) {
+ while (i > pos) {
switch (buf[i]) {
case '\f': case '\n': case '\r':
newline = true;
@@ -926,16 +896,24 @@
return Character.isUnicodeIdentifierStart(ch);
}
- protected boolean isIdentifierPart(char ch) {
- return Character.isUnicodeIdentifierPart(ch);
+ protected Name readIdentifier() {
+ int start = bp;
+ nextChar();
+ while (bp < buflen && Character.isUnicodeIdentifierPart(ch))
+ nextChar();
+ return names.fromChars(buf, start, bp - start);
}
protected boolean isJavaIdentifierStart(char ch) {
return Character.isJavaIdentifierStart(ch);
}
- protected boolean isJavaIdentifierPart(char ch) {
- return Character.isJavaIdentifierPart(ch);
+ protected Name readJavaIdentifier() {
+ int start = bp;
+ nextChar();
+ while (bp < buflen && Character.isJavaIdentifierPart(ch))
+ nextChar();
+ return names.fromChars(buf, start, bp - start);
}
protected boolean isDecimalDigit(char ch) {
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -236,7 +236,7 @@
// relative to the best match found in the array.
if (pos == Position.NOPOS)
return Position.NOPOS;
- if (pos < 0 || pos >= docComment.length())
+ if (pos < 0 || pos > docComment.length())
throw new StringIndexOutOfBoundsException(String.valueOf(pos));
if (docPosns == null)
return Position.NOPOS;
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/DCTree.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/DCTree.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -119,7 +119,7 @@
}
- public static abstract class DCBlockTag extends DCTree implements InlineTagTree {
+ public static abstract class DCBlockTag extends DCTree implements BlockTagTree {
public String getTagName() {
return getKind().tagName;
}
@@ -169,7 +169,7 @@
}
}
- public static class DCAuthor extends DCInlineTag implements AuthorTree {
+ public static class DCAuthor extends DCBlockTag implements AuthorTree {
public final List<DCTree> name;
DCAuthor(List<DCTree> name) {
@@ -640,7 +640,7 @@
}
}
- public static class DCSince extends DCInlineTag implements SinceTree {
+ public static class DCSince extends DCBlockTag implements SinceTree {
public final List<DCTree> body;
DCSince(List<DCTree> body) {
--- a/langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -139,12 +139,13 @@
@Override
public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) {
- PrintWriter err_pw = new PrintWriter(err, true);
- PrintWriter out_pw = new PrintWriter(out);
+ PrintWriter err_pw = new PrintWriter(err == null ? System.err : err, true);
+ PrintWriter out_pw = new PrintWriter(out == null ? System.out : out);
try {
String standardDocletName = "com.sun.tools.doclets.standard.Standard";
+ ClassLoader cl = getClass().getClassLoader();
return com.sun.tools.javadoc.Main.execute(
- "javadoc", err_pw, err_pw, out_pw, standardDocletName, arguments);
+ "javadoc", err_pw, err_pw, out_pw, standardDocletName, cl, arguments);
} finally {
err_pw.flush();
out_pw.flush();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/jdk/Supported.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,53 @@
+/*
+ * 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 jdk;
+
+import java.lang.annotation.*;
+
+/**
+ * Indicates whether or not a JDK specific type or package is a
+ * supported part of the JDK.
+ *
+ * This annotation should only be applied to types and packages
+ * <em>outside</em> of the Java SE namespaces of {@code java.*} and
+ * {@code javax.*} packages. For example, certain portions of {@code
+ * com.sun.*} are official parts of the JDK meant to be generally
+ * usable while other portions of {@code com.sun.*} are not. This
+ * annotation type allows those portions to be easily and
+ * programmaticly distinguished.
+ *
+ * @since 1.8
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.PACKAGE})
+@Supported
+public @interface Supported {
+ /**
+ * Whether or not this package or type is a supported part of the JDK.
+ */
+ boolean value() default true;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/EndWithIdentifierTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,32 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8007096
+ * @summary DocLint parsing problems with some comments
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs:-html EndWithIdentifierTest.java
+ * @run main DocLintTester -Xmsgs -ref EndWithIdentifierTest.out EndWithIdentifierTest.java
+ * @author jlahoda
+ */
+
+/**@deprecated*/
+public class EndWithIdentifierTest {
+
+ /**{@link*/
+ private void unfinishedInlineTagName() {}
+
+ /**@see List*/
+ private void endsWithIdentifier() {}
+
+ /**&*/
+ private void entityName() {}
+
+ /**<a*/
+ private void tag() {}
+
+ /**</a*/
+ private void tagEnd() {}
+
+ /**<a name*/
+ private void attribute() {}
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/EndWithIdentifierTest.out Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,20 @@
+EndWithIdentifierTest.java:14: error: syntax error in reference
+ /**{@link*/
+ ^
+EndWithIdentifierTest.java:17: error: reference not found
+ /**@see List*/
+ ^
+EndWithIdentifierTest.java:20: error: semicolon missing
+ /**&*/
+ ^
+EndWithIdentifierTest.java:23: error: malformed HTML
+ /**<a*/
+ ^
+EndWithIdentifierTest.java:26: error: malformed HTML
+ /**</a*/
+ ^
+EndWithIdentifierTest.java:29: error: malformed HTML
+ /**<a name*/
+ ^
+6 errors
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/UnfinishedInlineTagTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8007096
+ * @summary DocLint parsing problems with some comments
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs:-html UnfinishedInlineTagTest.java
+ * @run main DocLintTester -Xmsgs -ref UnfinishedInlineTagTest.out UnfinishedInlineTagTest.java
+ * @author jlahoda
+ */
+
+import java.util.List;
+
+/**{@link List
+ */
+public class UnfinishedInlineTagTest {
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/UnfinishedInlineTagTest.out Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,5 @@
+UnfinishedInlineTagTest.java:14: error: unterminated inline tag
+ */
+^
+1 error
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/7199823/InnerClassCannotBeVerified.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,110 @@
+/*
+ * 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
+ * @bug 7199823
+ * @summary javac generates inner class that can't be verified
+ * @run main InnerClassCannotBeVerified
+ */
+
+import java.util.Arrays;
+import javax.tools.JavaFileObject;
+import java.net.URI;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+import javax.tools.JavaCompiler;
+import com.sun.source.util.JavacTask;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ConstantPoolException;
+import java.io.File;
+import java.io.IOException;
+
+public class InnerClassCannotBeVerified {
+
+ private static final String errorMessage =
+ "Compile error while compiling the following source:\n";
+
+ public static void main(String... args) throws Exception {
+ new InnerClassCannotBeVerified().run();
+ }
+
+ void run() throws Exception {
+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+ JavaSource source = new JavaSource();
+ JavacTask ct = (JavacTask)comp.getTask(null, null, null,
+ null, null, Arrays.asList(source));
+ try {
+ if (!ct.call()) {
+ throw new AssertionError(errorMessage +
+ source.getCharContent(true));
+ }
+ } catch (Throwable ex) {
+ throw new AssertionError(errorMessage +
+ source.getCharContent(true));
+ }
+ check();
+ }
+
+ private void check() throws IOException, ConstantPoolException {
+ File file = new File("Test$1.class");
+ ClassFile classFile = ClassFile.read(file);
+ boolean inheritsFromObject =
+ classFile.getSuperclassName().equals("java/lang/Object");
+ boolean implementsNoInterface = classFile.interfaces.length == 0;
+ boolean noMethods = classFile.methods.length == 0;
+ if (!(inheritsFromObject &&
+ implementsNoInterface &&
+ noMethods)) {
+ throw new AssertionError("The inner classes reused as " +
+ "access constructor tag for this code must be empty");
+ }
+ }
+
+ class JavaSource extends SimpleJavaFileObject {
+
+ String internalSource =
+ "public class Test {\n" +
+ " private static class Foo {}\n" +
+ " public static void main(String[] args){ \n" +
+ " new Foo();\n" +
+ " if(false) {\n" +
+ " new Runnable() {\n" +
+ " @Override\n" +
+ " public void run() {\n" +
+ " System.out.println();\n" +
+ " }\n" +
+ " }.run();\n" +
+ " }\n" +
+ " }\n" +
+ "}";
+ public JavaSource() {
+ super(URI.create("Test.java"), JavaFileObject.Kind.SOURCE);
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return internalSource;
+ }
+ }
+}
--- a/langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -174,22 +174,20 @@
String sourceBase = new String("@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainedBy( AC.class )\n" +
+ "@Repeatable( AC.class )\n" +
"@interface A { }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainerFor(A.class)\n" +
"@interface AC { A[] value(); }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainedBy( BC.class )\n" +
+ "@Repeatable( BC.class )\n" +
"@interface B { }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainerFor(B.class)\n" +
"@interface BC { B[] value(); } \n\n" +
"@Retention("+retentn+")\n" +
@@ -198,12 +196,11 @@
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
- "@ContainedBy(DC.class)\n" +
+ "@Repeatable(DC.class)\n" +
"@interface D { }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
- "@ContainerFor(D.class) \n" +
"@interface DC { D[] value(); }\n\n");
// Test case sources with sample generated source.
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -171,32 +171,29 @@
String sourceBase = new String("@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainedBy( AC.class )\n" +
+ "@Repeatable( AC.class )\n" +
"@interface A { }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainerFor(A.class)\n" +
"@interface AC { A[] value(); }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainedBy( BC.class )\n" +
+ "@Repeatable( BC.class )\n" +
"@interface B { }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,_OTHER_})\n" +
- "@ContainerFor(B.class)\n" +
"@interface BC { B[] value(); } \n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
- "@ContainedBy(DC.class)\n" +
+ "@Repeatable(DC.class)\n" +
"@interface D { }\n\n" +
"@Retention("+retentn+")\n" +
"@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
- "@ContainerFor(D.class) \n" +
"@interface DC { D[] value(); }\n\n");
// Test case sources with sample generated source
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,13 +1,5 @@
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.TYPE_PARAMETER;
-import static java.lang.annotation.ElementType.TYPE_USE;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* 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,6 +28,14 @@
* @compile/fail/ref=DotClass.out -XDrawDiagnostics DotClass.java
*/
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.TYPE_PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
+
@Target({TYPE_USE, TYPE_PARAMETER, TYPE})
@Retention(RetentionPolicy.RUNTIME)
@interface A {}
--- a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Wed Feb 13 13:01:16 2013 -0800
@@ -120,7 +120,6 @@
@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
@interface RTA { }
-@ContainerFor(RTA.class)
@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
@interface RTAs {
RTA[] value();
--- a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,6 +1,5 @@
-
/*
- * Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* 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,8 +21,6 @@
* questions.
*/
-import java.lang.annotation.*;
-
/*
* @test
* @summary test acceptance of varargs annotations
@@ -31,6 +28,8 @@
* @compile Varargs.java
*/
+import java.lang.annotation.*;
+
@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
@interface A {}
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -241,8 +241,8 @@
sb.append("\n@Repeatable(RTAs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTA {}");
sb.append("\n@Repeatable(RTBs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTB {}");
- sb.append("\n@ContainerFor(RTA.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }");
- sb.append("\n@ContainerFor(RTB.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }");
sb.append("\n@Target(value={ElementType.TYPE,ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.CONSTRUCTOR,ElementType.LOCAL_VARIABLE})");
sb.append("\n@interface Decl {}");
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/api/8007344/Test.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,227 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8007344
+ * @summary javac may not make tree end positions and/or doc comments
+ * available to processors and listeners
+ * @library /tools/javac/lib
+ * @build JavacTestingAbstractProcessor
+ * @run main Test
+ */
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Set;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.tree.*;
+import com.sun.source.util.DocTrees;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.SourcePositions;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+import com.sun.source.util.TreePath;
+import com.sun.source.util.TreePathScanner;
+import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.Pretty;
+import com.sun.tools.javac.util.Position;
+
+/** Doc comment: Test */
+public class Test {
+ public static final int EXPECT_DOC_COMMENTS = 3;
+
+ /** Doc comment: main */
+ public static void main(String... args) throws Exception {
+ PrintWriter out = new PrintWriter(System.err);
+ try {
+ new Test(out).run();
+ } finally {
+ out.flush();
+ }
+ }
+
+ PrintWriter out;
+ int errors;
+
+ Test(PrintWriter out) {
+ this.out = out;
+ }
+
+ /** Doc comment: run */
+ void run() throws Exception {
+ File testSrc = new File(System.getProperty("test.src"));
+ File thisFile = new File(testSrc, getClass().getName() + ".java");
+ JavacTool javac = JavacTool.create();
+ StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null);
+ Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjects(thisFile);
+ testAnnoProcessor(javac, fm, fos, out, EXPECT_DOC_COMMENTS);
+ testTaskListener(javac, fm, fos, out, EXPECT_DOC_COMMENTS);
+
+ if (errors > 0)
+ throw new Exception(errors + " errors occurred");
+ }
+
+ void testAnnoProcessor(JavacTool javac, StandardJavaFileManager fm,
+ Iterable<? extends JavaFileObject> files, PrintWriter out,
+ int expectedDocComments) {
+ out.println("Test annotation processor");
+ JavacTask task = javac.getTask(out, fm, null, null, null, files);
+ AnnoProc ap = new AnnoProc(DocTrees.instance(task));
+ task.setProcessors(Arrays.asList(ap));
+ task.call();
+ ap.checker.checkDocComments(expectedDocComments);
+ }
+
+ void testTaskListener(JavacTool javac, StandardJavaFileManager fm,
+ Iterable<? extends JavaFileObject> files, PrintWriter out,
+ int expectedDocComments) {
+ out.println("Test task listener");
+ JavacTask task = javac.getTask(out, fm, null, null, null, files);
+ TaskListnr tl = new TaskListnr(DocTrees.instance(task));
+ task.addTaskListener(tl);
+ task.call();
+ tl.checker.checkDocComments(expectedDocComments);
+ }
+
+ void error(String msg) {
+ out.println("Error: " + msg);
+ errors++;
+ }
+
+ class AnnoProc extends JavacTestingAbstractProcessor {
+ Checker checker;
+
+ AnnoProc(DocTrees trees) {
+ checker = new Checker(trees);
+ }
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ for (Element e : roundEnv.getRootElements()) {
+ checker.scan(checker.trees.getPath(e), null);
+ }
+ return true;
+ }
+ }
+
+ class TaskListnr implements TaskListener {
+ Checker checker;
+
+ TaskListnr(DocTrees trees) {
+ checker = new Checker(trees);
+ }
+
+ public void started(TaskEvent e) {
+ if (e.getKind() == TaskEvent.Kind.ANALYZE)
+ checker.scan(new TreePath(e.getCompilationUnit()), null);
+ }
+
+ public void finished(TaskEvent e) {
+ }
+ }
+
+ class Checker extends TreePathScanner<Void,Void> {
+ DocTrees trees;
+ SourcePositions srcPosns;
+
+ int docComments = 0;
+
+ Checker(DocTrees trees) {
+ this.trees = trees;
+ srcPosns = trees.getSourcePositions();
+ }
+
+ @Override
+ public Void scan(Tree tree, Void ignore) {
+ if (tree != null) {
+ switch (tree.getKind()) {
+ // HACK: Workaround 8007350
+ // Some tree nodes do not have endpos set
+ case ASSIGNMENT:
+ case BLOCK:
+ case IDENTIFIER:
+ case METHOD_INVOCATION:
+ break;
+
+ default:
+ checkEndPos(getCurrentPath().getCompilationUnit(), tree);
+ }
+ }
+ return super.scan(tree, ignore);
+ }
+
+ @Override
+ public Void visitClass(ClassTree tree, Void ignore) {
+ checkComment();
+ return super.visitClass(tree, ignore);
+ }
+
+ @Override
+ public Void visitMethod(MethodTree tree, Void ignore) {
+ checkComment();
+ return super.visitMethod(tree, ignore);
+ }
+
+ @Override
+ public Void visitVariable(VariableTree tree, Void ignore) {
+ checkComment();
+ return super.visitVariable(tree, ignore);
+ }
+
+ void checkComment() {
+ DocCommentTree dc = trees.getDocCommentTree(getCurrentPath());
+ if (dc != null) {
+ out.println("comment: " + dc.toString().replaceAll("\\s+", " "));
+ docComments++;
+ }
+ }
+
+ void checkEndPos(CompilationUnitTree unit, Tree tree) {
+ long sp = srcPosns.getStartPosition(unit, tree);
+ long ep = srcPosns.getEndPosition(unit, tree);
+ if (sp >= 0 && ep == Position.NOPOS) {
+ error("endpos not set for " + tree.getKind()
+ + " " + Pretty.toSimpleString(((JCTree) tree))
+ +", start:" + sp);
+ }
+ }
+
+ void checkDocComments(int expected) {
+ if (docComments != expected) {
+ error("Unexpected number of doc comments received: "
+ + docComments + ", expected: " + expected);
+ }
+ }
+
+ }
+}
--- a/langtools/test/tools/javac/api/T6306137.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/api/T6306137.java Wed Feb 13 13:01:16 2013 -0800
@@ -26,9 +26,6 @@
* @bug 6306137
* @summary JSR 199: encoding option doesn't affect standard file manager
* @author Peter von der Ahé
- * @ignore
- * Need to make the contentCache in JavacFileManager be aware of changes to the encoding.
- * Need to propogate -source (and -encoding?) down to the JavacFileManager
*/
import java.io.File;
--- a/langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java Wed Feb 13 13:01:16 2013 -0800
@@ -23,7 +23,6 @@
/*
* @test
- * @ignore awaits for VM support
* @summary check that javac does not generate bridge methods for defaults
*/
--- a/langtools/test/tools/javac/lambda/LambdaCapture06.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/lambda/LambdaCapture06.java Wed Feb 13 13:01:16 2013 -0800
@@ -23,7 +23,6 @@
/*
* @test
- * @ignore investigate as to whether code generation fails
* @bug 8003280
* @summary Add lambda tests
* Compiler crash when local inner class nested inside lambda captures local variables from enclosing scope
--- a/langtools/test/tools/javac/lambda/LambdaExpr15.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/lambda/LambdaExpr15.java Wed Feb 13 13:01:16 2013 -0800
@@ -23,7 +23,6 @@
/*
* @test
- * @ignore investigate as to whether code generation fails
* @bug 8003280
* @summary Add lambda tests
* check that nested inner class in statement lambdas don't get corrupted return statements
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lib/DPrinter.java Wed Feb 13 13:01:16 2013 -0800
@@ -0,0 +1,1331 @@
+/*
+ * 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.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+import javax.tools.FileObject;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+import com.sun.source.util.Trees;
+import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.code.Annotations;
+import com.sun.tools.javac.code.Attribute;
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Kinds;
+import com.sun.tools.javac.code.Printer;
+import com.sun.tools.javac.code.Scope;
+import com.sun.tools.javac.code.Scope.CompoundScope;
+import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Type.*;
+import com.sun.tools.javac.code.TypeTag;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.tree.Pretty;
+import com.sun.tools.javac.tree.TreeInfo;
+import com.sun.tools.javac.tree.TreeScanner;
+import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Log;
+
+
+/**
+ * Debug printer for javac internals, for when toString() just isn't enough.
+ *
+ * <p>
+ * The printer provides an API to generate structured views of javac objects,
+ * such as AST nodes, symbol, types and annotations. Various aspects of the
+ * output can be configured, such as whether to show nulls, empty lists, or
+ * a compressed representation of the source code. Visitors are used to walk
+ * object hierarchies, and can be replaced with custom visitors if the default
+ * visitors are not flexible enough.
+ *
+ * <p>
+ * In general, nodes are printed with an initial line identifying the node
+ * followed by indented lines for the child nodes. Currently, graphs are
+ * represented by printing a spanning subtree.
+ *
+ * <p>
+ * The printer can be accessed via a simple command-line utility,
+ * which makes it easy to see the internal representation of source code,
+ * such as simple test programs, during the compilation pipeline.
+ *
+ * <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 DPrinter {
+ protected final PrintWriter out;
+ protected final Trees trees;
+ protected Printer printer;
+ protected boolean showEmptyItems = true;
+ protected boolean showNulls = true;
+ protected boolean showPositions = false;
+ protected boolean showSrc;
+ protected boolean showTreeSymbols;
+ protected boolean showTreeTypes;
+ protected int maxSrcLength = 32;
+ protected Locale locale = Locale.getDefault();
+ protected static final String NULL = "#null";
+
+ // <editor-fold defaultstate="collapsed" desc="Configuration">
+
+ public static DPrinter instance(Context context) {
+ DPrinter dp = context.get(DPrinter.class);
+ if (dp == null) {
+ dp = new DPrinter(context);
+ }
+ return dp;
+
+ }
+
+ protected DPrinter(Context context) {
+ context.put(DPrinter.class, this);
+ out = context.get(Log.outKey);
+ trees = JavacTrees.instance(context);
+ }
+
+ public DPrinter(PrintWriter out, Trees trees) {
+ this.out = out;
+ this.trees = trees;
+ }
+
+ public DPrinter emptyItems(boolean showEmptyItems) {
+ this.showEmptyItems = showEmptyItems;
+ return this;
+ }
+
+ public DPrinter nulls(boolean showNulls) {
+ this.showNulls = showNulls;
+ return this;
+ }
+
+ public DPrinter positions(boolean showPositions) {
+ this.showPositions = showPositions;
+ return this;
+ }
+
+ public DPrinter source(boolean showSrc) {
+ this.showSrc = showSrc;
+ return this;
+ }
+
+ public DPrinter source(int maxSrcLength) {
+ this.showSrc = true;
+ this.maxSrcLength = maxSrcLength;
+ return this;
+ }
+
+ public DPrinter treeSymbols(boolean showTreeSymbols) {
+ this.showTreeSymbols = showTreeSymbols;
+ return this;
+ }
+
+ public DPrinter treeTypes(boolean showTreeTypes) {
+ this.showTreeTypes = showTreeTypes;
+ return this;
+ }
+
+ public DPrinter typeSymbolPrinter(Printer p) {
+ printer = p;
+ return this;
+ }
+
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Printing">
+
+ protected enum Details {
+ /** A one-line non-recursive summary */
+ SUMMARY,
+ /** Multi-line, possibly recursive. */
+ FULL
+ };
+
+ public void printAnnotations(String label, Annotations annotations) {
+ printAnnotations(label, annotations, Details.FULL);
+ }
+
+ protected void printAnnotations(String label, Annotations annotations, Details details) {
+ if (annotations == null) {
+ printNull(label);
+ } else {
+ // no SUMMARY format currently available to use
+
+ // use reflection to get at private fields
+ Object DECL_NOT_STARTED = getField(null, Annotations.class, "DECL_NOT_STARTED");
+ Object DECL_IN_PROGRESS = getField(null, Annotations.class, "DECL_IN_PROGRESS");
+ Object attributes = getField(annotations, Annotations.class, "attributes");
+ Object type_attributes = getField(annotations, Annotations.class, "type_attributes");
+
+ if (!showEmptyItems) {
+ if (attributes instanceof List && ((List) attributes).isEmpty()
+ && attributes != DECL_NOT_STARTED
+ && attributes != DECL_IN_PROGRESS
+ && type_attributes instanceof List && ((List) type_attributes).isEmpty())
+ return;
+ }
+
+ printString(label, hashString(annotations));
+
+ indent(+1);
+ if (attributes == DECL_NOT_STARTED)
+ printString("attributes", "DECL_NOT_STARTED");
+ else if (attributes == DECL_IN_PROGRESS)
+ printString("attributes", "DECL_IN_PROGRESS");
+ else if (attributes instanceof List)
+ printList("attributes", (List) attributes);
+ else
+ printObject("attributes", attributes, Details.SUMMARY);
+
+ if (attributes instanceof List)
+ printList("type_attributes", (List) type_attributes);
+ else
+ printObject("type_attributes", type_attributes, Details.SUMMARY);
+ indent(-1);
+ }
+ }
+
+ public void printAttribute(String label, Attribute attr) {
+ if (attr == null) {
+ printNull(label);
+ } else {
+ printString(label, attr.getClass().getSimpleName());
+
+ indent(+1);
+ attr.accept(attrVisitor);
+ indent(-1);
+ }
+ }
+
+ public void printFileObject(String label, FileObject fo) {
+ if (fo == null) {
+ printNull(label);
+ } else {
+ printString(label, fo.getName());
+ }
+ }
+
+ protected <T> void printImplClass(T item, Class<? extends T> stdImplClass) {
+ if (item.getClass() != stdImplClass)
+ printString("impl", item.getClass().getName());
+ }
+
+ public void printInt(String label, int i) {
+ printString(label, String.valueOf(i));
+ }
+
+ public void printList(String label, List<?> list) {
+ if (list == null) {
+ printNull(label);
+ } else if (!list.isEmpty() || showEmptyItems) {
+ printString(label, "[" + list.size() + "]");
+
+ indent(+1);
+ int i = 0;
+ for (Object item: list) {
+ printObject(String.valueOf(i++), item, Details.FULL);
+ }
+ indent(-1);
+ }
+ }
+
+ public void printName(String label, Name name) {
+ if (name == null) {
+ printNull(label);
+ } else {
+ printString(label, name.toString());
+ }
+ }
+
+ public void printNull(String label) {
+ if (showNulls)
+ printString(label, NULL);
+ }
+
+ protected void printObject(String label, Object item, Details details) {
+ if (item == null) {
+ printNull(label);
+ } else if (item instanceof Attribute) {
+ printAttribute(label, (Attribute) item);
+ } else if (item instanceof Symbol) {
+ printSymbol(label, (Symbol) item, details);
+ } else if (item instanceof Type) {
+ printType(label, (Type) item, details);
+ } else if (item instanceof JCTree) {
+ printTree(label, (JCTree) item);
+ } else if (item instanceof List) {
+ printList(label, (List) item);
+ } else if (item instanceof Name) {
+ printName(label, (Name) item);
+ } else {
+ printString(label, String.valueOf(item));
+ }
+ }
+
+ public void printScope(String label, Scope scope) {
+ printScope(label, scope, Details.FULL);
+ }
+
+ public void printScope(String label, Scope scope, Details details) {
+ if (scope == null) {
+ printNull(label);
+ } else {
+ switch (details) {
+ case SUMMARY: {
+ indent();
+ out.print(label);
+ out.print(": [");
+ String sep = "";
+ for (Symbol sym: scope.getElements()) {
+ out.print(sep);
+ out.print(sym.name);
+ sep = ",";
+ }
+ out.println("]");
+ break;
+ }
+
+ case FULL: {
+ indent();
+ out.println(label);
+
+ indent(+1);
+ printImplClass(scope, Scope.class);
+ printSymbol("owner", scope.owner, Details.SUMMARY);
+ printScope("next", scope.next, Details.SUMMARY);
+ printObject("shared", getField(scope, Scope.class, "shared"), Details.SUMMARY);
+ if (scope instanceof CompoundScope) {
+ printObject("subScopes",
+ getField(scope, CompoundScope.class, "subScopes"),
+ Details.FULL);
+ } else {
+ for (Symbol sym : scope.getElements()) {
+ printSymbol(sym.name.toString(), sym, Details.SUMMARY);
+ }
+ }
+ indent(-1);
+ break;
+ }
+ }
+ }
+ }
+
+ public void printSource(String label, JCTree tree) {
+ printString(label, Pretty.toSimpleString(tree, maxSrcLength));
+ }
+
+ public void printString(String label, String text) {
+ indent();
+ out.print(label);
+ out.print(": ");
+ out.print(text);
+ out.println();
+ }
+
+ public void printSymbol(String label, Symbol symbol) {
+ printSymbol(label, symbol, Details.FULL);
+ }
+
+ protected void printSymbol(String label, Symbol sym, Details details) {
+ if (sym == null) {
+ printNull(label);
+ } else {
+ switch (details) {
+ case SUMMARY:
+ printString(label, toString(sym));
+ break;
+
+ case FULL:
+ indent();
+ out.print(label);
+ out.println(": " +
+ info(sym.getClass(),
+ String.format("0x%x--%s", sym.kind, Kinds.kindName(sym)),
+ sym.getKind())
+ + " " + sym.name
+ + " " + hashString(sym));
+
+ indent(+1);
+ if (showSrc) {
+ JCTree tree = (JCTree) trees.getTree(sym);
+ if (tree != null)
+ printSource("src", tree);
+ }
+ printString("flags", String.format("0x%x--%s",
+ sym.flags_field, Flags.toString(sym.flags_field)));
+ printObject("completer", sym.completer, Details.SUMMARY); // what if too long?
+ printSymbol("owner", sym.owner, Details.SUMMARY);
+ printType("type", sym.type, Details.SUMMARY);
+ printType("erasure", sym.erasure_field, Details.SUMMARY);
+ sym.accept(symVisitor, null);
+ printAnnotations("annotations", sym.annotations, Details.SUMMARY);
+ indent(-1);
+ }
+ }
+ }
+
+ protected String toString(Symbol sym) {
+ return (printer != null) ? printer.visit(sym, locale) : String.valueOf(sym);
+ }
+
+ protected void printTree(String label, JCTree tree) {
+ if (tree == null) {
+ printNull(label);
+ } else {
+ indent();
+ String ext;
+ try {
+ ext = tree.getKind().name();
+ } catch (Throwable t) {
+ ext = "n/a";
+ }
+ out.print(label + ": " + info(tree.getClass(), tree.getTag(), ext));
+ if (showPositions) {
+ // We can always get start position, but to get end position
+ // and/or line+offset, we would need a JCCompilationUnit
+ out.print(" pos:" + tree.pos);
+ }
+ if (showTreeTypes && tree.type != null)
+ out.print(" type:" + toString(tree.type));
+ Symbol sym;
+ if (showTreeSymbols && (sym = TreeInfo.symbolFor(tree)) != null)
+ out.print(" sym:" + toString(sym));
+ out.println();
+
+ indent(+1);
+ if (showSrc) {
+ indent();
+ out.println("src: " + Pretty.toSimpleString(tree, maxSrcLength));
+ }
+ tree.accept(treeVisitor);
+ indent(-1);
+ }
+ }
+
+ public void printType(String label, Type type) {
+ printType(label, type, Details.FULL);
+ }
+
+ protected void printType(String label, Type type, Details details) {
+ if (type == null)
+ printNull(label);
+ else {
+ switch (details) {
+ case SUMMARY:
+ printString(label, toString(type));
+ break;
+
+ case FULL:
+ indent();
+ out.print(label);
+ out.println(": " + info(type.getClass(), type.getTag(), type.getKind())
+ + " " + hashString(type));
+
+ indent(+1);
+ printSymbol("tsym", type.tsym, Details.SUMMARY);
+ printObject("constValue", type.constValue(), Details.SUMMARY);
+ type.accept(typeVisitor, null);
+ indent(-1);
+ }
+ }
+ }
+
+ protected String toString(Type type) {
+ return (printer != null) ? printer.visit(type, locale) : String.valueOf(type);
+ }
+
+ protected String hashString(Object obj) {
+ return String.format("#%x", obj.hashCode());
+ }
+
+ protected String info(Class<?> clazz, Object internal, Object external) {
+ return String.format("%s,%s,%s", clazz.getSimpleName(), internal, external);
+ }
+
+ private int indent = 0;
+
+ protected void indent() {
+ for (int i = 0; i < indent; i++) {
+ out.print(" ");
+ }
+ }
+
+ protected void indent(int n) {
+ indent += n;
+ }
+
+ protected Object getField(Object o, Class<?> clazz, String name) {
+ try {
+ Field f = clazz.getDeclaredField(name);
+ boolean prev = f.isAccessible();
+ f.setAccessible(true);
+ try {
+ return f.get(o);
+ } finally {
+ f.setAccessible(prev);
+ }
+ } catch (ReflectiveOperationException e) {
+ return e;
+ } catch (SecurityException e) {
+ return e;
+ }
+ }
+
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="JCTree visitor methods">
+
+ protected JCTree.Visitor treeVisitor = new TreeVisitor();
+
+ /**
+ * Default visitor class for JCTree (AST) objects.
+ */
+ public class TreeVisitor extends JCTree.Visitor {
+ @Override
+ public void visitTopLevel(JCCompilationUnit tree) {
+ printList("packageAnnotations", tree.packageAnnotations);
+ printTree("pid", tree.pid);
+ printList("defs", tree.defs);
+ }
+
+ @Override
+ public void visitImport(JCImport tree) {
+ printTree("qualid", tree.qualid);
+ }
+
+ @Override
+ public void visitClassDef(JCClassDecl tree) {
+ printName("name", tree.name);
+ printTree("mods", tree.mods);
+ printList("typarams", tree.typarams);
+ printTree("extending", tree.extending);
+ printList("implementing", tree.implementing);
+ printList("defs", tree.defs);
+ }
+
+ @Override
+ public void visitMethodDef(JCMethodDecl tree) {
+ printName("name", tree.name);
+ printTree("mods", tree.mods);
+ printTree("restype", tree.restype);
+ printList("typarams", tree.typarams);
+ printTree("recvparam", tree.recvparam);
+ printList("params", tree.params);
+ printList("thrown", tree.thrown);
+ printTree("defaultValue", tree.defaultValue);
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitVarDef(JCVariableDecl tree) {
+ printName("name", tree.name);
+ printTree("mods", tree.mods);
+ printTree("vartype", tree.vartype);
+ printTree("init", tree.init);
+ }
+
+ @Override
+ public void visitSkip(JCSkip tree) {
+ }
+
+ @Override
+ public void visitBlock(JCBlock tree) {
+ printList("stats", tree.stats);
+ }
+
+ @Override
+ public void visitDoLoop(JCDoWhileLoop tree) {
+ printTree("body", tree.body);
+ printTree("cond", tree.cond);
+ }
+
+ @Override
+ public void visitWhileLoop(JCWhileLoop tree) {
+ printTree("cond", tree.cond);
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitForLoop(JCForLoop tree) {
+ printList("init", tree.init);
+ printTree("cond", tree.cond);
+ printList("step", tree.step);
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitForeachLoop(JCEnhancedForLoop tree) {
+ printTree("var", tree.var);
+ printTree("expr", tree.expr);
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitLabelled(JCLabeledStatement tree) {
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitSwitch(JCSwitch tree) {
+ printTree("selector", tree.selector);
+ printList("cases", tree.cases);
+ }
+
+ @Override
+ public void visitCase(JCCase tree) {
+ printTree("pat", tree.pat);
+ printList("stats", tree.stats);
+ }
+
+ @Override
+ public void visitSynchronized(JCSynchronized tree) {
+ printTree("lock", tree.lock);
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitTry(JCTry tree) {
+ printList("resources", tree.resources);
+ printTree("body", tree.body);
+ printList("catchers", tree.catchers);
+ printTree("finalizer", tree.finalizer);
+ }
+
+ @Override
+ public void visitCatch(JCCatch tree) {
+ printTree("param", tree.param);
+ printTree("body", tree.body);
+ }
+
+ @Override
+ public void visitConditional(JCConditional tree) {
+ printTree("cond", tree.cond);
+ printTree("truepart", tree.truepart);
+ printTree("falsepart", tree.falsepart);
+ }
+
+ @Override
+ public void visitIf(JCIf tree) {
+ printTree("cond", tree.cond);
+ printTree("thenpart", tree.thenpart);
+ printTree("elsepart", tree.elsepart);
+ }
+
+ @Override
+ public void visitExec(JCExpressionStatement tree) {
+ printTree("expr", tree.expr);
+ }
+
+ @Override
+ public void visitBreak(JCBreak tree) {
+ printName("label", tree.label);
+ }
+
+ @Override
+ public void visitContinue(JCContinue tree) {
+ printName("label", tree.label);
+ }
+
+ @Override
+ public void visitReturn(JCReturn tree) {
+ printTree("expr", tree.expr);
+ }
+
+ @Override
+ public void visitThrow(JCThrow tree) {
+ printTree("expr", tree.expr);
+ }
+
+ @Override
+ public void visitAssert(JCAssert tree) {
+ printTree("cond", tree.cond);
+ printTree("detail", tree.detail);
+ }
+
+ @Override
+ public void visitApply(JCMethodInvocation tree) {
+ printList("typeargs", tree.typeargs);
+ printTree("meth", tree.meth);
+ printList("args", tree.args);
+ }
+
+ @Override
+ public void visitNewClass(JCNewClass tree) {
+ printTree("encl", tree.encl);
+ printList("typeargs", tree.typeargs);
+ printTree("clazz", tree.clazz);
+ printList("args", tree.args);
+ printTree("def", tree.def);
+ }
+
+ @Override
+ public void visitNewArray(JCNewArray tree) {
+ printList("annotations", tree.annotations);
+ printTree("elemtype", tree.elemtype);
+ printList("dims", tree.dims);
+ printList("dimAnnotations", tree.dimAnnotations);
+ printList("elems", tree.elems);
+ }
+
+ @Override
+ public void visitLambda(JCLambda tree) {
+ printTree("body", tree.body);
+ printList("params", tree.params);
+ }
+
+ @Override
+ public void visitParens(JCParens tree) {
+ printTree("expr", tree.expr);
+ }
+
+ @Override
+ public void visitAssign(JCAssign tree) {
+ printTree("lhs", tree.lhs);
+ printTree("rhs", tree.rhs);
+ }
+
+ @Override
+ public void visitAssignop(JCAssignOp tree) {
+ printTree("lhs", tree.lhs);
+ printTree("rhs", tree.rhs);
+ }
+
+ @Override
+ public void visitUnary(JCUnary tree) {
+ printTree("arg", tree.arg);
+ }
+
+ @Override
+ public void visitBinary(JCBinary tree) {
+ printTree("lhs", tree.lhs);
+ printTree("rhs", tree.rhs);
+ }
+
+ @Override
+ public void visitTypeCast(JCTypeCast tree) {
+ printTree("clazz", tree.clazz);
+ printTree("expr", tree.expr);
+ }
+
+ @Override
+ public void visitTypeTest(JCInstanceOf tree) {
+ printTree("expr", tree.expr);
+ printTree("clazz", tree.clazz);
+ }
+
+ @Override
+ public void visitIndexed(JCArrayAccess tree) {
+ printTree("indexed", tree.indexed);
+ printTree("index", tree.index);
+ }
+
+ @Override
+ public void visitSelect(JCFieldAccess tree) {
+ printTree("selected", tree.selected);
+ }
+
+ @Override
+ public void visitReference(JCMemberReference tree) {
+ printTree("expr", tree.expr);
+ printList("typeargs", tree.typeargs);
+ }
+
+ @Override
+ public void visitIdent(JCIdent tree) {
+ printName("name", tree.name);
+ }
+
+ @Override
+ public void visitLiteral(JCLiteral tree) {
+ printString("value", Pretty.toSimpleString(tree, 32));
+ }
+
+ @Override
+ public void visitTypeIdent(JCPrimitiveTypeTree tree) {
+ printString("typetag", tree.typetag.name());
+ }
+
+ @Override
+ public void visitTypeArray(JCArrayTypeTree tree) {
+ printTree("elemtype", tree.elemtype);
+ }
+
+ @Override
+ public void visitTypeApply(JCTypeApply tree) {
+ printTree("clazz", tree.clazz);
+ printList("arguments", tree.arguments);
+ }
+
+ @Override
+ public void visitTypeUnion(JCTypeUnion tree) {
+ printList("alternatives", tree.alternatives);
+ }
+
+ @Override
+ public void visitTypeIntersection(JCTypeIntersection tree) {
+ printList("bounds", tree.bounds);
+ }
+
+ @Override
+ public void visitTypeParameter(JCTypeParameter tree) {
+ printName("name", tree.name);
+ printList("annotations", tree.annotations);
+ printList("bounds", tree.bounds);
+ }
+
+ @Override
+ public void visitWildcard(JCWildcard tree) {
+ printTree("kind", tree.kind);
+ printTree("inner", tree.inner);
+ }
+
+ @Override
+ public void visitTypeBoundKind(TypeBoundKind tree) {
+ printString("kind", tree.kind.name());
+ }
+
+ @Override
+ public void visitModifiers(JCModifiers tree) {
+ printList("annotations", tree.annotations);
+ printString("flags", String.valueOf(Flags.asFlagSet(tree.flags)));
+ }
+
+ @Override
+ public void visitAnnotation(JCAnnotation tree) {
+ printTree("annotationType", tree.annotationType);
+ printList("args", tree.args);
+ }
+
+ @Override
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ printList("annotations", tree.annotations);
+ printTree("underlyingType", tree.underlyingType);
+ }
+
+ @Override
+ public void visitErroneous(JCErroneous tree) {
+ printList("errs", tree.errs);
+ }
+
+ @Override
+ public void visitLetExpr(LetExpr tree) {
+ printList("defs", tree.defs);
+ printTree("expr", tree.expr);
+ }
+
+ @Override
+ public void visitTree(JCTree tree) {
+ Assert.error();
+ }
+ }
+
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Symbol visitor">
+
+ protected Symbol.Visitor<Void,Void> symVisitor = new SymbolVisitor();
+
+ /**
+ * Default visitor class for Symbol objects.
+ * Note: each visitXYZ method ends by calling the corresponding
+ * visit method for its superclass.
+ */
+ class SymbolVisitor implements Symbol.Visitor<Void,Void> {
+ @Override
+ public Void visitClassSymbol(ClassSymbol sym, Void ignore) {
+ printName("fullname", sym.fullname);
+ printName("flatname", sym.flatname);
+ printScope("members", sym.members_field);
+ printFileObject("sourcefile", sym.sourcefile);
+ printFileObject("classfile", sym.classfile);
+ // trans-local?
+ // pool?
+ return visitTypeSymbol(sym, null);
+ }
+
+ @Override
+ public Void visitMethodSymbol(MethodSymbol sym, Void ignore) {
+ // code
+ printList("params", sym.params);
+ printList("savedParameterNames", sym.savedParameterNames);
+ return visitSymbol(sym, null);
+ }
+
+ @Override
+ public Void visitPackageSymbol(PackageSymbol sym, Void ignore) {
+ printName("fullname", sym.fullname);
+ printScope("members", sym.members_field);
+ printSymbol("package-info", sym.package_info, Details.SUMMARY);
+ return visitTypeSymbol(sym, null);
+ }
+
+ @Override
+ public Void visitOperatorSymbol(OperatorSymbol sym, Void ignore) {
+ printInt("opcode", sym.opcode);
+ return visitMethodSymbol(sym, null);
+ }
+
+ @Override
+ public Void visitVarSymbol(VarSymbol sym, Void ignore) {
+ printInt("pos", sym.pos);
+ printInt("adm", sym.adr);
+ // data is a private field, and the standard accessors may
+ // mutate it as part of lazy evaluation. Therefore, use
+ // reflection to get the raw data.
+ printObject("data", getField(sym, VarSymbol.class, "data"), Details.SUMMARY);
+ return visitSymbol(sym, null);
+ }
+
+ @Override
+ public Void visitTypeSymbol(TypeSymbol sym, Void ignore) {
+ return visitSymbol(sym, null);
+ }
+
+ @Override
+ public Void visitSymbol(Symbol sym, Void ignore) {
+ return null;
+ }
+ }
+
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Type visitor">
+
+ protected Type.Visitor<Void,Void> typeVisitor = new TypeVisitor();
+
+ /**
+ * Default visitor class for Type objects.
+ * Note: each visitXYZ method ends by calling the corresponding
+ * visit method for its superclass.
+ */
+ public class TypeVisitor implements Type.Visitor<Void,Void> {
+ public Void visitAnnotatedType(AnnotatedType type, Void ignore) {
+ printList("typeAnnotations", type.typeAnnotations);
+ printType("underlyingType", type.underlyingType, Details.FULL);
+ return visitType(type, null);
+ }
+
+ public Void visitArrayType(ArrayType type, Void ignore) {
+ printType("elemType", type.elemtype, Details.FULL);
+ return visitType(type, null);
+ }
+
+ public Void visitCapturedType(CapturedType type, Void ignore) {
+ printType("wildcard", type.wildcard, Details.FULL);
+ return visitTypeVar(type, null);
+ }
+
+ public Void visitClassType(ClassType type, Void ignore) {
+ printType("outer", type.getEnclosingType(), Details.SUMMARY);
+ printList("typarams", type.typarams_field);
+ printList("allparams", type.allparams_field);
+ printType("supertype", type.supertype_field, Details.SUMMARY);
+ printList("interfaces", type.interfaces_field);
+ printList("allinterfaces", type.all_interfaces_field);
+ return visitType(type, null);
+ }
+
+ public Void visitErrorType(ErrorType type, Void ignore) {
+ printType("originalType", type.getOriginalType(), Details.FULL);
+ return visitClassType(type, null);
+ }
+
+ public Void visitForAll(ForAll type, Void ignore) {
+ printList("tvars", type.tvars);
+ return visitDelegatedType(type);
+ }
+
+ public Void visitMethodType(MethodType type, Void ignore) {
+ printList("argtypes", type.argtypes);
+ printType("restype", type.restype, Details.FULL);
+ printList("thrown", type.thrown);
+ return visitType(type, null);
+ }
+
+ public Void visitPackageType(PackageType type, Void ignore) {
+ return visitType(type, null);
+ }
+
+ public Void visitTypeVar(TypeVar type, Void ignore) {
+ // For TypeVars (and not subtypes), the bound should always be
+ // null or bot. So, only print the bound for subtypes of TypeVar,
+ // or if the bound is (erroneously) not null or bot.
+ if (!type.hasTag(TypeTag.TYPEVAR)
+ || !(type.bound == null || type.bound.hasTag(TypeTag.BOT))) {
+ printType("bound", type.bound, Details.FULL);
+ }
+ printType("lower", type.lower, Details.FULL);
+ return visitType(type, null);
+ }
+
+ public Void visitUndetVar(UndetVar type, Void ignore) {
+ for (UndetVar.InferenceBound ib: UndetVar.InferenceBound.values())
+ printList("bounds." + ib, type.getBounds(ib));
+ printType("inst", type.inst, Details.SUMMARY);
+ return visitDelegatedType(type);
+ }
+
+ public Void visitWildcardType(WildcardType type, Void ignore) {
+ printType("type", type.type, Details.SUMMARY);
+ printString("kind", type.kind.name());
+ printType("bound", type.bound, Details.SUMMARY);
+ return visitType(type, null);
+ }
+
+ protected Void visitDelegatedType(DelegatedType type) {
+ printType("qtype", type.qtype, Details.FULL);
+ return visitType(type, null);
+ }
+
+ public Void visitType(Type type, Void ignore) {
+ return null;
+ }
+ }
+
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Attribute (annotations) visitor">
+
+ protected Attribute.Visitor attrVisitor = new AttributeVisitor();
+
+ /**
+ * Default visitor class for Attribute (annotation) objects.
+ */
+ public class AttributeVisitor implements Attribute.Visitor {
+
+ public void visitConstant(Attribute.Constant a) {
+ printObject("value", a.value, Details.SUMMARY);
+ visitAttribute(a);
+ }
+
+ public void visitClass(Attribute.Class a) {
+ printObject("classType", a.classType, Details.SUMMARY);
+ visitAttribute(a);
+ }
+
+ public void visitCompound(Attribute.Compound a) {
+ if (a instanceof Attribute.TypeCompound) {
+ Attribute.TypeCompound ta = (Attribute.TypeCompound) a;
+ // consider a custom printer?
+ printObject("position", ta.position, Details.SUMMARY);
+ }
+ printObject("synthesized", a.isSynthesized(), Details.SUMMARY);
+ printList("values", a.values);
+ visitAttribute(a);
+ }
+
+ public void visitArray(Attribute.Array a) {
+ printList("values", Arrays.asList(a.values));
+ visitAttribute(a);
+ }
+
+ public void visitEnum(Attribute.Enum a) {
+ printSymbol("value", a.value, Details.SUMMARY);
+ visitAttribute(a);
+ }
+
+ public void visitError(Attribute.Error a) {
+ visitAttribute(a);
+ }
+
+ public void visitAttribute(Attribute a) {
+ printType("type", a.type, Details.SUMMARY);
+ }
+
+ }
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Utility front end">
+
+ /**
+ * Utility class to invoke DPrinter from the command line.
+ */
+ static class Main {
+ public static void main(String... args) throws IOException {
+ Main m = new Main();
+ PrintWriter out = new PrintWriter(System.out);
+ try {
+ if (args.length == 0)
+ m.usage(out);
+ else
+ m.run(out, args);
+ } finally {
+ out.flush();
+ }
+ }
+
+ void usage(PrintWriter out) {
+ out.println("Usage:");
+ out.println(" java " + Main.class.getName() + " mode [options] [javac-options]");
+ out.print("where mode is one of: ");
+ String sep = "";
+ for (Handler h: getHandlers().values()) {
+ out.print(sep);
+ out.print(h.name);
+ sep = ", ";
+ }
+ out.println();
+ out.println("and where options include:");
+ out.println(" -before PARSE|ENTER|ANALYZE|GENERATE|ANNOTATION_PROCESSING|ANNOTATION_PROCESSING_ROUND");
+ out.println(" -after PARSE|ENTER|ANALYZE|GENERATE|ANNOTATION_PROCESSING|ANNOTATION_PROCESSING_ROUND");
+ out.println(" -showPositions");
+ out.println(" -showSource");
+ out.println(" -showTreeSymbols");
+ out.println(" -showTreeTypes");
+ out.println(" -hideEmptyItems");
+ out.println(" -hideNulls");
+ }
+
+ void run(PrintWriter out, String... args) throws IOException {
+ JavaCompiler c = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager fm = c.getStandardFileManager(null, null, null);
+
+ // DPrinter options
+ final Set<TaskEvent.Kind> before = EnumSet.noneOf(TaskEvent.Kind.class);
+ final Set<TaskEvent.Kind> after = EnumSet.noneOf(TaskEvent.Kind.class);
+ boolean showPositions = false;
+ boolean showSource = false;
+ boolean showTreeSymbols = false;
+ boolean showTreeTypes = false;
+ boolean showEmptyItems = true;
+ boolean showNulls = true;
+
+ // javac options
+ Collection<String> options = new ArrayList<String>();
+ Collection<File> files = new ArrayList<File>();
+ String classpath = null;
+ String classoutdir = null;
+
+ final Handler h = getHandlers().get(args[0]);
+ if (h == null)
+ throw new IllegalArgumentException(args[0]);
+
+ for (int i = 1; i < args.length; i++) {
+ String arg = args[i];
+ if (arg.equals("-before") && i + 1 < args.length) {
+ before.add(getKind(args[++i]));
+ } else if (arg.equals("-after") && i + 1 < args.length) {
+ after.add(getKind(args[++i]));
+ } else if (arg.equals("-showPositions")) {
+ showPositions = true;
+ } else if (arg.equals("-showSource")) {
+ showSource = true;
+ } else if (arg.equals("-showTreeSymbols")) {
+ showTreeSymbols = true;
+ } else if (arg.equals("-showTreeTypes")) {
+ showTreeTypes = true;
+ } else if (arg.equals("-hideEmptyLists")) {
+ showEmptyItems = false;
+ } else if (arg.equals("-hideNulls")) {
+ showNulls = false;
+ } else if (arg.equals("-classpath") && i + 1 < args.length) {
+ classpath = args[++i];
+ } else if (arg.equals("-d") && i + 1 < args.length) {
+ classoutdir = args[++i];
+ } else if (arg.startsWith("-")) {
+ int n = c.isSupportedOption(arg);
+ if (n < 0) throw new IllegalArgumentException(arg);
+ options.add(arg);
+ while (n > 0) options.add(args[++i]);
+ } else if (arg.endsWith(".java")) {
+ files.add(new File(arg));
+ }
+ }
+
+ if (classoutdir != null) {
+ fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(classoutdir)));
+ }
+
+ if (classpath != null) {
+ Collection<File> path = new ArrayList<File>();
+ for (String p: classpath.split(File.pathSeparator)) {
+ if (p.isEmpty()) continue;
+ File f = new File(p);
+ if (f.exists()) path.add(f);
+ }
+ fm.setLocation(StandardLocation.CLASS_PATH, path);
+ }
+ Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
+
+ JavacTask task = (JavacTask) c.getTask(out, fm, null, options, null, fos);
+ final Trees trees = Trees.instance(task);
+
+ final DPrinter dprinter = new DPrinter(out, trees);
+ dprinter.source(showSource)
+ .emptyItems(showEmptyItems)
+ .nulls(showNulls)
+ .positions(showPositions)
+ .treeSymbols(showTreeSymbols)
+ .treeTypes(showTreeTypes);
+
+ if (before.isEmpty() && after.isEmpty()) {
+ if (h.name.equals("trees") && !showTreeSymbols && !showTreeTypes)
+ after.add(TaskEvent.Kind.PARSE);
+ else
+ after.add(TaskEvent.Kind.ANALYZE);
+ }
+
+ task.addTaskListener(new TaskListener() {
+ public void started(TaskEvent e) {
+ if (before.contains(e.getKind()))
+ handle(e);
+ }
+
+ public void finished(TaskEvent e) {
+ if (after.contains(e.getKind()))
+ handle(e);
+ }
+
+ private void handle(TaskEvent e) {
+ switch (e.getKind()) {
+ case PARSE:
+ case ENTER:
+ h.handle(e.getSourceFile().getName(),
+ (JCTree) e.getCompilationUnit(),
+ dprinter);
+ break;
+
+ default:
+ TypeElement elem = e.getTypeElement();
+ h.handle(elem.toString(),
+ (JCTree) trees.getTree(elem),
+ dprinter);
+ break;
+ }
+ }
+ });
+
+ task.call();
+ }
+
+ TaskEvent.Kind getKind(String s) {
+ return TaskEvent.Kind.valueOf(s.toUpperCase());
+ }
+
+ static protected abstract class Handler {
+ final String name;
+ Handler(String name) {
+ this.name = name;
+ }
+ abstract void handle(String label, JCTree tree, DPrinter dprinter);
+ }
+
+ Map<String,Handler> getHandlers() {
+ Map<String,Handler> map = new HashMap<String, Handler>();
+ for (Handler h: defaultHandlers) {
+ map.put(h.name, h);
+ }
+ return map;
+ }
+
+ protected final Handler[] defaultHandlers = {
+ new Handler("trees") {
+ @Override
+ void handle(String name, JCTree tree, DPrinter dprinter) {
+ dprinter.printTree(name, tree);
+ dprinter.out.println();
+ }
+ },
+
+ new Handler("symbols") {
+ @Override
+ void handle(String name, JCTree tree, final DPrinter dprinter) {
+ TreeScanner ds = new TreeScanner() {
+ @Override
+ public void visitClassDef(JCClassDecl tree) {
+ visitDecl(tree, tree.sym);
+ super.visitClassDef(tree);
+ }
+
+ @Override
+ public void visitMethodDef(JCMethodDecl tree) {
+ visitDecl(tree, tree.sym);
+ super.visitMethodDef(tree);
+ }
+
+ @Override
+ public void visitVarDef(JCVariableDecl tree) {
+ visitDecl(tree, tree.sym);
+ super.visitVarDef(tree);
+ }
+
+ void visitDecl(JCTree tree, Symbol sym) {
+ dprinter.printSymbol(sym.name.toString(), sym);
+ dprinter.out.println();
+ }
+ };
+ ds.scan(tree);
+ }
+ },
+
+ new Handler("types") {
+ @Override
+ void handle(String name, JCTree tree, final DPrinter dprinter) {
+ TreeScanner ts = new TreeScanner() {
+ @Override
+ public void scan(JCTree tree) {
+ if (tree == null) {
+ return;
+ }
+ if (tree.type != null) {
+ String label = Pretty.toSimpleString(tree);
+ dprinter.printType(label, tree.type);
+ dprinter.out.println();
+ }
+ super.scan(tree);
+ }
+ };
+ ts.scan(tree);
+ }
+ }
+ };
+ }
+
+ // </editor-fold>
+
+}
--- a/langtools/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -41,14 +41,20 @@
*
* If the property is not set the class will use a heuristic to determine the
* maximum number of threads that can be fired to execute a given test.
+ *
+ * This code will have to be revisited if jprt starts using concurrency for
+ * for running jtreg tests.
*/
public abstract class JavacTestingAbstractThreadedTest {
+ protected static AtomicInteger numberOfThreads = new AtomicInteger();
+
protected static int getThreadPoolSize() {
Integer testConc = Integer.getInteger("test.concurrency");
if (testConc != null) return testConc;
int cores = Runtime.getRuntime().availableProcessors();
- return Math.max(2, Math.min(8, cores / 2));
+ numberOfThreads.set(Math.max(2, Math.min(8, cores / 2)));
+ return numberOfThreads.get();
}
protected static void checkAfterExec() throws InterruptedException {
@@ -82,11 +88,18 @@
} else if (printCheckCount) {
outWriter.println("Total check executed: " + checkCount.get());
}
+ /*
+ * This output is for supporting debugging. It does not mean that a given
+ * test had executed that number of threads concurrently. The value printed
+ * here is the maximum possible amount.
+ */
closePrinters();
if (printAll) {
System.out.println(errSWriter.toString());
System.out.println(outSWriter.toString());
}
+ System.out.println("Total number of threads in thread pool: " +
+ numberOfThreads.get());
}
protected static void closePrinters() {
--- a/langtools/test/tools/javadoc/api/basic/RunTest.java Tue Feb 12 09:58:21 2013 -0800
+++ b/langtools/test/tools/javadoc/api/basic/RunTest.java Wed Feb 13 13:01:16 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 6493690
+ * @bug 6493690 8007490
* @summary javadoc should have a javax.tools.Tool service provider
* @build APITest
* @run main RunTest
@@ -31,6 +31,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.PrintStream;
import javax.tools.DocumentationTool;
import javax.tools.ToolProvider;
@@ -46,7 +47,7 @@
* Verify that run method can be invoked.
*/
@Test
- public void testRun() throws Exception {
+ public void testRunOK() throws Exception {
File testSrc = new File(System.getProperty("test.src"));
File srcFile = new File(testSrc, "pkg/C.java");
File outDir = getOutDir();
@@ -77,7 +78,7 @@
* Verify that run method can be invoked.
*/
@Test
- public void testRun2() throws Exception {
+ public void testRunFail() throws Exception {
File outDir = getOutDir();
String badfile = "badfile.java";
String[] args = { "-d", outDir.getPath(), badfile };
@@ -100,5 +101,48 @@
}
}
+ /**
+ * Verify that null args are accepted.
+ */
+ @Test
+ public void testNullArgs() throws Exception {
+ File testSrc = new File(System.getProperty("test.src"));
+ File srcFile = new File(testSrc, "pkg/C.java");
+ File outDir = getOutDir();
+ String[] args = { "-d", outDir.getPath(), srcFile.getPath() };
+
+ ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+ PrintStream prevStdout = System.out;
+ System.setOut(new PrintStream(stdout));
+
+ ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+ PrintStream prevStderr = System.err;
+ System.setErr(new PrintStream(stderr));
+
+ int rc ;
+ try {
+ DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
+ rc = tool.run(null, null, null, args);
+ } finally {
+ System.setOut(prevStdout);
+ System.setErr(prevStderr);
+ }
+
+ System.err.println("stdout >>" + stdout.toString() + "<<");
+ System.err.println("stderr >>" + stderr.toString() + "<<");
+
+ if (rc == 0) {
+ System.err.println("call succeeded");
+ checkFiles(outDir, standardExpectFiles);
+ String out = stdout.toString();
+ for (String f: standardExpectFiles) {
+ String f1 = f.replace('/', File.separatorChar);
+ if (f1.endsWith(".html") && !out.contains(f1))
+ error("expected string not found: " + f1);
+ }
+ } else {
+ error("call failed");
+ }
+ }
}