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.

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

8318051: Duration.between uses exceptions for control flow #16318

Closed
wants to merge 1 commit into from

Conversation

eamonnmcmanus
Copy link
Member

@eamonnmcmanus eamonnmcmanus commented Oct 23, 2023

The existing logic uses nanosecond arithmetic to compute Duration.between. Since that can overflow for durations greater than 292 years, it has a try/catch that falls back to computing the seconds part and adjusting that for nanoseconds. However, exception handling is typically very expensive, so in cases like the one in the linked bug this method was a performance trap.

The new logic is essentially the old catch block. It needs a special case for when the number of seconds is 0, so it is slightly slower in that case. But in other cases it is probably somewhat faster, because it avoids a division and associated mod.

The test coverage in TCKDuration is already very thorough so no new tests are needed.


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-8318051: Duration.between uses exceptions for control flow (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16318

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

Using diff file

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

Webrev

Link to Webrev Comment

The existing logic uses nanosecond arithmetic to compute
Duration.between. Since that can overflow for durations greater than 292
years, it has a try/catch that falls back to computing the seconds part
and adjusting that for nanoseconds. However, exception handling is
typically very expensive, so in cases like the one in the linked bug
this method was a performance trap.

The new logic is essentially the old catch block. It needs a special
case for when the number of seconds is 0, so it is slightly slower in
that case. But in other cases it is probably somewhat faster, because it
avoids a
[division](https://github.com/openjdk/jdk/blob/8d9a4b43f4fff30fd217dab2c224e641cb913c18/src/java.base/share/classes/java/time/Duration.java#L283)
and associated mod.

The test coverage in
[`TCKDuration`](https://github.com/openjdk/jdk/blob/8d9a4b43f4fff30fd217dab2c224e641cb913c18/test/jdk/java/time/tck/java/time/TCKDuration.java#L780)
is already very thorough so no new tests are needed.
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 23, 2023

👋 Welcome back emcmanus! 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 Oct 23, 2023
@openjdk
Copy link

openjdk bot commented Oct 23, 2023

@eamonnmcmanus 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 Oct 23, 2023
@eamonnmcmanus eamonnmcmanus changed the title 8318051: Avoid try/catch in Duration.between 8318051: Duration.between uses exceptions for control flow Oct 23, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 23, 2023

Webrevs

@RogerRiggs
Copy link
Contributor

Did you identify an existing test that reproduces your initial issue case?
Duration.between(instant, Instant.MAX).compareTo(duration) < 0

Otherwise, looks good

@eamonnmcmanus
Copy link
Member Author

eamonnmcmanus commented Oct 24, 2023

Yes, what I tried was just removing the catch-block from the existing code and verifying that TCKDuration fails with ArithmeticException. It calls between on LocalDateTime values that are 800 years apart, which is enough to trigger nanosecond overflow. So both the original try and the original catch are tested.

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Thanks for the fix and confirming the test.

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

8318051: Duration.between uses exceptions for control flow

Reviewed-by: rriggs

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 27 new commits pushed to 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 Oct 24, 2023
@eamonnmcmanus
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

  • 1ddf826: 8316964: Security tools should not call System.exit
  • 1f2a80b: 8318306: java/util/Arrays/Sorting.java fails with "Array is not sorted at 8228-th position: 8251.0 and 8153.0"
  • 1165037: 8318569: Add getter methods for Locale and Patterns in ListFormat
  • 6f35274: 8318702: G1: Fix nonstandard indentation in g1HeapTransition.cpp
  • e272098: 8318160: javac does not reject private method reference with type-variable receiver
  • 54c613a: 8318693: Fix rendering for code blocks nested under list items in building.md
  • e67550c: 8318509: x86 count_positives intrinsic broken for -XX:AVX3Threshold=0
  • 8879c78: 8317689: [JVMCI] include error message when CreateJavaVM in libgraal fails
  • f9795d0: 8318222: RISC-V: C2 CmpU3
  • d1077d6: 8316046: x64 platforms unecessarily save xmm16-31 when UseAVX >= 3
  • ... and 19 more: https://git.openjdk.org/jdk/compare/8d9a4b43f4fff30fd217dab2c224e641cb913c18...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 24, 2023

@eamonnmcmanus Pushed as commit 9c819fd.

💡 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
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