Tue, 12 Oct 2010 09:36:48 -0700
6971296: G1: simplify G1RemSet class hierarchy
Summary: Remove G1RemSet base class and StupidG1RemSet class; rename HRInto_G1RemSet to just G1RemSet.
Reviewed-by: ysr, tonyp
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 | |
ysr@777 | 25 | inline size_t G1RemSet::n_workers() { |
ysr@777 | 26 | if (_g1->workers() != NULL) { |
ysr@777 | 27 | return _g1->workers()->total_workers(); |
ysr@777 | 28 | } else { |
ysr@777 | 29 | return 1; |
ysr@777 | 30 | } |
ysr@777 | 31 | } |
ysr@777 | 32 | |
johnc@2216 | 33 | template <class T> |
johnc@2216 | 34 | inline void G1RemSet::write_ref_nv(HeapRegion* from, T* p) { |
ysr@1280 | 35 | par_write_ref_nv(from, p, 0); |
ysr@777 | 36 | } |
ysr@777 | 37 | |
johnc@2216 | 38 | inline bool G1RemSet::self_forwarded(oop obj) { |
ysr@777 | 39 | bool result = (obj->is_forwarded() && (obj->forwardee()== obj)); |
ysr@777 | 40 | return result; |
ysr@777 | 41 | } |
ysr@777 | 42 | |
johnc@2216 | 43 | template <class T> |
johnc@2216 | 44 | inline void G1RemSet::par_write_ref_nv(HeapRegion* from, T* p, int tid) { |
ysr@1280 | 45 | oop obj = oopDesc::load_decode_heap_oop(p); |
ysr@777 | 46 | #ifdef ASSERT |
ysr@777 | 47 | // can't do because of races |
ysr@777 | 48 | // assert(obj == NULL || obj->is_oop(), "expected an oop"); |
ysr@777 | 49 | |
ysr@777 | 50 | // Do the safe subset of is_oop |
ysr@777 | 51 | if (obj != NULL) { |
ysr@777 | 52 | #ifdef CHECK_UNHANDLED_OOPS |
ysr@777 | 53 | oopDesc* o = obj.obj(); |
ysr@777 | 54 | #else |
ysr@777 | 55 | oopDesc* o = obj; |
ysr@777 | 56 | #endif // CHECK_UNHANDLED_OOPS |
ysr@777 | 57 | assert((intptr_t)o % MinObjAlignmentInBytes == 0, "not oop aligned"); |
ysr@777 | 58 | assert(Universe::heap()->is_in_reserved(obj), "must be in heap"); |
ysr@777 | 59 | } |
ysr@777 | 60 | #endif // ASSERT |
johnc@2060 | 61 | |
johnc@2060 | 62 | assert(from == NULL || from->is_in_reserved(p), "p is not in from"); |
johnc@2060 | 63 | |
ysr@777 | 64 | HeapRegion* to = _g1->heap_region_containing(obj); |
ysr@777 | 65 | // The test below could be optimized by applying a bit op to to and from. |
ysr@777 | 66 | if (to != NULL && from != NULL && from != to) { |
johnc@2063 | 67 | // The _traversal_in_progress flag is true during the collection pause, |
johnc@2063 | 68 | // false during the evacuation failure handling. This should avoid a |
johnc@2060 | 69 | // potential loop if we were to add the card containing 'p' to the DCQS |
johnc@2060 | 70 | // that's used to regenerate the remembered sets for the collection set, |
johnc@2060 | 71 | // in the event of an evacuation failure, here. The UpdateRSImmediate |
johnc@2060 | 72 | // closure will eventally call this routine. |
johnc@2063 | 73 | if (_traversal_in_progress && |
iveresov@1051 | 74 | to->in_collection_set() && !self_forwarded(obj)) { |
johnc@2060 | 75 | |
johnc@2060 | 76 | assert(_cset_rs_update_cl[tid] != NULL, "should have been set already"); |
johnc@2060 | 77 | _cset_rs_update_cl[tid]->do_oop(p); |
johnc@2060 | 78 | |
johnc@2060 | 79 | // Deferred updates to the CSet are either discarded (in the normal case), |
iveresov@1051 | 80 | // or processed (if an evacuation failure occurs) at the end |
iveresov@1051 | 81 | // of the collection. |
johnc@2216 | 82 | // See G1RemSet::cleanup_after_oops_into_collection_set_do(). |
apetrusenko@1112 | 83 | } else { |
ysr@777 | 84 | #if G1_REM_SET_LOGGING |
ysr@777 | 85 | gclog_or_tty->print_cr("Adding " PTR_FORMAT " (" PTR_FORMAT ") to RS" |
ysr@777 | 86 | " for region [" PTR_FORMAT ", " PTR_FORMAT ")", |
ysr@777 | 87 | p, obj, |
ysr@777 | 88 | to->bottom(), to->end()); |
ysr@777 | 89 | #endif |
ysr@777 | 90 | assert(to->rem_set() != NULL, "Need per-region 'into' remsets."); |
apetrusenko@1112 | 91 | to->rem_set()->add_reference(p, tid); |
ysr@777 | 92 | } |
ysr@777 | 93 | } |
ysr@777 | 94 | } |
apetrusenko@1061 | 95 | |
johnc@2216 | 96 | template <class T> |
johnc@2216 | 97 | inline void UpdateRSOopClosure::do_oop_work(T* p) { |
apetrusenko@1061 | 98 | assert(_from != NULL, "from region must be non-NULL"); |
apetrusenko@1061 | 99 | _rs->par_write_ref(_from, p, _worker_i); |
apetrusenko@1061 | 100 | } |
johnc@2060 | 101 | |
johnc@2216 | 102 | template <class T> |
johnc@2216 | 103 | inline void UpdateRSetImmediate::do_oop_work(T* p) { |
johnc@2060 | 104 | assert(_from->is_in_reserved(p), "paranoia"); |
johnc@2060 | 105 | T heap_oop = oopDesc::load_heap_oop(p); |
johnc@2060 | 106 | if (!oopDesc::is_null(heap_oop) && !_from->is_survivor()) { |
johnc@2060 | 107 | _g1_rem_set->par_write_ref(_from, p, 0); |
johnc@2060 | 108 | } |
johnc@2060 | 109 | } |
johnc@2060 | 110 |