infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-21 04:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8330463: Rename invalidate() to write_region() in ModRefBarrierSet

Browse Source 
Reviewed-by: gli, tschatzl
This commit is contained in:
Albert Mingkun Yang 2024-04-22 10:05:32 +00:00
parent c4f5c5140a
commit f889797e1f
7 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/gc/g1/g1BarrierSet.cpp
View File

@ -102,7 +102,7 @@ void G1BarrierSet::write_ref_field_post_slow(volatile CardValue* byte) {
}
}
void G1BarrierSet::invalidate(JavaThread* thread, MemRegion mr) {
void G1BarrierSet::write_region(JavaThread* thread, MemRegion mr) {
if (mr.is_empty()) {
return;
}

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

@ -48,8 +48,6 @@ class G1BarrierSet: public CardTableBarrierSet {
return barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
}
void invalidate(JavaThread* thread, MemRegion mr);
public:
G1BarrierSet(G1CardTable* table);
~G1BarrierSet() { }
@ -73,8 +71,8 @@ class G1BarrierSet: public CardTableBarrierSet {
template <DecoratorSet decorators, typename T>
void write_ref_field_pre(T* field);
inline void invalidate(MemRegion mr);
inline void write_region(JavaThread* thread, MemRegion mr);
inline void write_region(MemRegion mr);
void write_region(JavaThread* thread, MemRegion mr);
inline void write_ref_array_work(MemRegion mr);

10
src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
View File

@ -68,16 +68,12 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) {
enqueue(field);
}
inline void G1BarrierSet::invalidate(MemRegion mr) {
invalidate(JavaThread::current(), mr);
}
inline void G1BarrierSet::write_region(JavaThread* thread, MemRegion mr) {
invalidate(thread, mr);
inline void G1BarrierSet::write_region(MemRegion mr) {
write_region(JavaThread::current(), mr);
}
inline void G1BarrierSet::write_ref_array_work(MemRegion mr) {
invalidate(mr);
write_region(mr);
}
template <DecoratorSet decorators, typename T>

4
src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
View File

@ -84,7 +84,7 @@ void CardTableBarrierSet::write_ref_array_work(MemRegion mr) {
_card_table->dirty_MemRegion(mr);
}
void CardTableBarrierSet::invalidate(MemRegion mr) {
void CardTableBarrierSet::write_region(MemRegion mr) {
_card_table->dirty_MemRegion(mr);
}
@ -141,7 +141,7 @@ void CardTableBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop ne
thread->set_deferred_card_mark(mr);
} else {
// Do the card mark
invalidate(mr);
write_region(mr);
}
}
#endif // COMPILER2_OR_JVMCI

4
src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
View File

@ -67,7 +67,7 @@ public:
void initialize();
void write_region(JavaThread* thread, MemRegion mr) {
invalidate(mr);
write_region(mr);
}
void write_ref_array_work(MemRegion mr);
@ -80,7 +80,7 @@ public:
template <DecoratorSet decorators, typename T>
void write_ref_field_post(T* field);
virtual void invalidate(MemRegion mr);
virtual void write_region(MemRegion mr);
// ReduceInitialCardMarks
void initialize_deferred_card_mark_barriers();

2
src/hotspot/share/gc/shared/modRefBarrierSet.hpp
View File

@ -52,7 +52,7 @@ public:
inline void write_ref_field_post(T *addr) {}
// Causes all refs in "mr" to be assumed to be modified (by this JavaThread).
virtual void invalidate(MemRegion mr) = 0;
virtual void write_region(MemRegion mr) = 0;
// Causes all refs in "mr" to be assumed to be modified by the given JavaThread.
virtual void write_region(JavaThread* thread, MemRegion mr) = 0;

2
src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
View File

@ -138,7 +138,7 @@ inline void ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
clone_in_heap(oop src, oop dst, size_t size) {
Raw::clone(src, dst, size);
BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
bs->invalidate(MemRegion((HeapWord*)(void*)dst, size));
bs->write_region(MemRegion((HeapWord*)(void*)dst, size));
}
#endif // SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP