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

8310232: java.time.Clock$TickClock.millis() fails in runtime when tick is 1 microsecond #14657

Closed
wants to merge 4 commits into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Jun 26, 2023

Fixing the / by zero exception with tick durations less than a millisecond.


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-8310232: java.time.Clock$TickClock.millis() fails in runtime when tick is 1 microsecond (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14657

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 26, 2023

👋 Welcome back naoto! 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 Jun 26, 2023
@openjdk
Copy link

openjdk bot commented Jun 26, 2023

@naotoj 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 Jun 26, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 26, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

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

8310232: java.time.Clock$TickClock.millis() fails in runtime when tick is 1 microsecond

Reviewed-by: iris, rriggs, jpai

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 1 new commit pushed to the master branch:

  • fb283df: 8310828: java.sql java.sql.rowset packages have no @since info

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 Jun 26, 2023
@@ -73,6 +73,8 @@

/**
* Test tick clock.
*
* @bug 8310232
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you mean the put the "@bug" here? If you did then I assume you'll need to add the original bug ID too as TestClock_Tick wasn't created for 8310232.

Copy link
Member Author

Choose a reason for hiding this comment

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

I meant to put the bug id here, but you are right that it would confuse readers as if it is the bug that created this regression test. Will remove it and leave the bug id only for the added test.

@@ -759,7 +759,7 @@ public Clock withZone(ZoneId zone) {
@Override
public long millis() {
long millis = baseClock.millis();
return millis - Math.floorMod(millis, tickNanos / 1000_000L);
return tickNanos < 1000_000L ? millis : millis - Math.floorMod(millis, tickNanos / 1000_000L);
Copy link
Member

Choose a reason for hiding this comment

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

Cleaner precedence:

Suggested change
return tickNanos < 1000_000L ? millis : millis - Math.floorMod(millis, tickNanos / 1000_000L);
long trunc = (tickNanos >= 1000_000L) ? Math.floorMod(millis, tickNanos / 1000_000L) : 0;
return millis - trunc;

Copy link
Contributor

Choose a reason for hiding this comment

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

Either is fine, the current version avoids any extra operations if no (further) truncation is needed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. I think it is OK as it is.

@naotoj
Copy link
Member Author

naotoj commented Jun 29, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

  • 26efff7: 8309902: C2: assert(false) failed: Bad graph detected in build_loop_late after JDK-8305189
  • 05c2b6c: 8309979: BootstrapMethods attribute is missing in class files recreated by SA
  • 20f7d05: 8310502: Optimization for j.l.Long.fastUUID()
  • 07734f6: 8310848: Convert ClassDesc and MethodTypeDesc to be stored in static final fields
  • e5744b8: 8310919: runtime/ErrorHandling/TestAbortVmOnException.java times out due to core dumps taking a long time on OSX
  • 98a954e: 8308286: Fix clang warnings in linux code
  • f842ec4: 8305667: Some fonts installed in user directory are not detected on Windows
  • 690d626: 8307927: C2: "malformed control flow" with irreducible loop
  • be64d3a: 8310299: C2: 8275201 broke constant folding of array store check in some cases
  • b2eae16: 8295191: IR framework timeout options expect ms instead of s
  • ... and 38 more: https://git.openjdk.org/jdk/compare/ec45bd64d504d579aef54c924fb8ca75a944036f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 29, 2023

@naotoj Pushed as commit a995aa6.

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