Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8257072: ZGC: Rename roots iterators #1429

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/hotspot/share/gc/z/zHeapIterator.cpp
Original file line number Diff line number Diff line change
@@ -280,7 +280,10 @@ void ZHeapIterator::push_strong_roots(const ZHeapIteratorContext& context) {
ZHeapIteratorNMethodClosure nm_cl(&cl);
ZHeapIteratorThreadClosure thread_cl(&cl, &nm_cl);

_roots.apply(&cl, &cld_cl, &thread_cl, &nm_cl);
_roots.apply(&cl,
&cld_cl,
&thread_cl,
&nm_cl);
}

void ZHeapIterator::push_weak_roots(const ZHeapIteratorContext& context) {
5 changes: 4 additions & 1 deletion src/hotspot/share/gc/z/zRootsIterator.cpp
Original file line number Diff line number Diff line change
@@ -109,7 +109,10 @@ ZRootsIterator::ZRootsIterator(int cld_claim) {
}
}

void ZRootsIterator::apply(OopClosure* cl, CLDClosure* cld_cl, ThreadClosure* thread_cl, NMethodClosure* nm_cl) {
void ZRootsIterator::apply(OopClosure* cl,
CLDClosure* cld_cl,
ThreadClosure* thread_cl,
NMethodClosure* nm_cl) {
_oop_storage_set.apply(cl);
_class_loader_data_graph.apply(cld_cl);
_java_threads.apply(thread_cl);
5 changes: 4 additions & 1 deletion src/hotspot/share/gc/z/zRootsIterator.hpp
Original file line number Diff line number Diff line change
@@ -93,7 +93,10 @@ class ZRootsIterator {
public:
ZRootsIterator(int cld_claim);

void apply(OopClosure* cl, CLDClosure* cld_cl, ThreadClosure* thread_cl, NMethodClosure* nm_cl);
void apply(OopClosure* cl,
CLDClosure* cld_cl,
ThreadClosure* thread_cl,
NMethodClosure* nm_cl);
};

class ZWeakOopStorageSetIterator {
5 changes: 4 additions & 1 deletion src/hotspot/share/gc/z/zVerify.cpp
Original file line number Diff line number Diff line change
@@ -258,7 +258,10 @@ void ZVerify::roots_strong(bool verify_fixed) {
ZVerifyNMethodClosure nm_cl(&cl, verify_fixed);

ZRootsIterator iter(ClassLoaderData::_claim_none);
iter.apply(&cl, &cld_cl, &thread_cl, &nm_cl);
iter.apply(&cl,
&cld_cl,
&thread_cl,
&nm_cl);
}

void ZVerify::roots_weak() {
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/z/zWeakRootsProcessor.cpp
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ class ZProcessWeakRootsTask : public ZTask {

public:
ZProcessWeakRootsTask() :
ZTask("ZProcessConccurentWeakRootsTask"),
ZTask("ZProcessWeakRootsTask"),
_weak_roots() {}

~ZProcessWeakRootsTask() {