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

SapMachine (17): Cherry-pick 8329109: Threads::print_on() tries to print CPU time for terminated GC threads #1756

Merged
merged 1 commit into from
Jul 15, 2024

Conversation

RealCLanger
Copy link
Member

We want to cherry-pick the backport of JDK-8329109 for the July CPU. Due to SapMachine diffs, the upstream patch did not apply cleanly, I had to massage it.

fixes #1502

@SapMachine
Copy link
Member

Hello @RealCLanger, this pull request fulfills all formal requirements.

}
cl.do_thread(WatcherThread::watcher_thread());
cl.do_thread(AsyncLogWriter::instance());
non_java_threads_do(&cl);

// SapMachine 2019-11-07: Vitals
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think L3868 - L3883 can be also removed. The vitals sampler thread and the himem reporter thread are NonJavaThreads and handled by non_java_threads_do(&cl); in L3866.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, good catch. Then it's probably also wrong in head and the other higher backports, e.g.:

const Thread* vitals_sampler_thread = sapmachine_vitals::samplerthread();
correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes indeed. Likewise good catch.

@SapMachine
Copy link
Member

Hello @RealCLanger, this pull request fulfills all formal requirements.

@@ -3589,7 +3589,6 @@ void Threads::add(JavaThread* p, bool force_daemon) {
p->set_on_thread_list();

_number_of_threads++;

Copy link
Member

@reinrich reinrich Jul 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other nit: empty line L3618 before closing brace doesn't look nice either. I'll leave it to you if you remove it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this line only because it's a diff to upstream. 😉

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I noticed it.

@RealCLanger RealCLanger merged commit 8ae5765 into SAP:sapmachine17 Jul 15, 2024
63 of 68 checks passed
@RealCLanger RealCLanger deleted the printon17 branch July 15, 2024 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants