Skip to content

Commit 5a0a152

Browse files
committed
Remove Thread argument from tlab functions in CH
1 parent 4380a6b commit 5a0a152

18 files changed

+62
-64
lines changed

src/hotspot/share/gc/epsilon/epsilonHeap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ GrowableArray<MemoryPool*> EpsilonHeap::memory_pools() {
9191
return memory_pools;
9292
}
9393

94-
size_t EpsilonHeap::unsafe_max_tlab_alloc(Thread* thr) const {
94+
size_t EpsilonHeap::unsafe_max_tlab_alloc() const {
9595
// Return max allocatable TLAB size, and let allocation path figure out
9696
// the actual allocation size. Note: result should be in bytes.
9797
return _max_tlab_size * HeapWordSize;

src/hotspot/share/gc/epsilon/epsilonHeap.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ class EpsilonHeap : public CollectedHeap {
9090
size_t* actual_size) override;
9191

9292
// TLAB allocation
93-
size_t tlab_capacity(Thread* thr) const override { return capacity(); }
94-
size_t tlab_used(Thread* thr) const override { return used(); }
95-
size_t max_tlab_size() const override { return _max_tlab_size; }
96-
size_t unsafe_max_tlab_alloc(Thread* thr) const override;
93+
size_t tlab_capacity() const override { return capacity(); }
94+
size_t tlab_used() const override { return used(); }
95+
size_t max_tlab_size() const override { return _max_tlab_size; }
96+
size_t unsafe_max_tlab_alloc() const override;
9797

9898
void collect(GCCause::Cause cause) override;
9999
void do_full_collection(bool clear_all_soft_refs) override;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2192,11 +2192,11 @@ bool G1CollectedHeap::block_is_obj(const HeapWord* addr) const {
21922192
return hr->block_is_obj(addr, hr->parsable_bottom_acquire());
21932193
}
21942194

2195-
size_t G1CollectedHeap::tlab_capacity(Thread* ignored) const {
2195+
size_t G1CollectedHeap::tlab_capacity() const {
21962196
return eden_target_length() * G1HeapRegion::GrainBytes;
21972197
}
21982198

2199-
size_t G1CollectedHeap::tlab_used(Thread* ignored) const {
2199+
size_t G1CollectedHeap::tlab_used() const {
22002200
return _eden.length() * G1HeapRegion::GrainBytes;
22012201
}
22022202

@@ -2206,7 +2206,7 @@ size_t G1CollectedHeap::max_tlab_size() const {
22062206
return align_down(_humongous_object_threshold_in_words, MinObjAlignment);
22072207
}
22082208

2209-
size_t G1CollectedHeap::unsafe_max_tlab_alloc(Thread* ignored) const {
2209+
size_t G1CollectedHeap::unsafe_max_tlab_alloc() const {
22102210
return _allocator->unsafe_max_tlab_alloc();
22112211
}
22122212

src/hotspot/share/gc/g1/g1CollectedHeap.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,10 +1193,10 @@ class G1CollectedHeap : public CollectedHeap {
11931193
// Section on thread-local allocation buffers (TLABs)
11941194
// See CollectedHeap for semantics.
11951195

1196-
size_t tlab_capacity(Thread* ignored) const override;
1197-
size_t tlab_used(Thread* ignored) const override;
1196+
size_t tlab_capacity() const override;
1197+
size_t tlab_used() const override;
11981198
size_t max_tlab_size() const override;
1199-
size_t unsafe_max_tlab_alloc(Thread* ignored) const override;
1199+
size_t unsafe_max_tlab_alloc() const override;
12001200

12011201
inline bool is_in_young(const oop obj) const;
12021202
inline bool requires_barriers(stackChunkOop obj) const override;

src/hotspot/share/gc/parallel/mutableNUMASpace.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,23 +118,23 @@ size_t MutableNUMASpace::free_in_words() const {
118118
return s;
119119
}
120120

121-
size_t MutableNUMASpace::tlab_capacity(Thread *ignored) const {
121+
size_t MutableNUMASpace::tlab_capacity() const {
122122
size_t s = 0;
123123
for (LGRPSpace* ls : *lgrp_spaces()) {
124124
s += ls->space()->capacity_in_bytes();
125125
}
126126
return s / (size_t)lgrp_spaces()->length();
127127
}
128128

129-
size_t MutableNUMASpace::tlab_used(Thread *ignored) const {
129+
size_t MutableNUMASpace::tlab_used() const {
130130
size_t s = 0;
131131
for (LGRPSpace* ls : *lgrp_spaces()) {
132132
s += ls->space()->used_in_bytes();
133133
}
134134
return s / (size_t)lgrp_spaces()->length();
135135
}
136136

137-
size_t MutableNUMASpace::unsafe_max_tlab_alloc(Thread *ignored) const {
137+
size_t MutableNUMASpace::unsafe_max_tlab_alloc() const {
138138
size_t s = 0;
139139
for (LGRPSpace* ls : *lgrp_spaces()) {
140140
s += ls->space()->free_in_bytes();

src/hotspot/share/gc/parallel/mutableNUMASpace.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ class MutableNUMASpace : public MutableSpace {
176176
virtual size_t used_in_words() const;
177177
virtual size_t free_in_words() const;
178178

179-
virtual size_t tlab_capacity(Thread* ignored) const;
180-
virtual size_t tlab_used(Thread* ignored) const;
181-
virtual size_t unsafe_max_tlab_alloc(Thread* ignored) const;
179+
virtual size_t tlab_capacity() const;
180+
virtual size_t tlab_used() const;
181+
virtual size_t unsafe_max_tlab_alloc() const;
182182

183183
// Allocation (return null if full)
184184
virtual HeapWord* cas_allocate(size_t word_size);

src/hotspot/share/gc/parallel/mutableSpace.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ class MutableSpace: public CHeapObj<mtGC> {
116116
size_t free_in_bytes() const { return free_in_words() * HeapWordSize; }
117117

118118
// Size computations. Sizes are in heapwords.
119-
virtual size_t used_in_words() const { return pointer_delta(top(), bottom()); }
120-
virtual size_t free_in_words() const { return pointer_delta(end(), top()); }
121-
virtual size_t tlab_capacity(Thread* thr) const { return capacity_in_bytes(); }
122-
virtual size_t tlab_used(Thread* thr) const { return used_in_bytes(); }
123-
virtual size_t unsafe_max_tlab_alloc(Thread* thr) const { return free_in_bytes(); }
119+
virtual size_t used_in_words() const { return pointer_delta(top(), bottom()); }
120+
virtual size_t free_in_words() const { return pointer_delta(end(), top()); }
121+
virtual size_t tlab_capacity() const { return capacity_in_bytes(); }
122+
virtual size_t tlab_used() const { return used_in_bytes(); }
123+
virtual size_t unsafe_max_tlab_alloc() const { return free_in_bytes(); }
124124

125125
// Allocation (return null if full)
126126
virtual HeapWord* cas_allocate(size_t word_size);

src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,16 +434,16 @@ void ParallelScavengeHeap::ensure_parsability(bool retire_tlabs) {
434434
young_gen()->eden_space()->ensure_parsability();
435435
}
436436

437-
size_t ParallelScavengeHeap::tlab_capacity(Thread* thr) const {
438-
return young_gen()->eden_space()->tlab_capacity(thr);
437+
size_t ParallelScavengeHeap::tlab_capacity() const {
438+
return young_gen()->eden_space()->tlab_capacity();
439439
}
440440

441-
size_t ParallelScavengeHeap::tlab_used(Thread* thr) const {
442-
return young_gen()->eden_space()->tlab_used(thr);
441+
size_t ParallelScavengeHeap::tlab_used() const {
442+
return young_gen()->eden_space()->tlab_used();
443443
}
444444

445-
size_t ParallelScavengeHeap::unsafe_max_tlab_alloc(Thread* thr) const {
446-
return young_gen()->eden_space()->unsafe_max_tlab_alloc(thr);
445+
size_t ParallelScavengeHeap::unsafe_max_tlab_alloc() const {
446+
return young_gen()->eden_space()->unsafe_max_tlab_alloc();
447447
}
448448

449449
HeapWord* ParallelScavengeHeap::allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) {

src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ class ParallelScavengeHeap : public CollectedHeap {
199199
void ensure_parsability(bool retire_tlabs) override;
200200
void resize_all_tlabs() override;
201201

202-
size_t tlab_capacity(Thread* thr) const override;
203-
size_t tlab_used(Thread* thr) const override;
204-
size_t unsafe_max_tlab_alloc(Thread* thr) const override;
202+
size_t tlab_capacity() const override;
203+
size_t tlab_used() const override;
204+
size_t unsafe_max_tlab_alloc() const override;
205205

206206
void object_iterate(ObjectClosure* cl) override;
207207
void object_iterate_parallel(ObjectClosure* cl, HeapBlockClaimer* claimer);

src/hotspot/share/gc/serial/serialHeap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,16 +651,16 @@ bool SerialHeap::block_is_obj(const HeapWord* addr) const {
651651
return addr < _old_gen->space()->top();
652652
}
653653

654-
size_t SerialHeap::tlab_capacity(Thread* thr) const {
654+
size_t SerialHeap::tlab_capacity() const {
655655
// Only young-gen supports tlab allocation.
656656
return _young_gen->tlab_capacity();
657657
}
658658

659-
size_t SerialHeap::tlab_used(Thread* thr) const {
659+
size_t SerialHeap::tlab_used() const {
660660
return _young_gen->tlab_used();
661661
}
662662

663-
size_t SerialHeap::unsafe_max_tlab_alloc(Thread* thr) const {
663+
size_t SerialHeap::unsafe_max_tlab_alloc() const {
664664
return _young_gen->unsafe_max_tlab_alloc();
665665
}
666666

0 commit comments

Comments
 (0)