Changeset 10808 for extensions/jiwigo

Timestamp:

May 7, 2011, 3:42:06 PM (14 years ago)

Author:

mlg

Message:

Adds a maximum size for the cache
Will limit memory consumption.

Location:

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse

Files:

• CacheObjectManagement.java (added)
• CacheObjectManagementComparator.java (added)
• ImagesManagement.java (modified) (6 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/ImagesManagement.java

@@ -3 +3 @@
 import java.awt.image.BufferedImage;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.imageio.ImageIO;
@@ -64 +69 @@
      * cache allows to keep the images in the ram
      */
-    private HashMap<Integer, BufferedImage> imageCache = new HashMap<Integer, BufferedImage>();
+    private HashMap<Integer, CacheObjectManagement> imageCache = new HashMap<Integer, CacheObjectManagement>();
 
     /**
      * cache allows to keep the thumbnails in the ram
      */
-    private HashMap<Integer, BufferedImage> thumbnailsCache = new HashMap<Integer, BufferedImage>();
+    private HashMap<Integer, CacheObjectManagement> thumbnailsCache = new HashMap<Integer, CacheObjectManagement>();
 
     /**
@@ -96 +101 @@
      */
     private Integer currentCategory = -1;
+
+    private static Integer IMAGE_CACHE_SIZE = 20;
 
     /**
@@ -170 +177 @@
 
     /**
+     * Method that allows to keep a maximum number of images in the cache
+     * @param cache
+     * @param maxSize
+     */
+    private void checkCache(HashMap<Integer, CacheObjectManagement> cache, Integer maxSize) {
+        if (cache.size() == maxSize) {
+            Integer objectsToRemove = (maxSize / 4);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Cache has reached max size cleaning " + objectsToRemove + " objects");
+            }
+            ArrayList as = new ArrayList(cache.entrySet());
+
+            Collections.sort(as, new CacheObjectManagementComparator());
+            Iterator i = as.iterator();
+            for (int j = 0; j < objectsToRemove; j++) {
+                Integer key = (Integer) ((Map.Entry) i.next()).getKey();
+                if (LOG.isDebugEnabled()) {
+                    CacheObjectManagement cacheObject = cache.get(key);
+                    String debugStr = "";
+                    for (Integer id : cache.keySet()) {
+                        debugStr += "\t" + id + " : " + cache.get(id).getLastAccessDate() + "\n";
+                    }
+                    LOG.debug("Available object : \n" + debugStr);
+                    LOG.debug("Removed object : " + key + " : " + cacheObject.getLastAccessDate());
+                }
+
+                CacheObjectManagement object = cache.remove(key);
+                object = null;
+            }
+            if (LOG.isDebugEnabled()) {
+                String debugStr = "";
+                for (Integer id : cache.keySet()) {
+                    debugStr += "\t" + id + " : " + cache.get(id).getLastAccessDate() + "\n";
+                }
+                LOG.debug("Cache size is now " + cache.size() + ". Cache now contains : \n" + debugStr);
+            }
+        }
+    }
+
+    /**
      * Function that allows to load images once
      * to decrease response delays
@@ -177 +224 @@
         if (imageCache.get(currentImage.getIdentifier()) == null) {
             try {
+                checkCache(imageCache, IMAGE_CACHE_SIZE);
                 BufferedImage img = ImageIO.read(new URL(currentImage.getUrl()));
-                imageCache.put(currentImage.getIdentifier(), img);
+                CacheObjectManagement cacheObject = new CacheObjectManagement(img, new Date());
+                imageCache.put(currentImage.getIdentifier(), cacheObject);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Adding image to cache : " + currentImage.getIdentifier() + " : "
+                            + cacheObject.getLastAccessDate());
+                }
             } catch (Exception e) {
                 LOG.error(Tools.getStackTrace(e));
             }
         }
-        return imageCache.get(currentImage.getIdentifier());
+        CacheObjectManagement cacheObject = imageCache.get(currentImage.getIdentifier());
+        cacheObject.setLastAccessDate(new Date());
+        return cacheObject.getImage();
     }
 
@@ -195 +250 @@
             try {
                 BufferedImage img = ImageIO.read(new URL(image.getThumbnailUrl()));
-                thumbnailsCache.put(image.getIdentifier(), img);
+                CacheObjectManagement cacheObject = new CacheObjectManagement(img, new Date());
+                thumbnailsCache.put(image.getIdentifier(), cacheObject);
             } catch (Exception e) {
                 LOG.error(Tools.getStackTrace(e));
             }
         }
-
-        return thumbnailsCache.get(image.getIdentifier());
+        CacheObjectManagement cacheObject = thumbnailsCache.get(image.getIdentifier());
+        cacheObject.setLastAccessDate(new Date());
+        return cacheObject.getImage();
     }