Skip to content

8151413: os::allocation_granularity/page_size and friends return signed values #12091

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 8 commits into from

Conversation

afshin-zafari
Copy link
Contributor

@afshin-zafari afshin-zafari commented Jan 19, 2023

Description

os::allocation_granularity/page_size and friends return signed values

Patch

  • Type of vm_page_size and vm_allocation_granularity members of OSInfo class and their wrappers in os class changed to size_t
  • Initial value of them changed from -1 to 0.
  • In setters, checking for set only once condition is updated accordingly (comparing with 0 instead of -1). Also, checking the argument be positive is removed.
  • Equal to 0 (instead of <= 0 ) is used to check if calling setters failed.
  • All (size_t) casting of getters removed.
  • In arithmetic and negation operations, the operand related to the getters casted to (int). Otherwise, the Windows builds complain.
  • Explicitly casted to (int) where jint needed.
  • In <T, A> align_up(T size, A alignment), assignment of variables of type A to type T (i.e., T t = (A) a;) should be safe. T : size_t and A : int won't compile. Fixed appropriately.
  • "%d" format-flags replaced with SIZE_FORMAT.
  • Type of CompilerToVM::Data::vm_page_size changed to size_t.

Test

tier1-5: all green, except an unrelated fail for whom a bug is already created.
job-id: afshin-8151413-20230117-1255-40910454


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

  • JDK-8151413: os::allocation_granularity/page_size and friends return signed values

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12091

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2023

👋 Welcome back afshin-zafari! 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 Jan 19, 2023
@openjdk
Copy link

openjdk bot commented Jan 19, 2023

@afshin-zafari The following labels will be automatically applied to this pull request:

  • hotspot
  • shenandoah

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

@openjdk openjdk bot added hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Jan 19, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 19, 2023

Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

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

I think this mostly looks good. I've one thing I'd like to get checked.

@openjdk
Copy link

openjdk bot commented Jan 19, 2023

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

8151413: os::allocation_granularity/page_size and friends return signed values

Reviewed-by: stefank, ccheung, ysr

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

  • f5f38a8: 8301371: Interpreter store barriers on x86_64 don't have disjoint temp registers
  • 77dbcd8: 8301641: NativeMemoryUsageTotal event uses reserved value for committed field
  • 1aaf394: 8301736: jdk/incubator/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java fail with -Xcomp
  • 9dad874: 8298413: [s390] CPUInfoTest fails due to uppercase feature string
  • 98433a2: 8296999: AArch64: scalar intrinsics for reverse method in Integer and Long
  • c04a982: 8301818: RISC-V: Factor out function mvw from MacroAssembler
  • 787e16b: 8289077: Add manual tests to open
  • 07fb4f9: 7167356: (javac) investigate failing tests in JavacParserTest
  • 3ac2bed: 8299324: inline_native_setCurrentThread lacks GC barrier for Shenandoah
  • d53ade1: 8301813: Bad caret position in error message
  • ... and 276 more: https://git.openjdk.org/jdk/compare/49d60fee49b9f5f7182dcd1557d9b2f886901100...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@stefank, @calvinccheung, @ysramakrishna) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 19, 2023
Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

I have a suggestion below.

Also, you may want to update the copyright year of some of the files. The make/scripts/update_copyright_year.sh can help on that.

Copy link
Member

@ysramakrishna ysramakrishna 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 Jan 20, 2023

@afshin-zafari this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout _8151413
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jan 20, 2023
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jan 20, 2023
Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Looks good except for a few copyright issues.

@afshin-zafari
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 7, 2023
@openjdk
Copy link

openjdk bot commented Feb 7, 2023

@afshin-zafari
Your change (at version 2f58d7e) is now ready to be sponsored by a Committer.

@JesperIRL
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 7, 2023

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

  • 09b8a19: 8300177: URISyntaxException fields can be final
  • c61a382: 8296646: com/sun/jdi/JdbLastErrorTest.java test failure
  • f5f38a8: 8301371: Interpreter store barriers on x86_64 don't have disjoint temp registers
  • 77dbcd8: 8301641: NativeMemoryUsageTotal event uses reserved value for committed field
  • 1aaf394: 8301736: jdk/incubator/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java fail with -Xcomp
  • 9dad874: 8298413: [s390] CPUInfoTest fails due to uppercase feature string
  • 98433a2: 8296999: AArch64: scalar intrinsics for reverse method in Integer and Long
  • c04a982: 8301818: RISC-V: Factor out function mvw from MacroAssembler
  • 787e16b: 8289077: Add manual tests to open
  • 07fb4f9: 7167356: (javac) investigate failing tests in JavacParserTest
  • ... and 278 more: https://git.openjdk.org/jdk/compare/49d60fee49b9f5f7182dcd1557d9b2f886901100...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 7, 2023

@JesperIRL @afshin-zafari Pushed as commit 4fe99da.

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

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 shenandoah shenandoah-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

5 participants