Commit 2b17c752 authored by hpayer's avatar hpayer Committed by Commit bot

Shrink active semi-space and uncommit other semi-space only in idle memory mode.

BUG=chromium:483147
LOG=n

Review URL: https://codereview.chromium.org/1140693003

Cr-Commit-Position: refs/heads/master@{#28429}
parent 6ead193b
...@@ -4574,18 +4574,8 @@ void Heap::MakeHeapIterable() { ...@@ -4574,18 +4574,8 @@ void Heap::MakeHeapIterable() {
DCHECK(IsHeapIterable()); DCHECK(IsHeapIterable());
} }
void Heap::ReduceNewSpaceSize(bool is_long_idle_notification) {
if (is_long_idle_notification) {
new_space_.Shrink();
UncommitFromSpace();
}
}
bool Heap::TryFinalizeIdleIncrementalMarking( bool Heap::TryFinalizeIdleIncrementalMarking(
bool is_long_idle_notification, double idle_time_in_ms, double idle_time_in_ms, size_t size_of_objects,
size_t size_of_objects,
size_t final_incremental_mark_compact_speed_in_bytes_per_ms) { size_t final_incremental_mark_compact_speed_in_bytes_per_ms) {
if (FLAG_overapproximate_weak_closure && if (FLAG_overapproximate_weak_closure &&
(incremental_marking()->IsReadyToOverApproximateWeakClosure() || (incremental_marking()->IsReadyToOverApproximateWeakClosure() ||
...@@ -4603,7 +4593,6 @@ bool Heap::TryFinalizeIdleIncrementalMarking( ...@@ -4603,7 +4593,6 @@ bool Heap::TryFinalizeIdleIncrementalMarking(
final_incremental_mark_compact_speed_in_bytes_per_ms))) { final_incremental_mark_compact_speed_in_bytes_per_ms))) {
CollectAllGarbage(kNoGCFlags, "idle notification: finalize incremental"); CollectAllGarbage(kNoGCFlags, "idle notification: finalize incremental");
gc_idle_time_handler_.NotifyIdleMarkCompact(); gc_idle_time_handler_.NotifyIdleMarkCompact();
ReduceNewSpaceSize(is_long_idle_notification);
return true; return true;
} }
return false; return false;
...@@ -4710,8 +4699,7 @@ bool Heap::IdleNotification(double deadline_in_seconds) { ...@@ -4710,8 +4699,7 @@ bool Heap::IdleNotification(double deadline_in_seconds) {
!mark_compact_collector_.marking_deque()->IsEmpty()); !mark_compact_collector_.marking_deque()->IsEmpty());
if (remaining_idle_time_in_ms > 0.0) { if (remaining_idle_time_in_ms > 0.0) {
action.additional_work = TryFinalizeIdleIncrementalMarking( action.additional_work = TryFinalizeIdleIncrementalMarking(
is_long_idle_notification, remaining_idle_time_in_ms, remaining_idle_time_in_ms, heap_state.size_of_objects,
heap_state.size_of_objects,
heap_state.final_incremental_mark_compact_speed_in_bytes_per_ms); heap_state.final_incremental_mark_compact_speed_in_bytes_per_ms);
} }
break; break;
...@@ -4728,13 +4716,11 @@ bool Heap::IdleNotification(double deadline_in_seconds) { ...@@ -4728,13 +4716,11 @@ bool Heap::IdleNotification(double deadline_in_seconds) {
"idle notification: finalize idle round"); "idle notification: finalize idle round");
} }
gc_count_at_last_idle_gc_ = gc_count_; gc_count_at_last_idle_gc_ = gc_count_;
ReduceNewSpaceSize(is_long_idle_notification);
gc_idle_time_handler_.NotifyIdleMarkCompact(); gc_idle_time_handler_.NotifyIdleMarkCompact();
break; break;
} }
case DO_SCAVENGE: case DO_SCAVENGE:
CollectGarbage(NEW_SPACE, "idle notification: scavenge"); CollectGarbage(NEW_SPACE, "idle notification: scavenge");
ReduceNewSpaceSize(is_long_idle_notification);
break; break;
case DO_FINALIZE_SWEEPING: case DO_FINALIZE_SWEEPING:
mark_compact_collector()->EnsureSweepingCompleted(); mark_compact_collector()->EnsureSweepingCompleted();
...@@ -4743,6 +4729,11 @@ bool Heap::IdleNotification(double deadline_in_seconds) { ...@@ -4743,6 +4729,11 @@ bool Heap::IdleNotification(double deadline_in_seconds) {
break; break;
} }
if (action.reduce_memory) {
new_space_.Shrink();
UncommitFromSpace();
}
double current_time = MonotonicallyIncreasingTimeInMs(); double current_time = MonotonicallyIncreasingTimeInMs();
last_idle_notification_time_ = current_time; last_idle_notification_time_ = current_time;
double deadline_difference = deadline_in_ms - current_time; double deadline_difference = deadline_in_ms - current_time;
......
...@@ -2101,11 +2101,9 @@ class Heap { ...@@ -2101,11 +2101,9 @@ class Heap {
void SelectScavengingVisitorsTable(); void SelectScavengingVisitorsTable();
void ReduceNewSpaceSize(bool is_long_idle_notification);
bool TryFinalizeIdleIncrementalMarking( bool TryFinalizeIdleIncrementalMarking(
bool is_long_idle_notification, double idle_time_in_ms, double idle_time_in_ms, size_t size_of_objects,
size_t size_of_objects, size_t mark_compact_speed_in_bytes_per_ms); size_t mark_compact_speed_in_bytes_per_ms);
void ClearObjectStats(bool clear_last_time_stats = false); void ClearObjectStats(bool clear_last_time_stats = false);
......
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