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

Make OrderedParallelModDispatcher more reliable

Browse Source
This commit is contained in:
embeddedt 2023-01-07 13:06:53 -05:00
parent dd91031382
commit 9d0677a3d7
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/embeddedt/modernfix/util/OrderedParallelModDispatcher.java
View File

@ -35,10 +35,9 @@ public class OrderedParallelModDispatcher {
public static void dispatchBlocking(Executor executor, Consumer<String> task, Collection<String> modIDsToFilter) { public static void dispatchBlocking(Executor executor, Consumer<String> task, Collection<String> modIDsToFilter) {
Set<String> finishedMods = Collections.synchronizedSet(new HashSet<>(modIDsToFilter)); Set<String> finishedMods = Collections.synchronizedSet(new HashSet<>(modIDsToFilter));
HashMap<String, CompletableFuture<?>> submittedFutures = new HashMap<>(); HashMap<String, CompletableFuture<?>> submittedFutures = new HashMap<>();
int numMods = ModList.get().getMods().size();
Semaphore jobWaitingSemaphore = new Semaphore(0); Semaphore jobWaitingSemaphore = new Semaphore(0);
ArrayList<ModInfo> remainingModList = new ArrayList<>(ModList.get().getMods()); ArrayList<ModInfo> remainingModList = new ArrayList<>(ModList.get().getMods());
while(finishedMods.size() < numMods) { while(remainingModList.size() > 0) {
remainingModList.removeIf(modInfo -> { remainingModList.removeIf(modInfo -> {
if(finishedMods.contains(modInfo.getModId())) if(finishedMods.contains(modInfo.getModId()))
return true; return true;
@ -48,14 +47,14 @@ public class OrderedParallelModDispatcher {
.filter(modId -> !finishedMods.contains(modId)) .filter(modId -> !finishedMods.contains(modId))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(missingDependencies.size() > 0) { if(missingDependencies.size() > 0) {
//ModernFix.LOGGER.debug(DISPATCHER, "Cannot process " + modInfo.getModId() + ", as it is waiting on mods: [" + String.join(", ", missingDependencies) + "]"); ModernFix.LOGGER.debug(DISPATCHER, "Cannot process " + modInfo.getModId() + ", as it is waiting on mods: [" + String.join(", ", missingDependencies) + "]");
return false; return false;
} }
Optional<? extends ModContainer> modContainerOpt = ModList.get().getModContainerById(modInfo.getModId()); Optional<? extends ModContainer> modContainerOpt = ModList.get().getModContainerById(modInfo.getModId());
if(!modContainerOpt.isPresent()) if(!modContainerOpt.isPresent())
throw new IllegalStateException("Can't find mod container"); throw new IllegalStateException("Can't find mod container");
ModContainer container = modContainerOpt.get(); ModContainer container = modContainerOpt.get();
//ModernFix.LOGGER.debug(DISPATCHER, "Submitting job for " + modInfo.getModId()); ModernFix.LOGGER.debug(DISPATCHER, "Submitting job for " + modInfo.getModId());
submittedFutures.put(modInfo.getModId(), CompletableFuture.runAsync(() -> { submittedFutures.put(modInfo.getModId(), CompletableFuture.runAsync(() -> {
Supplier<?> contextExtension = ObfuscationReflectionHelper.getPrivateValue(ModContainer.class, container, "contextExtension"); Supplier<?> contextExtension = ObfuscationReflectionHelper.getPrivateValue(ModContainer.class, container, "contextExtension");
ModLoadingContext.get().setActiveContainer(container, contextExtension.get()); ModLoadingContext.get().setActiveContainer(container, contextExtension.get());
@ -75,7 +74,7 @@ public class OrderedParallelModDispatcher {
return true; return true;
}); });
Preconditions.checkState(submittedFutures.size() > 0, "The semaphore will block forever!"); Preconditions.checkState(submittedFutures.size() > 0, "The semaphore will block forever!");
//ModernFix.LOGGER.debug(DISPATCHER, "Waiting for one of [" + String.join(", ", submittedFutures.keySet()) + "] to finish..."); ModernFix.LOGGER.debug(DISPATCHER, "Waiting for one of [" + String.join(", ", submittedFutures.keySet()) + "] to finish...");
try { try {
jobWaitingSemaphore.acquire(); jobWaitingSemaphore.acquire();
} catch(InterruptedException e) { } catch(InterruptedException e) {
@ -83,12 +82,13 @@ public class OrderedParallelModDispatcher {
} }
submittedFutures.entrySet().removeIf(entry -> { submittedFutures.entrySet().removeIf(entry -> {
if(entry.getValue().isDone()) { if(entry.getValue().isDone()) {
//ModernFix.LOGGER.debug(DISPATCHER, "Job finished for " + entry.getKey()); ModernFix.LOGGER.debug(DISPATCHER, "Job finished for " + entry.getKey());
return true; return true;
} }
return false; return false;
}); });
} }
submittedFutures.values().forEach(CompletableFuture::join);
} }
public static void dispatchBlocking(Executor executor, Consumer<String> task) { public static void dispatchBlocking(Executor executor, Consumer<String> task) {