Commit a88475c0 authored by ulan's avatar ulan Committed by Commit bot

Revert d5419b for regressing v8.top_25_smooth benchmark.

BUG=chromium:516425
LOG=NO

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

Cr-Commit-Position: refs/heads/master@{#30008}
parent c7456abf
......@@ -1273,8 +1273,7 @@ bool Heap::PerformGarbageCollection(
// Register the amount of external allocated memory.
amount_of_external_allocated_memory_at_last_global_gc_ =
amount_of_external_allocated_memory_;
SetOldGenerationAllocationLimit(old_gen_size, gc_speed, mutator_speed,
freed_global_handles);
SetOldGenerationAllocationLimit(old_gen_size, gc_speed, mutator_speed);
} else if (HasLowYoungGenerationAllocationRate() &&
old_generation_size_configured_) {
DampenOldGenerationAllocationLimit(old_gen_size, gc_speed, mutator_speed);
......@@ -5584,9 +5583,7 @@ intptr_t Heap::CalculateOldGenerationAllocationLimit(double factor,
void Heap::SetOldGenerationAllocationLimit(intptr_t old_gen_size,
double gc_speed,
double mutator_speed,
int freed_global_handles) {
const int kFreedGlobalHandlesThreshold = 700;
double mutator_speed) {
const double kConservativeHeapGrowingFactor = 1.3;
double factor = HeapGrowingFactor(gc_speed, mutator_speed);
......@@ -5606,8 +5603,7 @@ void Heap::SetOldGenerationAllocationLimit(intptr_t old_gen_size,
factor = Min(factor, kMaxHeapGrowingFactorMemoryConstrained);
}
if (freed_global_handles >= kFreedGlobalHandlesThreshold ||
memory_reducer_.ShouldGrowHeapSlowly() || optimize_for_memory_usage_) {
if (memory_reducer_.ShouldGrowHeapSlowly() || optimize_for_memory_usage_) {
factor = Min(factor, kConservativeHeapGrowingFactor);
}
......
......@@ -1202,8 +1202,7 @@ class Heap {
// Sets the allocation limit to trigger the next full garbage collection.
void SetOldGenerationAllocationLimit(intptr_t old_gen_size, double gc_speed,
double mutator_speed,
int freed_global_handles);
double mutator_speed);
// Decrease the allocation limit if the new limit based on the given
// parameters is lower than the current limit.
......
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