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

8387765: G1: Let G1HeapRegionType::_tag use the Atomic API

Browse Source 
Reviewed-by: aboldtch
This commit is contained in:
Thomas Schatzl 2026-07-08 06:01:46 +00:00
parent 597053969e
commit cc2cd968c5
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hotspot/share/gc/g1/g1HeapRegionType.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,8 +45,7 @@ bool G1HeapRegionType::is_valid(Tag tag) {
}
const char* G1HeapRegionType::get_str() const {
hrt_assert_is_valid(_tag);
switch (_tag) {
switch (get()) {
case FreeTag: return "FREE";
case EdenTag: return "EDEN";
case SurvTag: return "SURV";
@ -60,8 +59,7 @@ const char* G1HeapRegionType::get_str() const {
}
const char* G1HeapRegionType::get_short_str() const {
hrt_assert_is_valid(_tag);
switch (_tag) {
switch (get()) {
case FreeTag: return "F";
case EdenTag: return "E";
case SurvTag: return "S";
@ -75,8 +73,7 @@ const char* G1HeapRegionType::get_short_str() const {
}
G1HeapRegionTraceType::Type G1HeapRegionType::get_trace_type() {
hrt_assert_is_valid(_tag);
switch (_tag) {
switch (get()) {
case FreeTag: return G1HeapRegionTraceType::Free;
case EdenTag: return G1HeapRegionTraceType::Eden;
case SurvTag: return G1HeapRegionTraceType::Survivor;

32
src/hotspot/share/gc/g1/g1HeapRegionType.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,7 @@
#define SHARE_GC_G1_G1HEAPREGIONTYPE_HPP
#include "gc/g1/g1HeapRegionTraceType.hpp"
#include "runtime/atomic.hpp"
#include "utilities/globalDefinitions.hpp"
#define hrt_assert_is_valid(tag) \
@ -34,7 +35,6 @@
class G1HeapRegionType {
friend class VMStructs;
private:
// We encode the value of the heap region type so the generation can be
// determined quickly. The tag is split into two parts:
//
@ -73,20 +73,21 @@ private:
OldTag = OldMask
} Tag;
volatile Tag _tag;
Atomic<Tag> _tag;
static bool is_valid(Tag tag);
Tag get() const {
hrt_assert_is_valid(_tag);
return _tag;
Tag result = _tag.load_relaxed();
hrt_assert_is_valid(result);
return result;
}
// Sets the type to 'tag'.
void set(Tag tag) {
hrt_assert_is_valid(tag);
hrt_assert_is_valid(_tag);
_tag = tag;
hrt_assert_is_valid(_tag.load_relaxed());
_tag.store_relaxed(tag);
}
// Sets the type to 'tag', expecting the type to be 'before'. This
@ -95,13 +96,12 @@ private:
void set_from(Tag tag, Tag before) {
hrt_assert_is_valid(tag);
hrt_assert_is_valid(before);
hrt_assert_is_valid(_tag);
assert(_tag == before, "HR tag: %u, expected: %u new tag; %u", _tag, before, tag);
_tag = tag;
assert(get() == before, "HR tag: %u, expected: %u new tag; %u", get(), before, tag);
_tag.store_relaxed(tag);
}
// Private constructor used for static constants
G1HeapRegionType(Tag t) : _tag(t) { hrt_assert_is_valid(_tag); }
G1HeapRegionType(Tag t) : _tag(t) { hrt_assert_is_valid(t); }
public:
// Queries
@ -159,7 +159,15 @@ public:
const char* get_short_str() const;
G1HeapRegionTraceType::Type get_trace_type();
G1HeapRegionType() : _tag(FreeTag) { hrt_assert_is_valid(_tag); }
G1HeapRegionType() : G1HeapRegionType(FreeTag) { }
G1HeapRegionType(const G1HeapRegionType& other) : G1HeapRegionType(other.get()) { }
G1HeapRegionType& operator=(const G1HeapRegionType& other) {
if (this != &other) {
set(other.get());
}
return *this;
}
static const G1HeapRegionType Eden;
static const G1HeapRegionType Survivor;

6
src/hotspot/share/gc/g1/vmStructs_g1.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,7 @@
nonstatic_field(G1HeapRegion, _end, HeapWord* const) \
nonstatic_field(G1HeapRegion, _pinned_object_count, Atomic<size_t>) \
\
nonstatic_field(G1HeapRegionType, _tag, G1HeapRegionType::Tag volatile) \
nonstatic_field(G1HeapRegionType, _tag, Atomic<G1HeapRegionType::Tag>) \
\
\
nonstatic_field(G1HeapRegionTable, _base, address) \
@ -104,6 +104,6 @@
declare_toplevel_type(G1HeapRegion*) \
declare_toplevel_type(G1MonitoringSupport*) \
\
declare_integer_type(G1HeapRegionType::Tag volatile)
declare_integer_type(Atomic<G1HeapRegionType::Tag>)
#endif // SHARE_GC_G1_VMSTRUCTS_G1_HPP