Skip to content

Commit e6bad04

Browse files
William Kemperpull[bot]
authored andcommitted
8317535: Shenandoah: Remove unused code
Reviewed-by: rkennke, ysr
1 parent 8792844 commit e6bad04

20 files changed

+6
-185
lines changed

src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ Node* ShenandoahBarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue&
530530
Node* ShenandoahBarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) const {
531531
// 1: non-reference load, no additional barrier is needed
532532
if (!access.is_oop()) {
533-
return BarrierSetC2::load_at_resolved(access, val_type);;
533+
return BarrierSetC2::load_at_resolved(access, val_type);
534534
}
535535

536536
Node* load = BarrierSetC2::load_at_resolved(access, val_type);

src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,6 @@ bool ShenandoahAllocationRate::is_spiking(double rate, double threshold) const {
353353
return false;
354354
}
355355

356-
double ShenandoahAllocationRate::instantaneous_rate(size_t allocated) const {
357-
return instantaneous_rate(os::elapsedTime(), allocated);
358-
}
359-
360356
double ShenandoahAllocationRate::instantaneous_rate(double time, size_t allocated) const {
361357
size_t last_value = _last_sample_value;
362358
double last_time = _last_sample_time;

src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class ShenandoahAllocationRate : public CHeapObj<mtGC> {
3737

3838
double sample(size_t allocated);
3939

40-
double instantaneous_rate(size_t allocated) const;
4140
double upper_bound(double sds) const;
4241
bool is_spiking(double rate, double threshold) const;
4342

src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,4 +220,4 @@ void ShenandoahAssertNotForwardedClosure::do_oop(narrowOop* p) { do_oop_work(p);
220220
void ShenandoahAssertNotForwardedClosure::do_oop(oop* p) { do_oop_work(p); }
221221
#endif
222222

223-
#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP
223+
#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_INLINE_HPP

src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -36,70 +36,6 @@
3636
#include "runtime/atomic.hpp"
3737
#include "utilities/powerOfTwo.hpp"
3838

39-
ShenandoahParallelCodeCacheIterator::ShenandoahParallelCodeCacheIterator(const GrowableArray<CodeHeap*>* heaps) {
40-
_length = heaps->length();
41-
_iters = NEW_C_HEAP_ARRAY(ShenandoahParallelCodeHeapIterator, _length, mtGC);
42-
for (int h = 0; h < _length; h++) {
43-
_iters[h] = ShenandoahParallelCodeHeapIterator(heaps->at(h));
44-
}
45-
}
46-
47-
ShenandoahParallelCodeCacheIterator::~ShenandoahParallelCodeCacheIterator() {
48-
FREE_C_HEAP_ARRAY(ParallelCodeHeapIterator, _iters);
49-
}
50-
51-
void ShenandoahParallelCodeCacheIterator::parallel_blobs_do(CodeBlobClosure* f) {
52-
for (int c = 0; c < _length; c++) {
53-
_iters[c].parallel_blobs_do(f);
54-
}
55-
}
56-
57-
ShenandoahParallelCodeHeapIterator::ShenandoahParallelCodeHeapIterator(CodeHeap* heap) :
58-
_heap(heap), _claimed_idx(0), _finished(false) {
59-
}
60-
61-
void ShenandoahParallelCodeHeapIterator::parallel_blobs_do(CodeBlobClosure* f) {
62-
assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint");
63-
64-
/*
65-
* Parallel code heap walk.
66-
*
67-
* This code makes all threads scan all code heaps, but only one thread would execute the
68-
* closure on given blob. This is achieved by recording the "claimed" blocks: if a thread
69-
* had claimed the block, it can process all blobs in it. Others have to fast-forward to
70-
* next attempt without processing.
71-
*
72-
* Late threads would return immediately if iterator is finished.
73-
*/
74-
75-
if (_finished) {
76-
return;
77-
}
78-
79-
int stride = 256; // educated guess
80-
int stride_mask = stride - 1;
81-
assert (is_power_of_2(stride), "sanity");
82-
83-
int count = 0;
84-
bool process_block = true;
85-
86-
for (CodeBlob *cb = CodeCache::first_blob(_heap); cb != nullptr; cb = CodeCache::next_blob(_heap, cb)) {
87-
int current = count++;
88-
if ((current & stride_mask) == 0) {
89-
process_block = (current >= _claimed_idx) &&
90-
(Atomic::cmpxchg(&_claimed_idx, current, current + stride, memory_order_relaxed) == current);
91-
}
92-
if (process_block) {
93-
f->do_code_blob(cb);
94-
#ifdef ASSERT
95-
if (cb->is_nmethod())
96-
Universe::heap()->verify_nmethod((nmethod*)cb);
97-
#endif
98-
}
99-
}
100-
101-
_finished = true;
102-
}
10339

10440
ShenandoahNMethodTable* ShenandoahCodeRoots::_nmethod_table;
10541
int ShenandoahCodeRoots::_disarmed_value = 1;
@@ -303,7 +239,6 @@ void ShenandoahCodeRoots::purge() {
303239
}
304240

305241
ShenandoahCodeRootsIterator::ShenandoahCodeRootsIterator() :
306-
_par_iterator(CodeCache::heaps()),
307242
_table_snapshot(nullptr) {
308243
assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint");
309244
MutexLocker locker(CodeCache_lock, Mutex::_no_safepoint_check_flag);

src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,38 +39,9 @@ class ShenandoahNMethodTable;
3939
class ShenandoahNMethodTableSnapshot;
4040
class WorkerThreads;
4141

42-
class ShenandoahParallelCodeHeapIterator {
43-
friend class CodeCache;
44-
private:
45-
CodeHeap* _heap;
46-
shenandoah_padding(0);
47-
volatile int _claimed_idx;
48-
volatile bool _finished;
49-
shenandoah_padding(1);
50-
public:
51-
ShenandoahParallelCodeHeapIterator(CodeHeap* heap);
52-
void parallel_blobs_do(CodeBlobClosure* f);
53-
};
54-
55-
class ShenandoahParallelCodeCacheIterator {
56-
friend class CodeCache;
57-
private:
58-
ShenandoahParallelCodeHeapIterator* _iters;
59-
int _length;
60-
61-
NONCOPYABLE(ShenandoahParallelCodeCacheIterator);
62-
63-
public:
64-
ShenandoahParallelCodeCacheIterator(const GrowableArray<CodeHeap*>* heaps);
65-
~ShenandoahParallelCodeCacheIterator();
66-
void parallel_blobs_do(CodeBlobClosure* f);
67-
};
68-
6942
class ShenandoahCodeRootsIterator {
7043
friend class ShenandoahCodeRoots;
7144
protected:
72-
ShenandoahParallelCodeCacheIterator _par_iterator;
73-
ShenandoahSharedFlag _seq_claimed;
7445
ShenandoahNMethodTableSnapshot* _table_snapshot;
7546

7647
public:
@@ -88,7 +59,6 @@ class ShenandoahCodeRoots : public AllStatic {
8859
static void initialize();
8960
static void register_nmethod(nmethod* nm);
9061
static void unregister_nmethod(nmethod* nm);
91-
static void flush_nmethod(nmethod* nm);
9262

9363
static ShenandoahNMethodTable* table() {
9464
return _nmethod_table;

src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class ShenandoahConcurrentMarkingTask : public WorkerTask {
5858
ShenandoahHeap* heap = ShenandoahHeap::heap();
5959
ShenandoahConcurrentWorkerSession worker_session(worker_id);
6060
ShenandoahSuspendibleThreadSetJoiner stsj(ShenandoahSuspendibleWorkers);
61-
ShenandoahObjToScanQueue* q = _cm->get_queue(worker_id);
6261
ShenandoahReferenceProcessor* rp = heap->ref_processor();
6362
assert(rp != nullptr, "need reference processor");
6463
StringDedup::Requests requests;

src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
279279
}
280280

281281
end++;
282-
};
282+
}
283283

284284
size_t remainder = words_size & ShenandoahHeapRegion::region_size_words_mask();
285285

src/hotspot/share/gc/shenandoah/shenandoahGC.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ class ShenandoahUpdateRootsTask : public WorkerTask {
6666
assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "Must be at a safepoint");
6767
ShenandoahParallelWorkerSession worker_session(worker_id);
6868

69-
ShenandoahHeap* heap = ShenandoahHeap::heap();
7069
ShenandoahUpdateRefsClosure cl;
7170
if (_check_alive) {
7271
ShenandoahForwardedIsAliveClosure is_alive;

src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,14 +1893,6 @@ address ShenandoahHeap::in_cset_fast_test_addr() {
18931893
return (address) heap->collection_set()->biased_map_address();
18941894
}
18951895

1896-
address ShenandoahHeap::cancelled_gc_addr() {
1897-
return (address) ShenandoahHeap::heap()->_cancelled_gc.addr_of();
1898-
}
1899-
1900-
address ShenandoahHeap::gc_state_addr() {
1901-
return (address) ShenandoahHeap::heap()->_gc_state.addr_of();
1902-
}
1903-
19041896
size_t ShenandoahHeap::bytes_allocated_since_gc_start() const {
19051897
return Atomic::load(&_bytes_allocated_since_gc_start);
19061898
}

0 commit comments

Comments
 (0)