MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

more deprecations and visibility tightening

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-01-17 15:10:15 +03:00
parent e138c44906
commit 7c57e6fe69
5 changed files with 60 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
+6 -6
View File
@@ -37,8 +37,8 @@ import java.util.concurrent.ConcurrentMap;
public class ResolveCache {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.ResolveCache");
@SuppressWarnings("unchecked")
private final ConcurrentMap[] myMaps = new ConcurrentWeakKeySoftValueHashMap[2*2*2]; //boolean physical, boolean incompleteCode, boolean isPoly
private final ConcurrentMap[] myMaps = new ConcurrentMap[2*2*2]; //boolean physical, boolean incompleteCode, boolean isPoly
private final RecursionGuard myGuard = RecursionManager.createGuard("resolveCache");
public static ResolveCache getInstance(Project project) {
@@ -84,7 +84,7 @@ public class ResolveCache {
}
});
}
@NotNull
private static <K,V> ConcurrentMap<K, V> createWeakMap() {
return new ConcurrentWeakKeySoftValueHashMap<K, V>(100, 0.75f, Runtime.getRuntime().availableProcessors(), ContainerUtil.<K>canonicalStrategy()){
@@ -224,9 +224,9 @@ public class ResolveCache {
}
private static final Object NULL_RESULT = new Object();
private <TRef extends PsiReference, TResult> void cache(@NotNull TRef ref,
@NotNull ConcurrentMap<TRef, TResult> map,
TResult result) {
private static <TRef extends PsiReference, TResult> void cache(@NotNull TRef ref,
@NotNull ConcurrentMap<TRef, TResult> map,
TResult result) {
// optimization: less contention
TResult cached = map.get(ref);
if (cached != null && cached == result) {
platform/platform-tests/testSrc/com/intellij/util/containers/ConcurrentMapsTest.java
+49 -72
View File
@@ -24,6 +24,7 @@ import org.junit.Test;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import static org.junit.Assert.*;
@@ -45,17 +46,8 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentWeakKeysRemovedWhenIdentityStrategyIsUsed() {
ConcurrentWeakHashMap<Object, Object> map = new ConcurrentWeakHashMap<>(ContainerUtil.identityStrategy());
map.put(new Object(), new Object());
do {
tryGcSoftlyReachableObjects(); // sometimes weak references are not collected under linux, try to stress gc to force them
System.gc();
}
while (!map.processQueue());
assertEquals(0, map.underlyingMapSize());
map.put(this, this);
assertEquals(1, map.underlyingMapSize());
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentWeakMap(ContainerUtil.identityStrategy());
checkKeyIsTossedAfterGCPressure(map);
}
@Test(timeout = TIMEOUT)
@@ -80,7 +72,7 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testRemoveFromSoftEntrySet() {
ConcurrentSoftHashMap<Object, Object> map = new ConcurrentSoftHashMap<>();
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentSoftMap();
map.put(this, this);
Set<Map.Entry<Object, Object>> entries = map.entrySet();
assertEquals(1, entries.size());
@@ -92,7 +84,7 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testRemoveFromWeakEntrySet() {
ConcurrentWeakHashMap<Object, Object> map = new ConcurrentWeakHashMap<>();
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentWeakMap();
map.put(this, this);
Set<Map.Entry<Object, Object>> entries = map.entrySet();
assertEquals(1, entries.size());
@@ -104,17 +96,8 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentWeakTossedWeakKeysAreRemoved() {
ConcurrentWeakHashMap<Object, Object> map = new ConcurrentWeakHashMap<>();
map.put(new Object(), new Object());
do {
tryGcSoftlyReachableObjects(); // sometimes weak references are not collected under linux, try to stress gc to force them
System.gc();
}
while (!map.processQueue());
assertEquals(0, map.underlyingMapSize());
map.put(this, this);
assertEquals(1, map.underlyingMapSize());
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentWeakMap();
checkKeyIsTossedAfterGCPressure(map);
}
public static void tryGcSoftlyReachableObjects() {
@@ -123,48 +106,37 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentSoftTossedSoftKeysAreRemoved() {
ConcurrentSoftHashMap<Object, Object> map = new ConcurrentSoftHashMap<>();
map.put(new Object(), new Object());
do {
tryGcSoftlyReachableObjects();
System.gc();
}
while (!map.processQueue());
assertEquals(0, map.underlyingMapSize());
map.put(this, this);
assertEquals(1, map.underlyingMapSize());
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentSoftMap();
checkKeyIsTossedAfterGCPressure(map);
}
@Test(timeout = TIMEOUT)
public void testConcurrentWeakTossedWeakValueIsRemoved() {
ConcurrentWeakValueHashMap<Object, Object> map =
(ConcurrentWeakValueHashMap<Object, Object>)ContainerUtil.createConcurrentWeakValueMap();
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentWeakValueMap();
checkKeyIsTossedAfterGCPressure(map);
}
private void checkKeyIsTossedAfterGCPressure(ConcurrentMap<Object, Object> map) {
map.put(new Object(), new Object());
//noinspection SizeReplaceableByIsEmpty
do {
map.put(this, this); // to run processQueues();
map.remove(this);
tryGcSoftlyReachableObjects(); // sometimes weak references are not collected under linux, try to stress gc to force them
System.gc();
}
while (!map.processQueue());
assertEquals(0, map.underlyingMapSize());
while (map.size() != 0);
assertEquals(0, map.size());
map.put(this, this);
assertEquals(1, map.underlyingMapSize());
assertEquals(1, map.size());
}
@Test(timeout = TIMEOUT)
public void testConcurrentSoftTossedSoftValueIsRemoved() {
ConcurrentSoftValueHashMap<Object, Object> map = new ConcurrentSoftValueHashMap<>();
map.put(new Object(), new Object());
do {
tryGcSoftlyReachableObjects();
System.gc();
}
while (!map.processQueue());
assertEquals(0, map.underlyingMapSize());
map.put(this, this);
assertEquals(1, map.underlyingMapSize());
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentSoftValueMap();
checkKeyIsTossedAfterGCPressure(map);
}
@Test(timeout = TIMEOUT)
@@ -224,7 +196,7 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentSoftCustomStrategy() {
ConcurrentSoftHashMap<String, String> map = new ConcurrentSoftHashMap<>(CUSTOM_STRATEGY);
ConcurrentMap<String, String> map = ContainerUtil.createConcurrentSoftMap(10,0.7f,16,CUSTOM_STRATEGY);
map.put("ab", "ab");
assertEquals(1, map.size());
@@ -236,32 +208,32 @@ public class ConcurrentMapsTest {
@Test
public void testConcurrentSoftNullKey() {
Map<String, String> map = new ConcurrentSoftHashMap<>();
Map<String, String> map = ContainerUtil.createConcurrentSoftMap();
checkNullKeys(map);
tryToInsertNullKeys(map);
}
@Test
public void testConcurrentWeakNullKey() {
Map<String, String> map = new ConcurrentWeakHashMap<>();
Map<String, String> map = ContainerUtil.createConcurrentWeakMap();
checkNullKeys(map);
tryToInsertNullKeys(map);
}
@Test(expected = IllegalArgumentException.class)
public void testConcurrentWeakSoftNullKey() {
Map<String, String> map = new ConcurrentWeakKeySoftValueHashMap<>(1, 1, 1, CUSTOM_STRATEGY);
Map<String, String> map = ContainerUtil.createConcurrentWeakKeySoftValueMap(1, 1, 1, CUSTOM_STRATEGY);
checkNullKeys(map);
tryToInsertNullKeys(map);
}
@Test(expected = IllegalArgumentException.class)
public void testConcurrentWeakWeakNullKey() {
Map<String, String> map = new ConcurrentWeakKeyWeakValueHashMap<>(1, 1, 1, CUSTOM_STRATEGY);
Map<String, String> map = ContainerUtil.createConcurrentWeakKeyWeakValueMap(CUSTOM_STRATEGY);
checkNullKeys(map);
tryToInsertNullKeys(map);
}
private static void checkNullKeys(Map<String, String> map) {
private static void tryToInsertNullKeys(Map<String, String> map) {
map.put(null, "ab");
assertEquals(1, map.size());
assertEquals("ab", map.get(null));
@@ -272,7 +244,7 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentWeakSoftCustomStrategy() {
ConcurrentWeakKeySoftValueHashMap<String, String> map = new ConcurrentWeakKeySoftValueHashMap<>(1, 1, 1, CUSTOM_STRATEGY);
ConcurrentMap<String, String> map = ContainerUtil.createConcurrentWeakKeySoftValueMap(1, 1, 1, CUSTOM_STRATEGY);
map.put("ab", "ab");
assertEquals(1, map.size());
@@ -340,7 +312,7 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentLongObjectHashMap() {
ConcurrentLongObjectMap<Object> map = new ConcurrentLongObjectHashMap<>();
ConcurrentLongObjectMap<Object> map = ContainerUtil.createConcurrentLongObjectMap();
for (int i = 0; i < 1000; i++) {
Object prev = map.put(i, i);
assertNull(prev);
@@ -383,7 +355,7 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentIntObjectHashMap() {
ConcurrentIntObjectMap<Object> map = new ConcurrentIntObjectHashMap<>();
ConcurrentIntObjectMap<Object> map = ContainerUtil.createConcurrentIntObjectMap();
for (int i = 0; i < 1000; i++) {
Object prev = map.put(i, i);
assertNull(prev);
@@ -404,32 +376,37 @@ public class ConcurrentMapsTest {
@Test(timeout = TIMEOUT)
public void testConcurrentWeakKeyAndValueTossed() {
ConcurrentWeakKeyWeakValueHashMap<Object, Object> map =
(ConcurrentWeakKeyWeakValueHashMap<Object, Object>)ContainerUtil.createConcurrentWeakKeyWeakValueMap();
ConcurrentMap<Object, Object> map = ContainerUtil.createConcurrentWeakKeyWeakValueMap();
map.put(new Object(), new Object());
do {
map.put(this, this); // to run processQueues();
map.remove(this);
tryGcSoftlyReachableObjects();
System.gc();
}
while (!map.processQueues());
assertTrue(map.isEmpty());
while (!map.isEmpty());
map.put(this, new Object());
do {
map.put(this, this); // to run processQueues();
map.remove(this);
tryGcSoftlyReachableObjects();
System.gc();
}
while (!map.processQueues());
assertTrue(map.isEmpty());
while (!map.isEmpty());
map.put(new Object(), this);
do {
map.put(this, this); // to run processQueues();
map.remove(this);
tryGcSoftlyReachableObjects();
System.gc();
}
while (!map.processQueues());
assertTrue(map.isEmpty());
while (!map.isEmpty());
}
@Test
platform/util/src/com/intellij/util/containers/ConcurrentSoftValueHashMap.java
+3 -3
View File
@@ -29,12 +29,12 @@ import java.util.Map;
* Null values are NOT allowed
* @deprecated Use {@link ContainerUtil#createConcurrentSoftValueMap()} instead
*/
public final class ConcurrentSoftValueHashMap<K,V> extends ConcurrentRefValueHashMap<K,V> {
public ConcurrentSoftValueHashMap(@NotNull Map<K, V> map) {
final class ConcurrentSoftValueHashMap<K,V> extends ConcurrentRefValueHashMap<K,V> {
ConcurrentSoftValueHashMap(@NotNull Map<K, V> map) {
super(map);
}
public ConcurrentSoftValueHashMap() {
ConcurrentSoftValueHashMap() {
}
public ConcurrentSoftValueHashMap(int initialCapacity, float loadFactor, int concurrencyLevel) {
platform/util/src/com/intellij/util/containers/ConcurrentWeakKeySoftValueHashMap.java
+1 -1
View File
@@ -275,7 +275,7 @@ public class ConcurrentWeakKeySoftValueHashMap<K, V> implements ConcurrentMap<K,
return deref(prevValReference);
}
boolean processQueues() {
private boolean processQueues() {
boolean removed = false;
KeyReference<K,V> keyReference;
while ((keyReference = (KeyReference<K, V>)myKeyQueue.poll()) != null) {
platform/util/src/com/intellij/util/containers/WeakKeySoftValueHashMap.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.lang.ref.SoftReference;
import java.util.Map;
final class WeakKeySoftValueHashMap<K,V> extends RefKeyRefValueHashMap<K,V> implements Map<K,V>{
public WeakKeySoftValueHashMap() {
WeakKeySoftValueHashMap() {
super(new WeakHashMap<K, ValueReference<K, V>>());
}