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

[heap] Clean-up incrementally finalize marking.

Browse Source 
Review URL: https://codereview.chromium.org/1424233002

Cr-Commit-Position: refs/heads/master@{#31639}
This commit is contained in:
hpayer 2015-10-28 11:27:46 -07:00 committed by Commit bot
parent 4cd3c16967
commit 1243ce0bb5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/heap/heap.cc
View File

@ -776,7 +776,7 @@ void Heap::HandleGCRequest() {
}
DCHECK(FLAG_finalize_marking_incrementally);
if (!incremental_marking()->finalize_marking_completed()) {
FinalizeIncrementalMarking("GC interrupt");
FinalizeIncrementalMarking("GC interrupt: finalize incremental marking");
}
}
@ -788,8 +788,7 @@ void Heap::ScheduleIdleScavengeIfNeeded(int bytes_allocated) {
void Heap::FinalizeIncrementalMarking(const char* gc_reason) {
if (FLAG_trace_incremental_marking) {
PrintF("[IncrementalMarking] Overapproximate weak closure (%s).\n",
gc_reason);
PrintF("[IncrementalMarking] (%s).\n", gc_reason);
}
GCTracer::Scope gc_scope(tracer(), GCTracer::Scope::MC_INCREMENTAL_FINALIZE);
@ -4095,7 +4094,7 @@ bool Heap::TryFinalizeIdleIncrementalMarking(double idle_time_in_ms) {
gc_idle_time_handler_->ShouldDoOverApproximateWeakClosure(
static_cast<size_t>(idle_time_in_ms))))) {
FinalizeIncrementalMarking(
"Idle notification: overapproximate weak closure");
"Idle notification: finalize incremental marking");
return true;
} else if (incremental_marking()->IsComplete() ||
(mark_compact_collector()->marking_deque()->IsEmpty() &&
@ -4103,7 +4102,7 @@ bool Heap::TryFinalizeIdleIncrementalMarking(double idle_time_in_ms) {
static_cast<size_t>(idle_time_in_ms), size_of_objects,
final_incremental_mark_compact_speed_in_bytes_per_ms))) {
CollectAllGarbage(current_gc_flags_,
"idle notification: finalize incremental");
"idle notification: finalize incremental marking");
return true;
}
return false;

3
src/heap/incremental-marking.cc
View File

@ -664,8 +664,7 @@ void IncrementalMarking::FinalizeIncrementally() {
int marking_progress =
abs(old_marking_deque_top -
heap_->mark_compact_collector()->marking_deque()->top()) /
kPointerSize;
heap_->mark_compact_collector()->marking_deque()->top());
++incremental_marking_finalization_rounds_;
if ((incremental_marking_finalization_rounds_ >=