Reviewers: Hannes Payer,
Message:
PTAL. I needed a manual merge with this revert.
Description:
Revert "Make sure that memory reducer makes progress in incremental marking"
This reverts commit 1345f811bf6a3ab9376cfbed6f08084662b32a4d.
BUG=
Please review this at https://codereview.chromium.org/1303333005/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+1, -41 lines):
M src/heap/heap.h
M src/heap/heap.cc
M src/heap/memory-reducer.cc
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
51d2918f8eb1a02894606e1e4ab230529311134c..988343606842f1f2046789fe629192e362b4360b
100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -4622,19 +4622,6 @@ void Heap::ReduceNewSpaceSize() {
}
-void Heap::FinalizeIncrementalMarkingIfComplete(const char* comment) {
- if (FLAG_overapproximate_weak_closure &&
- (incremental_marking()->IsReadyToOverApproximateWeakClosure() ||
- (!incremental_marking()->weak_closure_was_overapproximated() &&
- mark_compact_collector_.marking_deque()->IsEmpty()))) {
- OverApproximateWeakClosure(comment);
- } else if (incremental_marking()->IsComplete() ||
- (mark_compact_collector_.marking_deque()->IsEmpty())) {
- CollectAllGarbage(current_gc_flags(), comment);
- }
-}
-
-
bool Heap::TryFinalizeIdleIncrementalMarking(
double idle_time_in_ms, size_t size_of_objects,
size_t final_incremental_mark_compact_speed_in_bytes_per_ms) {
Index: src/heap/heap.h
diff --git a/src/heap/heap.h b/src/heap/heap.h
index
f7eca4011a2b71d6dfe9c926a261f4693977d526..f974c0764b09dc9190e680d429a4c58950e57f22
100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -902,8 +902,6 @@ class Heap {
// Notify the heap that a context has been disposed.
int NotifyContextDisposed(bool dependant_context);
- void FinalizeIncrementalMarkingIfComplete(const char* comment);
-
inline void increment_scan_on_scavenge_pages() {
scan_on_scavenge_pages_++;
if (FLAG_gc_verbose) {
@@ -1248,8 +1246,6 @@ class Heap {
bool HasHighFragmentation();
bool HasHighFragmentation(intptr_t used, intptr_t committed);
- bool ShouldOptimizeForMemoryUsage() { return optimize_for_memory_usage_;
}
-
//
===========================================================================
// Initialization.
===========================================================
//
===========================================================================
Index: src/heap/memory-reducer.cc
diff --git a/src/heap/memory-reducer.cc b/src/heap/memory-reducer.cc
index
f3c14731e7cb777793643a39f86536dc082eb2b4..4cf8bc2e3686a2571b4c7cc98a9d05c15fe11621
100644
--- a/src/heap/memory-reducer.cc
+++ b/src/heap/memory-reducer.cc
@@ -47,35 +47,12 @@ void MemoryReducer::NotifyTimer(const Event& event) {
if (state_.action == kRun) {
DCHECK(heap()->incremental_marking()->IsStopped());
DCHECK(FLAG_incremental_marking);
+ heap()->StartIdleIncrementalMarking();
if (FLAG_trace_gc_verbose) {
PrintIsolate(heap()->isolate(), "Memory reducer: started GC #%d\n",
state_.started_gcs);
}
- if (heap()->ShouldOptimizeForMemoryUsage()) {
- // Do full GC if memory usage has higher priority than latency. This
is
- // important for background tabs that do not send idle notifications.
- heap()->CollectAllGarbage(Heap::kReduceMemoryFootprintMask,
- "memory reducer");
- } else {
- heap()->StartIdleIncrementalMarking();
- }
} else if (state_.action == kWait) {
- if (!heap()->incremental_marking()->IsStopped() &&
- heap()->ShouldOptimizeForMemoryUsage()) {
- // Make progress with pending incremental marking if memory usage has
- // higher priority than latency. This is important for background
tabs
- // that do not send idle notifications.
- const int kIncrementalMarkingDelayMs = 500;
- double deadline = heap()->MonotonicallyIncreasingTimeInMs() +
- kIncrementalMarkingDelayMs;
- heap()->AdvanceIncrementalMarking(
- 0, deadline, i::IncrementalMarking::StepActions(
- i::IncrementalMarking::NO_GC_VIA_STACK_GUARD,
- i::IncrementalMarking::FORCE_MARKING,
- i::IncrementalMarking::FORCE_COMPLETION));
- heap()->FinalizeIncrementalMarkingIfComplete(
- "Memory reducer: finalize incremental marking");
- }
// Re-schedule the timer.
ScheduleTimer(state_.next_gc_start_ms - event.time_ms);
if (FLAG_trace_gc_verbose) {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
