Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-7464: Switch to use forked TrieMap
[yangtools.git]
/
common
/
util
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
util
/
ReadOnlyTrieMap.java
diff --git
a/common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
b/common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
index 4d429f1aaa11c899f6759cea472d48dabde75171..465f668450bf99926972497287505f32fbcccd9e 100644
(file)
--- a/
common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
+++ b/
common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
@@
-7,15
+7,15
@@
*/
package org.opendaylight.yangtools.util;
*/
package org.opendaylight.yangtools.util;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ForwardingMap;
import java.util.Map;
import java.util.Map;
-
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import org.opendaylight.yangtools.triemap.ImmutableTrieMap;
+import org.opendaylight.yangtools.triemap.MutableTrieMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ForwardingMap;
-import com.romix.scala.collection.concurrent.TrieMap;
-
/**
* A read-only facade in front of a TrieMap. This is what we give out from
* MapAdaptor.optimize(). The idea is that we want our read-only users to
/**
* A read-only facade in front of a TrieMap. This is what we give out from
* MapAdaptor.optimize(). The idea is that we want our read-only users to
@@
-24,36
+24,35
@@
import com.romix.scala.collection.concurrent.TrieMap;
* changes, we can cache it for future reference.
*/
final class ReadOnlyTrieMap<K, V> extends ForwardingMap<K, V> {
* changes, we can cache it for future reference.
*/
final class ReadOnlyTrieMap<K, V> extends ForwardingMap<K, V> {
+ @SuppressWarnings("rawtypes")
+ private static final AtomicReferenceFieldUpdater<ReadOnlyTrieMap, ImmutableTrieMap> UPDATER =
+ AtomicReferenceFieldUpdater.newUpdater(ReadOnlyTrieMap.class, ImmutableTrieMap.class, "readOnly");
private static final Logger LOG = LoggerFactory.getLogger(ReadOnlyTrieMap.class);
private static final Logger LOG = LoggerFactory.getLogger(ReadOnlyTrieMap.class);
- private final TrieMap<K, V> readWrite;
+ private final
Mutable
TrieMap<K, V> readWrite;
private final int size;
private final int size;
- private volatile TrieMap<K, V> readOnly;
+ private volatile
Immutable
TrieMap<K, V> readOnly;
- ReadOnlyTrieMap(final TrieMap<K, V> map, final int size) {
+ ReadOnlyTrieMap(final
Mutable
TrieMap<K, V> map, final int size) {
super();
this.readWrite = Preconditions.checkNotNull(map);
this.size = size;
}
Map<K, V> toReadWrite() {
super();
this.readWrite = Preconditions.checkNotNull(map);
this.size = size;
}
Map<K, V> toReadWrite() {
- final Map<K, V> ret = new ReadWriteTrieMap<>(readWrite.
s
napshot(), size);
+ final Map<K, V> ret = new ReadWriteTrieMap<>(readWrite.
mutableS
napshot(), size);
LOG.trace("Converted read-only TrieMap {} to read-write {}", this, ret);
return ret;
}
@Override
protected Map<K, V> delegate() {
LOG.trace("Converted read-only TrieMap {} to read-write {}", this, ret);
return ret;
}
@Override
protected Map<K, V> delegate() {
- TrieMap<K, V> ret = readOnly;
+
Immutable
TrieMap<K, V> ret = readOnly;
if (ret == null) {
if (ret == null) {
- synchronized (this) {
+ ret = readWrite.immutableSnapshot();
+ if (!UPDATER.compareAndSet(this, null, ret)) {
ret = readOnly;
ret = readOnly;
- if (ret == null) {
- ret = readWrite.readOnlySnapshot();
- readOnly = ret;
- }
}
}
}
}
-
return ret;
}
return ret;
}