infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-17 00:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

8241081: Shenandoah: Do not modify update-watermark concurrently

Browse Source 
Reviewed-by: shade
This commit is contained in:
Roman Kennke 2020-03-17 11:49:25 +01:00
parent dbd0f0dc3b
commit 035100cc89
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View File

@ -2407,7 +2407,6 @@ private:
if (r->is_active() && !r->is_cset()) {
_heap->marked_object_oop_iterate(r, &cl, update_watermark);
}
r->set_update_watermark(r->bottom());
if (ShenandoahPacing) {
_heap->pacer()->report_updaterefs(pointer_delta(update_watermark, r->bottom()));
}

15
src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
View File

@ -261,7 +261,7 @@ private:
volatile size_t _live_data;
volatile size_t _critical_pins;
HeapWord* volatile _update_watermark;
HeapWord* _update_watermark;
// Claim some space at the end to protect next region
DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE, 0);
@ -431,13 +431,20 @@ public:
}
HeapWord* get_update_watermark() const {
assert(bottom() <= _update_watermark && _update_watermark <= top(), "within bounds");
return Atomic::load_acquire(&_update_watermark);
// Updates to the update-watermark only happen at safepoints or, when pushing
// back the watermark for evacuation regions, under the Shenandoah heap-lock.
// Consequently, we should access the field under the same lock. However, since
// those updates are only monotonically increasing, possibly reading a stale value
// is only conservative - we would not miss to update any fields.
HeapWord* watermark = _update_watermark;
assert(bottom() <= watermark && watermark <= top(), "within bounds");
return watermark;
}
void set_update_watermark(HeapWord* w) {
_heap->assert_heaplock_or_safepoint();
assert(bottom() <= w && w <= top(), "within bounds");
Atomic::release_store(&_update_watermark, w);
_update_watermark = w;
}
private: