Merge
This commit is contained in:
commit
fd814172ac
@ -604,10 +604,6 @@ public:
|
||||
|
||||
virtual G1CollectorPolicy* as_g1_policy() { return this; }
|
||||
|
||||
virtual CollectorPolicy::Name kind() {
|
||||
return CollectorPolicy::G1CollectorPolicyKind;
|
||||
}
|
||||
|
||||
G1CollectorState* collector_state();
|
||||
|
||||
G1GCPhaseTimes* phase_times() const { return _phase_times; }
|
||||
|
@ -111,13 +111,6 @@ class CollectorPolicy : public CHeapObj<mtGC> {
|
||||
size_t max_heap_byte_size() { return _max_heap_byte_size; }
|
||||
size_t min_heap_byte_size() { return _min_heap_byte_size; }
|
||||
|
||||
enum Name {
|
||||
CollectorPolicyKind,
|
||||
GenCollectorPolicyKind,
|
||||
ConcurrentMarkSweepPolicyKind,
|
||||
G1CollectorPolicyKind
|
||||
};
|
||||
|
||||
AdaptiveSizePolicy* size_policy() { return _size_policy; }
|
||||
bool should_clear_all_soft_refs() { return _should_clear_all_soft_refs; }
|
||||
void set_should_clear_all_soft_refs(bool v) { _should_clear_all_soft_refs = v; }
|
||||
@ -180,10 +173,6 @@ class CollectorPolicy : public CHeapObj<mtGC> {
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
|
||||
virtual CollectorPolicy::Name kind() {
|
||||
return CollectorPolicy::CollectorPolicyKind;
|
||||
}
|
||||
|
||||
// Do any updates required to global flags that are due to heap initialization
|
||||
// changes
|
||||
virtual void post_heap_initialize() = 0;
|
||||
@ -296,10 +285,6 @@ class GenCollectorPolicy : public CollectorPolicy {
|
||||
virtual void post_heap_initialize() {
|
||||
assert(_max_young_size == MaxNewSize, "Should be taken care of by initialize_size_info");
|
||||
}
|
||||
|
||||
virtual CollectorPolicy::Name kind() {
|
||||
return CollectorPolicy::GenCollectorPolicyKind;
|
||||
}
|
||||
};
|
||||
|
||||
class MarkSweepPolicy : public GenCollectorPolicy {
|
||||
|
Loading…
Reference in New Issue
Block a user