Commit bd115122 authored by Omer Katz's avatar Omer Katz Committed by Commit Bot

heap: Add MarkBailOutObjects scope to ThreadHeap::AdvanceMarking

Bug: 986235
Change-Id: I4e1556dfba5f8b99cf488fcaacbcddc9d5564ad9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066843Reviewed-by: default avatarMichael Lippautz <mlippautz@chromium.org>
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743524}
parent afc2a4ab
...@@ -347,6 +347,9 @@ bool ThreadHeap::AdvanceMarking(MarkingVisitor* visitor, ...@@ -347,6 +347,9 @@ bool ThreadHeap::AdvanceMarking(MarkingVisitor* visitor,
if (!finished) if (!finished)
break; break;
{
ThreadHeapStatsCollector::EnabledScope bailout_scope(
stats_collector(), ThreadHeapStatsCollector::kMarkBailOutObjects);
finished = DrainWorklistWithDeadline( finished = DrainWorklistWithDeadline(
deadline, not_safe_to_concurrently_trace_worklist_.get(), deadline, not_safe_to_concurrently_trace_worklist_.get(),
[visitor](const MarkingItem& item) { [visitor](const MarkingItem& item) {
...@@ -355,6 +358,7 @@ bool ThreadHeap::AdvanceMarking(MarkingVisitor* visitor, ...@@ -355,6 +358,7 @@ bool ThreadHeap::AdvanceMarking(MarkingVisitor* visitor,
WorklistTaskId::MutatorThread); WorklistTaskId::MutatorThread);
if (!finished) if (!finished)
break; break;
}
finished = DrainWorklistWithDeadline( finished = DrainWorklistWithDeadline(
deadline, marking_worklist_.get(), deadline, marking_worklist_.get(),
......
...@@ -54,6 +54,7 @@ class PLATFORM_EXPORT ThreadHeapStatsObserver { ...@@ -54,6 +54,7 @@ class PLATFORM_EXPORT ThreadHeapStatsObserver {
V(InvokePreFinalizers) \ V(InvokePreFinalizers) \
V(LazySweepInIdle) \ V(LazySweepInIdle) \
V(LazySweepOnAllocation) \ V(LazySweepOnAllocation) \
V(MarkBailOutObjects) \
V(MarkInvokeEphemeronCallbacks) \ V(MarkInvokeEphemeronCallbacks) \
V(MarkProcessWorklist) \ V(MarkProcessWorklist) \
V(MarkNotFullyConstructedObjects) \ V(MarkNotFullyConstructedObjects) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment