archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8219856: Spell out G1CollectorPolicy::is_hetero_heap

Browse source 
Reviewed-by: sangheki, kbarrett
This commit is contained in:
Thomas Schatzl 2019-03-04 11:49:16 +01:00
parent bfaeb63761
commit 3d9de2e6f2
10 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/gc/g1/g1CollectedHeap.cpp
View file

@ -2332,8 +2332,8 @@ bool G1CollectedHeap::request_concurrent_phase(const char* phase) {
return _cm_thread->request_concurrent_phase(phase); return _cm_thread->request_concurrent_phase(phase);
} }
bool G1CollectedHeap::is_hetero_heap() const { bool G1CollectedHeap::is_heterogeneous_heap() const {
return _collector_policy->is_hetero_heap(); return _collector_policy->is_heterogeneous_heap();
} }
class PrintRegionClosure: public HeapRegionClosure { class PrintRegionClosure: public HeapRegionClosure {

2
src/hotspot/share/gc/g1/g1CollectedHeap.hpp
View file

@ -1366,7 +1366,7 @@ public:
// WhiteBox testing support. // WhiteBox testing support.
virtual bool supports_concurrent_phase_control() const; virtual bool supports_concurrent_phase_control() const;
virtual bool request_concurrent_phase(const char* phase); virtual bool request_concurrent_phase(const char* phase);
bool is_hetero_heap() const; bool is_heterogeneous_heap() const;
virtual WorkGang* get_safepoint_workers() { return _workers; } virtual WorkGang* get_safepoint_workers() { return _workers; }

2
src/hotspot/share/gc/g1/g1CollectorPolicy.cpp
View file

@ -60,6 +60,6 @@ size_t G1CollectorPolicy::heap_reserved_size_bytes() const {
return _max_heap_byte_size; return _max_heap_byte_size;
} }
bool G1CollectorPolicy::is_hetero_heap() const { bool G1CollectorPolicy::is_heterogeneous_heap() const {
return false; return false;
} }

2
src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
View file

@ -39,6 +39,6 @@ protected:
public: public:
G1CollectorPolicy(); G1CollectorPolicy();
virtual size_t heap_reserved_size_bytes() const; virtual size_t heap_reserved_size_bytes() const;
virtual bool is_hetero_heap() const; virtual bool is_heterogeneous_heap() const;
}; };
#endif // SHARE_GC_G1_G1COLLECTORPOLICY_HPP #endif // SHARE_GC_G1_G1COLLECTORPOLICY_HPP

2
src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.cpp
View file

@ -98,6 +98,6 @@ size_t G1HeterogeneousCollectorPolicy::heap_reserved_size_bytes() const {
return 2 * _max_heap_byte_size; return 2 * _max_heap_byte_size;
} }
bool G1HeterogeneousCollectorPolicy::is_hetero_heap() const { bool G1HeterogeneousCollectorPolicy::is_heterogeneous_heap() const {
return true; return true;
} }

2
src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
View file

@ -41,7 +41,7 @@ protected:
public: public:
G1HeterogeneousCollectorPolicy() {} G1HeterogeneousCollectorPolicy() {}
virtual size_t heap_reserved_size_bytes() const; virtual size_t heap_reserved_size_bytes() const;
virtual bool is_hetero_heap() const; virtual bool is_heterogeneous_heap() const;
static size_t reasonable_max_memory_for_young(); static size_t reasonable_max_memory_for_young();
}; };

2
src/hotspot/share/gc/g1/g1Policy.cpp
View file

@ -90,7 +90,7 @@ G1Policy::~G1Policy() {
} }
G1Policy* G1Policy::create_policy(G1CollectorPolicy* policy, STWGCTimer* gc_timer_stw) { G1Policy* G1Policy::create_policy(G1CollectorPolicy* policy, STWGCTimer* gc_timer_stw) {
if (policy->is_hetero_heap()) { if (policy->is_heterogeneous_heap()) {
return new G1HeterogeneousHeapPolicy(policy, gc_timer_stw); return new G1HeterogeneousHeapPolicy(policy, gc_timer_stw);
} else { } else {
return new G1Policy(policy, gc_timer_stw); return new G1Policy(policy, gc_timer_stw);

2
src/hotspot/share/gc/g1/g1YoungGenSizer.cpp
View file

@ -131,7 +131,7 @@ void G1YoungGenSizer::heap_size_changed(uint new_number_of_heap_regions) {
} }
G1YoungGenSizer* G1YoungGenSizer::create_gen_sizer(G1CollectorPolicy* policy) { G1YoungGenSizer* G1YoungGenSizer::create_gen_sizer(G1CollectorPolicy* policy) {
if (policy->is_hetero_heap()) { if (policy->is_heterogeneous_heap()) {
return new G1HeterogeneousHeapYoungGenSizer(); return new G1HeterogeneousHeapYoungGenSizer();
} else { } else {
return new G1YoungGenSizer(); return new G1YoungGenSizer();

2
src/hotspot/share/gc/g1/heapRegionManager.cpp
View file

@ -69,7 +69,7 @@ HeapRegionManager::HeapRegionManager() :
{ } { }
HeapRegionManager* HeapRegionManager::create_manager(G1CollectedHeap* heap, G1CollectorPolicy* policy) { HeapRegionManager* HeapRegionManager::create_manager(G1CollectedHeap* heap, G1CollectorPolicy* policy) {
if (policy->is_hetero_heap()) { if (policy->is_heterogeneous_heap()) {
return new HeterogeneousHeapRegionManager((uint)(policy->max_heap_byte_size() / HeapRegion::GrainBytes) /*heap size as num of regions*/); return new HeterogeneousHeapRegionManager((uint)(policy->max_heap_byte_size() / HeapRegion::GrainBytes) /*heap size as num of regions*/);
} }
return new HeapRegionManager(); return new HeapRegionManager();

8
src/hotspot/share/prims/whitebox.cpp
View file

@ -483,7 +483,7 @@ WB_ENTRY(jlong, WB_DramReservedStart(JNIEnv* env, jobject o))
#if INCLUDE_G1GC #if INCLUDE_G1GC
if (UseG1GC) { if (UseG1GC) {
G1CollectedHeap* g1h = G1CollectedHeap::heap(); G1CollectedHeap* g1h = G1CollectedHeap::heap();
if (g1h->is_hetero_heap()) { if (g1h->is_heterogeneous_heap()) {
uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_dram(); uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_dram();
return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes); return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
} else { } else {
@ -509,7 +509,7 @@ WB_ENTRY(jlong, WB_DramReservedEnd(JNIEnv* env, jobject o))
#if INCLUDE_G1GC #if INCLUDE_G1GC
if (UseG1GC) { if (UseG1GC) {
G1CollectedHeap* g1h = G1CollectedHeap::heap(); G1CollectedHeap* g1h = G1CollectedHeap::heap();
if (g1h->is_hetero_heap()) { if (g1h->is_heterogeneous_heap()) {
uint end_region = HeterogeneousHeapRegionManager::manager()->end_index_of_dram(); uint end_region = HeterogeneousHeapRegionManager::manager()->end_index_of_dram();
return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1); return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
} else { } else {
@ -535,7 +535,7 @@ WB_ENTRY(jlong, WB_NvdimmReservedStart(JNIEnv* env, jobject o))
#if INCLUDE_G1GC #if INCLUDE_G1GC
if (UseG1GC) { if (UseG1GC) {
G1CollectedHeap* g1h = G1CollectedHeap::heap(); G1CollectedHeap* g1h = G1CollectedHeap::heap();
if (g1h->is_hetero_heap()) { if (g1h->is_heterogeneous_heap()) {
uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm(); uint start_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes); return (jlong)(g1h->base() + start_region * HeapRegion::GrainBytes);
} else { } else {
@ -561,7 +561,7 @@ WB_ENTRY(jlong, WB_NvdimmReservedEnd(JNIEnv* env, jobject o))
#if INCLUDE_G1GC #if INCLUDE_G1GC
if (UseG1GC) { if (UseG1GC) {
G1CollectedHeap* g1h = G1CollectedHeap::heap(); G1CollectedHeap* g1h = G1CollectedHeap::heap();
if (g1h->is_hetero_heap()) { if (g1h->is_heterogeneous_heap()) {
uint end_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm(); uint end_region = HeterogeneousHeapRegionManager::manager()->start_index_of_nvdimm();
return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1); return (jlong)(g1h->base() + (end_region + 1) * HeapRegion::GrainBytes - 1);
} else { } else {