src/share/vm/memory/genCollectedHeap.cpp
Index Unified diffs Context diffs Sdiffs Patch New Old Previous File Next File hotspot Cdiff src/share/vm/memory/genCollectedHeap.cpp

src/share/vm/memory/genCollectedHeap.cpp

Print this page
rev 7211 : [mq]: remove_ngen
rev 7212 : [mq]: remove_get_gen

*** 190,211 **** void GenCollectedHeap::post_initialize() { SharedHeap::post_initialize(); GenCollectorPolicy *policy = (GenCollectorPolicy *)collector_policy(); guarantee(policy->is_generation_policy(), "Illegal policy type"); ! DefNewGeneration* def_new_gen = (DefNewGeneration*) get_gen(0); assert(def_new_gen->kind() == Generation::DefNew || def_new_gen->kind() == Generation::ParNew, "Wrong generation kind"); ! Generation* old_gen = get_gen(1); ! assert(old_gen->kind() == Generation::ConcurrentMarkSweep || ! old_gen->kind() == Generation::MarkSweepCompact, "Wrong generation kind"); policy->initialize_size_policy(def_new_gen->eden()->capacity(), ! old_gen->capacity(), def_new_gen->from()->capacity()); policy->initialize_gc_policy_counters(); } void GenCollectedHeap::ref_processing_init() { --- 190,210 ---- void GenCollectedHeap::post_initialize() { SharedHeap::post_initialize(); GenCollectorPolicy *policy = (GenCollectorPolicy *)collector_policy(); guarantee(policy->is_generation_policy(), "Illegal policy type"); ! DefNewGeneration* def_new_gen = (DefNewGeneration*) _young_gen; assert(def_new_gen->kind() == Generation::DefNew || def_new_gen->kind() == Generation::ParNew, "Wrong generation kind"); ! assert(_old_gen->kind() == Generation::ConcurrentMarkSweep || ! _old_gen->kind() == Generation::MarkSweepCompact, "Wrong generation kind"); policy->initialize_size_policy(def_new_gen->eden()->capacity(), ! _old_gen->capacity(), def_new_gen->from()->capacity()); policy->initialize_gc_policy_counters(); } void GenCollectedHeap::ref_processing_init() {
*** 1039,1062 **** } void GenCollectedHeap::prepare_for_compaction() { guarantee(_n_gens = 2, "Wrong number of generations"); - Generation* old_gen = _old_gen; // Start by compacting into same gen. ! CompactPoint cp(old_gen); ! old_gen->prepare_for_compaction(&cp); ! Generation* young_gen = _young_gen; ! young_gen->prepare_for_compaction(&cp); ! } ! ! GCStats* GenCollectedHeap::gc_stats(int level) const { ! if (level == 0) { ! return _young_gen->gc_stats(); ! } else { ! return _old_gen->gc_stats(); ! } } void GenCollectedHeap::verify(bool silent, VerifyOption option /* ignored */) { if (!silent) { gclog_or_tty->print("%s", _old_gen->name()); --- 1038,1051 ---- } void GenCollectedHeap::prepare_for_compaction() { guarantee(_n_gens = 2, "Wrong number of generations"); // Start by compacting into same gen. ! CompactPoint cp(_old_gen); ! _old_gen->prepare_for_compaction(&cp); ! _young_gen->prepare_for_compaction(&cp); } void GenCollectedHeap::verify(bool silent, VerifyOption option /* ignored */) { if (!silent) { gclog_or_tty->print("%s", _old_gen->name());
*** 1115,1128 **** #endif // INCLUDE_ALL_GCS } void GenCollectedHeap::print_tracing_info() const { if (TraceYoungGenTime) { ! get_gen(0)->print_summary_info(); } if (TraceOldGenTime) { ! get_gen(1)->print_summary_info(); } } void GenCollectedHeap::print_heap_change(size_t prev_used) const { if (PrintGCDetails && Verbose) { --- 1104,1117 ---- #endif // INCLUDE_ALL_GCS } void GenCollectedHeap::print_tracing_info() const { if (TraceYoungGenTime) { ! _young_gen->print_summary_info(); } if (TraceOldGenTime) { ! _old_gen->print_summary_info(); } } void GenCollectedHeap::print_heap_change(size_t prev_used) const { if (PrintGCDetails && Verbose) {
src/share/vm/memory/genCollectedHeap.cpp
Index Unified diffs Context diffs Sdiffs Patch New Old Previous File Next File