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

JDK-8295710 : remove os::dll_file_extension #10782

Closed
wants to merge 3 commits into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Oct 20, 2022

The os::dll_file_extension() function could be unified for the different OS platforms.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10782

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 20, 2022

👋 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 openjdk bot added the rfr Pull request is ready for review label Oct 20, 2022
@openjdk
Copy link

openjdk bot commented Oct 20, 2022

@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 Oct 20, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 20, 2022

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

This looks good but I think we can do better :) There is only a single use of os::dll_file_extension:

./share/compiler/disassembler.cpp:  int written = jio_snprintf(&buf[offset], sz, "%s%s", hsdis_library_name, os::dll_file_extension());

so we can remove it altogether and just replace with JNI_LIB_SUFFIX.

Thanks.

@MBaesken
Copy link
Member Author

Hi David, yes we can remove os::dll_file_extension ; I adjusted the change.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

You need to remove it from ./share/runtime/os.hpp too. Thanks.

@MBaesken
Copy link
Member Author

Hi David, I removed dll_file_extension() from os.hpp .

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks good.

But could you update the JBS issue/title to indicate it is now removed not unified.

Thanks.

@openjdk
Copy link

openjdk bot commented Oct 25, 2022

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

8295710: remove os::dll_file_extension

Reviewed-by: dholmes, mdoerr, lucy

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 63 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 25, 2022
@MBaesken MBaesken changed the title JDK-8295710 : unify os::dll_file_extension JDK-8295710 : remove os::dll_file_extension Oct 25, 2022
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Nice cleanup! LGTM. Yeah, describing that you remove it in the JBS issue makes sense.

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.
Thank you for unifying. I like the fact that knowledge about the dynamic library extension is now stored at exactly one place.

@MBaesken
Copy link
Member Author

Hi David, Lutz and Martin, thanks for the reviews !

@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 26, 2022

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

  • e3a5a34: 8295767: Remove unused fields in sun.awt.geom.Edge
  • 324bec1: 8295863: JFR: Use expected size for Maps and Sets
  • 3bd3caf: 8294486: Remove vmTestbase/nsk/jvmti/ tests ported to serviceability/jvmti.
  • fec6174: 8295816: jdwp jck tests failing with "FATAL ERROR in native method: JDWP SetTag, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"
  • e0c2930: 8295282: Use Zicboz/cbo.zero to zero-out memory on RISC-V
  • d393e05: 8294989: ResourceBundle naming convention issue in JdbcRowSetResourceBundle.java
  • 0caea81: 8295895: build error after JDK-8279366
  • ee0dec8: 8295838: Document why we do not print Code Cache Roots phase in G1 logging
  • ef60608: 8295732: Directly embed TruncatedSeqs in G1Analytics
  • 3e49f8f: 8295839: G1: Single threaded phases (within parallel phases) report as using multiple threads in logs
  • ... and 65 more: https://git.openjdk.org/jdk/compare/545021b18d6f82ac8013009939ef4e05b8ebf7ce...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 26, 2022

@MBaesken Pushed as commit b2878c9.

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