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

8325456: Rename nsk_mutex.h #17762

Closed
wants to merge 1 commit into from
Closed

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Feb 8, 2024

Please review this trivial change that renames the file
test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_mutex.h to nsk_mutex.hpp.

Testing: mach5 tier1

The usage is odd. The header is only included by the associated .cpp file.
That .cpp file is included by only one other file, and that file is compiled.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17762/head:pull/17762
$ git checkout pull/17762

Update a local copy of the PR:
$ git checkout pull/17762
$ git pull https://git.openjdk.org/jdk.git pull/17762/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17762

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17762.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 8, 2024

👋 Welcome back kbarrett! 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 Feb 8, 2024
@openjdk
Copy link

openjdk bot commented Feb 8, 2024

@kimbarrett 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 Feb 8, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 8, 2024

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

I just had a look at this and the way the file nsk/jvmti/scenarios/events/EM04/em04t001/libem04t001.cpp includes nsk_mutex.cpp is consistent with how it includes other cpp files so not worth changing (ie. deleting this) without more rewriting.
The rename change looks good and is trivial.

@openjdk
Copy link

openjdk bot commented Feb 8, 2024

@kimbarrett 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:

8325456: Rename nsk_mutex.h

Reviewed-by: coleenp, jwaters

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 9 new commits pushed to the master branch:

  • ab5e947: 8325436: G1: Remove unused G1RegionMarkStats::is_clear
  • 3c91b59: 8325444: GHA: JDK-8325194 causes a regression
  • e8ceb71: 6507038: Memory Leak in JTree / BasicTreeUI
  • 3d3a8f0: 8325432: enhance assert message "relocation addr must be in this section"
  • b58d73b: 8323746: Add PathElement hashCode and equals
  • 917838e: 8325150: (tz) Update Timezone Data to 2024a
  • 43089bf: 8325399: Add tests for virtual threads doing Selector operations
  • d109903: 8325028: (ch) Pipe channels should lazily set socket to non-blocking mode on first use by virtual thread
  • 1fb9e3d: 8325304: Several classes in java.util.jar and java.util.zip don't specify the behaviour for null arguments

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 Feb 8, 2024
Copy link
Contributor

@TheShermanTanker TheShermanTanker left a comment

Choose a reason for hiding this comment

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

Is it worth renaming the included cpp file to hpp as well? Just a small comment

@TheShermanTanker
Copy link
Contributor

Nevermind, I missed Coleen's comment

@kimbarrett
Copy link
Author

I just had a look at this and the way the file nsk/jvmti/scenarios/events/EM04/em04t001/libem04t001.cpp includes nsk_mutex.cpp is consistent with how it includes other cpp files so not worth changing (ie. deleting this) without more rewriting. The rename change looks good and is trivial.

Thanks for the review, @coleenp and @TheShermanTanker .

That seems to be a fairly common pattern in tests. There's a "library" source
file that gets compiled and linked. It directly includes all of the relevant
source files, rather than having those built separately and the relevant ones
linked together to make the library. It makes the build a bit simpler, since
there's less information in the makefiles. It does mean we're potentially
compiling the same source repeatedly, but compilation is cheap...

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 8, 2024

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

  • 0ea75b2: 8325259: Serial: Inline OldGenScanClosure during Young GC
  • ab5e947: 8325436: G1: Remove unused G1RegionMarkStats::is_clear
  • 3c91b59: 8325444: GHA: JDK-8325194 causes a regression
  • e8ceb71: 6507038: Memory Leak in JTree / BasicTreeUI
  • 3d3a8f0: 8325432: enhance assert message "relocation addr must be in this section"
  • b58d73b: 8323746: Add PathElement hashCode and equals
  • 917838e: 8325150: (tz) Update Timezone Data to 2024a
  • 43089bf: 8325399: Add tests for virtual threads doing Selector operations
  • d109903: 8325028: (ch) Pipe channels should lazily set socket to non-blocking mode on first use by virtual thread
  • 1fb9e3d: 8325304: Several classes in java.util.jar and java.util.zip don't specify the behaviour for null arguments

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 8, 2024
@openjdk openjdk bot closed this Feb 8, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 8, 2024
@openjdk
Copy link

openjdk bot commented Feb 8, 2024

@kimbarrett Pushed as commit 10beb31.

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

@kimbarrett kimbarrett deleted the nsk_mutex branch February 8, 2024 17:22
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.

3 participants