Changeset 29484 in osm for applications/editors/josm/plugins/imagerycache/src/org/mapdb/CacheWeakSoftRef.java

Timestamp:

2013-04-07T17:07:27+02:00 (12 years ago)

Author:

akks

Message:

JOSM/ImageryCache: updated MapDB (no more deadlocks, Java 1.6 compatible), less crashes, multiple-JOSM support

File:

• applications/editors/josm/plugins/imagerycache/src/org/mapdb/CacheWeakSoftRef.java (modified) (8 diffs)

applications/editors/josm/plugins/imagerycache/src/org/mapdb/CacheWeakSoftRef.java

@@ -20 +20 @@
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -30 +31 @@
 
 
-    protected final Locks.RecidLocks locks = new Locks.LongHashMapRecidLocks();
+    protected final ReentrantLock[] locks = Utils.newLocks(32);
 
     protected interface CacheItem{
@@ -130 +131 @@
 
         try{
-            locks.lock(recid);
+            Utils.lock(locks,recid);
             Object value = getWrappedEngine().get(recid, serializer);
             if(value!=null) putItemIntoCache(recid, value);
@@ -136 +137 @@
             return (A) value;
         }finally{
-            locks.unlock(recid);
+            Utils.unlock(locks,recid);
         }
 
@@ -144 +145 @@
     public <A> void update(long recid, A value, Serializer<A> serializer) {
         try{
-            locks.lock(recid);
+            Utils.lock(locks,recid);
             putItemIntoCache(recid, value);
             getWrappedEngine().update(recid, value, serializer);
         }finally {
-            locks.unlock(recid);
+            Utils.unlock(locks,recid);
         }
     }
@@ -163 +164 @@
     public <A> void delete(long recid, Serializer<A> serializer){
         try{
-            locks.lock(recid);
+            Utils.lock(locks,recid);
             checkClosed(items).remove(recid);
             getWrappedEngine().delete(recid,serializer);
         }finally {
-            locks.unlock(recid);
+            Utils.unlock(locks,recid);
         }
 
@@ -175 +176 @@
     public <A> boolean compareAndSwap(long recid, A expectedOldValue, A newValue, Serializer<A> serializer) {
         try{
-            locks.lock(recid);
+            Utils.lock(locks,recid);
             CacheItem item = checkClosed(items).get(recid);
             Object oldValue = item==null? null: item.get() ;
@@ -190 +191 @@
             }
         }finally {
-            locks.unlock(recid);
+            Utils.unlock(locks,recid);
         }
     }