src/share/vm/gc_implementation/shared/markSweep.cpp

Tue, 26 Nov 2013 14:35:38 +0100

author
sjohanss
date
Tue, 26 Nov 2013 14:35:38 +0100
changeset 6148
55a0da3d420b
parent 5237
f2110083203d
child 6680
78bbf4d43a14
permissions
-rw-r--r--

8027675: Full collections with Serial slower in JDK 8 compared to 7u40
Summary: Reduced the number of calls to follow_class_loader and instead marked and pushed the klass holder directly. Also removed unneeded calls to adjust_klass.
Reviewed-by: coleenp, jmasa, mgerdin, tschatzl

duke@435 1 /*
minqi@5097 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
duke@435 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
duke@435 4 *
duke@435 5 * This code is free software; you can redistribute it and/or modify it
duke@435 6 * under the terms of the GNU General Public License version 2 only, as
duke@435 7 * published by the Free Software Foundation.
duke@435 8 *
duke@435 9 * This code is distributed in the hope that it will be useful, but WITHOUT
duke@435 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
duke@435 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
duke@435 12 * version 2 for more details (a copy is included in the LICENSE file that
duke@435 13 * accompanied this code).
duke@435 14 *
duke@435 15 * You should have received a copy of the GNU General Public License version
duke@435 16 * 2 along with this work; if not, write to the Free Software Foundation,
duke@435 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
duke@435 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.
duke@435 22 *
duke@435 23 */
duke@435 24
stefank@2314 25 #include "precompiled.hpp"
stefank@2314 26 #include "compiler/compileBroker.hpp"
sla@5237 27 #include "gc_implementation/shared/gcTimer.hpp"
sla@5237 28 #include "gc_implementation/shared/gcTrace.hpp"
stefank@2314 29 #include "gc_implementation/shared/markSweep.inline.hpp"
stefank@2314 30 #include "gc_interface/collectedHeap.inline.hpp"
coleenp@4037 31 #include "oops/methodData.hpp"
stefank@2314 32 #include "oops/objArrayKlass.inline.hpp"
stefank@2314 33 #include "oops/oop.inline.hpp"
duke@435 34
tschatzl@5119 35 uint MarkSweep::_total_invocations = 0;
coleenp@4037 36
zgu@3900 37 Stack<oop, mtGC> MarkSweep::_marking_stack;
zgu@3900 38 Stack<ObjArrayTask, mtGC> MarkSweep::_objarray_stack;
duke@435 39
zgu@3900 40 Stack<oop, mtGC> MarkSweep::_preserved_oop_stack;
zgu@3900 41 Stack<markOop, mtGC> MarkSweep::_preserved_mark_stack;
duke@435 42 size_t MarkSweep::_preserved_count = 0;
duke@435 43 size_t MarkSweep::_preserved_count_max = 0;
duke@435 44 PreservedMark* MarkSweep::_preserved_marks = NULL;
duke@435 45 ReferenceProcessor* MarkSweep::_ref_processor = NULL;
sla@5237 46 STWGCTimer* MarkSweep::_gc_timer = NULL;
sla@5237 47 SerialOldTracer* MarkSweep::_gc_tracer = NULL;
duke@435 48
coleenp@548 49 MarkSweep::FollowRootClosure MarkSweep::follow_root_closure;
jrose@1424 50 CodeBlobToOopClosure MarkSweep::follow_code_root_closure(&MarkSweep::follow_root_closure, /*do_marking=*/ true);
duke@435 51
coleenp@548 52 void MarkSweep::FollowRootClosure::do_oop(oop* p) { follow_root(p); }
coleenp@548 53 void MarkSweep::FollowRootClosure::do_oop(narrowOop* p) { follow_root(p); }
duke@435 54
duke@435 55 MarkSweep::MarkAndPushClosure MarkSweep::mark_and_push_closure;
coleenp@4037 56 MarkSweep::FollowKlassClosure MarkSweep::follow_klass_closure;
coleenp@4037 57 MarkSweep::AdjustKlassClosure MarkSweep::adjust_klass_closure;
duke@435 58
coleenp@4037 59 void MarkSweep::MarkAndPushClosure::do_oop(oop* p) { mark_and_push(p); }
coleenp@548 60 void MarkSweep::MarkAndPushClosure::do_oop(narrowOop* p) { mark_and_push(p); }
duke@435 61
coleenp@4037 62 void MarkSweep::FollowKlassClosure::do_klass(Klass* klass) {
coleenp@4037 63 klass->oops_do(&MarkSweep::mark_and_push_closure);
coleenp@4037 64 }
coleenp@4037 65 void MarkSweep::AdjustKlassClosure::do_klass(Klass* klass) {
coleenp@4037 66 klass->oops_do(&MarkSweep::adjust_pointer_closure);
coleenp@4037 67 }
coleenp@4037 68
coleenp@4037 69 void MarkSweep::follow_class_loader(ClassLoaderData* cld) {
coleenp@4037 70 cld->oops_do(&MarkSweep::mark_and_push_closure, &MarkSweep::follow_klass_closure, true);
coleenp@4037 71 }
coleenp@4037 72
duke@435 73 void MarkSweep::follow_stack() {
jcoomes@1746 74 do {
jcoomes@2191 75 while (!_marking_stack.is_empty()) {
jcoomes@2191 76 oop obj = _marking_stack.pop();
jcoomes@1746 77 assert (obj->is_gc_marked(), "p must be marked");
jcoomes@1746 78 obj->follow_contents();
jcoomes@1746 79 }
jcoomes@1750 80 // Process ObjArrays one at a time to avoid marking stack bloat.
jcoomes@2191 81 if (!_objarray_stack.is_empty()) {
jcoomes@2191 82 ObjArrayTask task = _objarray_stack.pop();
minqi@5097 83 ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
jcoomes@1746 84 k->oop_follow_contents(task.obj(), task.index());
jcoomes@1746 85 }
jcoomes@2191 86 } while (!_marking_stack.is_empty() || !_objarray_stack.is_empty());
duke@435 87 }
duke@435 88
duke@435 89 MarkSweep::FollowStackClosure MarkSweep::follow_stack_closure;
duke@435 90
coleenp@548 91 void MarkSweep::FollowStackClosure::do_void() { follow_stack(); }
duke@435 92
jcoomes@2191 93 // We preserve the mark which should be replaced at the end and the location
jcoomes@2191 94 // that it will go. Note that the object that this markOop belongs to isn't
jcoomes@2191 95 // currently at that address but it will be after phase4
duke@435 96 void MarkSweep::preserve_mark(oop obj, markOop mark) {
jcoomes@2191 97 // We try to store preserved marks in the to space of the new generation since
jcoomes@2191 98 // this is storage which should be available. Most of the time this should be
jcoomes@2191 99 // sufficient space for the marks we need to preserve but if it isn't we fall
jcoomes@2191 100 // back to using Stacks to keep track of the overflow.
duke@435 101 if (_preserved_count < _preserved_count_max) {
duke@435 102 _preserved_marks[_preserved_count++].init(obj, mark);
duke@435 103 } else {
jcoomes@2191 104 _preserved_mark_stack.push(mark);
jcoomes@2191 105 _preserved_oop_stack.push(obj);
duke@435 106 }
duke@435 107 }
duke@435 108
stefank@5011 109 MarkSweep::AdjustPointerClosure MarkSweep::adjust_pointer_closure;
duke@435 110
stefank@5011 111 void MarkSweep::AdjustPointerClosure::do_oop(oop* p) { adjust_pointer(p); }
stefank@5011 112 void MarkSweep::AdjustPointerClosure::do_oop(narrowOop* p) { adjust_pointer(p); }
coleenp@548 113
duke@435 114 void MarkSweep::adjust_marks() {
jcoomes@2191 115 assert( _preserved_oop_stack.size() == _preserved_mark_stack.size(),
duke@435 116 "inconsistent preserved oop stacks");
duke@435 117
duke@435 118 // adjust the oops we saved earlier
duke@435 119 for (size_t i = 0; i < _preserved_count; i++) {
duke@435 120 _preserved_marks[i].adjust_pointer();
duke@435 121 }
duke@435 122
duke@435 123 // deal with the overflow stack
zgu@3900 124 StackIterator<oop, mtGC> iter(_preserved_oop_stack);
jcoomes@2191 125 while (!iter.is_empty()) {
jcoomes@2191 126 oop* p = iter.next_addr();
jcoomes@2191 127 adjust_pointer(p);
duke@435 128 }
duke@435 129 }
duke@435 130
duke@435 131 void MarkSweep::restore_marks() {
jcoomes@2191 132 assert(_preserved_oop_stack.size() == _preserved_mark_stack.size(),
duke@435 133 "inconsistent preserved oop stacks");
duke@435 134 if (PrintGC && Verbose) {
jcoomes@2191 135 gclog_or_tty->print_cr("Restoring %d marks",
jcoomes@2191 136 _preserved_count + _preserved_oop_stack.size());
duke@435 137 }
duke@435 138
duke@435 139 // restore the marks we saved earlier
duke@435 140 for (size_t i = 0; i < _preserved_count; i++) {
duke@435 141 _preserved_marks[i].restore();
duke@435 142 }
duke@435 143
duke@435 144 // deal with the overflow
jcoomes@2191 145 while (!_preserved_oop_stack.is_empty()) {
jcoomes@2191 146 oop obj = _preserved_oop_stack.pop();
jcoomes@2191 147 markOop mark = _preserved_mark_stack.pop();
jcoomes@2191 148 obj->set_mark(mark);
duke@435 149 }
duke@435 150 }
duke@435 151
coleenp@548 152 MarkSweep::IsAliveClosure MarkSweep::is_alive;
duke@435 153
coleenp@548 154 bool MarkSweep::IsAliveClosure::do_object_b(oop p) { return p->is_gc_marked(); }
duke@435 155
duke@435 156 MarkSweep::KeepAliveClosure MarkSweep::keep_alive;
duke@435 157
coleenp@548 158 void MarkSweep::KeepAliveClosure::do_oop(oop* p) { MarkSweep::KeepAliveClosure::do_oop_work(p); }
coleenp@548 159 void MarkSweep::KeepAliveClosure::do_oop(narrowOop* p) { MarkSweep::KeepAliveClosure::do_oop_work(p); }
coleenp@548 160
sla@5237 161 void marksweep_init() {
sla@5237 162 MarkSweep::_gc_timer = new (ResourceObj::C_HEAP, mtGC) STWGCTimer();
sla@5237 163 MarkSweep::_gc_tracer = new (ResourceObj::C_HEAP, mtGC) SerialOldTracer();
sla@5237 164 }
duke@435 165
duke@435 166 #ifndef PRODUCT
duke@435 167
duke@435 168 void MarkSweep::trace(const char* msg) {
duke@435 169 if (TraceMarkSweep)
duke@435 170 gclog_or_tty->print("%s", msg);
duke@435 171 }
duke@435 172
duke@435 173 #endif

mercurial