Skip to content
Permalink
Browse files
8246591: Shenandoah: move string dedup roots scanning to concurrent p…
…hase

Reviewed-by: shade
  • Loading branch information
zhengyu123 committed Jun 10, 2020
1 parent f3c2a17 commit d36a55d2acc5a2b6155027f3515c93247b3dfafb
Showing 3 changed files with 5 additions and 7 deletions.
@@ -199,8 +199,7 @@ ShenandoahRootProcessor::ShenandoahRootProcessor(ShenandoahPhaseTimings::Phase p
ShenandoahRootScanner::ShenandoahRootScanner(uint n_workers, ShenandoahPhaseTimings::Phase phase) :
ShenandoahRootProcessor(phase),
_serial_roots(phase),
_thread_roots(phase, n_workers > 1),
_dedup_roots(phase) {
_thread_roots(phase, n_workers > 1) {
nmethod::oops_do_marking_prologue();
}

@@ -234,9 +233,6 @@ void ShenandoahRootScanner::roots_do(uint worker_id, OopClosure* oops, CLDClosur
// Process serial-claiming roots first
_serial_roots.oops_do(oops, worker_id);

// Process light-weight/limited parallel roots then
_dedup_roots.oops_do(&always_true, oops, worker_id);

// Process heavy-weight/fully parallel roots the last
_thread_roots.threads_do(&tc_cl, worker_id);
}
@@ -261,7 +261,6 @@ class ShenandoahRootScanner : public ShenandoahRootProcessor {
private:
ShenandoahSerialRoots _serial_roots;
ShenandoahThreadRoots _thread_roots;
ShenandoahStringDedupRoots _dedup_roots;

public:
ShenandoahRootScanner(uint n_workers, ShenandoahPhaseTimings::Phase phase);
@@ -284,6 +283,7 @@ class ShenandoahConcurrentRootScanner {
ShenandoahVMRoots<CONCURRENT> _vm_roots;
ShenandoahClassLoaderDataRoots<CONCURRENT, false /* single-threaded*/>
_cld_roots;
ShenandoahConcurrentStringDedupRoots _dedup_roots;
ShenandoahNMethodTableSnapshot* _codecache_snapshot;
ShenandoahPhaseTimings::Phase _phase;

@@ -189,6 +189,7 @@ ShenandoahConcurrentRootScanner<CONCURRENT>::ShenandoahConcurrentRootScanner(uin
ShenandoahPhaseTimings::Phase phase) :
_vm_roots(phase),
_cld_roots(phase, n_workers),
_dedup_roots(phase),
_codecache_snapshot(NULL),
_phase(phase) {
if (!ShenandoahHeap::heap()->unload_classes()) {
@@ -219,8 +220,9 @@ void ShenandoahConcurrentRootScanner<CONCURRENT>::oops_do(OopClosure* oops, uint
_vm_roots.oops_do(oops, worker_id);

if (!heap->unload_classes()) {
AlwaysTrueClosure always_true;
_cld_roots.cld_do(&clds_cl, worker_id);

_dedup_roots.oops_do(&always_true, oops, worker_id);
ShenandoahWorkerTimingsTracker timer(_phase, ShenandoahPhaseTimings::CodeCacheRoots, worker_id);
CodeBlobToOopClosure blobs(oops, !CodeBlobToOopClosure::FixRelocations);
_codecache_snapshot->parallel_blobs_do(&blobs);

0 comments on commit d36a55d

Please sign in to comment.