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

Synchronize access to the tile cache so that we can load tiles on other

Browse Source 
threads.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2460 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-04-25 18:21:49 +00:00
parent 90391aa69d
commit 2051770c91
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/TileSet.java
+18 -14
View File
@@ -1,5 +1,5 @@
//
// $Id: TileSet.java,v 1.46 2003/04/05 01:52:58 mdb Exp $
// $Id: TileSet.java,v 1.47 2003/04/25 18:21:49 mdb Exp $
package com.threerings.media.tile;
@@ -184,23 +184,17 @@ public abstract class TileSet
*/
public Tile getTile (int tileIndex, Colorization[] zations)
{
// create our tile cache if necessary
if (_tiles == null) {
int tcsize = _cacheSize.getValue();
Log.debug("Creating tile cache [size=" + tcsize + "k].");
_tiles = new LRUHashMap(tcsize*1024, new LRUHashMap.ItemSizer() {
public int computeSize (Object value) {
return (int)((Tile)value).getEstimatedMemoryUsage();
}
});
}
TileKey key = new TileKey(this, tileIndex, zations);
Tile tile = (Tile)_tiles.get(key);
Tile tile = null;
synchronized (_tiles) {
tile = (Tile)_tiles.get(key);
}
if (tile == null) {
tile = createTile(tileIndex, getTileMirage(tileIndex, zations));
initTile(tile);
_tiles.put(key, tile);
synchronized (_tiles) {
_tiles.put(key, tile);
}
}
return tile;
@@ -413,4 +407,14 @@ public abstract class TileSet
"Size (in kb of memory used) of the tile LRU cache " +
"[requires restart]", "narya.media.tile.cache_size",
MediaPrefs.config, 1024);
static {
int tcsize = _cacheSize.getValue();
Log.debug("Creating tile cache [size=" + tcsize + "k].");
_tiles = new LRUHashMap(tcsize*1024, new LRUHashMap.ItemSizer() {
public int computeSize (Object value) {
return (int)((Tile)value).getEstimatedMemoryUsage();
}
});
}
}