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

Timestamp:

2013-04-07T17:07:27+02:00 (13 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/Queues.java (modified) (12 diffs)

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

@@ -1 +1 @@
 package org.mapdb;
-
-
 
 import java.io.DataInput;
@@ -13 +11 @@
 
 /**
- * Various queues algorithms
+ * Various queue algorithms
  */
 public final class Queues {
@@ -107 +105 @@
         public void clear() {
             while(!isEmpty())
-                remove();
+                poll();
         }
 
@@ -124 +122 @@
             if(ret == null) throw new NoSuchElementException();
             return ret;
-
         }
 
@@ -132 +129 @@
             return add(e);
         }
-
 
 
@@ -202 +198 @@
 
         protected final boolean useLocks;
-        protected final Locks.RecidLocks locks;
-
+        protected final ReentrantLock[] locks;
 
 
@@ -209 +204 @@
             super(engine, serializer, headerRecid);
             this.useLocks = useLocks;
-            locks = useLocks? new Locks.LongHashMapRecidLocks() : null;
+            locks = useLocks? Utils.newLocks(32) : null;
         }
 
@@ -229 +224 @@
             Node<E> n;
             do{
-                if(useLocks && head2!=0)locks.unlock(head2);
+                if(useLocks && head2!=0)Utils.lock(locks,head2);
                 head2 =head.get();
                 if(head2 == 0) return null;
 
-                if(useLocks && head2!=0)locks.lock(head2);
+                if(useLocks && head2!=0)Utils.lock(locks,head2);
                 n = engine.get(head2, nodeSerializer);
             }while(n==null || !head.compareAndSet(head2, n.next));
             if(useLocks && head2!=0){
                 engine.delete(head2,Serializer.LONG_SERIALIZER);
-                locks.unlock(head2);
+                Utils.unlock(locks,head2);
             }else{
                 engine.update(head2, null, nodeSerializer);
@@ -328 +323 @@
         }
 
-
-        @Override
-        public boolean isEmpty() {
-            return head.get() == 0;
-        }
-
+        @Override
         public boolean add(E item){
             final long nextTail = engine.put((Node<E>)Node.EMPTY, nodeSerializer);
@@ -347 +337 @@
         }
 
+        @Override
         public E poll(){
             while(true){
@@ -472 +463 @@
 
         @Override
+        public void clear() {
+            // praise locking
+            lock.lock();
+            try {
+                for (int i = 0; i < size; i++) {
+                    poll();
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+
+        @Override
         public E poll() {
             lock.lock();
@@ -569 +573 @@
     }
 
-
 }