R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do resource cache generation on-thread, but lazily

Browse Source 
Apparently ForkJoinPools can deadlock even though they are not
supposed to
This commit is contained in:
embeddedt 2023-05-08 10:17:24 -04:00
parent 2f8f47ae3e
commit b955f17fbd
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
View File

@ -14,7 +14,6 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -31,7 +30,9 @@ public class PackResourcesCacheEngine {
private final Map<PackType, Set<String>> namespacesByType; private final Map<PackType, Set<String>> namespacesByType;
private final Set<CachedResourcePath> containedPaths; private final Set<CachedResourcePath> containedPaths;
private final EnumMap<PackType, Map<String, List<CachedResourcePath>>> resourceListings; private final EnumMap<PackType, Map<String, List<CachedResourcePath>>> resourceListings;
private volatile CompletableFuture<Void> cacheFuture; private volatile boolean cacheGenerationFlag = false;
private List<Runnable> cacheGenerationTasks = new ArrayList<>();
private Path debugPath;
public PackResourcesCacheEngine(Function<PackType, Set<String>> namespacesRetriever, BiFunction<PackType, String, Path> basePathRetriever) { public PackResourcesCacheEngine(Function<PackType, Set<String>> namespacesRetriever, BiFunction<PackType, String, Path> basePathRetriever) {
this.namespacesByType = new EnumMap<>(PackType.class); this.namespacesByType = new EnumMap<>(PackType.class);
@ -42,14 +43,12 @@ public class PackResourcesCacheEngine {
} }
this.containedPaths = new ObjectOpenHashSet<>(); this.containedPaths = new ObjectOpenHashSet<>();
this.resourceListings = new EnumMap<>(PackType.class); this.resourceListings = new EnumMap<>(PackType.class);
CompletableFuture<Void> future = CompletableFuture.completedFuture(null);
Stopwatch watch = Stopwatch.createStarted();
// used for log message // used for log message
Path debugPath = basePathRetriever.apply(PackType.CLIENT_RESOURCES, "minecraft").toAbsolutePath(); this.debugPath = basePathRetriever.apply(PackType.CLIENT_RESOURCES, "minecraft").toAbsolutePath();
for(PackType type : PackType.values()) { for(PackType type : PackType.values()) {
Collection<String> namespaces = PackTypeHelper.isVanillaPackType(type) ? this.namespacesByType.get(type) : namespacesRetriever.apply(type); Collection<String> namespaces = PackTypeHelper.isVanillaPackType(type) ? this.namespacesByType.get(type) : namespacesRetriever.apply(type);
Collection<Pair<String, Path>> namespacedRoots = namespaces.stream().map(s -> Pair.of(s, basePathRetriever.apply(type, s).toAbsolutePath())).collect(Collectors.toList()); Collection<Pair<String, Path>> namespacedRoots = namespaces.stream().map(s -> Pair.of(s, basePathRetriever.apply(type, s).toAbsolutePath())).collect(Collectors.toList());
future = future.thenRunAsync(() -> { cacheGenerationTasks.add(() -> {
ImmutableMap.Builder<String, List<CachedResourcePath>> packTypedMap = ImmutableMap.builder(); ImmutableMap.Builder<String, List<CachedResourcePath>> packTypedMap = ImmutableMap.builder();
for(Pair<String, Path> pair : namespacedRoots) { for(Pair<String, Path> pair : namespacedRoots) {
try { try {
@ -77,17 +76,11 @@ public class PackResourcesCacheEngine {
synchronized (this.resourceListings) { synchronized (this.resourceListings) {
this.resourceListings.put(type, packTypedMap.build()); this.resourceListings.put(type, packTypedMap.build());
} }
}, ModernFix.resourceReloadExecutor()); });
} }
future = future.thenRunAsync(() -> { cacheGenerationTasks.add(() -> {
((ObjectOpenHashSet<CachedResourcePath>)this.containedPaths).trim(); ((ObjectOpenHashSet<CachedResourcePath>)this.containedPaths).trim();
watch.stop(); });
}, ModernFix.resourceReloadExecutor());
this.cacheFuture = future;
// print debug message in separate task to prevent slowing down rest of load
future.thenRunAsync(() -> {
ModernFix.LOGGER.debug("Generated cache for {} in {}", debugPath, watch);
}, ModernFix.resourceReloadExecutor());
} }
private static boolean isValidCachedResourcePath(Path path) { private static boolean isValidCachedResourcePath(Path path) {
@ -112,12 +105,23 @@ public class PackResourcesCacheEngine {
return null; return null;
} }
private void doGenerateCache() {
Stopwatch watch = Stopwatch.createStarted();
for(Runnable r : this.cacheGenerationTasks) {
r.run();
}
watch.stop();
ModernFix.LOGGER.debug("Generated cache for {} in {}", debugPath, watch);
debugPath = null;
cacheGenerationTasks = ImmutableList.of();
}
private void awaitLoad() { private void awaitLoad() {
if(this.cacheFuture != null) { if(!this.cacheGenerationFlag) {
synchronized (this) { synchronized (this) {
if(this.cacheFuture != null) { if(!this.cacheGenerationFlag) {
this.cacheFuture.join(); this.doGenerateCache();
this.cacheFuture = null; this.cacheGenerationFlag = true;
} }
} }
} }