From a1c85d91fc4c2aa2398f11ffc0f78f1305ad01ab Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 23 Mar 2024 16:18:21 -0500 Subject: [PATCH] Comment out trace logs These logs aren't printed and will just increase GC pressure for strings --- .../distanthorizons/core/api/internal/SharedApi.java | 2 +- .../core/dataObjects/fullData/FullDataPointIdMap.java | 8 ++++---- .../render/bufferBuilding/ColumnRenderBufferBuilder.java | 7 ++++--- .../distanthorizons/core/generation/DhLightingEngine.java | 2 +- .../core/generation/WorldGenerationQueue.java | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java index f72484df5..f04bd98c1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java @@ -293,7 +293,7 @@ public class SharedApi executor.execute(() -> { - LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount()); + //LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount()); try { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java index 56d682a42..4dd9ef5b9 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java @@ -182,7 +182,7 @@ public class FullDataPointIdMap { try { - LOGGER.trace("merging {" + this.pos + ", " + this.entryList.size() + "} and {" + inputMap.pos + ", " + inputMap.entryList.size() + "}"); + //LOGGER.trace("merging {" + this.pos + ", " + this.entryList.size() + "} and {" + inputMap.pos + ", " + inputMap.entryList.size() + "}"); inputMap.readWriteLock.readLock().lock(); this.readWriteLock.writeLock().lock(); @@ -203,7 +203,7 @@ public class FullDataPointIdMap this.readWriteLock.writeLock().unlock(); inputMap.readWriteLock.readLock().unlock(); - LOGGER.trace("finished merging {" + this.pos + ", " + this.entryList.size() + "} and {" + inputMap.pos + ", " + inputMap.entryList.size() + "}"); + //LOGGER.trace("finished merging {" + this.pos + ", " + this.entryList.size() + "} and {" + inputMap.pos + ", " + inputMap.entryList.size() + "}"); } } @@ -254,7 +254,7 @@ public class FullDataPointIdMap finally { this.readWriteLock.readLock().unlock(); - LOGGER.trace("serialize " + this.pos + " " + this.entryList.size()); + //LOGGER.trace("serialize " + this.pos + " " + this.entryList.size()); } } @@ -287,7 +287,7 @@ public class FullDataPointIdMap } } - LOGGER.trace("deserialized " + pos + " " + newMap.entryList.size() + "-" + entityCount); + //LOGGER.trace("deserialized " + pos + " " + newMap.entryList.size() + "-" + entityCount); return newMap; } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java index 4c9bd2b43..0761b66bb 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java @@ -85,7 +85,7 @@ public class ColumnRenderBufferBuilder { boolean enableTransparency = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled; - EVENT_LOGGER.trace("RenderRegion start QuadBuild @ " + renderSource.sectionPos); + //EVENT_LOGGER.trace("RenderRegion start QuadBuild @ " + renderSource.sectionPos); boolean enableSkyLightCulling = ( // dimensions with a ceiling will be all caves so we don't want cave culling @@ -126,7 +126,7 @@ public class ColumnRenderBufferBuilder { try { - EVENT_LOGGER.trace("RenderRegion start Upload @ " + renderSource.sectionPos); + //EVENT_LOGGER.trace("RenderRegion start Upload @ " + renderSource.sectionPos); ColumnRenderBuffer buffer = renderBufferRef.swap(null); if (buffer == null) @@ -138,7 +138,8 @@ public class ColumnRenderBufferBuilder { buffer.uploadBuffer(quadBuilder, GLProxy.getInstance().getGpuUploadMethod()); LodUtil.assertTrue(buffer.buffersUploaded); - EVENT_LOGGER.trace("RenderRegion end Upload @ " + renderSource.sectionPos); + + //EVENT_LOGGER.trace("RenderRegion end Upload @ " + renderSource.sectionPos); return buffer; } catch (Exception e) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java index c319c3b07..0e648ef33 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java @@ -207,7 +207,7 @@ public class DhLightingEngine long endTimeNs = System.nanoTime(); float totalTimeMs = (endTimeNs - startTimeNs) / 1_000_000.0f; - LOGGER.trace("Finished generating lighting for chunk: [" + centerChunkPos + "] in ["+totalTimeMs+"] milliseconds"); + //LOGGER.trace("Finished generating lighting for chunk: [" + centerChunkPos + "] in ["+totalTimeMs+"] milliseconds"); } /** Applies each {@link LightPos} from the queue to the given set of {@link IChunkWrapper}'s. */ diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java index e946d2698..05d75ec8c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java @@ -292,7 +292,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb boolean taskStarted = this.tryStartingWorldGenTaskGroup(newTaskGroup); if (!taskStarted) { - LOGGER.trace("Unable to start task: "+closestTask.pos+", skipping. Task position may have already been generated."); + //LOGGER.trace("Unable to start task: "+closestTask.pos+", skipping. Task position may have already been generated."); } } else @@ -302,7 +302,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb // the newly selected task, we cannot use it, // as some chunks may have already been written into. - LOGGER.trace("A task already exists for this position, todo: "+closestTask.pos); + //LOGGER.trace("A task already exists for this position, todo: "+closestTask.pos); } // a task has been started @@ -349,7 +349,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb if (this.alreadyGeneratedPosHashSet.containsKey(newTaskGroup.group.pos)) { // temporary solution to prevent generating the same section multiple times - LOGGER.trace("Duplicate generation section " + taskPos + " with granularity [" + granularity + "] at " + chunkPosMin + ". Skipping..."); + //LOGGER.trace("Duplicate generation section " + taskPos + " with granularity [" + granularity + "] at " + chunkPosMin + ". Skipping..."); // sending a success result is necessary to make sure the render sections are reloaded correctly newTaskGroup.group.worldGenTasks.forEach(worldGenTask -> worldGenTask.future.complete(WorldGenResult.CreateSuccess(new DhSectionPos(granularity, taskPos.getX(), taskPos.getZ()))));