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

8282515: More clean up on NativeLibraries just for JNI library use #7661

Closed
wants to merge 2 commits into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Mar 2, 2022

This patch further cleans up NativeLibraries just for JNI library use. RawNativeLibraries implements its own native load and unload methods. In addition, this also fixes the implementation of RawNativeLibraries::load not to throw UnsatisfiedLinkError if a library cannot be loaded for any reason but instead returns null.


Progress

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

Issue

  • JDK-8282515: More clean up on NativeLibraries just for JNI library use

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7661

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 2, 2022

👋 Welcome back mchung! 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 label Mar 2, 2022
@openjdk
Copy link

openjdk bot commented Mar 2, 2022

@mlchung 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 label Mar 2, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 2, 2022

Webrevs

Copy link
Contributor

@mcimadamore mcimadamore left a comment

Looks good - thanks for cleaning up further. I think separating the library implementation makes a lot of sense. There's some duplication at the native level, but that's acceptable IMHO - and probably better than having a shared piece of logic that can work in two very different modes.


JVM_UnloadLibrary(handle);
JNU_ReleaseStringPlatformChars(env, name, cname);
}
Copy link
Contributor

@mcimadamore mcimadamore Mar 2, 2022

Choose a reason for hiding this comment

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

Watch out for the newline

@openjdk
Copy link

openjdk bot commented Mar 2, 2022

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

8282515: More clean up on NativeLibraries just for JNI library use

Reviewed-by: mcimadamore

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 label Mar 2, 2022
@mlchung
Copy link
Member Author

mlchung commented Mar 2, 2022

Thanks for the review.

I also think this is better and cleaner separation. The duplicated native code is small and they just call JVM_LoadLibrary and JVM_UnloadLibrary that makes it very clear what this native method does.

@mlchung
Copy link
Member Author

mlchung commented Mar 3, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 3, 2022

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

  • 1485883: 8281628: KeyAgreement : generateSecret intermittently not resetting
  • b6c35ae: 8209784: Include hsdis in the JDK

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 3, 2022
@openjdk openjdk bot closed this Mar 3, 2022
@openjdk openjdk bot removed ready rfr labels Mar 3, 2022
@openjdk
Copy link

openjdk bot commented Mar 3, 2022

@mlchung Pushed as commit 02aa7ce.

💡 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 integrated
2 participants