改进线程锁处理，更好的支持多线程操作

alafighting · alafighting · commit daa4c51cde7d · 2016-07-30T16:39:28.000+08:00
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/Cache.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/Cache.java
@@ -4,6 +4,8 @@
 import com.im4j.kakacache.rxjava.common.utils.Utils;
 
 import java.util.Collection;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * 缓存基类
@@ -13,6 +15,7 @@ public abstract class Cache {
 
     protected final long mMaxSize;
     protected final long mMaxQuantity;
+    private final ReadWriteLock mLock = new ReentrantReadWriteLock();
 
     public Cache(long maxSize, long maxQuantity) {
         this.mMaxSize = maxSize;
@@ -39,8 +42,13 @@ public final <T> T load(String key) throws CacheException {
             return null;
         }
 
-        // 读取缓存
-        return doLoad(key);
+        mLock.readLock().lock();
+        try {
+            // 读取缓存
+            return doLoad(key);
+        } finally {
+            mLock.readLock().unlock();
+        }
     }
 
     /**
@@ -65,8 +73,13 @@ public final <T> void save(String key, T value, int maxAge, CacheTarget target)
 
         // TODO 先写入，后清理。会超出限定条件，需要一定交换空间
 
-        // 写入缓存
-        doSave(key, value, maxAge, target);
+        mLock.writeLock().lock();
+        try {
+            // 写入缓存
+            doSave(key, value, maxAge, target);
+        } finally {
+            mLock.writeLock().unlock();
+        }
 
         // 清理无用数据
         clearUnused();
@@ -89,18 +102,57 @@ public final <T> void save(String key, T value, int maxAge, CacheTarget target)
      * @param key
      * @return
      */
-    public abstract boolean containsKey(String key);
+    public final boolean containsKey(String key) {
+        mLock.writeLock().lock();
+        try {
+            return doContainsKey(key);
+        } finally {
+            mLock.writeLock().unlock();
+        }
+    }
+
+    /**
+     * 删除缓存
+     * @param key
+     */
+    public final void remove(String key) throws CacheException {
+        mLock.writeLock().lock();
+        try {
+            doRemove(key);
+        } finally {
+            mLock.writeLock().unlock();
+        }
+    }
+
+    /**
+     * 清空缓存
+     */
+    public final void clear() throws CacheException {
+        mLock.writeLock().lock();
+        try {
+            doClear();
+        } finally {
+            mLock.writeLock().unlock();
+        }
+    }
+
+    /**
+     * 是否包含
+     * @param key
+     * @return
+     */
+    protected abstract boolean doContainsKey(String key);
 
     /**
      * 删除缓存
      * @param key
      */
-    public abstract void remove(String key) throws CacheException;
+    protected abstract void doRemove(String key) throws CacheException;
 
     /**
      * 清空缓存
      */
-    public abstract void clear() throws CacheException;
+    protected abstract void doClear() throws CacheException;
 
 
     /**
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/DiskCache.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/DiskCache.java
@@ -82,18 +82,18 @@ protected boolean isExpiry(String key) {
     }
 
     @Override
-    public boolean containsKey(String key) {
+    protected boolean doContainsKey(String key) {
         return mJournal.containsKey(key);
     }
 
     @Override
-    public void remove(String key) throws CacheException {
+    protected void doRemove(String key) throws CacheException {
         mStorage.remove(key);
         mJournal.remove(key);
     }
 
     @Override
-    public void clear() throws CacheException {
+    protected void doClear() throws CacheException {
         mStorage.clear();
         mJournal.clear();
     }
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/memory/MemoryCache.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/memory/MemoryCache.java
@@ -52,23 +52,25 @@ protected boolean isExpiry(String key) {
     }
 
     @Override
-    public boolean containsKey(String key) {
+    protected boolean doContainsKey(String key) {
         return mJournal.containsKey(key);
     }
 
     /**
      * 删除缓存
      * @param key
      */
-    public void remove(String key) throws CacheException {
+    @Override
+    protected void doRemove(String key) throws CacheException {
         mStorage.remove(key);
         mJournal.remove(key);
     }
 
     /**
      * 清空缓存
      */
-    public void clear() throws CacheException {
+    @Override
+    protected void doClear() throws CacheException {
         mStorage.clear();
         mJournal.clear();
     }
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/memory/storage/SimpleMemoryStorage.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/memory/storage/SimpleMemoryStorage.java
@@ -12,7 +12,7 @@
 import java.util.Map;
 
 /**
- * 简单的磁盘存储
+ * 简单的内存存储
  * @version alafighting 2016-06
  */
 public class SimpleMemoryStorage implements IMemoryStorage {
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/manager/RxCacheManager.java b/library/src/main/java/com/im4j/kakacache/rxjava/manager/RxCacheManager.java
@@ -39,8 +39,6 @@ public final void call(Subscriber<? super T> subscriber) {
     }
 
 
-    private final Object lock = new Object();
-
     private CacheCore cache;
     private int defaultExpires;
 
@@ -61,7 +59,6 @@ public <T> rx.Observable<T> load(final String key) {
         return rx.Observable.create(new SimpleSubscribe<T>() {
             @Override
             T execute() {
-                // TODO 是否需要加锁？避免脏数据
                 LogUtils.debug("loadCache  key="+key);
                 return cache.load(key);
             }
@@ -82,10 +79,7 @@ public <T> rx.Observable<Boolean> save(final String key, final T value, final in
         return rx.Observable.create(new SimpleSubscribe<Boolean>() {
             @Override
             Boolean execute() throws Throwable {
-                // 同步
-                synchronized(lock) {
-                    cache.save(key, value, expires, target);
-                }
+                cache.save(key, value, expires, target);
                 return true;
             }
         });
@@ -114,9 +108,7 @@ public rx.Observable<Boolean> remove(final String key) {
         return rx.Observable.create(new SimpleSubscribe<Boolean>() {
             @Override
             Boolean execute() throws Throwable {
-                synchronized(lock) {
-                    cache.remove(key);
-                }
+                cache.remove(key);
                 return true;
             }
         });
@@ -129,10 +121,7 @@ public rx.Observable<Boolean> clear() throws CacheException {
         return rx.Observable.create(new SimpleSubscribe<Boolean>() {
             @Override
             Boolean execute() throws Throwable {
-                // 同步
-                synchronized(lock) {
-                    cache.clear();
-                }
+                cache.clear();
                 return true;
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -82,18 +82,18 @@ protected boolean isExpiry(String key) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`		`- public boolean containsKey(String key) {`
	`85`	`+ protected boolean doContainsKey(String key) {`
`86`	`86`	`return mJournal.containsKey(key);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- public void remove(String key) throws CacheException {`
	`90`	`+ protected void doRemove(String key) throws CacheException {`
`91`	`91`	`mStorage.remove(key);`
`92`	`92`	`mJournal.remove(key);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public void clear() throws CacheException {`
	`96`	`+ protected void doClear() throws CacheException {`
`97`	`97`	`mStorage.clear();`
`98`	`98`	`mJournal.clear();`
`99`	`99`	`}`