TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2024-12-23 00:15:08 +00:00
Code Issues Projects Releases Wiki Activity

Synchronize cache (#63)

Browse source
This commit is contained in:
Jikoo 2017-02-13 19:56:32 -05:00
parent 7ab0003b62
commit 443e0c489e
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
common/src/main/java/com/lishid/openinv/util/Cache.java
View file

@ -9,7 +9,7 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.TreeMultimap; import com.google.common.collect.TreeMultimap;
/** /**
* A minimal time-based cache implementation backed by a HashMap and TreeMultimap. * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
* *
* @author Jikoo * @author Jikoo
*/ */
@ -59,8 +59,10 @@ public class Cache<K, V> {
// Invalidate key - runs lazy check and ensures value won't be cleaned up early // Invalidate key - runs lazy check and ensures value won't be cleaned up early
invalidate(key); invalidate(key);
internal.put(key, value); synchronized (internal) {
expiry.put(System.currentTimeMillis() + retention, key); internal.put(key, value);
expiry.put(System.currentTimeMillis() + retention, key);
}
} }
/** /**
@ -70,10 +72,12 @@ public class Cache<K, V> {
* @return the value to which the specified key is mapped, or null if no value is mapped for the key * @return the value to which the specified key is mapped, or null if no value is mapped for the key
*/ */
public V get(K key) { public V get(K key) {
// Run lazy check to clean cache synchronized (internal) {
lazyCheck(); // Run lazy check to clean cache
lazyCheck();
return internal.get(key); return internal.get(key);
}
} }
/** /**
@ -83,10 +87,12 @@ public class Cache<K, V> {
* @return true if a mapping exists for the specified key * @return true if a mapping exists for the specified key
*/ */
public boolean containsKey(K key) { public boolean containsKey(K key) {
// Run lazy check to clean cache synchronized (internal) {
lazyCheck(); // Run lazy check to clean cache
lazyCheck();
return internal.containsKey(key); return internal.containsKey(key);
}
} }
/** /**
@ -95,22 +101,24 @@ public class Cache<K, V> {
* @param key key to invalidate * @param key key to invalidate
*/ */
public void invalidate(K key) { public void invalidate(K key) {
// Run lazy check to clean cache synchronized (internal) {
lazyCheck(); // Run lazy check to clean cache
lazyCheck();
if (!internal.containsKey(key)) { if (!internal.containsKey(key)) {
// Value either not present or cleaned by lazy check. Either way, we're good // Value either not present or cleaned by lazy check. Either way, we're good
return; return;
} }
// Remove stored object // Remove stored object
internal.remove(key); internal.remove(key);
// Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) { for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
if (key.equals(iterator.next().getValue())) { if (key.equals(iterator.next().getValue())) {
iterator.remove(); iterator.remove();
break; break;
}
} }
} }
} }
@ -119,11 +127,13 @@ public class Cache<K, V> {
* Forcibly invalidates all keys, even if they are considered to be in use. * Forcibly invalidates all keys, even if they are considered to be in use.
*/ */
public void invalidateAll() { public void invalidateAll() {
for (V value : internal.values()) { synchronized (internal) {
postRemoval.run(value); for (V value : internal.values()) {
postRemoval.run(value);
}
expiry.clear();
internal.clear();
} }
expiry.clear();
internal.clear();
} }
/** /**