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.

Sign up for GitHub

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

Jump to bottom

JDK-8260625: Rename MetaspaceExpand_lock #2308

Closed
wants to merge 1 commit into from
Closed

JDK-8260625: Rename MetaspaceExpand_lock #2308

wants to merge 1 commit into from

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Jan 29, 2021 •
edited by openjdk bot
Loading

Hi, may I have reviews please for this trivial change:

MetaspaceExpand_lock is a potentially confusing misnomer for the casual code reader, since it does not only guard metaspace expansion but guards access to all central metaspace structures for expansion, reclamation, access to freelist etc.

With this patch it is renamed to the more generic "Metaspace_lock".

Thanks, Thomas

Progress

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

Issue

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 29, 2021

👋 Welcome back stuefe! 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 Jan 29, 2021

@tstuefe 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 Jan 29, 2021
@tstuefe tstuefe marked this pull request as ready for review January 29, 2021 06:51
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 29, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 29, 2021

Webrevs

shipilev
shipilev approved these changes Jan 29, 2021
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine to me.

@openjdk
Copy link

openjdk bot commented Jan 29, 2021

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

8260625: Rename MetaspaceExpand_lock

Reviewed-by: shade

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

  • 64a150c: 6986863: ProfileDeferralMgr throwing ConcurrentModificationException
  • ea2c447: 8259778: Merge MutableSpace and ImmutableSpace
  • 251c641: 8259487: Remove unused StarTask
  • 1519632: 8251462: Simplify compilation policy
  • 71128cf: 8260586: Shenandoah: simplify "Concurrent Weak References" logging
  • 81e9e6a: 8260461: Modernize jsr166 tck tests
  • 2b166d8: 8260596: Comment cleanup in BigInteger
  • 1de3c55: 8260584: Shenandoah: simplify "Concurrent Thread Roots" logging
  • bbbfaa5: 8249262: Initialize InstanceKlass::_package_entry during CDS dump time
  • 3aabbd7: 8260432: allocateSpaceForGP in freetypeScaler.c might leak memory

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 Jan 29, 2021
@tstuefe
Copy link
Member Author

tstuefe commented Jan 29, 2021

Looks fine to me.

Thanks! Trivial too?

@shipilev
Copy link
Member

Thanks! Trivial too?

I don't see why not. The patch is trivial in substance, but I would like to see builds to complete first.

@tstuefe
Copy link
Member Author

tstuefe commented Jan 29, 2021

Thanks! Trivial too?

I don't see why not. The patch is trivial in substance, but I would like to see builds to complete first.

Oh for sure.

@tstuefe
Copy link
Member Author

tstuefe commented Jan 29, 2021

/integrate

@openjdk openjdk bot closed this Jan 29, 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 Jan 29, 2021
@openjdk
Copy link

openjdk bot commented Jan 29, 2021

@tstuefe Since your change was applied there have been 16 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit b7b391b.

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

yminqi
yminqi reviewed Jan 29, 2021
View reviewed changes
Copy link
Contributor

@yminqi yminqi left a comment

Choose a reason for hiding this comment

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

LGTM.

test/hotspot/gtest/metaspace/test_virtualspacenode.cpp
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020 SAP SE. All rights reserved.
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021 SAP SE. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

There should add a ',' after 2021

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, Yumin! Sorry, I already had integrated under the trivial rule. And yes, Coleen is right, we do not have that trailing comma (don't ask me why).

..Thomas

@mlbridge
Copy link

mlbridge bot commented Jan 29, 2021

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

On 1/29/21 2:00 PM, Yumin Qi wrote:

On Fri, 29 Jan 2021 06:40:49 GMT, Thomas Stuefe <stuefe at openjdk.org> wrote:

Hi, may I have reviews please for this trivial change:

MetaspaceExpand_lock is a potentially confusing misnomer for the casual code reader, since it does not only guard metaspace expansion but guards access to all central metaspace structures for expansion, reclamation, access to freelist etc.

With this patch it is renamed to the more generic "Metaspace_lock".

Thanks, Thomas
LGTM.

test/hotspot/gtest/metaspace/test_virtualspacenode.cpp line 3:

1: /*
2: * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
3: * Copyright (c) 2020, 2021 SAP SE. All rights reserved.
There should add a ',' after 2021

Turns out that the SAP copyright doesn't have the trailing comma. Now
you know :)
Coleen

@mlbridge
Copy link

mlbridge bot commented Jan 29, 2021

Mailing list message from Yumin Qi on hotspot-runtime-dev:

Thanks, now I know:)

Yumin

On 1/29/21 11:19 AM, Coleen Phillimore wrote:

On 1/29/21 2:00 PM, Yumin Qi wrote:

On Fri, 29 Jan 2021 06:40:49 GMT, Thomas Stuefe <stuefe at openjdk.org> wrote:

Hi, may I have reviews please for this trivial change:

MetaspaceExpand_lock is a potentially confusing misnomer for the casual code reader, since it does not only guard metaspace expansion but guards access to all central metaspace structures for expansion, reclamation, access to freelist etc.

With this patch it is renamed to the more generic "Metaspace_lock".

Thanks, Thomas
LGTM.

test/hotspot/gtest/metaspace/test_virtualspacenode.cpp line 3:

1: /*
2:? * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
3:? * Copyright (c) 2020, 2021 SAP SE. All rights reserved.
There should add a ',' after 2021

Turns out that the SAP copyright doesn't have the trailing comma. Now you know :)
Coleen

@tstuefe tstuefe deleted the JDK-8260625-rename-metaspace-expand-lock branch February 1, 2021 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yminqi yminqi yminqi left review comments

@shipilev shipilev shipilev approved these changes

Assignees
No one assigned
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tstuefe @shipilev @yminqi