Mercurial > hg > graal-jvmci-8
view src/share/vm/memory/gcLocker.inline.hpp @ 3293:1f4413413144
7039089: G1: changeset for 7037276 broke heap verification, and related cleanups
Summary: In G1 heap verification, we no longer scan perm to G1-collected heap refs as part of process_strong_roots() but rather in a separate explicit oop iteration over the perm gen. This preserves the original perm card-marks. Added a new assertion in younger_refs_iterate() to catch a simple subcase where the user may have forgotten a prior save_marks() call, as happened in the case of G1's attempt to iterate perm to G1 refs when verifying the heap before exit. The assert was deliberately weakened for ParNew+CMS and will be fixed for that combination in a future CR. Also made some (non-G1) cleanups related to code and comments obsoleted by the migration of Symbols to the native heap.
Reviewed-by: iveresov, jmasa, tonyp
author | ysr |
---|---|
date | Tue, 26 Apr 2011 21:17:24 -0700 |
parents | f95d63e2154a |
children | 1a2723f7ad8e |
line wrap: on
line source
/* * Copyright (c) 2000, 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. * * 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. * */ #ifndef SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP #define SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP #include "memory/gcLocker.hpp" inline bool GC_locker::is_active() { return _lock_count > 0 || _jni_lock_count > 0; } inline bool GC_locker::check_active_before_gc() { if (is_active()) { set_needs_gc(); } return is_active(); } inline void GC_locker::lock() { // cast away volatile Atomic::inc(&_lock_count); CHECK_UNHANDLED_OOPS_ONLY( if (CheckUnhandledOops) { Thread::current()->_gc_locked_out_count++; }) assert(Universe::heap() == NULL || !Universe::heap()->is_gc_active(), "locking failed"); } inline void GC_locker::unlock() { // cast away volatile Atomic::dec(&_lock_count); CHECK_UNHANDLED_OOPS_ONLY( if (CheckUnhandledOops) { Thread::current()->_gc_locked_out_count--; }) } inline void GC_locker::lock_critical(JavaThread* thread) { if (!thread->in_critical()) { if (!needs_gc()) { jni_lock(); } else { jni_lock_slow(); } } thread->enter_critical(); } inline void GC_locker::unlock_critical(JavaThread* thread) { thread->exit_critical(); if (!thread->in_critical()) { if (!needs_gc()) { jni_unlock(); } else { jni_unlock_slow(); } } } #endif // SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP