AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Make scope for finishing Minor MC incremental marking optional

Browse Source 
Bug: v8:12612
Change-Id: I1b8be498c08f379a65087d1264eb6739e4c83e0d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4212395
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Omer Katz <omerkatz@chromium.org>
Auto-Submit: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#85593}
This commit is contained in:
Michael Lippautz 2023-02-01 14:26:53 +01:00 committed by V8 LUCI CQ
parent 9b46fb9d7d
commit d2c4ae10c9
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/heap/mark-compact.cc
View File

@ -2802,13 +2802,14 @@ void MarkCompactCollector::MarkLiveObjects() {
// with the C stack limit check.
PostponeInterruptsScope postpone(isolate());
bool was_marked_incrementally = false;
{
const bool was_marked_incrementally =
!heap_->incremental_marking()->IsStopped();
if (was_marked_incrementally) {
TRACE_GC(heap()->tracer(), GCTracer::Scope::MC_MARK_FINISH_INCREMENTAL);
if (heap_->incremental_marking()->Stop()) {
MarkingBarrier::PublishAll(heap());
was_marked_incrementally = true;
}
auto* incremental_marking = heap_->incremental_marking();
DCHECK(incremental_marking->IsMajorMarking());
incremental_marking->Stop();
MarkingBarrier::PublishAll(heap());
}
#ifdef DEBUG
@ -6342,18 +6343,19 @@ void MinorMarkCompactCollector::MarkLiveObjects() {
PostponeInterruptsScope postpone(isolate());
bool was_marked_incrementally = false;
{
const bool was_marked_incrementally =
!heap_->incremental_marking()->IsStopped();
if (was_marked_incrementally) {
TRACE_GC(heap()->tracer(),
GCTracer::Scope::MINOR_MC_MARK_FINISH_INCREMENTAL);
if (heap_->incremental_marking()->Stop()) {
MarkingBarrier::PublishAll(heap());
// TODO(v8:13012): TRACE_GC with MINOR_MC_MARK_FULL_CLOSURE_PARALLEL_JOIN.
// TODO(v8:13012): Instead of finishing concurrent marking here, we could
// continue running it to replace parallel marking.
FinishConcurrentMarking();
was_marked_incrementally = true;
}
auto* incremental_marking = heap_->incremental_marking();
DCHECK(incremental_marking->IsMinorMarking());
incremental_marking->Stop();
MarkingBarrier::PublishAll(heap());
// TODO(v8:13012): TRACE_GC with MINOR_MC_MARK_FULL_CLOSURE_PARALLEL_JOIN.
// TODO(v8:13012): Instead of finishing concurrent marking here, we could
// continue running it to replace parallel marking.
FinishConcurrentMarking();
}
RootMarkingVisitor root_visitor(this);