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

8255596: Mutex safepoint checking options and flags should be scoped enums #957

Closed
wants to merge 3 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Oct 30, 2020

Please review this change to some enums in the Mutex class.
SafepointCheckFlag and SafepointCheckRequired are changed to scoped
enums. Also removed the anonymous enum defining _allow_vm_block_flag
and _as_suspend_equivalent_flag, instead defining those as bool
constants.

To avoid changing all references to the SafepointCheckXXX enumerators
(due to the additional scoping introduced by using scoped enums), same
named constants are defined at Mutex class scope. Some renaming might
be preferable in the long term, but I didn't want to do that just to
get the improved type checking. An X-macro approach to defining the
enumerators and hoisting them into class scope could have been taken,
but the number of enumerators here doesn't seem to warrant the additional
infrastructure to do so.

Changing the enum types uncovered a few places in the implementation
of Mutex and MutexLocker where enum values were being implicitly
converted to bool, with associated assumptions about the order or
values of the enumerators. Those have been fixed.

Testing:
tier1


Progress

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

Issue

  • JDK-8255596: Mutex safepoint checking options and flags should be scoped enums

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/957/head:pull/957
$ git checkout pull/957

@kimbarrett kimbarrett changed the title Strong mutex flags 8255596: Mutex safepoint checking options and flags should be scoped enums Oct 30, 2020
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 2020

👋 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
Copy link

openjdk bot commented Oct 30, 2020

@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 Oct 30, 2020
@kimbarrett
Copy link
Author

/label add hotspot
/label remove hotspot-runtime

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Oct 30, 2020
@openjdk
Copy link

openjdk bot commented Oct 30, 2020

@kimbarrett
The hotspot label was successfully added.

@openjdk openjdk bot removed the hotspot-runtime hotspot-runtime-dev@openjdk.org label Oct 30, 2020
@openjdk
Copy link

openjdk bot commented Oct 30, 2020

@kimbarrett
The hotspot-runtime label was successfully removed.

@kimbarrett kimbarrett marked this pull request as ready for review October 30, 2020 14:25
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 30, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 30, 2020

Webrevs

Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Oct 30, 2020

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

8255596: Mutex safepoint checking options and flags should be scoped enums

Reviewed-by: tschatzl, rehn

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Oct 30, 2020
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

+1

@kimbarrett
Copy link
Author

Thanks @tschatzl and @robehn for reviews.

@kimbarrett
Copy link
Author

/integrate

@openjdk openjdk bot closed this Nov 2, 2020
@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 Nov 2, 2020
@openjdk
Copy link

openjdk bot commented Nov 2, 2020

@kimbarrett Since your change was applied there has been 1 commit pushed to the master branch:

  • d05df7c: 8236842: Surprising 'multiple elements' behaviour from getTypeElement when cross-compiling with --release

Your commit was automatically rebased without conflicts.

Pushed as commit 69f5235.

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

openjdk-notifier bot referenced this pull request Nov 2, 2020
@kimbarrett kimbarrett deleted the strong_mutex_flags branch November 2, 2020 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants