Skip to content

Commit

Permalink
8329109: Threads::print_on() tries to print CPU time for terminated G…
Browse files Browse the repository at this point in the history 
…C threads

Reviewed-by: mbaesken, dholmes, ayang
  • Loading branch information
@reinrich
reinrich committed Apr 5, 2024
1 parent 5860a48 commit c1cfb43
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/hotspot/share/runtime/threads.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1336,10 +1336,7 @@ void Threads::print_on(outputStream* st, bool print_stacks,
}

PrintOnClosure cl(st);
cl.do_thread(VMThread::vm_thread());
Universe::heap()->gc_threads_do(&cl);
cl.do_thread(WatcherThread::watcher_thread());
cl.do_thread(AsyncLogWriter::instance());
non_java_threads_do(&cl);

st->flush();
}
Expand Down

3 comments on commit c1cfb43

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on c1cfb43 Jul 1, 2024

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport c1cfb43d to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/share/runtime/threads.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-MBaesken-c1cfb43d-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git c1cfb43d8de8d0eed01b9bb6aa1202dc7cbff007

# Backport the commit
$ git cherry-pick --no-commit c1cfb43d8de8d0eed01b9bb6aa1202dc7cbff007
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport c1cfb43d8de8d0eed01b9bb6aa1202dc7cbff007'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport c1cfb43d8de8d0eed01b9bb6aa1202dc7cbff007.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c1cfb43d from the openjdk/jdk repository.

The commit being backported was authored by Richard Reingruber on 5 Apr 2024 and was reviewed by Matthias Baesken, David Holmes and Albert Mingkun Yang.

Thanks!

Please sign in to comment.