Skip to content

8269293: ObjectMonitor thread id fields should be 64 bits. #4584

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

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jun 24, 2021

This is a trivial change to fix the type of _previous_version_tid and _notifier_tid in ObjectMonitor to be unint64_t.
Tested with tier1-3 and JFR tests on linux-x64-debug and windows-x64-debug. I don't have a 32 bit system to test this out on.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8269293: ObjectMonitor thread id fields should be 64 bits.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4584/head:pull/4584
$ git checkout pull/4584

Update a local copy of the PR:
$ git checkout pull/4584
$ git pull https://git.openjdk.java.net/jdk pull/4584/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4584

View PR using the GUI difftool:
$ git pr show -t 4584

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4584.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 24, 2021

👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 24, 2021
@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@coleenp The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 24, 2021
@coleenp
Copy link
Contributor Author

coleenp commented Jun 24, 2021

/label add hotspot-jfr

@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@coleenp The label jfr is not a valid label. These labels are valid:

  • serviceability
  • hotspot
  • sound
  • hotspot-compiler
  • ide-support
  • kulla
  • i18n
  • shenandoah
  • jdk
  • javadoc
  • security
  • 2d
  • swing
  • hotspot-runtime
  • jmx
  • nio
  • build
  • beans
  • core-libs
  • compiler
  • net
  • hotspot-gc
  • hotspot-jfr
  • awt

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Hi Coleen,

Is there any way we can use the JFR type definition "traceid" for this? If not then this looks fine.

Thanks,
David

@mlbridge
Copy link

mlbridge bot commented Jun 24, 2021

Webrevs

@dholmes-ora
Copy link
Member

Note you can build a 32-bit VM and run it on a 64-bit system.

@shipilev
Copy link
Member

Note you can build a 32-bit VM and run it on a 64-bit system.

...and GHA would run x86_32 tier1 for you. The patch is unlikely to cause trouble, but just look through GHA results.

@mlbridge
Copy link

mlbridge bot commented Jun 24, 2021

Mailing list message from Coleen Phillimore on hotspot-runtime-dev:

On 6/24/21 9:18 AM, David Holmes wrote:

On Thu, 24 Jun 2021 13:05:04 GMT, Coleen Phillimore <coleenp at openjdk.org> wrote:

This is a trivial change to fix the type of _previous_version_tid and _notifier_tid in ObjectMonitor to be unint64_t.
Tested with tier1-3 and JFR tests on linux-x64-debug and windows-x64-debug. I don't have a 32 bit system to test this out on.
Hi Coleen,

Is there any way we can use the JFR type definition "traceid" for this? If not then this looks fine.

Thanks for the quick review.? It's pretty awkward to include
jfr/support/jfrThreadId.hpp in objectMonitor.hpp (JFR is included
conditionally), so would have to include these fields conditionally, and
add #if INCLUDE_JFR in lots of places.? It's not nice.

Thanks,
Coleen

1 similar comment
@mlbridge
Copy link

mlbridge bot commented Jun 24, 2021

Mailing list message from Coleen Phillimore on hotspot-runtime-dev:

On 6/24/21 9:18 AM, David Holmes wrote:

On Thu, 24 Jun 2021 13:05:04 GMT, Coleen Phillimore <coleenp at openjdk.org> wrote:

This is a trivial change to fix the type of _previous_version_tid and _notifier_tid in ObjectMonitor to be unint64_t.
Tested with tier1-3 and JFR tests on linux-x64-debug and windows-x64-debug. I don't have a 32 bit system to test this out on.
Hi Coleen,

Is there any way we can use the JFR type definition "traceid" for this? If not then this looks fine.

Thanks for the quick review.? It's pretty awkward to include
jfr/support/jfrThreadId.hpp in objectMonitor.hpp (JFR is included
conditionally), so would have to include these fields conditionally, and
add #if INCLUDE_JFR in lots of places.? It's not nice.

Thanks,
Coleen

@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@coleenp This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8269293: ObjectMonitor thread id fields should be 64 bits.

Reviewed-by: mgronlun, dcubed

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 7c31903: 8267075: jcmd VM.cds should print directory of the output files

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 24, 2021
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up.

@coleenp
Copy link
Contributor Author

coleenp commented Jun 24, 2021

Thanks David, Markus and Dan. The github actions built linux-x86 so that's ok.
/integrate

@openjdk
Copy link

openjdk bot commented Jun 24, 2021

Going to push as commit 42968db.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 2fd7943: 8256425: Obsolete Biased Locking in JDK 18
  • 595446b: 8269087: CheckSegmentedCodeCache test fails in an emulated-client VM
  • 7c31903: 8267075: jcmd VM.cds should print directory of the output files

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 24, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 24, 2021
@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@coleenp Pushed as commit 42968db.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@coleenp coleenp deleted the jint branch June 24, 2021 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants