Fri, 18 Feb 2011 10:07:34 -0800
7020042: G1: Partially remove fix for 6994628
Summary: Disable reference discovery and processing during concurrent marking by disabling fix for 6994628.
Reviewed-by: tonyp, ysr
ysr@777 | 1 | /* |
johnc@2060 | 2 | * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. |
ysr@777 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ysr@777 | 4 | * |
ysr@777 | 5 | * This code is free software; you can redistribute it and/or modify it |
ysr@777 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ysr@777 | 7 | * published by the Free Software Foundation. |
ysr@777 | 8 | * |
ysr@777 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
ysr@777 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ysr@777 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ysr@777 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
ysr@777 | 13 | * accompanied this code). |
ysr@777 | 14 | * |
ysr@777 | 15 | * You should have received a copy of the GNU General Public License version |
ysr@777 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
ysr@777 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ysr@777 | 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. |
ysr@777 | 22 | * |
ysr@777 | 23 | */ |
ysr@777 | 24 | |
stefank@2314 | 25 | #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "gc_implementation/g1/g1RemSet.hpp" |
stefank@2314 | 29 | #include "gc_implementation/g1/heapRegionRemSet.hpp" |
stefank@2314 | 30 | #include "oops/oop.inline.hpp" |
stefank@2314 | 31 | |
ysr@777 | 32 | inline size_t G1RemSet::n_workers() { |
ysr@777 | 33 | if (_g1->workers() != NULL) { |
ysr@777 | 34 | return _g1->workers()->total_workers(); |
ysr@777 | 35 | } else { |
ysr@777 | 36 | return 1; |
ysr@777 | 37 | } |
ysr@777 | 38 | } |
ysr@777 | 39 | |
johnc@2216 | 40 | template <class T> |
johnc@2302 | 41 | inline void G1RemSet::write_ref(HeapRegion* from, T* p) { |
johnc@2302 | 42 | par_write_ref(from, p, 0); |
ysr@777 | 43 | } |
ysr@777 | 44 | |
johnc@2216 | 45 | template <class T> |
johnc@2302 | 46 | inline void G1RemSet::par_write_ref(HeapRegion* from, T* p, int tid) { |
ysr@1280 | 47 | oop obj = oopDesc::load_decode_heap_oop(p); |
ysr@777 | 48 | #ifdef ASSERT |
ysr@777 | 49 | // can't do because of races |
ysr@777 | 50 | // assert(obj == NULL || obj->is_oop(), "expected an oop"); |
ysr@777 | 51 | |
ysr@777 | 52 | // Do the safe subset of is_oop |
ysr@777 | 53 | if (obj != NULL) { |
ysr@777 | 54 | #ifdef CHECK_UNHANDLED_OOPS |
ysr@777 | 55 | oopDesc* o = obj.obj(); |
ysr@777 | 56 | #else |
ysr@777 | 57 | oopDesc* o = obj; |
ysr@777 | 58 | #endif // CHECK_UNHANDLED_OOPS |
ysr@777 | 59 | assert((intptr_t)o % MinObjAlignmentInBytes == 0, "not oop aligned"); |
ysr@777 | 60 | assert(Universe::heap()->is_in_reserved(obj), "must be in heap"); |
ysr@777 | 61 | } |
ysr@777 | 62 | #endif // ASSERT |
johnc@2060 | 63 | |
johnc@2060 | 64 | assert(from == NULL || from->is_in_reserved(p), "p is not in from"); |
johnc@2060 | 65 | |
ysr@777 | 66 | HeapRegion* to = _g1->heap_region_containing(obj); |
johnc@2302 | 67 | if (to != NULL && from != to) { |
ysr@777 | 68 | #if G1_REM_SET_LOGGING |
johnc@2302 | 69 | gclog_or_tty->print_cr("Adding " PTR_FORMAT " (" PTR_FORMAT ") to RS" |
johnc@2302 | 70 | " for region [" PTR_FORMAT ", " PTR_FORMAT ")", |
johnc@2302 | 71 | p, obj, |
johnc@2302 | 72 | to->bottom(), to->end()); |
ysr@777 | 73 | #endif |
johnc@2302 | 74 | assert(to->rem_set() != NULL, "Need per-region 'into' remsets."); |
johnc@2302 | 75 | to->rem_set()->add_reference(p, tid); |
ysr@777 | 76 | } |
ysr@777 | 77 | } |
apetrusenko@1061 | 78 | |
johnc@2216 | 79 | template <class T> |
johnc@2216 | 80 | inline void UpdateRSOopClosure::do_oop_work(T* p) { |
apetrusenko@1061 | 81 | assert(_from != NULL, "from region must be non-NULL"); |
apetrusenko@1061 | 82 | _rs->par_write_ref(_from, p, _worker_i); |
apetrusenko@1061 | 83 | } |
johnc@2060 | 84 | |
johnc@2216 | 85 | template <class T> |
johnc@2216 | 86 | inline void UpdateRSetImmediate::do_oop_work(T* p) { |
johnc@2060 | 87 | assert(_from->is_in_reserved(p), "paranoia"); |
johnc@2060 | 88 | T heap_oop = oopDesc::load_heap_oop(p); |
johnc@2060 | 89 | if (!oopDesc::is_null(heap_oop) && !_from->is_survivor()) { |
johnc@2060 | 90 | _g1_rem_set->par_write_ref(_from, p, 0); |
johnc@2060 | 91 | } |
johnc@2060 | 92 | } |
johnc@2060 | 93 | |
johnc@2302 | 94 | template <class T> |
johnc@2302 | 95 | inline void UpdateRSOrPushRefOopClosure::do_oop_work(T* p) { |
johnc@2302 | 96 | oop obj = oopDesc::load_decode_heap_oop(p); |
johnc@2302 | 97 | #ifdef ASSERT |
johnc@2302 | 98 | // can't do because of races |
johnc@2302 | 99 | // assert(obj == NULL || obj->is_oop(), "expected an oop"); |
johnc@2302 | 100 | |
johnc@2302 | 101 | // Do the safe subset of is_oop |
johnc@2302 | 102 | if (obj != NULL) { |
johnc@2302 | 103 | #ifdef CHECK_UNHANDLED_OOPS |
johnc@2302 | 104 | oopDesc* o = obj.obj(); |
johnc@2302 | 105 | #else |
johnc@2302 | 106 | oopDesc* o = obj; |
johnc@2302 | 107 | #endif // CHECK_UNHANDLED_OOPS |
johnc@2302 | 108 | assert((intptr_t)o % MinObjAlignmentInBytes == 0, "not oop aligned"); |
johnc@2302 | 109 | assert(Universe::heap()->is_in_reserved(obj), "must be in heap"); |
johnc@2302 | 110 | } |
johnc@2302 | 111 | #endif // ASSERT |
johnc@2302 | 112 | |
johnc@2302 | 113 | assert(_from != NULL, "from region must be non-NULL"); |
johnc@2302 | 114 | |
johnc@2302 | 115 | HeapRegion* to = _g1->heap_region_containing(obj); |
johnc@2302 | 116 | if (to != NULL && _from != to) { |
johnc@2302 | 117 | // The _record_refs_into_cset flag is true during the RSet |
johnc@2302 | 118 | // updating part of an evacuation pause. It is false at all |
johnc@2302 | 119 | // other times: |
johnc@2302 | 120 | // * rebuilding the rembered sets after a full GC |
johnc@2302 | 121 | // * during concurrent refinement. |
johnc@2302 | 122 | // * updating the remembered sets of regions in the collection |
johnc@2302 | 123 | // set in the event of an evacuation failure (when deferred |
johnc@2302 | 124 | // updates are enabled). |
johnc@2302 | 125 | |
johnc@2302 | 126 | if (_record_refs_into_cset && to->in_collection_set()) { |
johnc@2302 | 127 | // We are recording references that point into the collection |
johnc@2302 | 128 | // set and this particular reference does exactly that... |
johnc@2302 | 129 | // If the referenced object has already been forwarded |
johnc@2302 | 130 | // to itself, we are handling an evacuation failure and |
johnc@2302 | 131 | // we have already visited/tried to copy this object |
johnc@2302 | 132 | // there is no need to retry. |
johnc@2302 | 133 | if (!self_forwarded(obj)) { |
johnc@2302 | 134 | assert(_push_ref_cl != NULL, "should not be null"); |
johnc@2302 | 135 | // Push the reference in the refs queue of the G1ParScanThreadState |
johnc@2302 | 136 | // instance for this worker thread. |
johnc@2302 | 137 | _push_ref_cl->do_oop(p); |
johnc@2302 | 138 | } |
johnc@2302 | 139 | |
johnc@2302 | 140 | // Deferred updates to the CSet are either discarded (in the normal case), |
johnc@2302 | 141 | // or processed (if an evacuation failure occurs) at the end |
johnc@2302 | 142 | // of the collection. |
johnc@2302 | 143 | // See G1RemSet::cleanup_after_oops_into_collection_set_do(). |
johnc@2302 | 144 | } else { |
johnc@2302 | 145 | // We either don't care about pushing references that point into the |
johnc@2302 | 146 | // collection set (i.e. we're not during an evacuation pause) _or_ |
johnc@2302 | 147 | // the reference doesn't point into the collection set. Either way |
johnc@2302 | 148 | // we add the reference directly to the RSet of the region containing |
johnc@2302 | 149 | // the referenced object. |
johnc@2302 | 150 | _g1_rem_set->par_write_ref(_from, p, _worker_i); |
johnc@2302 | 151 | } |
johnc@2302 | 152 | } |
johnc@2302 | 153 | } |
johnc@2302 | 154 | |
stefank@2314 | 155 | |
stefank@2314 | 156 | #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP |