Skip to content

Conversation

@iklam
Copy link
Member

@iklam iklam commented Sep 8, 2022

This is a clean up of the source code to make it more readable.

  • When creating a CDS archive, we first load Java classes and create metadata objects as usual. These are call "source" objects.
  • We then copy the source objects into the output buffer at their "buffered addresses".

However, we used a mix of other words to refer to them:

  • The word "orig" was also used for the former.
  • The words "dumped" and "relocated" were also used for the latter.

This PR renamed the names of functions and parameters to consistently use "source" and "buffered" only. In one case I reordered two fields in a class. There's otherwise no change in the code.

Please see new comments in archiveBuilder.hpp that explains the three types of addresses: "source" vs "buffered" vs "requested".


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-8292225: Rename ArchiveBuilder APIs related to source and buffered addresses

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10212

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 8, 2022

👋 Welcome back iklam! 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 Sep 8, 2022
@openjdk
Copy link

openjdk bot commented Sep 8, 2022

@iklam 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 Sep 8, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 8, 2022

Webrevs

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.

Renaming seems fine. Were there any tests run with this changset?

@openjdk
Copy link

openjdk bot commented Sep 12, 2022

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

8292225: Rename ArchiveBuilder APIs related to source and buffered addresses

Reviewed-by: ccheung

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 Sep 12, 2022
@iklam
Copy link
Member Author

iklam commented Sep 12, 2022

Renaming seems fine. Were there any tests run with this changset?

Hi Calvin, thanks for the review. I tested with tiers 1-4 and saw no regression.

@iklam
Copy link
Member Author

iklam commented Sep 12, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 12, 2022

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

  • 155b10a: 8293329: x86: Improve handling of constants in AES/GHASH stubs
  • d3f7e3b: 8293339: vm/jvmti/StopThread/stop001/stop00103 crashes with SIGSEGV in Continuation::is_continuation_mounted

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 12, 2022

@iklam Pushed as commit 41ce658.

💡 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-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants