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

8054341: Remove some obsolete code in G1CollectedHeap class

Browse source 
Remove dead code.

Reviewed-by: stefank, brutisso
This commit is contained in:
Thomas Schatzl 2014-08-07 22:28:53 +02:00
parent 24bee82e67
commit 94d0494b27
2 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View file

@ -2582,15 +2582,12 @@ bool G1CollectedHeap::is_in(const void* p) const {
// Iteration functions. // Iteration functions.
// Iterates an OopClosure over all ref-containing fields of objects // Applies an ExtendedOopClosure onto all references of objects within a HeapRegion.
// within a HeapRegion.
class IterateOopClosureRegionClosure: public HeapRegionClosure { class IterateOopClosureRegionClosure: public HeapRegionClosure {
MemRegion _mr;
ExtendedOopClosure* _cl; ExtendedOopClosure* _cl;
public: public:
IterateOopClosureRegionClosure(MemRegion mr, ExtendedOopClosure* cl) IterateOopClosureRegionClosure(ExtendedOopClosure* cl) : _cl(cl) {}
: _mr(mr), _cl(cl) {}
bool doHeapRegion(HeapRegion* r) { bool doHeapRegion(HeapRegion* r) {
if (!r->continuesHumongous()) { if (!r->continuesHumongous()) {
r->oop_iterate(_cl); r->oop_iterate(_cl);
@ -2600,12 +2597,7 @@ public:
}; };
void G1CollectedHeap::oop_iterate(ExtendedOopClosure* cl) { void G1CollectedHeap::oop_iterate(ExtendedOopClosure* cl) {
IterateOopClosureRegionClosure blk(_g1_committed, cl); IterateOopClosureRegionClosure blk(cl);
heap_region_iterate(&blk);
}
void G1CollectedHeap::oop_iterate(MemRegion mr, ExtendedOopClosure* cl) {
IterateOopClosureRegionClosure blk(mr, cl);
heap_region_iterate(&blk); heap_region_iterate(&blk);
} }
@ -4792,11 +4784,6 @@ protected:
Mutex _stats_lock; Mutex _stats_lock;
Mutex* stats_lock() { return &_stats_lock; } Mutex* stats_lock() { return &_stats_lock; }
size_t getNCards() {
return (_g1h->capacity() + G1BlockOffsetSharedArray::N_bytes - 1)
/ G1BlockOffsetSharedArray::N_bytes;
}
public: public:
G1ParTask(G1CollectedHeap* g1h, RefToScanQueueSet *task_queues) G1ParTask(G1CollectedHeap* g1h, RefToScanQueueSet *task_queues)
: AbstractGangTask("G1 collection"), : AbstractGangTask("G1 collection"),

3
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
View file

@ -1395,9 +1395,6 @@ public:
// "cl.do_oop" on each. // "cl.do_oop" on each.
virtual void oop_iterate(ExtendedOopClosure* cl); virtual void oop_iterate(ExtendedOopClosure* cl);
// Same as above, restricted to a memory region.
void oop_iterate(MemRegion mr, ExtendedOopClosure* cl);
// Iterate over all objects, calling "cl.do_object" on each. // Iterate over all objects, calling "cl.do_object" on each.
virtual void object_iterate(ObjectClosure* cl); virtual void object_iterate(ObjectClosure* cl);