From 90391aa69d2e676f5fd1e200dbd758cce8ae1da2 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 25 Apr 2003 18:21:28 +0000
Subject: [PATCH] Synchronize access to the image cache so that we can load
 images on other threads.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2459 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/media/image/ImageManager.java  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java
index 278dea8a6..71b926c8c 100644
--- a/src/java/com/threerings/media/image/ImageManager.java
+++ b/src/java/com/threerings/media/image/ImageManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ImageManager.java,v 1.48 2003/04/25 15:51:34 mdb Exp $
+// $Id: ImageManager.java,v 1.49 2003/04/25 18:21:28 mdb Exp $
 
 package com.threerings.media.image;
 
@@ -189,7 +189,10 @@ public class ImageManager
      */
     public BufferedImage getImage (ImageKey key, Colorization[] zations)
     {
-        CacheRecord crec = (CacheRecord)_ccache.get(key);
+        CacheRecord crec = null;
+        synchronized (_ccache) {
+            crec = (CacheRecord)_ccache.get(key);
+        }
         if (crec != null) {
 //             Log.info("Cache hit [key=" + key + ", crec=" + crec + "].");
             return crec.getImage(zations);
@@ -209,7 +212,9 @@ public class ImageManager
 
         // create a cache record
         crec = new CacheRecord(key, image);
-        _ccache.put(key, crec);
+        synchronized (_ccache) {
+            _ccache.put(key, crec);
+        }
         _keySet.add(key);
 
         // periodically report our image cache performance
@@ -397,12 +402,15 @@ public class ImageManager
 
         // compute our estimated memory usage
         long size = 0;
-        Iterator iter = _ccache.values().iterator();
-        while (iter.hasNext()) {
-            size += ((CacheRecord)iter.next()).getEstimatedMemoryUsage();
-        }
 
-        int[] eff = _ccache.getTrackedEffectiveness();
+        int[] eff = null;
+        synchronized (_ccache) {
+            Iterator iter = _ccache.values().iterator();
+            while (iter.hasNext()) {
+                size += ((CacheRecord)iter.next()).getEstimatedMemoryUsage();
+            }
+            eff = _ccache.getTrackedEffectiveness();
+        }
         Log.info("ImageManager LRU [mem=" + (size / 1024) + "k" +
                  ", size=" + _ccache.size() +  ", hits=" + eff[0] +
                  ", misses=" + eff[1] + ", totalKeys=" + _keySet.size() + "].");