Mercurial > hg > truffle
annotate src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.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 | da91efe96a93 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 1972 | 2 * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
| 0 | 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 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
941
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
941
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
941
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP |
| 26 #define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP | |
| 27 | |
| 28 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp" | |
| 29 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" | |
| 30 | |
| 0 | 31 // Trim our work_queue so its length is below max at return |
| 32 inline void Par_MarkRefsIntoAndScanClosure::trim_queue(uint max) { | |
| 33 while (_work_queue->size() > max) { | |
| 34 oop newOop; | |
| 35 if (_work_queue->pop_local(newOop)) { | |
| 36 assert(newOop->is_oop(), "Expected an oop"); | |
| 37 assert(_bit_map->isMarked((HeapWord*)newOop), | |
| 38 "only grey objects on this stack"); | |
| 39 // iterate over the oops in this oop, marking and pushing | |
| 40 // the ones in CMS heap (i.e. in _span). | |
| 41 newOop->oop_iterate(&_par_pushAndMarkClosure); | |
| 42 } | |
| 43 } | |
| 44 } | |
| 45 | |
| 935 | 46 #ifndef PRODUCT |
| 47 void KlassRememberingOopClosure::check_remember_klasses() const { | |
| 48 assert(_should_remember_klasses == must_remember_klasses(), | |
| 49 "Should remember klasses in this context."); | |
| 50 } | |
| 51 #endif | |
| 52 | |
| 53 void KlassRememberingOopClosure::remember_klass(Klass* k) { | |
| 54 if (!_revisit_stack->push(oop(k))) { | |
| 0 | 55 fatal("Revisit stack overflow in PushOrMarkClosure"); |
| 56 } | |
| 935 | 57 check_remember_klasses(); |
| 0 | 58 } |
| 59 | |
| 941 | 60 inline void PushOrMarkClosure::remember_mdo(DataLayout* v) { |
| 61 // TBD | |
| 62 } | |
| 63 | |
| 64 | |
| 935 | 65 void Par_KlassRememberingOopClosure::remember_klass(Klass* k) { |
| 0 | 66 if (!_revisit_stack->par_push(oop(k))) { |
| 941 | 67 fatal("Revisit stack overflow in Par_KlassRememberingOopClosure"); |
| 0 | 68 } |
| 935 | 69 check_remember_klasses(); |
| 0 | 70 } |
| 71 | |
| 941 | 72 inline void Par_PushOrMarkClosure::remember_mdo(DataLayout* v) { |
| 73 // TBD | |
| 74 } | |
| 75 | |
| 0 | 76 inline void PushOrMarkClosure::do_yield_check() { |
| 77 _parent->do_yield_check(); | |
| 78 } | |
| 79 | |
| 80 inline void Par_PushOrMarkClosure::do_yield_check() { | |
| 81 _parent->do_yield_check(); | |
| 82 } | |
| 1972 | 83 |
| 84 #endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP |