AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Widening/vararging

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@757 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Dave Hoover
2009-01-17 23:48:10 +00:00
parent e7132a127f
commit f381f4fe01
4 changed files with 64 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/image/ClientImageManager.java
+5 -6
View File
@@ -32,9 +32,8 @@ import com.threerings.resource.ResourceManager;
import com.threerings.media.MediaPrefs;
/**
* Provides a single point of access for image retrieval and caching - just like the
* ImageManager but adds a tie in to the RuntimeAdjust system to control caching and
* mirage creation.
* Provides a single point of access for image retrieval and caching - just like the ImageManager
* but adds a tie in to the RuntimeAdjust system to control caching and mirage creation.
*/
public class ClientImageManager extends ImageManager
{
@@ -106,10 +105,10 @@ public class ClientImageManager extends ImageManager
protected static RuntimeAdjust.IntAdjust _cacheSize = new RuntimeAdjust.IntAdjust(
"Size (in kb of memory used) of the image manager LRU cache [requires restart]",
"narya.media.image.cache_size", MediaPrefs.config, DEFAULT_CACHE_SIZE);
/**
* Cache size to be used in this run. Adjusted by setCacheSize without affecting
* the stored value.
* Cache size to be used in this run. Adjusted by setCacheSize without affecting the stored
* value.
*/
protected static int _runCacheSize = _cacheSize.getValue();
src/java/com/threerings/media/image/ImageManager.java
+10 -11
View File
@@ -66,8 +66,7 @@ public class ImageManager
}
ImageKey okey = (ImageKey)other;
return ((okey.daprov.getIdent().equals(daprov.getIdent())) &&
(okey.path.equals(path)));
return ((okey.daprov.getIdent().equals(daprov.getIdent())) && (okey.path.equals(path)));
}
@Override
@@ -101,7 +100,7 @@ public class ImageManager
// create our image cache
int icsize = getCacheSize();
log.debug("Creating image cache [size=" + icsize + "k].");
log.debug("Creating image cache", "size", (icsize + "k"));
_ccache = new LRUHashMap<ImageKey, CacheRecord>(
icsize * 1024, new LRUHashMap.ItemSizer<CacheRecord>() {
public int computeSize (CacheRecord value) {
@@ -266,10 +265,10 @@ public class ImageManager
crec = _ccache.get(key);
}
if (crec != null) {
// Log.info("Cache hit [key=" + key + ", crec=" + crec + "].");
// log.info("Cache hit", "key", key, "crec", crec);
return crec.getImage(zations, _ccache);
}
// Log.info("Cache miss [key=" + key + ", crec=" + crec + "].");
// log.info("Cache miss", "key", key, "crec", crec);
// load up the raw image
BufferedImage image = loadImage(key);
@@ -279,8 +278,8 @@ public class ImageManager
image = new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_INDEXED);
}
// Log.info("Loaded " + key.path + ", image=" + image +
// ", size=" + ImageUtil.getEstimatedMemoryUsage(image));
// log.info("Loaded Image", "path", key.path, "image", image,
// "size", ImageUtil.getEstimatedMemoryUsage(image));
// create a cache record
crec = new CacheRecord(key, image);
@@ -439,8 +438,8 @@ public class ImageManager
}
eff = _ccache.getTrackedEffectiveness();
}
log.info("ImageManager LRU [mem=" + (size / 1024) + "k, size=" + _ccache.size() +
", hits=" + eff[0] + ", misses=" + eff[1] + ", totalKeys=" + _keySet.size() + "].");
log.info("ImageManager LRU", "mem", ((size / 1024) + "k"), "size", _ccache.size(),
"hits", eff[0], "misses", eff[1], "totalKeys", _keySet.size());
}
/** Maintains a source image and a set of colorized versions in the image cache. */
@@ -482,8 +481,8 @@ public class ImageManager
return cimage;
} catch (Exception re) {
log.warning("Failure recoloring image [source" + _key +
", zations=" + StringUtil.toString(zations) + ", error=" + re + "].");
log.warning("Failure recoloring image",
"source", _key, "zations", StringUtil.toString(zations), "error", re);
// return the uncolorized version
return _source;
}