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
8283060: RawNativeLibraries should allow multiple clients to load/unload the same library #8022
Conversation
…oad the same library
👋 Welcome back mchung! A progress list of the required criteria for merging this PR into |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@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:
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 103 new commits pushed to the
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 |
@@ -45,7 +45,7 @@ | |||
* 3. No relationship with class loaders. | |||
*/ | |||
public final class RawNativeLibraries { | |||
final Map<String, RawNativeLibraryImpl> libraries = new ConcurrentHashMap<>(); | |||
final Set<RawNativeLibraryImpl> libraries = ConcurrentHashMap.newKeySet(); | |||
final Class<?> caller; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello Mandy,
Apart from the caller
being used for checks while constructing a RawNativeLibraries
in RawNativeLibraries.newInstance(MethodHandles.Lookup trustedCaller)
, I don't see this instance member being used anywhere. Do you think we need to store this as an instance member?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I keep it as a record and for debugging use in case.
/integrate |
Going to push as commit 1ddab6f.
Your commit was automatically rebased without conflicts. |
A small improvement to
RawNativeLibraries
.RawNativeLibraries::load
returns the sameNativeLibrary
instance of a given path if it's called multiple times. This means that multiple clients have to coordinate that the last one using the loaded library is the one to close the library by callingRawNativeLibraries::unload
; otherwise, an exception may be thrown.This patch changes
RawNativeLibraries::load
to delegate to the underlying platform-specific library loading mechanism e.g. dlopen/dlclose that keeps the reference count. So each call toRawNativeLibraries::load
andunload
is simply a call to dlopen and dlclose respectively. Each client of callingRawNativeLibraries::load
is responsible for callingRawNativeLibraries::unload
. This will be consistent with the current behavior when you callload
andunload
with a differentRawNativeLibraries
instance.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8022/head:pull/8022
$ git checkout pull/8022
Update a local copy of the PR:
$ git checkout pull/8022
$ git pull https://git.openjdk.java.net/jdk pull/8022/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 8022
View PR using the GUI difftool:
$ git pr show -t 8022
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8022.diff