diff options
Diffstat (limited to 'deps/v8/src/heap/incremental-marking.cc')
| -rw-r--r-- | deps/v8/src/heap/incremental-marking.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/deps/v8/src/heap/incremental-marking.cc b/deps/v8/src/heap/incremental-marking.cc index 29b2a84d68..af1e3c6308 100644 --- a/deps/v8/src/heap/incremental-marking.cc +++ b/deps/v8/src/heap/incremental-marking.cc @@ -159,7 +159,7 @@ bool IncrementalMarking::CanBeActivated() { bool IncrementalMarking::IsBelowActivationThresholds() const { return heap_->OldGenerationSizeOfObjects() <= kV8ActivationThreshold && - heap_->GlobalSizeOfObjects() <= kGlobalActivationThreshold; + heap_->EmbedderSizeOfObjects() <= kEmbedderActivationThreshold; } void IncrementalMarking::Start(GarbageCollectionReason gc_reason) { @@ -194,7 +194,7 @@ void IncrementalMarking::Start(GarbageCollectionReason gc_reason) { counters->incremental_marking_reason()->AddSample( static_cast<int>(gc_reason)); - HistogramTimerScope incremental_marking_scope( + NestedTimedHistogramScope incremental_marking_scope( counters->gc_incremental_marking_start()); TRACE_EVENT1("v8", "V8.GCIncrementalMarkingStart", "epoch", heap_->epoch_full()); @@ -784,7 +784,7 @@ StepResult CombineStepResults(StepResult a, StepResult b) { StepResult IncrementalMarking::AdvanceWithDeadline( double deadline_in_ms, CompletionAction completion_action, StepOrigin step_origin) { - HistogramTimerScope incremental_marking_scope( + NestedTimedHistogramScope incremental_marking_scope( heap_->isolate()->counters()->gc_incremental_marking()); TRACE_EVENT1("v8", "V8.GCIncrementalMarking", "epoch", heap_->epoch_full()); TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL, @@ -889,7 +889,7 @@ void IncrementalMarking::AdvanceOnAllocation() { state_ != MARKING || heap_->always_allocate()) { return; } - HistogramTimerScope incremental_marking_scope( + NestedTimedHistogramScope incremental_marking_scope( heap_->isolate()->counters()->gc_incremental_marking()); TRACE_EVENT0("v8", "V8.GCIncrementalMarking"); TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL, @@ -944,7 +944,8 @@ StepResult IncrementalMarking::Step(double max_step_size_in_ms, // This ignores that case where the embedder finds new V8-side objects. The // assumption is that large graphs are well connected and can mostly be // processed on their own. For small graphs, helping is not necessary. - v8_bytes_processed = collector_->ProcessMarkingWorklist(bytes_to_process); + std::tie(v8_bytes_processed, std::ignore) = + collector_->ProcessMarkingWorklist(bytes_to_process); StepResult v8_result = local_marking_worklists()->IsEmpty() ? StepResult::kNoImmediateWork : StepResult::kMoreWorkRemaining; |