Skip to content

Commit f9e9131

Browse files
albertnetymkalbertnetymk
committedNov 27, 2023
8319703: Serial: Remove generationSpec
Reviewed-by: cjplummer, tschatzl
1 parent a006d7e commit f9e9131

12 files changed

+11
-264
lines changed
 

‎src/hotspot/share/gc/g1/g1CollectedHeap.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
#include "gc/shared/gcLocker.inline.hpp"
8282
#include "gc/shared/gcTimer.hpp"
8383
#include "gc/shared/gcTraceTime.inline.hpp"
84-
#include "gc/shared/generationSpec.hpp"
8584
#include "gc/shared/isGCActiveMark.hpp"
8685
#include "gc/shared/locationPrinter.inline.hpp"
8786
#include "gc/shared/oopStorageParState.hpp"

‎src/hotspot/share/gc/serial/defNewGeneration.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "gc/shared/gcTimer.hpp"
4141
#include "gc/shared/gcTrace.hpp"
4242
#include "gc/shared/gcTraceTime.inline.hpp"
43-
#include "gc/shared/generationSpec.hpp"
4443
#include "gc/shared/preservedMarks.inline.hpp"
4544
#include "gc/shared/referencePolicy.hpp"
4645
#include "gc/shared/referenceProcessorPhaseTimes.hpp"
@@ -560,7 +559,7 @@ void DefNewGeneration::compute_new_size() {
560559

561560
size_t old_size = gch->old_gen()->capacity();
562561
size_t new_size_before = _virtual_space.committed_size();
563-
size_t min_new_size = initial_size();
562+
size_t min_new_size = NewSize;
564563
size_t max_new_size = reserved().byte_size();
565564
assert(min_new_size <= new_size_before &&
566565
new_size_before <= max_new_size,

‎src/hotspot/share/gc/serial/generation.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "gc/shared/gcLocker.hpp"
3232
#include "gc/shared/gcTimer.hpp"
3333
#include "gc/shared/gcTrace.hpp"
34-
#include "gc/shared/generationSpec.hpp"
3534
#include "gc/shared/space.inline.hpp"
3635
#include "gc/shared/spaceDecorator.inline.hpp"
3736
#include "logging/log.hpp"
@@ -57,14 +56,6 @@ Generation::Generation(ReservedSpace rs, size_t initial_size) :
5756
(HeapWord*)_virtual_space.high_boundary());
5857
}
5958

60-
size_t Generation::initial_size() {
61-
SerialHeap* serial_heap = SerialHeap::heap();
62-
if (serial_heap->is_young_gen(this)) {
63-
return serial_heap->young_gen_spec()->init_size();
64-
}
65-
return serial_heap->old_gen_spec()->init_size();
66-
}
67-
6859
size_t Generation::max_capacity() const {
6960
return reserved().byte_size();
7061
}

‎src/hotspot/share/gc/serial/generation.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050

5151
class DefNewGeneration;
5252
class GCMemoryManager;
53-
class GenerationSpec;
5453
class ContiguousSpace;
5554
class CompactPoint;
5655
class OopClosure;
@@ -113,8 +112,6 @@ class Generation: public CHeapObj<mtGC> {
113112

114113
virtual Generation::Name kind() { return Generation::Other; }
115114

116-
// Space inquiries (results in bytes)
117-
size_t initial_size();
118115
virtual size_t capacity() const = 0; // The maximum number of object bytes the
119116
// generation can currently hold.
120117
virtual size_t used() const = 0; // The number of used bytes in the gen.

‎src/hotspot/share/gc/serial/tenuredGeneration.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "gc/shared/gcLocker.hpp"
3333
#include "gc/shared/gcTimer.hpp"
3434
#include "gc/shared/gcTrace.hpp"
35-
#include "gc/shared/generationSpec.hpp"
3635
#include "gc/shared/space.hpp"
3736
#include "logging/log.hpp"
3837
#include "memory/allocation.inline.hpp"
@@ -165,7 +164,7 @@ void TenuredGeneration::compute_new_size_inner() {
165164
const double min_tmp = used_after_gc / maximum_used_percentage;
166165
size_t minimum_desired_capacity = (size_t)MIN2(min_tmp, double(max_uintx));
167166
// Don't shrink less than the initial generation size
168-
minimum_desired_capacity = MAX2(minimum_desired_capacity, initial_size());
167+
minimum_desired_capacity = MAX2(minimum_desired_capacity, OldSize);
169168
assert(used_after_gc <= minimum_desired_capacity, "sanity check");
170169

171170
const size_t free_after_gc = free();
@@ -204,7 +203,7 @@ void TenuredGeneration::compute_new_size_inner() {
204203
const double minimum_used_percentage = 1.0 - maximum_free_percentage;
205204
const double max_tmp = used_after_gc / minimum_used_percentage;
206205
size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
207-
maximum_desired_capacity = MAX2(maximum_desired_capacity, initial_size());
206+
maximum_desired_capacity = MAX2(maximum_desired_capacity, OldSize);
208207
log_trace(gc, heap)(" maximum_free_percentage: %6.2f minimum_used_percentage: %6.2f",
209208
maximum_free_percentage, minimum_used_percentage);
210209
log_trace(gc, heap)(" _capacity_at_prologue: %6.1fK minimum_desired_capacity: %6.1fK maximum_desired_capacity: %6.1fK",
@@ -234,7 +233,7 @@ void TenuredGeneration::compute_new_size_inner() {
234233
}
235234
assert(shrink_bytes <= max_shrink_bytes, "invalid shrink size");
236235
log_trace(gc, heap)(" shrinking: initSize: %.1fK maximum_desired_capacity: %.1fK",
237-
initial_size() / (double) K, maximum_desired_capacity / (double) K);
236+
OldSize / (double) K, maximum_desired_capacity / (double) K);
238237
log_trace(gc, heap)(" shrink_bytes: %.1fK current_shrink_factor: " SIZE_FORMAT " new shrink factor: " SIZE_FORMAT " _min_heap_delta_bytes: %.1fK",
239238
shrink_bytes / (double) K,
240239
current_shrink_factor,

‎src/hotspot/share/gc/shared/genCollectedHeap.cpp

+7-23
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "gc/serial/defNewGeneration.hpp"
3535
#include "gc/serial/genMarkSweep.hpp"
3636
#include "gc/serial/markSweep.hpp"
37+
#include "gc/serial/tenuredGeneration.hpp"
3738
#include "gc/shared/cardTableBarrierSet.hpp"
3839
#include "gc/shared/collectedHeap.inline.hpp"
3940
#include "gc/shared/collectorCounters.hpp"
@@ -47,7 +48,6 @@
4748
#include "gc/shared/gcVMOperations.hpp"
4849
#include "gc/shared/genArguments.hpp"
4950
#include "gc/shared/genCollectedHeap.hpp"
50-
#include "gc/shared/generationSpec.hpp"
5151
#include "gc/shared/locationPrinter.inline.hpp"
5252
#include "gc/shared/oopStorage.inline.hpp"
5353
#include "gc/shared/oopStorageParState.inline.hpp"
@@ -85,14 +85,6 @@ GenCollectedHeap::GenCollectedHeap(Generation::Name young,
8585
CollectedHeap(),
8686
_young_gen(nullptr),
8787
_old_gen(nullptr),
88-
_young_gen_spec(new GenerationSpec(young,
89-
NewSize,
90-
MaxNewSize,
91-
GenAlignment)),
92-
_old_gen_spec(new GenerationSpec(old,
93-
OldSize,
94-
MaxOldSize,
95-
GenAlignment)),
9688
_rem_set(nullptr),
9789
_soft_ref_policy(),
9890
_gc_policy_counters(new GCPolicyCounters(policy_counters_name, 2, 2)),
@@ -115,8 +107,8 @@ jint GenCollectedHeap::initialize() {
115107

116108
initialize_reserved_region(heap_rs);
117109

118-
ReservedSpace young_rs = heap_rs.first_part(_young_gen_spec->max_size());
119-
ReservedSpace old_rs = heap_rs.last_part(_young_gen_spec->max_size());
110+
ReservedSpace young_rs = heap_rs.first_part(MaxNewSize);
111+
ReservedSpace old_rs = heap_rs.last_part(MaxNewSize);
120112

121113
_rem_set = create_rem_set(heap_rs.region());
122114
_rem_set->initialize(young_rs.base(), old_rs.base());
@@ -125,8 +117,8 @@ jint GenCollectedHeap::initialize() {
125117
bs->initialize();
126118
BarrierSet::set_barrier_set(bs);
127119

128-
_young_gen = _young_gen_spec->init(young_rs, rem_set());
129-
_old_gen = _old_gen_spec->init(old_rs, rem_set());
120+
_young_gen = new DefNewGeneration(young_rs, NewSize, MinNewSize, MaxNewSize);
121+
_old_gen = new TenuredGeneration(old_rs, OldSize, MinOldSize, MaxOldSize, rem_set());
130122

131123
GCInitLogger::print();
132124

@@ -143,8 +135,8 @@ ReservedHeapSpace GenCollectedHeap::allocate(size_t alignment) {
143135
assert(alignment % pageSize == 0, "Must be");
144136

145137
// Check for overflow.
146-
size_t total_reserved = _young_gen_spec->max_size() + _old_gen_spec->max_size();
147-
if (total_reserved < _young_gen_spec->max_size()) {
138+
size_t total_reserved = MaxNewSize + MaxOldSize;
139+
if (total_reserved < MaxNewSize) {
148140
vm_exit_during_initialization("The size of the object heap + VM data exceeds "
149141
"the maximum representable size");
150142
}
@@ -199,14 +191,6 @@ PreGenGCValues GenCollectedHeap::get_pre_gc_values() const {
199191
old_gen()->capacity());
200192
}
201193

202-
GenerationSpec* GenCollectedHeap::young_gen_spec() const {
203-
return _young_gen_spec;
204-
}
205-
206-
GenerationSpec* GenCollectedHeap::old_gen_spec() const {
207-
return _old_gen_spec;
208-
}
209-
210194
size_t GenCollectedHeap::capacity() const {
211195
return _young_gen->capacity() + _old_gen->capacity();
212196
}

‎src/hotspot/share/gc/shared/genCollectedHeap.hpp

-7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
class CardTableRS;
3535
class GCPolicyCounters;
36-
class GenerationSpec;
3736

3837
// A "GenCollectedHeap" is a CollectedHeap that uses generational
3938
// collection. It has two generations, young and old.
@@ -62,9 +61,6 @@ class GenCollectedHeap : public CollectedHeap {
6261
Generation* _old_gen;
6362

6463
private:
65-
GenerationSpec* _young_gen_spec;
66-
GenerationSpec* _old_gen_spec;
67-
6864
// The singleton CardTable Remembered Set.
6965
CardTableRS* _rem_set;
7066

@@ -144,9 +140,6 @@ class GenCollectedHeap : public CollectedHeap {
144140
MemRegion reserved_region() const { return _reserved; }
145141
bool is_in_reserved(const void* addr) const { return _reserved.contains(addr); }
146142

147-
GenerationSpec* young_gen_spec() const;
148-
GenerationSpec* old_gen_spec() const;
149-
150143
SoftRefPolicy* soft_ref_policy() override { return &_soft_ref_policy; }
151144

152145
// Performance Counter support

‎src/hotspot/share/gc/shared/generationSpec.cpp

-49
This file was deleted.

‎src/hotspot/share/gc/shared/generationSpec.hpp

-61
This file was deleted.

‎src/hotspot/share/gc/shared/vmStructs_gc.hpp

-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "gc/shared/cardTable.hpp"
3030
#include "gc/shared/collectedHeap.hpp"
3131
#include "gc/shared/genCollectedHeap.hpp"
32-
#include "gc/shared/generationSpec.hpp"
3332
#include "gc/shared/oopStorage.hpp"
3433
#include "gc/shared/space.hpp"
3534
#if INCLUDE_EPSILONGC
@@ -114,14 +113,8 @@
114113
nonstatic_field(Generation::StatRecord, invocations, int) \
115114
nonstatic_field(Generation::StatRecord, accumulated_time, elapsedTimer) \
116115
\
117-
nonstatic_field(GenerationSpec, _name, Generation::Name) \
118-
nonstatic_field(GenerationSpec, _init_size, size_t) \
119-
nonstatic_field(GenerationSpec, _max_size, size_t) \
120-
\
121116
nonstatic_field(GenCollectedHeap, _young_gen, Generation*) \
122117
nonstatic_field(GenCollectedHeap, _old_gen, Generation*) \
123-
nonstatic_field(GenCollectedHeap, _young_gen_spec, GenerationSpec*) \
124-
nonstatic_field(GenCollectedHeap, _old_gen_spec, GenerationSpec*) \
125118
\
126119
nonstatic_field(MemRegion, _start, HeapWord*) \
127120
nonstatic_field(MemRegion, _word_size, size_t) \
@@ -172,7 +165,6 @@
172165
declare_toplevel_type(AgeTable) \
173166
declare_toplevel_type(CardTable::CardValue) \
174167
declare_toplevel_type(Generation::StatRecord) \
175-
declare_toplevel_type(GenerationSpec) \
176168
declare_toplevel_type(HeapWord) \
177169
declare_toplevel_type(MemRegion) \
178170
declare_toplevel_type(ThreadLocalAllocBuffer) \
@@ -190,7 +182,6 @@
190182
declare_toplevel_type(DefNewGeneration*) \
191183
declare_toplevel_type(GenCollectedHeap*) \
192184
declare_toplevel_type(Generation*) \
193-
declare_toplevel_type(GenerationSpec**) \
194185
declare_toplevel_type(HeapWord*) \
195186
declare_toplevel_type(HeapWord* volatile) \
196187
declare_toplevel_type(MemRegion*) \

‎src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java

-25
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public abstract class GenCollectedHeap extends CollectedHeap {
3939
private static AddressField youngGenField;
4040
private static AddressField oldGenField;
4141

42-
private static AddressField youngGenSpecField;
43-
private static AddressField oldGenSpecField;
44-
4542
private static GenerationFactory genFactory;
4643

4744
static {
@@ -57,8 +54,6 @@ private static synchronized void initialize(TypeDataBase db) {
5754

5855
youngGenField = type.getAddressField("_young_gen");
5956
oldGenField = type.getAddressField("_old_gen");
60-
youngGenSpecField = type.getAddressField("_young_gen_spec");
61-
oldGenSpecField = type.getAddressField("_old_gen_spec");
6257

6358
genFactory = new GenerationFactory();
6459
}
@@ -115,26 +110,6 @@ public long used() {
115110
return used;
116111
}
117112

118-
/** Package-private access to GenerationSpecs */
119-
GenerationSpec spec(int level) {
120-
if (Assert.ASSERTS_ENABLED) {
121-
Assert.that((level == 0) || (level == 1), "Index " + level +
122-
" out of range (should be 0 or 1)");
123-
}
124-
125-
if ((level != 0) && (level != 1)) {
126-
return null;
127-
}
128-
129-
if (level == 0) {
130-
return VMObjectFactory.newObject(GenerationSpec.class,
131-
youngGenSpecField.getAddress());
132-
} else {
133-
return VMObjectFactory.newObject(GenerationSpec.class,
134-
oldGenSpecField.getAddress());
135-
}
136-
}
137-
138113
public void liveRegionsIterate(LiveRegionsClosure closure) {
139114
// Run through all generations, obtaining bottom-top pairs.
140115
for (int i = 0; i < nGens(); i++) {

‎src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GenerationSpec.java

-71
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.