archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8270321: Startup regressions in 18-b5 caused by JDK-8266310

Browse source 
Reviewed-by: mchung, alanb
This commit is contained in:
Sergey Chernyshev 2021-07-30 16:10:25 +00:00 • committed by Alexander Scherbatiy
parent baf7797b09
commit 5b3c418249
1 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java
View file

@ -34,6 +34,8 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayDeque;
import java.util.Deque;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.HashSet;
import java.util.Objects;
import java.util.Map;
@ -483,28 +485,36 @@ public final class NativeLibraries {
new ConcurrentHashMap<>();
private static void acquireNativeLibraryLock(String libraryName) {
nativeLibraryLockMap.compute(libraryName, (name, currentLock) -> {
if (currentLock == null) {
currentLock = new CountedLock();
nativeLibraryLockMap.compute(libraryName,
new BiFunction<>() {
public CountedLock apply(String name, CountedLock currentLock) {
if (currentLock == null) {
currentLock = new CountedLock();
}
// safe as compute BiFunction<> is executed atomically
currentLock.increment();
return currentLock;
}
}
// safe as compute lambda is executed atomically
currentLock.increment();
return currentLock;
}).lock();
).lock();
}
private static void releaseNativeLibraryLock(String libraryName) {
CountedLock lock = nativeLibraryLockMap.computeIfPresent(libraryName, (name, currentLock) -> {
if (currentLock.getCounter() == 1) {
// unlock and release the object if no other threads are queued
currentLock.unlock();
// remove the element
return null;
} else {
currentLock.decrement();
return currentLock;
CountedLock lock = nativeLibraryLockMap.computeIfPresent(libraryName,
new BiFunction<>() {
public CountedLock apply(String name, CountedLock currentLock) {
if (currentLock.getCounter() == 1) {
// unlock and release the object if no other threads are queued
currentLock.unlock();
// remove the element
return null;
} else {
currentLock.decrement();
return currentLock;
}
}
}
});
);
if (lock != null) {
lock.unlock();
}
@ -521,7 +531,11 @@ public final class NativeLibraries {
private static Deque<NativeLibraryImpl> current() {
return nativeLibraryThreadContext.computeIfAbsent(
Thread.currentThread(),
t -> new ArrayDeque<>(8));
new Function<>() {
public Deque<NativeLibraryImpl> apply(Thread t) {
return new ArrayDeque<>(8);
}
});
}
private static NativeLibraryImpl peek() {