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

8275162: Use varargs in 'def' macros in mutexLocker.cpp #6108

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Oct 25, 2021

This change uses vararags in the 'def' and 'defl' macros in mutexLocker.cpp so that only the exceptions to the default parameter for _allow_vm_block are specified.
Some of these exceptions are not needed but that's a later patch that I'm working on.
Tested with tier1 sanity (all Oracle platforms) and tier1-3 linux-x64-debug, linux-x64, windows-x64-debug.


Progress

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

Issue

  • JDK-8275162: Use varargs in 'def' macros in mutexLocker.cpp

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6108

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 25, 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 label Oct 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 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 label Oct 25, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 25, 2021

Webrevs

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Oct 25, 2021

Hi Coleen,

So the default for allow_vm_block, if not specified, is false - correct? And you are changing a whole bunch of mutexes from true to false with this change? I'm not clear why some explicit false usages remain.

Thanks,
David

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Oct 25, 2021

No, the default for allow_vm_block is 'true' for no-safepoint checking locks and 'false' for safepoint checking locks. I am NOT changing any of the values with this change.

Mutex(Rank rank, const char *name) :
Mutex(rank, name, rank > nosafepoint ? false : true) {}

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Oct 25, 2021

Okay I see. So all the explicit true/false uses are non-default for the given type of Mutex.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Seems fine.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 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:

8275162: Use varargs in 'def' macros in mutexLocker.cpp

Reviewed-by: dholmes, pchilanomate

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

  • 7ca053d: 8251904: vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java fails with ClassNotFoundException: nsk.sysdict.share.BTree0LLRLRLRRLR
  • 4be88d5: 8275047: Optimize existing fill stubs for AVX-512 target
  • 63e0f34: 8275767: JDK source code contains redundant boolean operations in jdk.charsets
  • 4961373: 8275137: jdk.unsupported/sun.reflect.ReflectionFactory.readObjectNoDataForSerialization uses wrong signature
  • 174f553: 8275869: Problem list applications/jcstress/copy.java on Linux-aarch64
  • 3ff085e: 8275582: Don't purge metaspace mapping lists
  • 10e1610: 8251134: Unwrapping a key with a Private Key generated by Microsoft CNG fails
  • 4361945: 8185844: MSCAPI doesn't list aliases correctly
  • 337a9b7: 8269853: Prefetch::read should accept pointer to const
  • 97d3280: 8275536: Add test to check that File::lastModified returns same time stamp as Files.getLastModifiedTime
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/0bcc1749eaea20cb983a983073ad33d305681879...master

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 label Oct 25, 2021
@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Oct 25, 2021

Thanks David.

Copy link
Contributor

@pchilano pchilano left a comment

LGTM.

Thanks,
Patricio

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Oct 26, 2021

Thanks Patricio and David!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 26, 2021

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

  • 7ca053d: 8251904: vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java fails with ClassNotFoundException: nsk.sysdict.share.BTree0LLRLRLRRLR
  • 4be88d5: 8275047: Optimize existing fill stubs for AVX-512 target
  • 63e0f34: 8275767: JDK source code contains redundant boolean operations in jdk.charsets
  • 4961373: 8275137: jdk.unsupported/sun.reflect.ReflectionFactory.readObjectNoDataForSerialization uses wrong signature
  • 174f553: 8275869: Problem list applications/jcstress/copy.java on Linux-aarch64
  • 3ff085e: 8275582: Don't purge metaspace mapping lists
  • 10e1610: 8251134: Unwrapping a key with a Private Key generated by Microsoft CNG fails
  • 4361945: 8185844: MSCAPI doesn't list aliases correctly
  • 337a9b7: 8269853: Prefetch::read should accept pointer to const
  • 97d3280: 8275536: Add test to check that File::lastModified returns same time stamp as Files.getLastModifiedTime
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/0bcc1749eaea20cb983a983073ad33d305681879...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 26, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 26, 2021

@coleenp Pushed as commit 71d593e.

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

@coleenp coleenp deleted the def branch Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
3 participants