Skip to content

8316305: Initial buffer size of StackWalker is too small caused by JDK-8285447 #15749

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

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Sep 14, 2023

A trivial fix. JDK-8285447 intends to change the initial batch size only for a stack walker with an estimated stack depth. For stack walkers without user-supplied estimated stack depth, the initial batch size is changed to 3 which is a bug. This causes the stack walker to fetch the second batch after walking 2 frames.


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-8316305: Initial buffer size of StackWalker is too small caused by JDK-8285447 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15749

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 14, 2023

👋 Welcome back mchung! 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 14, 2023
@openjdk
Copy link

openjdk bot commented Sep 14, 2023

@mlchung The following label will be automatically applied to this pull request:

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Sep 14, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 14, 2023

Webrevs

Comment on lines +542 to +544
return walker.estimateDepth() == 0
? SMALL_BATCH
: Math.min(walker.estimateDepth() + RESERVED_ELEMENTS, LARGE_BATCH_SIZE);
Copy link
Member

Choose a reason for hiding this comment

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

Without the
Math.max(walker.estimateDepth()+RESERVED_ELEMENTS, MIN_BATCH_SIZE)
for estimateDepth = 1, I believe this will now return 2, where previously it returned 3.
Is that OK?

Copy link
Member Author

@mlchung mlchung Sep 14, 2023

Choose a reason for hiding this comment

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

yes as it's asked by the user. It will fetch the second batch if it walks more than 1 frame.

Copy link
Member

Choose a reason for hiding this comment

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

Sounds good, thanks

@openjdk
Copy link

openjdk bot commented Sep 14, 2023

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

8316305: Initial buffer size of StackWalker is too small caused by JDK-8285447

Reviewed-by: bchristi

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

  • 53516ae: 8304956: Update KeyStore.getDefaultType​() specification to return pkcs12 as fallback
  • 373cdf2: 8315960: test/jdk/java/io/File/TempDirDoesNotExist.java leaves test files behind

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 Sep 14, 2023
@mlchung
Copy link
Member Author

mlchung commented Sep 22, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 22, 2023

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

  • 53516ae: 8304956: Update KeyStore.getDefaultType​() specification to return pkcs12 as fallback
  • 373cdf2: 8315960: test/jdk/java/io/File/TempDirDoesNotExist.java leaves test files behind

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 22, 2023

@mlchung Pushed as commit 9b65b7d.

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

@mlchung mlchung deleted the JDK-8316305 branch October 4, 2023 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants