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

8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem #30

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 8, 2022

I backport this for parity with 11.0.15-oracle.

The code touched was completely reworked in jdk15 by "8228336: Refactor native library loading implementation"

make/test/JtregNativeJdk.gmk
Trivial resolve due to context.

src/hotspot/share/prims/jvm.cpp
Applies clean, but does not compile.
I removed "log_info(library)("Failed to load library %s", name);"
Logging was only added to this file in jdk15 with "8187305: Add logging for shared library loads/unloads"

Changes to
src/java.base/macosx/classes/jdk/internal/loader/ClassLoaderHelper.java
applied to
src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java
Fits well.

Changes to
src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java
applied to class NativeLibrary in java/lang/ClassLoader.java.
I had to modify the code.

Changes to
src/java.base/share/native/libjava/NativeLibraries.c
applied to
src/java.base/share/native/libjava/ClassLoader.c
Fits acceptable.

Changes to
src/java.base/unix/classes/jdk/internal/loader/ClassLoaderHelper.java
applied to
src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
Fits well.

Changes to
src/java.base/windows/classes/jdk/internal/loader/ClassLoaderHelper.java
applied to
src/java.base/windows/classes/java/lang/ClassLoaderHelper.java
Fits well.

SAP testing passed.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u pull/30/head:pull/30
$ git checkout pull/30

Update a local copy of the PR:
$ git checkout pull/30
$ git pull https://git.openjdk.java.net/jdk11u pull/30/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 30

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u/pull/30.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 8, 2022

👋 Welcome back goetz! 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 changed the title Backport 6aa02d75d9f26f46fbdb54aef52cea3257aa7462 8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem Mar 8, 2022
@openjdk
Copy link

openjdk bot commented Mar 8, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 8, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 8, 2022

Webrevs

Copy link
Member

@MBaesken MBaesken 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 mostly.
Minor comments (leave it to you if you want to add)

src/hotspot/share/prims/jvm.cpp

Instead of

log_info(library)("Failed to load library %s", name);

we could use

log_info(os)("Failed to load library %s", name);

The comment from

src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java

  • Load a native library from the given file. Returns null if the given
  • library is determined to be non-loadable, which is system-dependent.

could be added to

src/java.base/share/classes/java/lang/ClassLoader.java

at an approriate place.

@openjdk
Copy link

openjdk bot commented Mar 8, 2022

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8275703: System.loadLibrary fails on Big Sur for libraries hidden from filesystem

Reviewed-by: mbaesken

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:

  • 1cff563: 8277795: ldap connection timeout not honoured under contention
  • e339111: 8276141: XPathFactory set/getProperty method

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 Mar 8, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 8, 2022

Thanks for the review!
I think adding the log output is a bit lost, as all the related logs are missing in 11, as e.g.
"Loaded library %s"
"Unloaded library with handle "

As for the comment ... I did not find an appropriate place. The code is split into several classes after the reengineering.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 8, 2022

Pre-submit failures: dependencies missing

@GoeLin
Copy link
Member Author

GoeLin commented Mar 9, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 9, 2022

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

  • 1cff563: 8277795: ldap connection timeout not honoured under contention
  • e339111: 8276141: XPathFactory set/getProperty method

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 9, 2022

@GoeLin Pushed as commit f7346f0.

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

@GoeLin GoeLin deleted the goetz_backport_8275703 branch March 9, 2022 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants