Skip to content

Conversation

@MBaesken
Copy link
Member

@MBaesken MBaesken commented Apr 17, 2025

Seems some of the clock_tics_per_sec code can be unified (e.g. in os_posix) between os_linux and os_posix.


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-8354811: clock_tics_per_sec code duplication between os_linux and os_posix (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24720

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 17, 2025

👋 Welcome back mbaesken! 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
Copy link

openjdk bot commented Apr 17, 2025

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

8354811: clock_tics_per_sec code duplication between os_linux and os_posix

Reviewed-by: lucy, clanger, asteiner

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 167 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 changed the title JDK-8354811: clock_tics_per_sec code duplication between os_linux and os_posix 8354811: clock_tics_per_sec code duplication between os_linux and os_posix Apr 17, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 17, 2025
@openjdk
Copy link

openjdk bot commented Apr 17, 2025

@MBaesken 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 Apr 17, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 17, 2025

Webrevs

@MBaesken
Copy link
Member Author

I noticed we have 2 usages here as well

static clock_t ticks_per_sec = sysconf(_SC_CLK_TCK);

Should I call the new method there too ?
On AIX it is clock_t (an int type, looking at the headers it is a typedef to 'int') .

Copy link
Contributor

@ansteiner ansteiner left a comment

Choose a reason for hiding this comment

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

Good that the code duplication was removed.

@RealCLanger
Copy link
Contributor

I noticed we have 2 usages here as well

static clock_t ticks_per_sec = sysconf(_SC_CLK_TCK);

Should I call the new method there too ? On AIX it is clock_t (an int type, looking at the headers it is a typedef to 'int') .

Yes, I think it would make sense if AIX then used os::Posix::clock_tics_per_second() as well.

&ldummy, &ldummy, &ldummy, &ldummy, &ldummy,
&user_time, &sys_time);
if (count != 13) return -1;
double clock_tics_factor = 1000000000 / os::Posix::clock_tics_per_second();
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you should rather not add clock_tics_factor but replace clock_tics_per_sec with os::Posix::clock_tics_per_second() in place, but it's maybe just a matter of taste...

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay I change it.

&ldummy, &ldummy, &ldummy, &ldummy, &ldummy,
&user_time, &sys_time);
if (count != 13) return -1;
double clock_tics_factor = 1000000000 / os::Posix::clock_tics_per_second();
Copy link
Contributor

Choose a reason for hiding this comment

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

Why use double here? The right hand side is an int expression and the use of clock_ticks_factor below is in a jlong expression yielding a jlong function result. If you want to avoid integer rounding, you have to cast at least one res operand to double.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM now.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 26, 2025
Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

LGTM now. Thanks for updating.

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 28, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 28, 2025

@MBaesken Pushed as commit 7df1bfe.

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

4 participants