Skip to content

Commit 2aaf795

Browse files
committed
8272520: Inline GenericTaskQueue::initialize() to the constructor
Reviewed-by: kbarrett, iwalulya
1 parent ed57cf1 commit 2aaf795

File tree

10 files changed

+4
-23
lines changed

10 files changed

+4
-23
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,6 @@ G1CollectedHeap::G1CollectedHeap() :
15111511

15121512
for (uint i = 0; i < n_queues; i++) {
15131513
G1ScannerTasksQueue* q = new G1ScannerTasksQueue();
1514-
q->initialize();
15151514
_task_queues->register_queue(i, q);
15161515
::new (&_evacuation_failed_info_array[i]) EvacuationFailedInfo();
15171516
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
445445

446446
for (uint i = 0; i < _max_num_tasks; ++i) {
447447
G1CMTaskQueue* task_queue = new G1CMTaskQueue();
448-
task_queue->initialize();
449448
_task_queues->register_queue(i, task_queue);
450449

451450
_tasks[i] = new G1CMTask(i, this, task_queue, _region_mark_stats);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector,
4646
_cld_closure(mark_closure(), ClassLoaderData::_claim_strong),
4747
_mark_stats_cache(mark_stats, G1RegionMarkStatsCache::RegionMarkStatsCacheSize) {
4848
_mark_stats_cache.reset();
49-
_oop_stack.initialize();
50-
_objarray_stack.initialize();
5149
}
5250

5351
G1FullGCMarker::~G1FullGCMarker() {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ ParCompactionManager::ParCompactionManager() {
5858
_old_gen = heap->old_gen();
5959
_start_array = old_gen()->start_array();
6060

61-
marking_stack()->initialize();
62-
_objarray_stack.initialize();
63-
_region_stack.initialize();
64-
6561
reset_bitmap_query_cache();
6662
}
6763

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ PSPromotionManager::PSPromotionManager() {
190190
_old_lab.set_start_array(old_gen()->start_array());
191191

192192
uint queue_size;
193-
claimed_stack_depth()->initialize();
194193
queue_size = claimed_stack_depth()->max_elems();
195194

196195
_totally_drain = (ParallelGCThreads == 1) || (GCDrainStackTargetSize == 0);

src/hotspot/share/gc/shared/taskqueue.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,6 @@ class GenericTaskQueue: public TaskQueueSuper<N, F> {
345345
// Initializes the queue to empty.
346346
GenericTaskQueue();
347347

348-
void initialize();
349-
350348
// Push the task "t" on the queue. Returns "false" iff the queue is full.
351349
inline bool push(E t);
352350

@@ -392,11 +390,6 @@ class GenericTaskQueue: public TaskQueueSuper<N, F> {
392390
void invalidate_last_stolen_queue_id() { _last_stolen_queue_id = InvalidQueueId; }
393391
};
394392

395-
template<class E, MEMFLAGS F, unsigned int N>
396-
GenericTaskQueue<E, F, N>::GenericTaskQueue() : _last_stolen_queue_id(InvalidQueueId), _seed(17 /* random number */) {
397-
assert(sizeof(Age) == sizeof(size_t), "Depends on this.");
398-
}
399-
400393
// OverflowTaskQueue is a TaskQueue that also includes an overflow stack for
401394
// elements that do not fit in the TaskQueue.
402395
//

src/hotspot/share/gc/shared/taskqueue.inline.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ inline GenericTaskQueueSet<T, F>::~GenericTaskQueueSet() {
4949
}
5050

5151
template<class E, MEMFLAGS F, unsigned int N>
52-
inline void GenericTaskQueue<E, F, N>::initialize() {
53-
_elems = ArrayAllocator<E>::allocate(N, F);
54-
}
52+
inline GenericTaskQueue<E, F, N>::GenericTaskQueue() :
53+
_elems(ArrayAllocator<E>::allocate(N, F)),
54+
_last_stolen_queue_id(InvalidQueueId),
55+
_seed(17 /* random number */) {}
5556

5657
template<class E, MEMFLAGS F, unsigned int N>
5758
inline GenericTaskQueue<E, F, N>::~GenericTaskQueue() {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,6 @@ class ShenandoahParallelObjectIterator : public ParallelObjectIterator {
14251425
// Initialize queues for every workers
14261426
for (uint i = 0; i < _num_workers; ++i) {
14271427
ShenandoahObjToScanQueue* task_queue = new ShenandoahObjToScanQueue();
1428-
task_queue->initialize();
14291428
_task_queues->register_queue(i, task_queue);
14301429
}
14311430
// Divide roots among the workers. Assume that object referencing distribution

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ ShenandoahMarkingContext::ShenandoahMarkingContext(MemRegion heap_region, MemReg
4040
assert(max_queues > 0, "At least one queue");
4141
for (uint i = 0; i < max_queues; ++i) {
4242
ShenandoahObjToScanQueue* task_queue = new ShenandoahObjToScanQueue();
43-
task_queue->initialize();
4443
_task_queues->register_queue(i, task_queue);
4544
}
4645
}

src/hotspot/share/gc/z/zHeapIterator.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,12 @@ ZHeapIterator::ZHeapIterator(uint nworkers, bool visit_weaks) :
206206
// Create queues
207207
for (uint i = 0; i < _queues.size(); i++) {
208208
ZHeapIteratorQueue* const queue = new ZHeapIteratorQueue();
209-
queue->initialize();
210209
_queues.register_queue(i, queue);
211210
}
212211

213212
// Create array queues
214213
for (uint i = 0; i < _array_queues.size(); i++) {
215214
ZHeapIteratorArrayQueue* const array_queue = new ZHeapIteratorArrayQueue();
216-
array_queue->initialize();
217215
_array_queues.register_queue(i, array_queue);
218216
}
219217
}

0 commit comments

Comments
 (0)