Print this page
Split |
Close |
Expand all |
Collapse all |
--- old/src/share/vm/memory/iterator.cpp
+++ new/src/share/vm/memory/iterator.cpp
1 1 /*
2 - * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
2 + * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20 20 * CA 95054 USA or visit www.sun.com if you need additional information or
21 21 * have any questions.
22 22 *
23 23 */
24 24
25 25 # include "incls/_precompiled.incl"
26 26 # include "incls/_iterator.cpp.incl"
27 27
28 28 #ifdef ASSERT
29 29 bool OopClosure::_must_remember_klasses = false;
30 30 #endif
31 31
32 32 void ObjectToOopClosure::do_object(oop obj) {
33 33 obj->oop_iterate(_cl);
34 34 }
35 35
36 36 void VoidClosure::do_void() {
37 37 ShouldNotCallThis();
38 38 }
39 39
40 40 #ifdef ASSERT
41 41 bool OopClosure::must_remember_klasses() {
42 42 return _must_remember_klasses;
43 43 }
44 44 void OopClosure::set_must_remember_klasses(bool v) {
45 45 _must_remember_klasses = v;
46 46 }
47 47 #endif
48 48
49 49
50 50 MarkingCodeBlobClosure::MarkScope::MarkScope(bool activate)
↓ open down ↓ |
38 lines elided |
↑ open up ↑ |
51 51 : _active(activate)
52 52 {
53 53 if (_active) nmethod::oops_do_marking_prologue();
54 54 }
55 55
56 56 MarkingCodeBlobClosure::MarkScope::~MarkScope() {
57 57 if (_active) nmethod::oops_do_marking_epilogue();
58 58 }
59 59
60 60 void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) {
61 - if (!cb->is_nmethod()) return;
62 - nmethod* nm = (nmethod*) cb;
61 + nmethod* nm = cb->as_nmethod_or_null();
62 + if (nm == NULL) return;
63 63 if (!nm->test_set_oops_do_mark()) {
64 64 NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, 1st visit\n"));
65 65 do_newly_marked_nmethod(nm);
66 66 } else {
67 67 NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, skipped on 2nd visit\n"));
68 68 }
69 69 }
70 70
71 71 void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
72 72 nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
73 73 }
74 74
75 75 void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
76 76 if (!_do_marking) {
77 - NOT_PRODUCT(if (TraceScavenge && Verbose && cb->is_nmethod()) ((nmethod*)cb)->print_on(tty, "oops_do, unmarked visit\n"));
77 + nmethod* nm = cb->as_nmethod_or_null();
78 + NOT_PRODUCT(if (TraceScavenge && Verbose && nm != NULL) nm->print_on(tty, "oops_do, unmarked visit\n"));
78 79 // This assert won't work, since there are lots of mini-passes
79 80 // (mostly in debug mode) that co-exist with marking phases.
80 81 //assert(!(cb->is_nmethod() && ((nmethod*)cb)->test_oops_do_mark()), "found marked nmethod during mark-free phase");
81 - cb->oops_do(_cl);
82 + if (nm != NULL) {
83 + nm->oops_do(_cl);
84 + }
82 85 } else {
83 86 MarkingCodeBlobClosure::do_code_blob(cb);
84 87 }
85 88 }
86 89
87 90
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX