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
1 /*
2 * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation.
8 *
9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 * version 2 for more details (a copy is included in the LICENSE file that
13 * accompanied this code).
14 *
15 * You should have received a copy of the GNU General Public License version
16 * 2 along with this work; if not, write to the Free Software Foundation,
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 *
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any
21 * questions.
22 *
23 */
25 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP
26 #define SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP
28 #include "gc_implementation/g1/concurrentMark.hpp"
29 #include "gc_implementation/g1/g1CollectedHeap.hpp"
30 #include "gc_implementation/g1/g1OopClosures.hpp"
31 #include "gc_implementation/g1/g1RemSet.hpp"
33 /*
34 * This really ought to be an inline function, but apparently the C++
35 * compiler sometimes sees fit to ignore inline declarations. Sigh.
36 */
38 // This must a ifdef'ed because the counting it controls is in a
39 // perf-critical inner loop.
40 #define FILTERINTOCSCLOSURE_DOHISTOGRAMCOUNT 0
42 template <class T> inline void FilterIntoCSClosure::do_oop_nv(T* p) {
43 T heap_oop = oopDesc::load_heap_oop(p);
44 if (!oopDesc::is_null(heap_oop) &&
45 _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop))) {
46 _oc->do_oop(p);
47 #if FILTERINTOCSCLOSURE_DOHISTOGRAMCOUNT
48 if (_dcto_cl != NULL)
49 _dcto_cl->incr_count();
50 #endif
51 }
52 }
54 #define FILTEROUTOFREGIONCLOSURE_DOHISTOGRAMCOUNT 0
56 template <class T> inline void FilterOutOfRegionClosure::do_oop_nv(T* p) {
57 T heap_oop = oopDesc::load_heap_oop(p);
58 if (!oopDesc::is_null(heap_oop)) {
59 HeapWord* obj_hw = (HeapWord*)oopDesc::decode_heap_oop_not_null(heap_oop);
60 if (obj_hw < _r_bottom || obj_hw >= _r_end) {
61 _oc->do_oop(p);
62 #if FILTEROUTOFREGIONCLOSURE_DOHISTOGRAMCOUNT
63 _out_of_region++;
64 #endif
65 }
66 }
67 }
69 template <class T> inline void FilterInHeapRegionAndIntoCSClosure::do_oop_nv(T* p) {
70 T heap_oop = oopDesc::load_heap_oop(p);
71 if (!oopDesc::is_null(heap_oop) &&
72 _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop)))
73 _oc->do_oop(p);
74 }
76 template <class T> inline void FilterAndMarkInHeapRegionAndIntoCSClosure::do_oop_nv(T* p) {
77 T heap_oop = oopDesc::load_heap_oop(p);
78 if (!oopDesc::is_null(heap_oop)) {
79 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
80 HeapRegion* hr = _g1->heap_region_containing((HeapWord*) obj);
81 if (hr != NULL) {
82 if (hr->in_collection_set())
83 _oc->do_oop(p);
84 else if (!hr->is_young())
85 _cm->grayRoot(obj);
86 }
87 }
88 }
90 // This closure is applied to the fields of the objects that have just been copied.
91 template <class T> inline void G1ParScanClosure::do_oop_nv(T* p) {
92 T heap_oop = oopDesc::load_heap_oop(p);
94 if (!oopDesc::is_null(heap_oop)) {
95 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
96 if (_g1->in_cset_fast_test(obj)) {
97 // We're not going to even bother checking whether the object is
98 // already forwarded or not, as this usually causes an immediate
99 // stall. We'll try to prefetch the object (for write, given that
100 // we might need to install the forwarding reference) and we'll
101 // get back to it when pop it from the queue
102 Prefetch::write(obj->mark_addr(), 0);
103 Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
105 // slightly paranoid test; I'm trying to catch potential
106 // problems before we go into push_on_queue to know where the
107 // problem is coming from
108 assert(obj == oopDesc::load_decode_heap_oop(p),
109 "p should still be pointing to obj");
110 _par_scan_state->push_on_queue(p);
111 } else {
112 _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
113 }
114 }
115 }
117 template <class T> inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
118 T heap_oop = oopDesc::load_heap_oop(p);
120 if (!oopDesc::is_null(heap_oop)) {
121 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
122 if (_g1->in_cset_fast_test(obj)) {
123 Prefetch::write(obj->mark_addr(), 0);
124 Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
126 // Place on the references queue
127 _par_scan_state->push_on_queue(p);
128 }
129 }
130 }
133 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP