Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-26 02:27:55 +01:00
Code Issues Projects Releases Wiki Activity

More memory tuning on BufferedImage handling, workaround bukkit leak

Browse Source
This commit is contained in:
Mike Primm 2011-05-29 22:33:51 +08:00 committed by mikeprimm
parent cf6a2f8f90
commit 995f4c242a
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/dynmap/MapChunkCache.java
View File

@ -14,6 +14,7 @@ public class MapChunkCache {
private World w; private World w;
private static Method getchunkdata = null; private static Method getchunkdata = null;
private static Method gethandle = null; private static Method gethandle = null;
private static Method poppreservedchunk = null;
private static Field heightmap = null; private static Field heightmap = null;
private static boolean initialized = false; private static boolean initialized = false;
@ -177,6 +178,13 @@ public class MapChunkCache {
} catch (NoSuchMethodException nsmx) { } catch (NoSuchMethodException nsmx) {
} catch (NoSuchFieldException nsfx) { } catch (NoSuchFieldException nsfx) {
} }
/* Get CraftWorld.popPreservedChunk(x,z) - reduces memory bloat from map traversals (optional) */
try {
Class c = Class.forName("org.bukkit.craftbukkit.CraftWorld");
poppreservedchunk = c.getDeclaredMethod("popPreservedChunk", new Class[] { int.class, int.class });
} catch (ClassNotFoundException cnfx) {
} catch (NoSuchMethodException nsmx) {
}
initialized = true; initialized = true;
if(gethandle != null) if(gethandle != null)
Log.info("Chunk snapshot support enabled"); Log.info("Chunk snapshot support enabled");
@ -220,6 +228,13 @@ public class MapChunkCache {
* while the actual in-use chunk area for a player where the chunks are managed * while the actual in-use chunk area for a player where the chunks are managed
* by the MC base server is 21x21 (or about a 160 block radius) */ * by the MC base server is 21x21 (or about a 160 block radius) */
w.unloadChunk(chunk.x, chunk.z, false, false); w.unloadChunk(chunk.x, chunk.z, false, false);
/* And pop preserved chunk - this is a bad leak in Bukkit for map traversals like us */
try {
if(poppreservedchunk != null)
poppreservedchunk.invoke(w, chunk.x, chunk.z);
} catch (Exception x) {
Log.severe("Cannot pop preserved chunk - " + x.toString());
}
} }
} }
} }

3
src/main/java/org/dynmap/kzedmap/KzedMap.java
View File

@ -293,8 +293,8 @@ public class KzedMap extends MapType {
img.width = x; img.width = x;
img.height = y; img.height = y;
img.argb_buf = new int[x*y]; img.argb_buf = new int[x*y];
img.buf_img = createBufferedImage(img.argb_buf, img.width, img.height);
} }
img.buf_img = createBufferedImage(img.argb_buf, img.width, img.height);
return img; return img;
} }
@ -303,6 +303,7 @@ public class KzedMap extends MapType {
*/ */
public static void freeBufferedImage(KzedBufferedImage img) { public static void freeBufferedImage(KzedBufferedImage img) {
img.buf_img.flush(); img.buf_img.flush();
img.buf_img = null; /* Toss bufferedimage - seems to hold on to other memory */
synchronized(lock) { synchronized(lock) {
long k = (img.width<<16) + img.height; long k = (img.width<<16) + img.height;
LinkedList<KzedBufferedImage> ll = imgcache.get(k); LinkedList<KzedBufferedImage> ll = imgcache.get(k);