Mercurial > hg > truffle

view make/hotspot_version @ 1994:6cd6d394f280

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7001033: assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed()) 7002546: regression on SpecJbb2005 on 7b118 comparing to 7b117 on small heaps Summary: Relaxed assertion checking related to incremental_collection_failed flag to allow for ExplicitGCInvokesConcurrent behaviour where we do not want a failing scavenge to bail to a stop-world collection. Parameterized incremental_collection_will_fail() so we can selectively use, or not use, as appropriate, the statistical prediction at specific use sites. This essentially reverts the scavenge bail-out logic to what it was prior to some recent changes that had inadvertently started using the statistical prediction which can be noisy in the presence of bursty loads. Added some associated verbose non-product debugging messages. Reviewed-by: johnc, tonyp
author ysr
date Tue, 07 Dec 2010 21:55:53 -0800
parents 5484e7c53fa7
children 0d4395745860
line wrap: on
line source

# 
# Copyright (c) 2006, 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
# 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.
# 

#
# 

#
# Master Hotspot version file.  These values may be overridden by a control
# workspace build.  This file format must remain compatible with both
# GNU Makefile and Microsoft nmake formats.
#

# Don't put quotes (fail windows build).
HOTSPOT_VM_COPYRIGHT=Copyright 2010

HS_MAJOR_VER=20
HS_MINOR_VER=0
HS_BUILD_NUMBER=03

JDK_MAJOR_VER=1
JDK_MINOR_VER=7
JDK_MICRO_VER=0

# Previous (bootdir) JDK version
JDK_PREVIOUS_VERSION=1.6.0