Fri, 20 Sep 2013 10:53:28 +0200
8024974: Incorrect use of GC_locker::is_active()
Summary: SymbolTable and StringTable can make calls to GC_locker::is_active() outside a safepoint. This isn't safe because the GC_locker active state (lock count) is only updated at a safepoint and only remains valid as long as _needs_gc is true. However, outside a safepoint_needs_gc can change to false at any time, which makes it impossible to do a correct call to is_active() in that context. In this case these calls can just be removed since the input argument to basic_add() should never be on the heap and so there's no need to check the GC_locker state. This change also adjusts the assert() in is_active() to makes sure all calls to this function are always done under a safepoint.
Reviewed-by: brutisso, dcubed
Contributed-by: per.liden@oracle.com
duke@435 | 1 | # |
dcubed@3724 | 2 | # Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | # |
duke@435 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | # published by the Free Software Foundation. |
duke@435 | 8 | # |
duke@435 | 9 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | # accompanied this code). |
duke@435 | 14 | # |
duke@435 | 15 | # You should have received a copy of the GNU General Public License version |
duke@435 | 16 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | # |
trims@1907 | 19 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | # or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | # questions. |
duke@435 | 22 | # |
duke@435 | 23 | # |
duke@435 | 24 | |
duke@435 | 25 | # This makefile is used to build Serviceability Agent code |
duke@435 | 26 | # and generate JNI header file for native methods. |
duke@435 | 27 | |
duke@435 | 28 | AGENT_DIR = $(WorkSpace)/agent |
duke@435 | 29 | checkAndBuildSA:: |
duke@435 | 30 | |
duke@435 | 31 | !if "$(BUILD_WIN_SA)" != "1" |
duke@435 | 32 | # Already warned about this in build.make |
duke@435 | 33 | !else |
duke@435 | 34 | |
duke@435 | 35 | # This first part is used to build sa-jdi.jar |
kamg@526 | 36 | !include $(WorkSpace)/make/windows/makefiles/rules.make |
kamg@526 | 37 | !include $(WorkSpace)/make/sa.files |
duke@435 | 38 | |
dcubed@3990 | 39 | GENERATED = ../generated |
duke@435 | 40 | |
duke@435 | 41 | # tools.jar is needed by the JDI - SA binding |
dcubed@3990 | 42 | SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar |
duke@435 | 43 | |
dcubed@3990 | 44 | SA_CLASSDIR = $(GENERATED)/saclasses |
duke@435 | 45 | |
duke@435 | 46 | SA_BUILD_VERSION_PROP = sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION) |
duke@435 | 47 | |
dcubed@3990 | 48 | SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties |
duke@435 | 49 | |
dcubed@3990 | 50 | default:: $(GENERATED)/sa-jdi.jar |
duke@435 | 51 | |
poonam@891 | 52 | # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space |
poonam@891 | 53 | # at the end of SA version string and causes a version mismatch with the target VM version. |
poonam@891 | 54 | |
dcubed@3990 | 55 | $(GENERATED)/sa-jdi.jar: $(AGENT_FILES) |
dcubed@3990 | 56 | $(QUIETLY) mkdir -p $(SA_CLASSDIR) |
dcubed@3990 | 57 | @echo ...Building sa-jdi.jar into $(SA_CLASSDIR) |
andrew@2753 | 58 | @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... |
dcubed@3990 | 59 | @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES) |
duke@435 | 60 | $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
poonam@891 | 61 | $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES) |
poonam@746 | 62 | $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
poonam@746 | 63 | $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql |
poonam@891 | 64 | $(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
dcubed@3990 | 65 | $(QUIETLY) mkdir $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
poonam@891 | 66 | $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
poonam@891 | 67 | $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR) |
kvn@3044 | 68 | $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) . |
dcubed@3990 | 69 | $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector |
duke@435 | 70 | $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal |
duke@435 | 71 | $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext |
duke@435 | 72 | $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext |
minqi@4093 | 73 | $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.asm.Disassembler |
duke@435 | 74 | |
duke@435 | 75 | |
duke@435 | 76 | |
duke@435 | 77 | # This second part is used to build sawindbg.dll |
duke@435 | 78 | # We currently build it the same way for product, debug, and fastdebug. |
duke@435 | 79 | |
duke@435 | 80 | SAWINDBG=sawindbg.dll |
duke@435 | 81 | |
duke@435 | 82 | checkAndBuildSA:: $(SAWINDBG) |
duke@435 | 83 | |
duke@435 | 84 | # These do not need to be optimized (don't run a lot of code) and it |
duke@435 | 85 | # will be useful to have the assertion checks in place |
duke@435 | 86 | |
duke@435 | 87 | !if "$(BUILDARCH)" == "ia64" |
dcubed@3990 | 88 | SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c |
duke@435 | 89 | !elseif "$(BUILDARCH)" == "amd64" |
dcubed@3990 | 90 | SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c |
kvn@1080 | 91 | !if "$(COMPILER_NAME)" == "VS2005" |
duke@435 | 92 | # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, |
duke@435 | 93 | # otherwise we get missing __security_check_cookie externals at link time. |
erikj@3518 | 94 | SA_LD_FLAGS = bufferoverflowU.lib |
kvn@1080 | 95 | !endif |
duke@435 | 96 | !else |
dcubed@3990 | 97 | SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c |
dcubed@3724 | 98 | !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
dcubed@3990 | 99 | SA_CFLAGS = $(SA_CFLAGS) -ZI |
dcubed@3724 | 100 | !endif |
duke@435 | 101 | !endif |
tbell@862 | 102 | !if "$(MT)" != "" |
dcubed@3990 | 103 | SA_LD_FLAGS = -manifest $(SA_LD_FLAGS) |
tbell@862 | 104 | !endif |
duke@435 | 105 | SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp |
dcubed@3990 | 106 | SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE) |
dcubed@3724 | 107 | !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
dcubed@3990 | 108 | SA_LFLAGS = $(SA_LFLAGS) -map -debug |
dcubed@3724 | 109 | !endif |
duke@435 | 110 | |
duke@435 | 111 | # Note that we do not keep sawindbj.obj around as it would then |
duke@435 | 112 | # get included in the dumpbin command in build_vm_def.sh |
duke@435 | 113 | |
tbell@862 | 114 | # In VS2005 or VS2008 the link command creates a .manifest file that we want |
tbell@862 | 115 | # to insert into the linked artifact so we do not need to track it separately. |
tbell@862 | 116 | # Use ";#2" for .dll and ";#1" for .exe in the MT command below: |
duke@435 | 117 | $(SAWINDBG): $(SASRCFILE) |
duke@435 | 118 | set INCLUDE=$(SA_INCLUDE)$(INCLUDE) |
erikj@3518 | 119 | $(CXX) @<< |
dcubed@3990 | 120 | -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32" |
dcubed@3990 | 121 | -I"$(GENERATED)" $(SA_CFLAGS) |
duke@435 | 122 | $(SASRCFILE) |
dcubed@3990 | 123 | -out:$*.obj |
duke@435 | 124 | << |
duke@435 | 125 | set LIB=$(SA_LIB)$(LIB) |
dcubed@3990 | 126 | $(LD) -out:$@ -DLL $*.obj dbgeng.lib $(SA_LFLAGS) |
tbell@862 | 127 | !if "$(MT)" != "" |
dcubed@3990 | 128 | $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2 |
tbell@862 | 129 | !endif |
dcubed@3724 | 130 | !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
dcubed@3724 | 131 | !if "$(ZIP_DEBUGINFO_FILES)" == "1" |
dcubed@3724 | 132 | $(ZIPEXE) -q $*.diz $*.map $*.pdb |
dcubed@3724 | 133 | $(RM) $*.map $*.pdb |
dcubed@3724 | 134 | !endif |
dcubed@3724 | 135 | !endif |
dcubed@3724 | 136 | -@rm -f $*.obj |
duke@435 | 137 | |
duke@435 | 138 | cleanall : |
dcubed@3990 | 139 | rm -rf $(GENERATED)/saclasses |
dcubed@3990 | 140 | rm -rf $(GENERATED)/sa-jdi.jar |
duke@435 | 141 | !endif |