OpenJDK / jdk / jdk
changeset 57855:369e969a0610
8237963: Shenandoah: Heap iteration should use concurrent version of string dedup roots
Reviewed-by: shade
| author | zgu |
|---|---|
| date | Tue, 28 Jan 2020 15:47:39 -0500 |
| parents | e4fc1e578b3a |
| children | 3233c22ea079 |
| files | src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Tue Jan 28 09:13:27 2020 +0100 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Tue Jan 28 15:47:39 2020 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Red Hat, Inc. All rights reserved. + * Copyright (c) 2015, 2020, Red Hat, Inc. 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 @@ -152,9 +152,9 @@ ShenandoahConcurrentStringDedupRoots::ShenandoahConcurrentStringDedupRoots() { if (ShenandoahStringDedup::is_enabled()) { - StringDedup::gc_prologue(true); StringDedupTable_lock->lock_without_safepoint_check(); StringDedupQueue_lock->lock_without_safepoint_check(); + StringDedup::gc_prologue(true); } }
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Tue Jan 28 09:13:27 2020 +0100 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Tue Jan 28 15:47:39 2020 -0500 @@ -266,7 +266,7 @@ _cld_roots; ShenandoahSerialWeakRoots _serial_weak_roots; ShenandoahWeakRoots<false /*concurrent*/> _weak_roots; - ShenandoahStringDedupRoots _dedup_roots; + ShenandoahConcurrentStringDedupRoots _dedup_roots; ShenandoahCodeCacheRoots<ShenandoahAllCodeRootsIterator> _code_roots; public: