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

Merge

Browse source
This commit is contained in:
Erik Helin 2013-06-27 10:56:10 +02:00
commit 62be1fc827
17 changed files with 310 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp
View file

@ -70,6 +70,17 @@ ASPSOldGen::ASPSOldGen(PSVirtualSpace* vs,
_virtual_space = vs;
}
void ASPSOldGen::initialize_work(const char* perf_data_name, int level) {
PSOldGen::initialize_work(perf_data_name, level);
// The old gen can grow to gen_size_limit(). _reserve reflects only
// the current maximum that can be committed.
assert(_reserved.byte_size() <= gen_size_limit(), "Consistency check");
initialize_performance_counters(perf_data_name, level);
}
void ASPSOldGen::reset_after_change() {
_reserved = MemRegion((HeapWord*)virtual_space()->low_boundary(),
(HeapWord*)virtual_space()->high_boundary());

2
hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp
View file

@ -50,6 +50,8 @@ class ASPSOldGen : public PSOldGen {
size_t max_gen_size() { return _reserved.byte_size(); }
void set_gen_size_limit(size_t v) { _gen_size_limit = v; }
virtual void initialize_work(const char* perf_data_name, int level);
// After a shrink or expand reset the generation
void reset_after_change();

2
hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp
View file

@ -110,7 +110,7 @@ class PSOldGen : public CHeapObj<mtGC> {
virtual void initialize(ReservedSpace rs, size_t alignment,
const char* perf_data_name, int level);
void initialize_virtual_space(ReservedSpace rs, size_t alignment);
void initialize_work(const char* perf_data_name, int level);
virtual void initialize_work(const char* perf_data_name, int level);
virtual void initialize_performance_counters(const char* perf_data_name, int level);
MemRegion reserved() const { return _reserved; }