azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No lazy values stored for memoized functions with non-null values

Browse Source
This commit is contained in:
Andrey Breslav
2013-02-11 17:45:50 +04:00
parent 98dba29ab0
commit 71bad95783
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
+30 -15
View File
@@ -44,38 +44,49 @@ public class LockBasedStorageManager implements StorageManager {
@NotNull
@Override
public <K, V> Function<K, V> createMemoizedFunction(@NotNull final Function<K, V> compute, @NotNull final MemoizationMode mode) {
return createMemoizedFunction(compute, mode, false);
public <K, V> Function<K, V> createMemoizedFunction(@NotNull final Function<K, V> compute, @NotNull final MemoizationMode modeForValues) {
return new Function<K, V>() {
private final ConcurrentMap<K, V> cache = createConcurrentMap(modeForValues);
@Override
public V fun(@NotNull final K input) {
V value = cache.get(input);
if (value != null) return value;
synchronized (lock) {
value = cache.get(input);
if (value != null) return value;
value = compute.fun(input);
V oldValue = cache.put(input, value);
assert oldValue == null : "Race condition detected";
}
return value;
}
};
}
@NotNull
@Override
public <K, V> Function<K, V> createMemoizedFunctionWithNullableValues(
@NotNull Function<K, V> compute, @NotNull MemoizationMode modeForValues
@NotNull final Function<K, V> compute, @NotNull final MemoizationMode modeForValues
) {
return createMemoizedFunction(compute, modeForValues, true);
}
@NotNull
private <K, V> Function<K, V> createMemoizedFunction(final Function<K, V> compute, final MemoizationMode mode, final boolean nullable) {
return new Function<K, V>() {
private final ConcurrentMap<K, LazyValue<V>> cache;
{
cache = (mode == WEAK) ? new ConcurrentWeakValueHashMap<K, LazyValue<V>>() : new ConcurrentHashMap<K, LazyValue<V>>();
}
private final ConcurrentMap<K, LazyValue<V>> cache = createConcurrentMap(modeForValues);
@Override
public V fun(@NotNull final K input) {
LazyValue<V> lazyValue = cache.get(input);
if (lazyValue != null) return lazyValue.get();
Computable<V> computable = new Computable<V>() {
lazyValue = createNullableLazyValue(new Computable<V>() {
@Override
public V compute() {
return compute.fun(input);
}
};
lazyValue = nullable ? createNullableLazyValue(computable) : createLazyValue(computable);
});
LazyValue<V> oldValue = cache.putIfAbsent(input, lazyValue);
if (oldValue != null) return oldValue.get();
@@ -85,6 +96,10 @@ public class LockBasedStorageManager implements StorageManager {
};
}
private static <K, V> ConcurrentMap<K, V> createConcurrentMap(MemoizationMode mode) {
return (mode == WEAK) ? new ConcurrentWeakValueHashMap<K, V>() : new ConcurrentHashMap<K, V>();
}
@NotNull
@Override
public <T> LazyValue<T> createLazyValue(@NotNull Computable<T> computable) {