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

8374684: ZGC: Convert zMark to use Atomic<T>

Browse Source 
Reviewed-by: stefank, tschatzl
This commit is contained in:
Axel Boldt-Christmas 2026-01-26 15:35:59 +00:00
parent 6648567574
commit f4607ed0a7
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hotspot/share/gc/z/zMark.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 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
@ -57,7 +57,6 @@
#include "memory/iterator.inline.hpp" #include "memory/iterator.inline.hpp"
#include "oops/objArrayOop.inline.hpp" #include "oops/objArrayOop.inline.hpp"
#include "oops/oop.inline.hpp" #include "oops/oop.inline.hpp"
#include "runtime/atomicAccess.hpp"
#include "runtime/continuation.hpp" #include "runtime/continuation.hpp"
#include "runtime/handshake.hpp" #include "runtime/handshake.hpp"
#include "runtime/javaThread.hpp" #include "runtime/javaThread.hpp"
@ -152,13 +151,14 @@ void ZMark::prepare_work() {
_terminate.reset(_nworkers); _terminate.reset(_nworkers);
// Reset flush counters // Reset flush counters
_work_nproactiveflush = _work_nterminateflush = 0; _work_nproactiveflush.store_relaxed(0u);
_work_nterminateflush.store_relaxed(0u);
} }
void ZMark::finish_work() { void ZMark::finish_work() {
// Accumulate proactive/terminate flush counters // Accumulate proactive/terminate flush counters
_nproactiveflush += _work_nproactiveflush; _nproactiveflush += _work_nproactiveflush.load_relaxed();
_nterminateflush += _work_nterminateflush; _nterminateflush += _work_nterminateflush.load_relaxed();
} }
void ZMark::follow_work_complete() { void ZMark::follow_work_complete() {
@ -594,7 +594,7 @@ bool ZMark::flush() {
} }
bool ZMark::try_terminate_flush() { bool ZMark::try_terminate_flush() {
AtomicAccess::inc(&_work_nterminateflush); _work_nterminateflush.add_then_fetch(1u);
_terminate.set_resurrected(false); _terminate.set_resurrected(false);
if (ZVerifyMarking) { if (ZVerifyMarking) {
@ -610,12 +610,12 @@ bool ZMark::try_proactive_flush() {
return false; return false;
} }
if (AtomicAccess::load(&_work_nproactiveflush) == ZMarkProactiveFlushMax) { if (_work_nproactiveflush.load_relaxed() == ZMarkProactiveFlushMax) {
// Limit reached or we're trying to terminate // Limit reached or we're trying to terminate
return false; return false;
} }
AtomicAccess::inc(&_work_nproactiveflush); _work_nproactiveflush.add_then_fetch(1u);
SuspendibleThreadSetLeaver sts_leaver; SuspendibleThreadSetLeaver sts_leaver;
return flush(); return flush();

7
src/hotspot/share/gc/z/zMark.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 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
@ -30,6 +30,7 @@
#include "gc/z/zMarkStackEntry.hpp" #include "gc/z/zMarkStackEntry.hpp"
#include "gc/z/zMarkTerminate.hpp" #include "gc/z/zMarkTerminate.hpp"
#include "oops/oopsHierarchy.hpp" #include "oops/oopsHierarchy.hpp"
#include "runtime/atomic.hpp"
#include "utilities/globalDefinitions.hpp" #include "utilities/globalDefinitions.hpp"
class Thread; class Thread;
@ -60,8 +61,8 @@ private:
ZMarkingSMR _marking_smr; ZMarkingSMR _marking_smr;
ZMarkStripeSet _stripes; ZMarkStripeSet _stripes;
ZMarkTerminate _terminate; ZMarkTerminate _terminate;
volatile size_t _work_nproactiveflush; Atomic<size_t> _work_nproactiveflush;
volatile size_t _work_nterminateflush; Atomic<size_t> _work_nterminateflush;
size_t _nproactiveflush; size_t _nproactiveflush;
size_t _nterminateflush; size_t _nterminateflush;
size_t _ntrycomplete; size_t _ntrycomplete;