diff options
| author | ysr <none@none> | 2010-10-23 23:03:49 -0700 |
|---|---|---|
| committer | ysr <none@none> | 2010-10-23 23:03:49 -0700 |
| commit | d1e543e77611635129e7227b91ef4b4814df45d7 (patch) | |
| tree | 0a48edcc5afdb9f93547b3cd6b0ad90107faf123 /src/share/vm/memory/collectorPolicy.cpp | |
| parent | f0f278f27dae9a82ab9269e44dd611386daa312a (diff) | |
6896603: CMS/GCH: collection_attempt_is_safe() ergo should use more recent data
Summary: Deprecated HandlePromotionFailure, removing the ability to turn off that feature, did away with one epoch look-ahead when deciding if a scavenge is likely to fail, relying on current data.
Reviewed-by: jmasa, johnc, poonam
Diffstat (limited to 'src/share/vm/memory/collectorPolicy.cpp')
| -rw-r--r-- | src/share/vm/memory/collectorPolicy.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp index c6b8e3875..3ddb0f65b 100644 --- a/src/share/vm/memory/collectorPolicy.cpp +++ b/src/share/vm/memory/collectorPolicy.cpp @@ -659,9 +659,6 @@ HeapWord* GenCollectorPolicy::satisfy_failed_allocation(size_t size, } return result; // could be null if we are out of space } else if (!gch->incremental_collection_will_fail()) { - // The gc_prologues have not executed yet. The value - // for incremental_collection_will_fail() is the remanent - // of the last collection. // Do an incremental collection. gch->do_collection(false /* full */, false /* clear_all_soft_refs */, @@ -739,9 +736,8 @@ bool GenCollectorPolicy::should_try_older_generation_allocation( GenCollectedHeap* gch = GenCollectedHeap::heap(); size_t gen0_capacity = gch->get_gen(0)->capacity_before_gc(); return (word_size > heap_word_size(gen0_capacity)) - || (GC_locker::is_active_and_needs_gc()) - || ( gch->last_incremental_collection_failed() - && gch->incremental_collection_will_fail()); + || GC_locker::is_active_and_needs_gc() + || gch->incremental_collection_failed(); } |