--- a/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp Fri Jun 02 05:24:28 2017 -0400
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp Fri Jun 02 13:45:15 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -112,6 +112,24 @@
return _bot_part.block_start_const(p);
}
+inline bool HeapRegion::is_obj_dead_with_size(const oop obj, G1CMBitMapRO* prev_bitmap, size_t* size) const {
+ HeapWord* addr = (HeapWord*) obj;
+
+ assert(addr < top(), "must be");
+ assert(!is_archive(), "Archive regions should not have references into interesting regions.");
+ assert(!is_humongous(), "Humongous objects not handled here");
+ bool obj_is_dead = is_obj_dead(obj, prev_bitmap);
+
+ if (ClassUnloadingWithConcurrentMark && obj_is_dead) {
+ assert(!block_is_obj(addr), "must be");
+ *size = block_size_using_bitmap(addr, prev_bitmap);
+ } else {
+ assert(block_is_obj(addr), "must be");
+ *size = obj->size();
+ }
+ return obj_is_dead;
+}
+
inline bool
HeapRegion::block_is_obj(const HeapWord* p) const {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
@@ -126,8 +144,27 @@
return p < top();
}
-inline size_t
-HeapRegion::block_size(const HeapWord *addr) const {
+inline size_t HeapRegion::block_size_using_bitmap(const HeapWord* addr, const G1CMBitMapRO* prev_bitmap) const {
+ assert(ClassUnloadingWithConcurrentMark,
+ "All blocks should be objects if class unloading isn't used, so this method should not be called. "
+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
+ "addr: " PTR_FORMAT,
+ p2i(bottom()), p2i(top()), p2i(end()), p2i(addr));
+
+ // Old regions' dead objects may have dead classes
+ // We need to find the next live object using the bitmap
+ HeapWord* next = prev_bitmap->getNextMarkedWordAddress(addr, prev_top_at_mark_start());
+
+ assert(next > addr, "must get the next live object");
+ return pointer_delta(next, addr);
+}
+
+inline bool HeapRegion::is_obj_dead(const oop obj, const G1CMBitMapRO* prev_bitmap) const {
+ assert(is_in_reserved(obj), "Object " PTR_FORMAT " must be in region", p2i(obj));
+ return !obj_allocated_since_prev_marking(obj) && !prev_bitmap->isMarked((HeapWord*)obj);
+}
+
+inline size_t HeapRegion::block_size(const HeapWord *addr) const {
if (addr == top()) {
return pointer_delta(end(), addr);
}
@@ -136,21 +173,7 @@
return oop(addr)->size();
}
- assert(ClassUnloadingWithConcurrentMark,
- "All blocks should be objects if G1 Class Unloading isn't used. "
- "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
- "addr: " PTR_FORMAT,
- p2i(bottom()), p2i(top()), p2i(end()), p2i(addr));
-
- // Old regions' dead objects may have dead classes
- // We need to find the next live object in some other
- // manner than getting the oop size
- G1CollectedHeap* g1h = G1CollectedHeap::heap();
- HeapWord* next = g1h->concurrent_mark()->prevMarkBitMap()->
- getNextMarkedWordAddress(addr, prev_top_at_mark_start());
-
- assert(next > addr, "must get the next live object");
- return pointer_delta(next, addr);
+ return block_size_using_bitmap(addr, G1CollectedHeap::heap()->concurrent_mark()->prevMarkBitMap());
}
inline HeapWord* HeapRegion::par_allocate_no_bot_updates(size_t min_word_size,
@@ -230,4 +253,110 @@
return G1CollectedHeap::heap()->is_in_cset(this);
}
+template <class Closure, bool is_gc_active>
+bool HeapRegion::do_oops_on_card_in_humongous(MemRegion mr,
+ Closure* cl,
+ G1CollectedHeap* g1h) {
+ assert(is_humongous(), "precondition");
+ HeapRegion* sr = humongous_start_region();
+ oop obj = oop(sr->bottom());
+
+ // If concurrent and klass_or_null is NULL, then space has been
+ // allocated but the object has not yet been published by setting
+ // the klass. That can only happen if the card is stale. However,
+ // we've already set the card clean, so we must return failure,
+ // since the allocating thread could have performed a write to the
+ // card that might be missed otherwise.
+ if (!is_gc_active && (obj->klass_or_null_acquire() == NULL)) {
+ return false;
+ }
+
+ // We have a well-formed humongous object at the start of sr.
+ // Only filler objects follow a humongous object in the containing
+ // regions, and we can ignore those. So only process the one
+ // humongous object.
+ if (!g1h->is_obj_dead(obj, sr)) {
+ if (obj->is_objArray() || (sr->bottom() < mr.start())) {
+ // objArrays are always marked precisely, so limit processing
+ // with mr. Non-objArrays might be precisely marked, and since
+ // it's humongous it's worthwhile avoiding full processing.
+ // However, the card could be stale and only cover filler
+ // objects. That should be rare, so not worth checking for;
+ // instead let it fall out from the bounded iteration.
+ obj->oop_iterate(cl, mr);
+ } else {
+ // If obj is not an objArray and mr contains the start of the
+ // obj, then this could be an imprecise mark, and we need to
+ // process the entire object.
+ obj->oop_iterate(cl);
+ }
+ }
+ return true;
+}
+
+template <bool is_gc_active, class Closure>
+bool HeapRegion::oops_on_card_seq_iterate_careful(MemRegion mr,
+ Closure* cl) {
+ assert(MemRegion(bottom(), end()).contains(mr), "Card region not in heap region");
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+
+ // Special handling for humongous regions.
+ if (is_humongous()) {
+ return do_oops_on_card_in_humongous<Closure, is_gc_active>(mr, cl, g1h);
+ }
+ assert(is_old(), "precondition");
+
+ // Because mr has been trimmed to what's been allocated in this
+ // region, the parts of the heap that are examined here are always
+ // parsable; there's no need to use klass_or_null to detect
+ // in-progress allocation.
+
+ // Cache the boundaries of the memory region in some const locals
+ HeapWord* const start = mr.start();
+ HeapWord* const end = mr.end();
+
+ // Find the obj that extends onto mr.start().
+ // Update BOT as needed while finding start of (possibly dead)
+ // object containing the start of the region.
+ HeapWord* cur = block_start(start);
+
+#ifdef ASSERT
+ {
+ assert(cur <= start,
+ "cur: " PTR_FORMAT ", start: " PTR_FORMAT, p2i(cur), p2i(start));
+ HeapWord* next = cur + block_size(cur);
+ assert(start < next,
+ "start: " PTR_FORMAT ", next: " PTR_FORMAT, p2i(start), p2i(next));
+ }
+#endif
+
+ G1CMBitMapRO* bitmap = g1h->concurrent_mark()->prevMarkBitMap();
+ do {
+ oop obj = oop(cur);
+ assert(obj->is_oop(true), "Not an oop at " PTR_FORMAT, p2i(cur));
+ assert(obj->klass_or_null() != NULL,
+ "Unparsable heap at " PTR_FORMAT, p2i(cur));
+
+ size_t size;
+ bool is_dead = is_obj_dead_with_size(obj, bitmap, &size);
+
+ cur += size;
+ if (!is_dead) {
+ // Process live object's references.
+
+ // Non-objArrays are usually marked imprecise at the object
+ // start, in which case we need to iterate over them in full.
+ // objArrays are precisely marked, but can still be iterated
+ // over in full if completely covered.
+ if (!obj->is_objArray() || (((HeapWord*)obj) >= start && cur <= end)) {
+ obj->oop_iterate(cl);
+ } else {
+ obj->oop_iterate(cl, mr);
+ }
+ }
+ } while (cur < end);
+
+ return true;
+}
+
#endif // SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP