Skip to content

Commit

Permalink
8329663: hs_err file event log entry for thread adding/removing shoul…
Browse files Browse the repository at this point in the history 
…d print current thread

Reviewed-by: kevinw, rrich
  • Loading branch information
@MBaesken
MBaesken committed Apr 8, 2024
1 parent be45de1 commit 3ebf8c9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/threads.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ void Threads::add(JavaThread* p, bool force_daemon) {
ObjectSynchronizer::inc_in_use_list_ceiling();

// Possible GC point.
Events::log(p, "Thread added: " INTPTR_FORMAT, p2i(p));
Events::log(Thread::current(), "Thread added: " INTPTR_FORMAT, p2i(p));

// Make new thread known to active EscapeBarrier
EscapeBarrier::thread_added(p);
Expand Down Expand Up @@ -1081,7 +1081,7 @@ void Threads::remove(JavaThread* p, bool is_daemon) {
ObjectSynchronizer::dec_in_use_list_ceiling();

// Since Events::log uses a lock, we grab it outside the Threads_lock
Events::log(p, "Thread exited: " INTPTR_FORMAT, p2i(p));
Events::log(Thread::current(), "Thread exited: " INTPTR_FORMAT, p2i(p));
}

// Operations on the Threads list for GC. These are not explicitly locked,
Expand Down

7 comments on commit 3ebf8c9

@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 Author

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3ebf8c9 May 6, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-3ebf8c93 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Matthias Baesken on 8 Apr 2024 and was reviewed by Kevin Walls and Richard Reingruber.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-MBaesken-3ebf8c93:backport-MBaesken-3ebf8c93
$ git checkout backport-MBaesken-3ebf8c93
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-MBaesken-3ebf8c93

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on 3ebf8c9 May 7, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-3ebf8c93 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Matthias Baesken on 8 Apr 2024 and was reviewed by Kevin Walls and Richard Reingruber.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-MBaesken-3ebf8c93:backport-MBaesken-3ebf8c93
$ git checkout backport-MBaesken-3ebf8c93
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-MBaesken-3ebf8c93

@MBaesken
Copy link
Member Author

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 3ebf8c9 Jun 17, 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 3ebf8c93 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-3ebf8c93-master

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

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

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

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

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

Hi all,

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

The commit being backported was authored by Matthias Baesken on 8 Apr 2024 and was reviewed by Kevin Walls and Richard Reingruber.

Thanks!

Please sign in to comment.