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

Merge pull request #319 from mikeprimm/master

Browse Source 
Use memory buffer for ImageIO encoding - avoid re-encoding when lock retry needed
This commit is contained in:
mikeprimm 2011-07-24 22:14:27 -07:00
commit 23db0c62fc
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/dynmap/utils/FileLockManager.java
View File

@ -1,12 +1,16 @@
package org.dynmap.utils;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.RandomAccessFile;
import java.util.HashMap;
import java.awt.image.BufferedImage;
import java.io.IOException;
import javax.imageio.ImageIO;
import org.dynmap.Log;
import org.dynmap.debug.Debug;
/**
* Implements soft-locks for prevent concurrency issues with file updates
*/
@ -129,20 +133,30 @@ public class FileLockManager {
//Log.info("releaseReadLock(" + f + ")");
}
private static final int MAX_WRITE_RETRIES = 6;
private static ByteArrayOutputStream baos = new ByteArrayOutputStream();
private static Object baos_lock = new Object();
/**
* Wrapper for IOImage.write - implements retries for busy files
*/
public static void imageIOWrite(BufferedImage img, String type, File fname) throws IOException {
int retrycnt = 0;
boolean done = false;
byte[] rslt;
synchronized(baos_lock) {
baos.reset();
ImageIO.write(img, type, baos); /* Write to byte array stream - prevent bogus I/O errors */
rslt = baos.toByteArray();
}
while(!done) {
RandomAccessFile f = null;
try {
ImageIO.write(img, type, fname);
f = new RandomAccessFile(fname, "rw");
f.write(rslt);
done = true;
} catch (IOException fnfx) {
if(retrycnt < MAX_WRITE_RETRIES) {
Log.info("Image file " + fname.getPath() + " - unable to write - retry #" + retrycnt);
Debug.debug("Image file " + fname.getPath() + " - unable to write - retry #" + retrycnt);
try { Thread.sleep(50 << retrycnt); } catch (InterruptedException ix) { throw fnfx; }
retrycnt++;
}
@ -150,6 +164,10 @@ public class FileLockManager {
Log.info("Image file " + fname.getPath() + " - unable to write - failed");
throw fnfx;
}
} finally {
if(f != null) {
try { f.close(); } catch (IOException iox) {}
}
}
}
}