7089625: G1: policy for how many old regions to add to the CSet (when young gen is fixed) is broken
Summary: When refactoring the code for a previous fix, a condition was not correctly negated which prevents the G1 policy from adding the correct number of old regions to the CSet when the young gen size is fixed. The changeset also fixes a small syntactical issue in g1ErgoVerbose.hpp which is causing compiler warnings.
Reviewed-by: brutisso, ysr
<?xml version="1.0"?>
<!--
Copyright (c) 2009, 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
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.
-->
<project name="jaxp_defs" default="all" basedir=".">
<!-- Specific build properties. -->
<property file="jaxp.properties"/>
<!-- Where generated xml files will stay. -->
<property name="xml.gen.dir" value="${build.dir}/xml_generated"/>
<property name="xml.template" value="build-drop-template.xml"/>
<!-- ############### -->
<!-- Begin Macrodefs -->
<!-- Copies template file, replaces @DROP@ pattern, and imports it. -->
<macrodef name="drop-import">
<attribute name="name"/>
<sequential>
<property name="xml.gen.@{name}" value="${xml.gen.dir}/build-drop-@{name}.xml"/>
<mkdir dir="${xml.gen.dir}"/>
<copy file="${xml.template}" tofile="${xml.gen.@{name}}"/>
<replace file="${xml.gen.@{name}}" token="@DROP@" value="@{name}"/>
<import file="${xml.gen.@{name}}"/>
</sequential>
</macrodef>
<!-- End of Macrodefs -->
<!-- ############### -->
<!-- Create xml file and import it for these drops. -->
<drop-import name="jaxp_src"/>
<!-- <drop-import name="jaxp_tests"/> -->
<!-- Fail and print helpful messages if source does not exist. -->
<target name="-src-help">
<fail message="${failed.url.src.message}">
<condition>
<and>
<not>
<available file="${jaxp_src.src.dir}" type="dir"/>
</not>
<istrue value="${allow.downloads}"/>
</and>
</condition>
</fail>
<fail message="${failed.nourl.src.message}">
<condition>
<not>
<available file="${jaxp_src.src.dir}" type="dir"/>
</not>
</condition>
</fail>
</target>
<!-- Special build area setup. -->
<target name="-drop-build-setup" depends="init, -init-src-dirs">
<mkdir dir="${build.classes.dir}"/>
<copy todir="${build.classes.dir}">
<fileset dir="${primary.src.dir}"
includes="**/*.properties"/>
</copy>
<replaceregexp match="#(.*)$" replace="#" flags="gm">
<fileset dir="${build.classes.dir}" includes="**/*.properties"/>
</replaceregexp>
</target>
<!-- Try to get drop sources. -->
<target name="-set-props"
depends="init,
jaxp_src-update">
</target>
<!-- Set up source to use drop.dir. -->
<target name="-use-drop" depends="-set-props">
<property name="primary.src.dir" value="${jaxp_src.src.dir}"/>
<path id="src.dir.id">
<pathelement path="${primary.src.dir}"/>
</path>
</target>
<!-- Source directory selection. -->
<target name="-init-src-dirs"
depends="init, -use-drop,-src-help">
<echo message="Using primary.src.dir=${primary.src.dir}"/>
<pathconvert property="src.list.id" refid="src.dir.id"/>
<echo message="Using src.dir.id=${src.list.id}"/>
</target>
<!-- Create drop src.zip. -->
<target name="-drop-src-zip" depends="init, -set-props">
<zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
</target>
<!-- Create src.zip. -->
<target name="-dist-src-zip" depends="init, -drop-src-zip">
</target>
</project>