# HG changeset patch # User minqi # Date 1349740784 25200 # Node ID 0e8ca886e4e101de0ae5c25cd9a22086ed92125c # Parent 7a40901e0d5c7e0e91030f1e536803b21c63437d# Parent 75982791ddb6c13b1798b60bae645996002a22a2 Merge diff -r 7a40901e0d5c -r 0e8ca886e4e1 make/bsd/makefiles/buildtree.make --- a/make/bsd/makefiles/buildtree.make Mon Oct 08 16:48:52 2012 -0700 +++ b/make/bsd/makefiles/buildtree.make Mon Oct 08 16:59:44 2012 -0700 @@ -163,6 +163,13 @@ endif endif +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK +ifndef OPENJDK + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) + OPENJDK=true + endif +endif + BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) BUILDTREE = \ @@ -205,6 +212,7 @@ echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ + echo "OPENJDK = $(OPENJDK)"; \ echo; \ echo "# Used for platform dispatching"; \ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ diff -r 7a40901e0d5c -r 0e8ca886e4e1 make/linux/makefiles/buildtree.make --- a/make/linux/makefiles/buildtree.make Mon Oct 08 16:48:52 2012 -0700 +++ b/make/linux/makefiles/buildtree.make Mon Oct 08 16:59:44 2012 -0700 @@ -156,6 +156,13 @@ endif endif +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK +ifndef OPENJDK + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) + OPENJDK=true + endif +endif + BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) BUILDTREE = \ @@ -198,6 +205,7 @@ echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ + echo "OPENJDK = $(OPENJDK)"; \ echo; \ echo "# Used for platform dispatching"; \ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ diff -r 7a40901e0d5c -r 0e8ca886e4e1 make/linux/makefiles/dtrace.make --- a/make/linux/makefiles/dtrace.make Mon Oct 08 16:48:52 2012 -0700 +++ b/make/linux/makefiles/dtrace.make Mon Oct 08 16:59:44 2012 -0700 @@ -1,5 +1,6 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012 Red Hat, Inc. # 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,3 +26,40 @@ # Linux does not build jvm_db LIBJVM_DB = +# Only OPENJDK builds test and support SDT probes currently. +ifndef OPENJDK +REASON = "This JDK does not support SDT probes" +else + +# We need a recent GCC for the default +ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 4 \) \& \( $(CC_VER_MINOR) \>= 4 \) )" "0" +REASON = "gcc version is too old" +else + +# But it does have a SystemTap dtrace compatible sys/sdt.h +ifneq ($(ALT_SDT_H),) + SDT_H_FILE = $(ALT_SDT_H) +else + SDT_H_FILE = /usr/include/sys/sdt.h +endif +DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) +REASON = "$(SDT_H_FILE) not found" + +ifneq ($(DTRACE_ENABLED),) + CFLAGS += -DDTRACE_ENABLED +endif + +endif +endif + +# Phony target used in vm.make build target to check whether enabled. +.PHONY: dtraceCheck +ifeq ($(DTRACE_ENABLED),) +dtraceCheck: + $(QUIETLY) echo "**NOTICE** Dtrace support disabled: $(REASON)" +else +dtraceCheck: +endif + +# It doesn't support HAVE_DTRACE_H though. + diff -r 7a40901e0d5c -r 0e8ca886e4e1 make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Mon Oct 08 16:48:52 2012 -0700 +++ b/make/linux/makefiles/vm.make Mon Oct 08 16:59:44 2012 -0700 @@ -387,7 +387,7 @@ #---------------------------------------------------------------------- -build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR) +build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR) install: install_jvm install_jsig install_saproc diff -r 7a40901e0d5c -r 0e8ca886e4e1 make/solaris/makefiles/buildtree.make --- a/make/solaris/makefiles/buildtree.make Mon Oct 08 16:48:52 2012 -0700 +++ b/make/solaris/makefiles/buildtree.make Mon Oct 08 16:59:44 2012 -0700 @@ -148,6 +148,13 @@ endif endif +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK +ifndef OPENJDK + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) + OPENJDK=true + endif +endif + BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) BUILDTREE = \ @@ -190,6 +197,7 @@ echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ + echo "OPENJDK = $(OPENJDK)"; \ echo "$(LP64_SETTING/$(DATA_MODE))"; \ echo; \ echo "# Used for platform dispatching"; \ diff -r 7a40901e0d5c -r 0e8ca886e4e1 src/cpu/x86/vm/assembler_x86.cpp --- a/src/cpu/x86/vm/assembler_x86.cpp Mon Oct 08 16:48:52 2012 -0700 +++ b/src/cpu/x86/vm/assembler_x86.cpp Mon Oct 08 16:59:44 2012 -0700 @@ -1170,26 +1170,11 @@ // and stores reg into adr if so; otherwise, the value at adr is loaded into rax,. // The ZF is set if the compared values were equal, and cleared otherwise. void Assembler::cmpxchgl(Register reg, Address adr) { // cmpxchg - if (Atomics & 2) { - // caveat: no instructionmark, so this isn't relocatable. - // Emit a synthetic, non-atomic, CAS equivalent. - // Beware. The synthetic form sets all ICCs, not just ZF. - // cmpxchg r,[m] is equivalent to rax, = CAS (m, rax, r) - cmpl(rax, adr); - movl(rax, adr); - if (reg != rax) { - Label L ; - jcc(Assembler::notEqual, L); - movl(adr, reg); - bind(L); - } - } else { - InstructionMark im(this); - prefix(adr, reg); - emit_byte(0x0F); - emit_byte(0xB1); - emit_operand(reg, adr); - } + InstructionMark im(this); + prefix(adr, reg); + emit_byte(0x0F); + emit_byte(0xB1); + emit_operand(reg, adr); } void Assembler::comisd(XMMRegister dst, Address src) { @@ -1513,12 +1498,7 @@ } void Assembler::lock() { - if (Atomics & 1) { - // Emit either nothing, a NOP, or a NOP: prefix - emit_byte(0x90) ; - } else { - emit_byte(0xF0); - } + emit_byte(0xF0); } void Assembler::lzcntl(Register dst, Register src) { diff -r 7a40901e0d5c -r 0e8ca886e4e1 src/os/windows/vm/jvm_windows.h --- a/src/os/windows/vm/jvm_windows.h Mon Oct 08 16:48:52 2012 -0700 +++ b/src/os/windows/vm/jvm_windows.h Mon Oct 08 16:59:44 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -61,8 +61,6 @@ typedef int socklen_t; -// #include "jni.h" - #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"} #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"} #define JVM_ONLOAD_SYMBOLS {"_JVM_OnLoad@12", "JVM_OnLoad"} @@ -108,10 +106,7 @@ * File I/O */ -// #include -// #include -// #include -// #include +#include /* O Flags */ diff -r 7a40901e0d5c -r 0e8ca886e4e1 src/share/vm/prims/jni.cpp --- a/src/share/vm/prims/jni.cpp Mon Oct 08 16:48:52 2012 -0700 +++ b/src/share/vm/prims/jni.cpp Mon Oct 08 16:59:44 2012 -0700 @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2820,10 +2821,9 @@ JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \ JNIWrapper("Set" XSTR(Result) "Field"); \ \ - HS_DTRACE_PROBE_CDECL_N(hotspot_jni, Set##Result##Field__entry, \ - ( JNIEnv*, jobject, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ - HS_DTRACE_PROBE_N(hotspot_jni, Set##Result##Field__entry, \ - ( env, obj, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ + FP_SELECT_##Result( \ + DTRACE_PROBE4(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID, value), \ + DTRACE_PROBE3(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID)); \ \ oop o = JNIHandles::resolve_non_null(obj); \ Klass* k = o->klass(); \ @@ -3130,10 +3130,9 @@ \ JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \ JNIWrapper("SetStatic" XSTR(Result) "Field"); \ - HS_DTRACE_PROBE_CDECL_N(hotspot_jni, SetStatic##Result##Field__entry,\ - ( JNIEnv*, jclass, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ - HS_DTRACE_PROBE_N(hotspot_jni, SetStatic##Result##Field__entry, \ - ( env, clazz, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ + FP_SELECT_##Result( \ + DTRACE_PROBE4(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID, value), \ + DTRACE_PROBE3(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID)); \ \ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \ assert(id->is_static_field_id(), "invalid static field id"); \ diff -r 7a40901e0d5c -r 0e8ca886e4e1 src/share/vm/runtime/globals.hpp --- a/src/share/vm/runtime/globals.hpp Mon Oct 08 16:48:52 2012 -0700 +++ b/src/share/vm/runtime/globals.hpp Mon Oct 08 16:59:44 2012 -0700 @@ -1066,9 +1066,6 @@ \ product(bool, MonitorInUseLists, false, "Track Monitors for Deflation") \ \ - product(intx, Atomics, 0, \ - "(Unsafe,Unstable) Diagnostic - Controls emission of atomics") \ - \ product(intx, SyncFlags, 0, "(Unsafe,Unstable) Experimental Sync flags" ) \ \ product(intx, SyncVerbose, 0, "(Unstable)" ) \ diff -r 7a40901e0d5c -r 0e8ca886e4e1 src/share/vm/utilities/dtrace.hpp --- a/src/share/vm/utilities/dtrace.hpp Mon Oct 08 16:48:52 2012 -0700 +++ b/src/share/vm/utilities/dtrace.hpp Mon Oct 08 16:59:44 2012 -0700 @@ -1,5 +1,6 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2012 Red Hat, Inc. * 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,13 +33,17 @@ #define DTRACE_ONLY(x) x #define NOT_DTRACE(x) +#if defined(SOLARIS) // Work around dtrace tail call bug 6672627 until it is fixed in solaris 10. #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \ do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0) -#if defined(SOLARIS) +#define USDT1 1 +#elif defined(LINUX) +#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() #define USDT1 1 #elif defined(__APPLE__) +#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() #define USDT2 1 #include #include "dtracefiles/hotspot.h" @@ -63,6 +68,11 @@ #define DTRACE_PROBE3(a,b,c,d,e) {;} #define DTRACE_PROBE4(a,b,c,d,e,f) {;} #define DTRACE_PROBE5(a,b,c,d,e,f,g) {;} +#define DTRACE_PROBE6(a,b,c,d,e,f,g,h) {;} +#define DTRACE_PROBE7(a,b,c,d,e,f,g,h,i) {;} +#define DTRACE_PROBE8(a,b,c,d,e,f,g,h,i,j) {;} +#define DTRACE_PROBE9(a,b,c,d,e,f,g,h,i,j,k) {;} +#define DTRACE_PROBE10(a,b,c,d,e,f,g,h,i,j,k,l) {;} #else /* USDT2 */ @@ -76,10 +86,18 @@ #define HS_DTRACE_PROBE_FN(provider,name)\ __dtrace_##provider##___##name +#ifdef SOLARIS +// Solaris dtrace needs actual extern function decls. #define HS_DTRACE_PROBE_DECL_N(provider,name,args) \ DTRACE_ONLY(extern "C" void HS_DTRACE_PROBE_FN(provider,name) args) #define HS_DTRACE_PROBE_CDECL_N(provider,name,args) \ DTRACE_ONLY(extern void HS_DTRACE_PROBE_FN(provider,name) args) +#else +// Systemtap dtrace compatible probes on GNU/Linux don't. +// If dtrace is disabled this macro becomes NULL +#define HS_DTRACE_PROBE_DECL_N(provider,name,args) +#define HS_DTRACE_PROBE_CDECL_N(provider,name,args) +#endif /* Dtrace probe declarations */ #define HS_DTRACE_PROBE_DECL(provider,name) \ @@ -118,6 +136,8 @@ uintptr_t,uintptr_t,uintptr_t)) /* Dtrace probe definitions */ +#if defined(SOLARIS) +// Solaris dtrace uses actual function calls. #define HS_DTRACE_PROBE_N(provider,name, args) \ DTRACE_ONLY(HS_DTRACE_PROBE_FN(provider,name) args) @@ -153,6 +173,33 @@ HS_DTRACE_PROBE_N(provider,name,((uintptr_t)a0,(uintptr_t)a1,(uintptr_t)a2,\ (uintptr_t)a3,(uintptr_t)a4,(uintptr_t)a5,(uintptr_t)a6,(uintptr_t)a7,\ (uintptr_t)a8,(uintptr_t)a9)) +#else +// Systemtap dtrace compatible probes on GNU/Linux use direct macros. +// If dtrace is disabled this macro becomes NULL +#define HS_DTRACE_PROBE(provider,name) HS_DTRACE_PROBE0(provider,name) +#define HS_DTRACE_PROBE0(provider,name)\ + DTRACE_PROBE(provider,name) +#define HS_DTRACE_PROBE1(provider,name,a0)\ + DTRACE_PROBE1(provider,name,a0) +#define HS_DTRACE_PROBE2(provider,name,a0,a1)\ + DTRACE_PROBE2(provider,name,a0,a1) +#define HS_DTRACE_PROBE3(provider,name,a0,a1,a2)\ + DTRACE_PROBE3(provider,name,a0,a1,a2) +#define HS_DTRACE_PROBE4(provider,name,a0,a1,a2,a3)\ + DTRACE_PROBE4(provider,name,a0,a1,a2,a3) +#define HS_DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4)\ + DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4) +#define HS_DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5)\ + DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5) +#define HS_DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6)\ + DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6) +#define HS_DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7)\ + DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7) +#define HS_DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ + DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) +#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9)\ + DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9) +#endif #endif /* !USDT2 */ diff -r 7a40901e0d5c -r 0e8ca886e4e1 test/runtime/7194254/Test7194254.java --- a/test/runtime/7194254/Test7194254.java Mon Oct 08 16:48:52 2012 -0700 +++ b/test/runtime/7194254/Test7194254.java Mon Oct 08 16:59:44 2012 -0700 @@ -27,7 +27,7 @@ * @summary Creates several threads with different java priorities and checks * whether jstack reports correct priorities for them. * - * @run main T7194254 + * @run main Test7194254 */ import java.io.BufferedReader;