diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp index 77de502dfff93..572fe8c2c652a 100644 --- a/src/hotspot/share/gc/serial/serialHeap.cpp +++ b/src/hotspot/share/gc/serial/serialHeap.cpp @@ -120,7 +120,7 @@ void SerialHeap::initialize_serviceability() { young->max_survivor_size(), false /* support_usage_threshold */); TenuredGeneration* old = old_gen(); - _old_pool = new GenerationPool(old, "Tenured Gen", true); + _old_pool = new TenuredGenerationPool(old, "Tenured Gen", true); _young_manager->add_pool(_eden_pool); _young_manager->add_pool(_survivor_pool); diff --git a/src/hotspot/share/gc/serial/serialMemoryPools.cpp b/src/hotspot/share/gc/serial/serialMemoryPools.cpp index f688771f60912..b82252b5a094f 100644 --- a/src/hotspot/share/gc/serial/serialMemoryPools.cpp +++ b/src/hotspot/share/gc/serial/serialMemoryPools.cpp @@ -24,8 +24,8 @@ #include "precompiled.hpp" #include "gc/serial/defNewGeneration.hpp" -#include "gc/serial/generation.hpp" #include "gc/serial/serialMemoryPools.hpp" +#include "gc/serial/tenuredGeneration.hpp" #include "gc/shared/space.hpp" ContiguousSpacePool::ContiguousSpacePool(ContiguousSpace* space, @@ -72,18 +72,18 @@ MemoryUsage SurvivorContiguousSpacePool::get_memory_usage() { return MemoryUsage(initial_size(), used, committed, maxSize); } -GenerationPool::GenerationPool(Generation* gen, - const char* name, - bool support_usage_threshold) : +TenuredGenerationPool::TenuredGenerationPool(TenuredGeneration* gen, + const char* name, + bool support_usage_threshold) : CollectedMemoryPool(name, gen->capacity(), gen->max_capacity(), support_usage_threshold), _gen(gen) { } -size_t GenerationPool::used_in_bytes() { +size_t TenuredGenerationPool::used_in_bytes() { return _gen->used(); } -MemoryUsage GenerationPool::get_memory_usage() { +MemoryUsage TenuredGenerationPool::get_memory_usage() { size_t used = used_in_bytes(); size_t committed = _gen->capacity(); size_t maxSize = (available_for_allocation() ? max_size() : 0); diff --git a/src/hotspot/share/gc/serial/serialMemoryPools.hpp b/src/hotspot/share/gc/serial/serialMemoryPools.hpp index aa89e4e4c382e..36cd978905578 100644 --- a/src/hotspot/share/gc/serial/serialMemoryPools.hpp +++ b/src/hotspot/share/gc/serial/serialMemoryPools.hpp @@ -62,11 +62,11 @@ class SurvivorContiguousSpacePool : public CollectedMemoryPool { size_t committed_in_bytes(); }; -class GenerationPool : public CollectedMemoryPool { +class TenuredGenerationPool : public CollectedMemoryPool { private: - Generation* _gen; + TenuredGeneration* _gen; public: - GenerationPool(Generation* gen, const char* name, bool support_usage_threshold); + TenuredGenerationPool(TenuredGeneration* gen, const char* name, bool support_usage_threshold); MemoryUsage get_memory_usage(); size_t used_in_bytes();