wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix RenderSourceFileHandler thread pools not closing if files don't need saving

Browse Source
This commit is contained in:
James Seibel
2023-07-15 12:31:34 -05:00
parent fce04b419d
commit cb23b1ee55
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java
+17 -17
View File
@@ -485,15 +485,6 @@ public class RenderSourceFileHandler implements ILodRenderSourceProvider
// clearing / shutdown //
//=====================//
/** closes the handler after any necessary saving has been completed */
public CompletableFuture<Void> saveAndCloseAsync()
{
CompletableFuture<Void> shutdownFuture = this.flushAndSaveAsync();
shutdownFuture.whenComplete((voidObj, ex) -> { this.close(); });
return shutdownFuture;
}
@Override
public void close()
{
@@ -503,23 +494,32 @@ public class RenderSourceFileHandler implements ILodRenderSourceProvider
ArrayList<CompletableFuture<Void>> futures = new ArrayList<>();
for (RenderMetaDataFile metaFile : this.filesBySectionPos.values())
{
futures.add(metaFile.flushAndSaveAsync(this.fileHandlerThreadPool));
CompletableFuture<Void> saveFuture = metaFile.flushAndSaveAsync(this.fileHandlerThreadPool);
if (!saveFuture.isDone())
{
futures.add(saveFuture);
}
}
// if the save futures didn't already complete, wait for them and then shut down the thread pool
CompletableFuture<Void> combinedFuture = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
combinedFuture.thenRun(() ->
if (futures.size() != 0)
{
LOGGER.info("Finished closing "+this.getClass().getSimpleName()+", ["+futures.size()+"] files were saved.");
this.fileHandlerThreadPool.shutdown();
});
LOGGER.info("Waiting for ["+futures.size()+"] files to save...");
// if the save futures didn't already complete, wait for them and then shut down the thread pool
CompletableFuture<Void> combinedFuture = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
combinedFuture.thenRun(() ->
{
LOGGER.info("Finished closing "+this.getClass().getSimpleName()+", ["+futures.size()+"] files were saved out of ["+this.filesBySectionPos.size()+"] total files.");
this.fileHandlerThreadPool.shutdown();
});
}
// if the save futures were already completed, the above "thenRun" won't fire,
// if the executor isn't currently running anything, shut it down
if (!this.fileHandlerThreadPool.isTerminated() && this.fileHandlerThreadPool.getActiveCount() == 0)
{
LOGGER.info("Finished closing "+this.getClass().getSimpleName()+", thread pool manually shut down due to file save futures already being completed.");
LOGGER.info("Finished closing " + this.getClass().getSimpleName() + " when files were already saved.");
this.fileHandlerThreadPool.shutdown();
}
}
core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java
+8 -8
View File
@@ -60,13 +60,13 @@ public class ClientLevelModule {
return;
}
clientRenderState.closeAsync().join(); //TODO: Make it async.
clientRenderState.close();
clientRenderState = new ClientRenderState(parent, parent.getFileHandler(), parent.getSaveStructure());
if (!this.ClientRenderStateRef.compareAndSet(null, clientRenderState))
{
//FIXME: How to handle this?
LOGGER.warn("Failed to set render state due to concurrency after changing view distance");
clientRenderState.closeAsync();
clientRenderState.close();
return;
}
}
@@ -96,7 +96,7 @@ public class ClientLevelModule {
if (!this.ClientRenderStateRef.compareAndSet(null, ClientRenderState))
{
LOGGER.warn("Failed to start renderer due to concurrency");
ClientRenderState.closeAsync();
ClientRenderState.close();
return false;
}
else
@@ -138,7 +138,7 @@ public class ClientLevelModule {
return;
}
}
ClientRenderState.closeAsync();
ClientRenderState.close();
}
//===============//
@@ -189,7 +189,7 @@ public class ClientLevelModule {
if (ClientRenderState != null)
{
ClientRenderState.closeAsync();
ClientRenderState.close();
}
}
}
@@ -263,13 +263,13 @@ public class ClientLevelModule {
public CompletableFuture<Void> closeAsync()
public void close()
{
LOGGER.info("Shutting down "+ ClientRenderState.class.getSimpleName()+" async...");
LOGGER.info("Shutting down "+ ClientRenderState.class.getSimpleName());
this.renderer.close();
this.quadtree.close();
return this.renderSourceFileHandler.saveAndCloseAsync();
this.renderSourceFileHandler.close();
}
}