Mercurial > hg > truffle
comparison src/share/vm/memory/universe.cpp @ 13060:8f07aa079343
8016309: assert(eden_size > 0 && survivor_size > 0) failed: just checking
7057939: jmap shows MaxNewSize=4GB when Java is using parallel collector
Summary: Major cleanup of the collectorpolicy classes
Reviewed-by: tschatzl, jcoomes
author | jwilhelm |
---|---|
date | Fri, 01 Nov 2013 17:09:38 +0100 |
parents | 46d7652b223c |
children | 610be0309a79 |
comparison
equal
deleted
inserted
replaced
13059:46d7652b223c | 13060:8f07aa079343 |
---|---|
763 #endif // INCLUDE_ALL_GCS | 763 #endif // INCLUDE_ALL_GCS |
764 | 764 |
765 } else if (UseG1GC) { | 765 } else if (UseG1GC) { |
766 #if INCLUDE_ALL_GCS | 766 #if INCLUDE_ALL_GCS |
767 G1CollectorPolicy* g1p = new G1CollectorPolicy(); | 767 G1CollectorPolicy* g1p = new G1CollectorPolicy(); |
768 g1p->initialize_all(); | |
768 G1CollectedHeap* g1h = new G1CollectedHeap(g1p); | 769 G1CollectedHeap* g1h = new G1CollectedHeap(g1p); |
769 Universe::_collectedHeap = g1h; | 770 Universe::_collectedHeap = g1h; |
770 #else // INCLUDE_ALL_GCS | 771 #else // INCLUDE_ALL_GCS |
771 fatal("UseG1GC not supported in java kernel vm."); | 772 fatal("UseG1GC not supported in java kernel vm."); |
772 #endif // INCLUDE_ALL_GCS | 773 #endif // INCLUDE_ALL_GCS |
787 fatal("UseConcMarkSweepGC not supported in this VM."); | 788 fatal("UseConcMarkSweepGC not supported in this VM."); |
788 #endif // INCLUDE_ALL_GCS | 789 #endif // INCLUDE_ALL_GCS |
789 } else { // default old generation | 790 } else { // default old generation |
790 gc_policy = new MarkSweepPolicy(); | 791 gc_policy = new MarkSweepPolicy(); |
791 } | 792 } |
793 gc_policy->initialize_all(); | |
792 | 794 |
793 Universe::_collectedHeap = new GenCollectedHeap(gc_policy); | 795 Universe::_collectedHeap = new GenCollectedHeap(gc_policy); |
794 } | 796 } |
795 | 797 |
796 jint status = Universe::heap()->initialize(); | 798 jint status = Universe::heap()->initialize(); |