3

RockyLOMO · Nov 28, 2024 · fd5fb21 · fd5fb21
1 parent 9fce94a
commit fd5fb21
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/rxlib/src/main/java/org/rx/bean/ConcurrentWeakMap.java b/rxlib/src/main/java/org/rx/bean/ConcurrentWeakMap.java
@@ -19,11 +19,11 @@ public class ConcurrentWeakMap<K, V> implements AbstractMap<K, V> {
     final boolean identityReference;
     transient MapView.EntrySetView<Reference<K>, K, V> entrySet;
 
-    public ConcurrentWeakMap() {
-        this(16, false);
+    public ConcurrentWeakMap(boolean identityReference) {
+        this(identityReference, 16);
     }
 
-    public ConcurrentWeakMap(int initialCapacity, boolean identityReference) {
+    public ConcurrentWeakMap(boolean identityReference, int initialCapacity) {
         map = new ConcurrentHashMap<>(initialCapacity);
         this.identityReference = identityReference;
     }

diff --git a/rxlib/src/main/java/org/rx/core/CpuWatchman.java b/rxlib/src/main/java/org/rx/core/CpuWatchman.java
@@ -9,10 +9,7 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.rx.bean.DateTime;
-import org.rx.bean.Decimal;
-import org.rx.bean.IntWaterMark;
-import org.rx.bean.Tuple;
+import org.rx.bean.*;
 import org.rx.exception.InvalidException;
 import org.rx.exception.TraceHandler;
 import org.rx.util.BeanMapper;
@@ -162,7 +159,7 @@ static int decrSize(ThreadPoolExecutor pool) {
         return poolSize;
     }
 
-    final Map<ThreadPoolExecutor, Tuple<IntWaterMark, int[]>> holder = new WeakIdentityMap<>(8);
+    final Map<ThreadPoolExecutor, Tuple<IntWaterMark, int[]>> holder = new ConcurrentWeakMap<>(true, 8);
 
     private CpuWatchman() {
         timer.newTimeout(this, RxConfig.INSTANCE.threadPool.samplingPeriod, TimeUnit.MILLISECONDS);

diff --git a/rxlib/src/main/java/org/rx/core/IOC.java b/rxlib/src/main/java/org/rx/core/IOC.java
@@ -6,7 +6,6 @@
 import org.apache.commons.collections4.map.ReferenceIdentityMap;
 import org.apache.commons.collections4.map.ReferenceMap;
 import org.rx.bean.ConcurrentWeakMap;
-import org.rx.bean.WeakIdentityMap;
 import org.rx.exception.InvalidException;
 
 import java.util.*;
@@ -17,7 +16,8 @@
 @SuppressWarnings(NON_UNCHECKED)
 public final class IOC {
     static final Map<Class<?>, Object> container = new ConcurrentHashMap<>(8);
-    static final Map WEAK_KEY_MAP = Collections.synchronizedMap(new WeakHashMap<>());
+    //    static final Map WEAK_KEY_MAP = Collections.synchronizedMap(new WeakHashMap<>());
+    static final Map WEAK_KEY_MAP = new ConcurrentWeakMap<>(false);
     static Map weakValMap, wKeyIdentityMap, wValIdentityMap;
 
     public static <T> boolean isInit(Class<T> type) {
@@ -94,7 +94,7 @@ public synchronized static <K, V> Map<K, V> weakIdentityMap(boolean weakValue) {
             return wValIdentityMap;
         }
         if (wKeyIdentityMap == null) {
-            wKeyIdentityMap = new ConcurrentWeakMap<>();
+            wKeyIdentityMap = new ConcurrentWeakMap<>(true);
         }
         return wKeyIdentityMap;
     }

diff --git a/rxlib/src/main/java/org/rx/core/ObjectChangeTracker.java b/rxlib/src/main/java/org/rx/core/ObjectChangeTracker.java
@@ -173,7 +173,7 @@ static Object getTarget(Object sourceObj) {
     //endregion
 
     public static final ObjectChangeTracker DEFAULT = new ObjectChangeTracker();
-    final Map<Object, Map<String, Object>> sources = new ConcurrentWeakMap<>();
+    final Map<Object, Map<String, Object>> sources = new ConcurrentWeakMap<>(true);
     final EventBus bus = EventBus.DEFAULT;
 
     public ObjectChangeTracker() {

diff --git a/rxlib/src/main/java/org/rx/net/NetEventWait.java b/rxlib/src/main/java/org/rx/net/NetEventWait.java
@@ -9,7 +9,7 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.rx.bean.WeakIdentityMap;
+import org.rx.bean.ConcurrentWeakMap;
 import org.rx.core.*;
 import org.rx.exception.TraceHandler;
 import org.rx.io.Bytes;
@@ -88,7 +88,7 @@ public NetEventWait(@NonNull String group, @NonNull InetSocketAddress multicastE
         this.multicastEndpoint = multicastEndpoint;
         idString = group + "@" + Integer.toHexString(hashCode());
         channel = channels.computeIfAbsent(multicastEndpoint, k -> (NioDatagramChannel) Sockets.udpBootstrap(MemoryMode.LOW, true, c -> {
-                    c.attr(REF).set(Collections.newSetFromMap(new WeakIdentityMap<>()));
+                    c.attr(REF).set(Collections.newSetFromMap(new ConcurrentWeakMap<>(true)));
                     c.pipeline().addLast(Handler.DEFAULT);
                 })
                 .bind(multicastEndpoint.getPort()).addListener((ChannelFutureListener) f -> {