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
sla@5237 | 1 | # |
sla@5237 | 2 | # Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. |
sla@5237 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
sla@5237 | 4 | # |
sla@5237 | 5 | # This code is free software; you can redistribute it and/or modify it |
sla@5237 | 6 | # under the terms of the GNU General Public License version 2 only, as |
sla@5237 | 7 | # published by the Free Software Foundation. |
sla@5237 | 8 | # |
sla@5237 | 9 | # This code is distributed in the hope that it will be useful, but WITHOUT |
sla@5237 | 10 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
sla@5237 | 11 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
sla@5237 | 12 | # version 2 for more details (a copy is included in the LICENSE file that |
sla@5237 | 13 | # accompanied this code). |
sla@5237 | 14 | # |
sla@5237 | 15 | # You should have received a copy of the GNU General Public License version |
sla@5237 | 16 | # 2 along with this work; if not, write to the Free Software Foundation, |
sla@5237 | 17 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
sla@5237 | 18 | # |
sla@5237 | 19 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
sla@5237 | 20 | # or visit www.oracle.com if you need additional information or have any |
sla@5237 | 21 | # questions. |
sla@5237 | 22 | # |
sla@5237 | 23 | # |
sla@5237 | 24 | |
sla@5237 | 25 | # This makefile (trace.make) is included from the trace.make in the |
sla@5237 | 26 | # build directories. |
sla@5237 | 27 | # |
sla@5237 | 28 | # It knows how to build and run the tools to generate trace files. |
sla@5237 | 29 | |
sla@5237 | 30 | !include $(WorkSpace)/make/windows/makefiles/rules.make |
sla@5237 | 31 | |
sla@5237 | 32 | # ######################################################################### |
sla@5237 | 33 | |
sla@5237 | 34 | |
sla@5237 | 35 | TraceAltSrcDir = $(WorkSpace)/src/closed/share/vm/trace |
sla@5237 | 36 | TraceSrcDir = $(WorkSpace)/src/share/vm/trace |
sla@5237 | 37 | |
sla@5237 | 38 | TraceGeneratedNames = \ |
sla@5237 | 39 | traceEventClasses.hpp \ |
sla@5237 | 40 | traceEventIds.hpp \ |
sla@5237 | 41 | traceTypes.hpp |
sla@5237 | 42 | |
sla@5237 | 43 | |
sla@5237 | 44 | !if "$(OPENJDK)" != "true" |
sla@5237 | 45 | TraceGeneratedNames = $(TraceGeneratedNames) \ |
sla@5237 | 46 | traceRequestables.hpp \ |
sla@5237 | 47 | traceEventControl.hpp \ |
sla@5237 | 48 | traceProducer.cpp |
sla@5237 | 49 | !endif |
sla@5237 | 50 | |
sla@5237 | 51 | |
sla@5237 | 52 | #Note: TraceGeneratedFiles must be kept in sync with TraceGeneratedNames by hand. |
sla@5237 | 53 | #Should be equivalent to "TraceGeneratedFiles = $(TraceGeneratedNames:%=$(TraceOutDir)/%)" |
sla@5237 | 54 | TraceGeneratedFiles = \ |
sla@5237 | 55 | $(TraceOutDir)/traceEventClasses.hpp \ |
sla@5237 | 56 | $(TraceOutDir)/traceEventIds.hpp \ |
sla@5237 | 57 | $(TraceOutDir)/traceTypes.hpp |
sla@5237 | 58 | |
sla@5237 | 59 | !if "$(OPENJDK)" != "true" |
sla@5237 | 60 | TraceGeneratedFiles = $(TraceGeneratedFiles) \ |
sla@5237 | 61 | $(TraceOutDir)/traceRequestables.hpp \ |
sla@5237 | 62 | $(TraceOutDir)/traceEventControl.hpp \ |
sla@5237 | 63 | $(TraceOutDir)/traceProducer.cpp |
sla@5237 | 64 | !endif |
sla@5237 | 65 | |
sla@5237 | 66 | XSLT = $(QUIETLY) $(REMOTE) $(RUN_JAVA) -classpath $(JvmtiOutDir) jvmtiGen |
sla@5237 | 67 | |
sla@5237 | 68 | XML_DEPS = $(TraceSrcDir)/trace.xml $(TraceSrcDir)/tracetypes.xml \ |
sla@5237 | 69 | $(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod |
sla@5237 | 70 | |
sla@5237 | 71 | !if "$(OPENJDK)" != "true" |
sla@5237 | 72 | XML_DEPS = $(XML_DEPS) $(TraceAltSrcDir)/traceevents.xml |
sla@5237 | 73 | !endif |
sla@5237 | 74 | |
sla@5237 | 75 | .PHONY: all clean cleanall |
sla@5237 | 76 | |
sla@5237 | 77 | # ######################################################################### |
sla@5237 | 78 | |
sla@5237 | 79 | default:: |
sla@5237 | 80 | @if not exist $(TraceOutDir) mkdir $(TraceOutDir) |
sla@5237 | 81 | |
sla@5237 | 82 | $(TraceOutDir)/traceEventIds.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventIds.xsl $(XML_DEPS) |
sla@5237 | 83 | @echo Generating $@ |
sla@5237 | 84 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceEventIds.xsl -OUT $(TraceOutDir)/traceEventIds.hpp |
sla@5237 | 85 | |
sla@5237 | 86 | $(TraceOutDir)/traceTypes.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceTypes.xsl $(XML_DEPS) |
sla@5237 | 87 | @echo Generating $@ |
sla@5237 | 88 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceTypes.xsl -OUT $(TraceOutDir)/traceTypes.hpp |
sla@5237 | 89 | |
sla@5237 | 90 | !if "$(OPENJDK)" == "true" |
sla@5237 | 91 | |
sla@5237 | 92 | $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventClasses.xsl $(XML_DEPS) |
dcubed@5500 | 93 | @echo Generating OpenJDK $@ |
sla@5237 | 94 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceEventClasses.xsl -OUT $(TraceOutDir)/traceEventClasses.hpp |
sla@5237 | 95 | |
sla@5237 | 96 | !else |
sla@5237 | 97 | |
sla@5237 | 98 | $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceAltSrcDir)/traceEventClasses.xsl $(XML_DEPS) |
dcubed@5500 | 99 | @echo Generating AltSrc $@ |
sla@5237 | 100 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceAltSrcDir)/traceEventClasses.xsl -OUT $(TraceOutDir)/traceEventClasses.hpp |
sla@5237 | 101 | |
sla@5237 | 102 | $(TraceOutDir)/traceProducer.cpp: $(TraceSrcDir)/trace.xml $(TraceAltSrcDir)/traceProducer.xsl $(XML_DEPS) |
dcubed@5500 | 103 | @echo Generating AltSrc $@ |
sla@5237 | 104 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceAltSrcDir)/traceProducer.xsl -OUT $(TraceOutDir)/traceProducer.cpp |
sla@5237 | 105 | |
sla@5237 | 106 | $(TraceOutDir)/traceRequestables.hpp: $(TraceSrcDir)/trace.xml $(TraceAltSrcDir)/traceRequestables.xsl $(XML_DEPS) |
dcubed@5500 | 107 | @echo Generating AltSrc $@ |
sla@5237 | 108 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceAltSrcDir)/traceRequestables.xsl -OUT $(TraceOutDir)/traceRequestables.hpp |
sla@5237 | 109 | |
sla@5237 | 110 | $(TraceOutDir)/traceEventControl.hpp: $(TraceSrcDir)/trace.xml $(TraceAltSrcDir)/traceEventControl.xsl $(XML_DEPS) |
dcubed@5500 | 111 | @echo Generating AltSrc $@ |
sla@5237 | 112 | @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceAltSrcDir)/traceEventControl.xsl -OUT $(TraceOutDir)/traceEventControl.hpp |
sla@5237 | 113 | |
sla@5237 | 114 | !endif |
sla@5237 | 115 | |
sla@5237 | 116 | # ######################################################################### |
sla@5237 | 117 | |
sla@5237 | 118 | cleanall : |
sla@5237 | 119 | rm $(TraceGeneratedFiles) |
sla@5237 | 120 | |
sla@5237 | 121 |