Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-09-19 17:41:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #301 from mikeprimm/hdrender

Browse Source 
Make incremental update zoom processing more disk I/O efficient
This commit is contained in:
mikeprimm 2011-07-21 16:38:14 -07:00
commit 43dba33db9
1 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/org/dynmap/DynmapWorld.java
View File

@ -85,6 +85,14 @@ public class DynmapWorld {
} }
} }
private String[] peekQueuedUpdates(int level) {
if(level >= zoomoutupdates.length)
return new String[0];
synchronized(lock) {
return zoomoutupdates[level].toArray(new String[zoomoutupdates[level].size()]);
}
}
private static class DirFilter implements FilenameFilter { private static class DirFilter implements FilenameFilter {
public boolean accept(File f, String n) { public boolean accept(File f, String n) {
if(!n.equals("..") && !n.equals(".")) { if(!n.equals("..") && !n.equals(".")) {
@ -142,6 +150,7 @@ public class DynmapWorld {
return true; return true;
HashMap<String, PrefixData> maptab = buildPrefixData(zoomlevel); HashMap<String, PrefixData> maptab = buildPrefixData(zoomlevel);
if(checkts) { /* If doing timestamp based scan (initial) */
DirFilter df = new DirFilter(); DirFilter df = new DirFilter();
for(String pfx : maptab.keySet()) { /* Walk through prefixes */ for(String pfx : maptab.keySet()) { /* Walk through prefixes */
PrefixData pd = maptab.get(pfx); PrefixData pd = maptab.get(pfx);
@ -160,6 +169,38 @@ public class DynmapWorld {
} }
} }
Debug.debug("freshenZoomOutFiles(" + world.getName() + "," + zoomlevel + ") - done (" + cnt + " updated files)"); Debug.debug("freshenZoomOutFiles(" + world.getName() + "," + zoomlevel + ") - done (" + cnt + " updated files)");
}
else { /* Else, only process updates */
String[] paths = peekQueuedUpdates(zoomlevel); /* Get pending updates */
HashMap<String, ProcessTileRec> toprocess = new HashMap<String, ProcessTileRec>();
/* Accumulate zoomed tiles to be processed (combine triggering subtiles) */
for(String p : paths) {
File f = new File(p); /* Make file */
/* Find matching prefix */
for(PrefixData pd : maptab.values()) { /* Walk through prefixes */
ProcessTileRec tr = null;
/* If big map and matches name pattern */
if(pd.isbigmap && f.getName().startsWith(pd.fnprefix) &&
f.getParentFile().getParentFile().getName().equals(pd.baseprefix)) {
tr = processZoomFile(f, pd);
}
/* If not big map and matches name pattern */
else if((!pd.isbigmap) && f.getName().startsWith(pd.fnprefix)) {
tr = processZoomFile(f, pd);
}
if(tr != null) {
String zfpath = tr.zf.getPath();
if(!toprocess.containsKey(zfpath)) {
toprocess.put(zfpath, tr);
}
}
}
}
/* Do processing */
for(ProcessTileRec s : toprocess.values()) {
processZoomTile(s.pd, s.zf, s.zfname, s.x, s.y);
}
}
/* Return true when we have none left at the level */ /* Return true when we have none left at the level */
return (maptab.size() == 0); return (maptab.size() == 0);
} }
@ -226,6 +267,7 @@ public class DynmapWorld {
File zf; File zf;
String zfname; String zfname;
int x, y; int x, y;
PrefixData pd;
} }
private String makeFilePath(PrefixData pd, int x, int y, boolean zoomed) { private String makeFilePath(PrefixData pd, int x, int y, boolean zoomed) {
@ -253,7 +295,7 @@ public class DynmapWorld {
int cnt = 0; int cnt = 0;
/* Do processing */ /* Do processing */
for(ProcessTileRec s : toprocess.values()) { for(ProcessTileRec s : toprocess.values()) {
processZoomTile(pd, dir, s.zf, s.zfname, s.x, s.y); processZoomTile(s.pd, s.zf, s.zfname, s.x, s.y);
cnt++; cnt++;
} }
Debug.debug("processZoomDirectory(" + dir.getPath() + "," + pd.baseprefix + ") - done (" + cnt + " files)"); Debug.debug("processZoomDirectory(" + dir.getPath() + "," + pd.baseprefix + ") - done (" + cnt + " files)");
@ -310,12 +352,13 @@ public class DynmapWorld {
rec.x = x; rec.x = x;
rec.y = y; rec.y = y;
rec.zfname = zfname; rec.zfname = zfname;
rec.pd = pd;
Debug.debug("Process " + zf.getPath() + " due to " + f.getPath()); Debug.debug("Process " + zf.getPath() + " due to " + f.getPath());
return rec; return rec;
} }
private void processZoomTile(PrefixData pd, File dir, File zf, String zfname, int tx, int ty) { private void processZoomTile(PrefixData pd, File zf, String zfname, int tx, int ty) {
Debug.debug("processZoomFile(" + pd.baseprefix + "," + dir.getPath() + "," + zf.getPath() + "," + tx + "," + ty + ")"); Debug.debug("processZoomFile(" + pd.baseprefix + "," + zf.getPath() + "," + tx + "," + ty + ")");
int width = 128, height = 128; int width = 128, height = 128;
BufferedImage zIm = null; BufferedImage zIm = null;
KzedBufferedImage kzIm = null; KzedBufferedImage kzIm = null;
@ -347,7 +390,6 @@ public class DynmapWorld {
im.getRGB(0, 0, width, height, argb, 0, width); /* Read data */ im.getRGB(0, 0, width, height, argb, 0, width); /* Read data */
im.flush(); im.flush();
/* Do binlinear scale to 64x64 */ /* Do binlinear scale to 64x64 */
Color c1 = new Color();
int off = 0; int off = 0;
for(int y = 0; y < height; y += 2) { for(int y = 0; y < height; y += 2) {
off = y*width; off = y*width;