Mercurial > hg > truffle

comparison src/share/vm/memory/universe.cpp @ 20655:b840813adfcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8065305: Make it possible to extend the G1CollectorPolicy Summary: Added a G1CollectorPolicyExt where it is possible to extend the class. Reviewed-by: sjohanss, tschatzl
author jwilhelm
date Fri, 21 Nov 2014 12:08:37 +0100
parents fa6c442c59ee
children d3f3f7677537
comparison
equal deleted inserted replaced
20654:fa6adc194d48 20655:b840813adfcc
76 #include "utilities/macros.hpp" 76 #include "utilities/macros.hpp"
77 #if INCLUDE_ALL_GCS 77 #if INCLUDE_ALL_GCS
78 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" 78 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
79 #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp" 79 #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
80 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 80 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
81 #include "gc_implementation/g1/g1CollectorPolicy.hpp" 81 #include "gc_implementation/g1/g1CollectorPolicy_ext.hpp"
82 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" 82 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
83 #endif // INCLUDE_ALL_GCS 83 #endif // INCLUDE_ALL_GCS
84 84
85 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC 85 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
86 86
796 fatal("UseParallelGC not supported in this VM."); 796 fatal("UseParallelGC not supported in this VM.");
797 #endif // INCLUDE_ALL_GCS 797 #endif // INCLUDE_ALL_GCS
798 798
799 } else if (UseG1GC) { 799 } else if (UseG1GC) {
800 #if INCLUDE_ALL_GCS 800 #if INCLUDE_ALL_GCS
801 G1CollectorPolicy* g1p = new G1CollectorPolicy(); 801 G1CollectorPolicyExt* g1p = new G1CollectorPolicyExt();
802 g1p->initialize_all(); 802 g1p->initialize_all();
803 G1CollectedHeap* g1h = new G1CollectedHeap(g1p); 803 G1CollectedHeap* g1h = new G1CollectedHeap(g1p);
804 Universe::_collectedHeap = g1h; 804 Universe::_collectedHeap = g1h;
805 #else // INCLUDE_ALL_GCS 805 #else // INCLUDE_ALL_GCS
806 fatal("UseG1GC not supported in java kernel vm."); 806 fatal("UseG1GC not supported in java kernel vm.");