-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8344668: Unnecessary array allocations and copying in TextLine #22288
Conversation
👋 Welcome back dgredler! A progress list of the required criteria for merging this PR into |
@gredler 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:
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 609 new commits pushed to the
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 (@prrace, @honkar-jdk, @azvegint) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. This is very wasteful.
@mrserb Would you have a few free cycles to provide the second review for this PR? |
@azvegint @TejeshR13 @prsadhuk @honkar-jdk - this needs a 2nd reviewer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gredler There is one other place where expandArray()
is called similarly - TextLine.getComponents().
@honkar-jdk Good catch -- I've gone ahead and fixed that one, too. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Ran awt/font and java/awt/font/LineBreakMeasurer tests with fix and they work as expected.
@gredler Missed mentioning it earlier, copyright year needs to be updated for TextLine.java
@honkar-jdk Done! Let me know if there's anything else that catches your eye. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@honkar-jdk Done! Let me know if there's anything else that catches your eye.
Looks good now. Re-approved.
/integrate |
@prrace I think this is ready to be sponsored. Thanks! |
/sponsor |
Going to push as commit f6021a9.
Your commit was automatically rebased without conflicts. |
When
LineBreakMeasurer
is used to break text into lines, internally it usesTextMeasurer
andTextLine
to do the job. In the common case,TextLine.getComponents(...)
allocates aTextLineComponent[]
with room for a single array entry, and passes it toTextLine.createComponentsOnRun(...)
, which fills the array and returns it, optionally resizing to a larger array if necessary, after which the array is resized back down to actual size (if necessary).Unfortunately
TextLine.createComponentsOnRun(...)
is too eager in allocating larger arrays. In the most common case of a single component, this means that a single-element array is allocated, then a 9-element array is allocated (viaexpandArray(...)
), and then another single-element array is allocated (to shrink the array back to actual size). Only one array allocation is necessary in this common case, and no array copying is needed.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22288/head:pull/22288
$ git checkout pull/22288
Update a local copy of the PR:
$ git checkout pull/22288
$ git pull https://git.openjdk.org/jdk.git pull/22288/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 22288
View PR using the GUI difftool:
$ git pr show -t 22288
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22288.diff
Using Webrev
Link to Webrev Comment