Release some more heap-space when bluemap is idle

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

@@ -33,6 +33,7 @@
 import de.bluecolored.bluemap.common.config.*;
 import de.bluecolored.bluemap.common.debug.StateDumper;
 import de.bluecolored.bluemap.common.live.LivePlayersDataSupplier;
+import de.bluecolored.bluemap.common.metrics.Metrics;
 import de.bluecolored.bluemap.common.plugin.skins.PlayerSkinUpdater;
 import de.bluecolored.bluemap.common.rendermanager.MapUpdatePreparationTask;
 import de.bluecolored.bluemap.common.rendermanager.RenderManager;
@@ -42,9 +43,9 @@
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import de.bluecolored.bluemap.common.web.*;
 import de.bluecolored.bluemap.common.web.http.HttpServer;
-import de.bluecolored.bluemap.common.metrics.Metrics;
 import de.bluecolored.bluemap.core.logger.Logger;
 import de.bluecolored.bluemap.core.map.BmMap;
+import de.bluecolored.bluemap.core.map.hires.ArrayTileModel;
 import de.bluecolored.bluemap.core.resources.MinecraftVersion;
 import de.bluecolored.bluemap.core.resources.pack.resourcepack.ResourcePack;
 import de.bluecolored.bluemap.core.storage.Storage;
@@ -278,11 +279,15 @@ private void load(@Nullable ResourcePack preloadedResourcePack) throws IOExcepti
                 //init timer
                 daemonTimer = new Timer("BlueMap-Plugin-DaemonTimer", true);
 
-                //periodically save
+                //periodically save and release memory
                 TimerTask saveTask = new TimerTask() {
                     @Override
                     public void run() {
                         save();
+
+                        // if nothing is being actively rendered, clear caches and pools to release some heap-space
+                        if (!renderManager.isRunning() || renderManager.getCurrentRenderTask() == null)
+                            ArrayTileModel.instancePool().clear();
                     }
                 };
                 daemonTimer.schedule(saveTask, TimeUnit.MINUTES.toMillis(10), TimeUnit.MINUTES.toMillis(10));

common/src/main/java/de/bluecolored/bluemap/common/rendermanager/MapUpdateTask.java

@@ -29,15 +29,17 @@
 import lombok.Getter;
 
 import java.util.Collection;
+import java.util.stream.Stream;
 
 public class MapUpdateTask extends CombinedRenderTask<RenderTask> implements MapRenderTask {
 
     @Getter private final BmMap map;
 
     public MapUpdateTask(BmMap map, Collection<Vector2i> regions, TileUpdateStrategy force) {
-        this(map, regions.stream()
-                .<RenderTask>map(region -> new WorldRegionRenderTask(map, region, force))
-                .toList());
+        this(map, Stream.concat(
+                regions.stream().<RenderTask>map(region -> new WorldRegionRenderTask(map, region, force)),
+                Stream.of(new MapSaveTask(map))
+        ).toList());
     }
 
     protected MapUpdateTask(BmMap map, Collection<RenderTask> tasks) {

core/src/main/java/de/bluecolored/bluemap/core/map/hires/ArrayTileModel.java

@@ -498,7 +498,7 @@ private void swap(int face1, int face2) {
         materialIndex[face2] = vi;
     }
 
-    static InstancePool<ArrayTileModel> instancePool() {
+    public static InstancePool<ArrayTileModel> instancePool() {
         return INSTANCE_POOL;
     }
 

core/src/main/java/de/bluecolored/bluemap/core/util/InstancePool.java

@@ -58,4 +58,8 @@ public void recycleInstance(T instance) {
             pool.offer(instance);
     }
 
+    public void clear() {
+        pool.clear();
+    }
+
 }