infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8375616: G1: Convert G1BatchedTask to use Atomic<T>

Browse Source 
Reviewed-by: sjohanss, kbarrett
This commit is contained in:
Thomas Schatzl 2026-01-22 08:29:27 +00:00
parent f3381f0ffe
commit e50bf1f2a4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hotspot/share/gc/g1/g1BatchedTask.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,6 @@
#include "gc/g1/g1BatchedTask.hpp" #include "gc/g1/g1BatchedTask.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1GCParPhaseTimesTracker.hpp" #include "gc/g1/g1GCParPhaseTimesTracker.hpp"
#include "runtime/atomicAccess.hpp"
#include "utilities/growableArray.hpp" #include "utilities/growableArray.hpp"
void G1AbstractSubTask::record_work_item(uint worker_id, uint index, size_t count) { void G1AbstractSubTask::record_work_item(uint worker_id, uint index, size_t count) {
@ -40,7 +39,7 @@ const char* G1AbstractSubTask::name() const {
} }
bool G1BatchedTask::try_claim_serial_task(int& task) { bool G1BatchedTask::try_claim_serial_task(int& task) {
task = AtomicAccess::fetch_then_add(&_num_serial_tasks_done, 1); task = _num_serial_tasks_done.fetch_then_add(1);
return task < _serial_tasks.length(); return task < _serial_tasks.length();
} }
@ -96,8 +95,8 @@ void G1BatchedTask::work(uint worker_id) {
} }
G1BatchedTask::~G1BatchedTask() { G1BatchedTask::~G1BatchedTask() {
assert(AtomicAccess::load(&_num_serial_tasks_done) >= _serial_tasks.length(), assert(_num_serial_tasks_done.load_relaxed() >= _serial_tasks.length(),
"Only %d tasks of %d claimed", AtomicAccess::load(&_num_serial_tasks_done), _serial_tasks.length()); "Only %d tasks of %d claimed", _num_serial_tasks_done.load_relaxed(), _serial_tasks.length());
for (G1AbstractSubTask* task : _parallel_tasks) { for (G1AbstractSubTask* task : _parallel_tasks) {
delete task; delete task;

5
src/hotspot/share/gc/g1/g1BatchedTask.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -28,6 +28,7 @@
#include "gc/g1/g1GCPhaseTimes.hpp" #include "gc/g1/g1GCPhaseTimes.hpp"
#include "gc/shared/workerThread.hpp" #include "gc/shared/workerThread.hpp"
#include "memory/allocation.hpp" #include "memory/allocation.hpp"
#include "runtime/atomic.hpp"
template <typename E, MemTag MT> template <typename E, MemTag MT>
class GrowableArrayCHeap; class GrowableArrayCHeap;
@ -120,7 +121,7 @@ public:
// 5) ~T() // 5) ~T()
// //
class G1BatchedTask : public WorkerTask { class G1BatchedTask : public WorkerTask {
volatile int _num_serial_tasks_done; Atomic<int> _num_serial_tasks_done;
G1GCPhaseTimes* _phase_times; G1GCPhaseTimes* _phase_times;
bool try_claim_serial_task(int& task); bool try_claim_serial_task(int& task);