SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2025-02-05 15:55:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

cacheLock and awaitLock

Browse Source
This commit is contained in:
Ivan Pekov 2021-11-03 16:25:48 +02:00
parent 6e5d323213
commit ab11e36206
No known key found for this signature in database
GPG Key ID: E44CE4557A5E12E0
2 changed files with 89 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java
View File

@ -46,6 +46,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.stream.Collector;
@ -76,8 +77,10 @@ public final class CloudExpansionManager {
@NotNull
private final Map<String, CloudExpansion> cache = new HashMap<>();
private final ReentrantLock cacheLock = new ReentrantLock();
@NotNull
private final Map<String, CompletableFuture<File>> await = new ConcurrentHashMap<>();
private final ReentrantLock awaitLock = new ReentrantLock();
static final ExecutorService ASYNC_EXECUTOR =
Executors.newCachedThreadPool(
@ -113,39 +116,59 @@ public final class CloudExpansionManager {
@NotNull
@Unmodifiable
public Map<String, CloudExpansion> getCloudExpansions() {
return ImmutableMap.copyOf(cache);
cacheLock.lock();
try {
return ImmutableMap.copyOf(cache);
} finally {
cacheLock.unlock();
}
}
@NotNull
@Unmodifiable
public Map<String, CloudExpansion> getCloudExpansionsInstalled() {
if (cache.isEmpty()) {
return Collections.emptyMap();
}
cacheLock.lock();
try {
if (cache.isEmpty()) {
return Collections.emptyMap();
}
return cache.values()
.stream()
.filter(CloudExpansion::hasExpansion)
.collect(INDEXED_NAME_COLLECTOR);
return cache.values()
.stream()
.filter(CloudExpansion::hasExpansion)
.collect(INDEXED_NAME_COLLECTOR);
} finally {
cacheLock.unlock();
}
}
@NotNull
@Unmodifiable
public Map<String, CloudExpansion> getCloudExpansionsByAuthor(@NotNull final String author) {
if (cache.isEmpty()) {
return Collections.emptyMap();
}
cacheLock.lock();
try {
if (cache.isEmpty()) {
return Collections.emptyMap();
}
return cache.values()
.stream()
.filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor()))
.collect(INDEXED_NAME_COLLECTOR);
return cache.values()
.stream()
.filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor()))
.collect(INDEXED_NAME_COLLECTOR);
} finally {
cacheLock.unlock();
}
}
@NotNull
@Unmodifiable
public Set<String> getCloudExpansionAuthors() {
return cache.values().stream().map(CloudExpansion::getAuthor).collect(Collectors.toSet());
cacheLock.lock();
try {
return cache.values().stream().map(CloudExpansion::getAuthor).collect(Collectors.toSet());
} finally {
cacheLock.unlock();
}
}
public int getCloudExpansionAuthorCount() {
@ -163,14 +186,29 @@ public final class CloudExpansionManager {
@NotNull
public Optional<CloudExpansion> findCloudExpansionByName(@NotNull final String name) {
return Optional.ofNullable(cache.get(toIndexName(name)));
cacheLock.lock();
try {
return Optional.ofNullable(cache.get(toIndexName(name)));
} finally {
cacheLock.unlock();
}
}
public void clean() {
cache.clear();
cacheLock.lock();
try {
cache.clear();
} finally {
cacheLock.unlock();
}
await.values().forEach(future -> future.cancel(true));
await.clear();
awaitLock.lock();
try {
await.values().forEach(future -> future.cancel(true));
await.clear();
} finally {
awaitLock.unlock();
}
}
public void fetch(final boolean allowUnverified) {
@ -231,7 +269,12 @@ public final class CloudExpansionManager {
}
}
cache.put(toIndexName(expansion), expansion);
cacheLock.lock();
try {
cache.put(toIndexName(expansion), expansion);
} finally {
cacheLock.unlock();
}
}
} catch (Throwable e) {
// ugly swallowing of every throwable, but we have to be defensive
@ -244,13 +287,24 @@ public final class CloudExpansionManager {
}
public boolean isDownloading(@NotNull final CloudExpansion expansion) {
return await.containsKey(toIndexName(expansion));
awaitLock.lock();
try {
return await.containsKey(toIndexName(expansion));
} finally {
awaitLock.unlock();
}
}
@NotNull
public CompletableFuture<File> downloadExpansion(@NotNull final CloudExpansion expansion,
@NotNull final CloudExpansion.Version version) {
final CompletableFuture<File> previous = await.get(toIndexName(expansion));
CompletableFuture<File> previous;
awaitLock.lock();
try {
previous = await.get(toIndexName(expansion));
} finally {
awaitLock.unlock();
}
if (previous != null) {
return previous;
}
@ -269,7 +323,12 @@ public final class CloudExpansionManager {
}, ASYNC_EXECUTOR);
download.whenCompleteAsync((value, exception) -> {
await.remove(toIndexName(expansion));
awaitLock.lock();
try {
await.remove(toIndexName(expansion));
} finally {
awaitLock.unlock();
}
if (exception != null) {
plugin.getLogger().log(Level.SEVERE,
@ -277,7 +336,12 @@ public final class CloudExpansionManager {
}
}, ASYNC_EXECUTOR);
await.put(toIndexName(expansion), download);
awaitLock.lock();
try {
await.put(toIndexName(expansion), download);
} finally {
awaitLock.unlock();
}
return download;
}

1
src/main/java/me/clip/placeholderapi/util/Futures.java
View File

@ -71,7 +71,6 @@ public final class Futures {
@NotNull
private static <T> List<T> awaitCompletion(
@NotNull final Collection<CompletableFuture<T>> futures) {
// TODO: Calling CompletableFuture#join is bad. Find a way to optimise this whole class
return futures.stream().map(CompletableFuture::join).collect(Collectors.toList());
}