Merge branch 'release/v0.2.3'

uia4j · Aug 22, 2018 · b3aa713 · b3aa713
2 parents fc20207 + 91788aa
commit b3aa713
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/uia.comm/src/main/java/uia/comm/SocketClient.java b/uia.comm/src/main/java/uia/comm/SocketClient.java
@@ -75,6 +75,8 @@ public class SocketClient implements ProtocolEventHandler<SocketDataController>,
 
     private int port;
 
+    private int maxCache;
+
     /**
      * The constructor.
      *
@@ -103,6 +105,15 @@ public SocketClient(final Protocol<SocketDataController> protocol, final Message
         this.callIns = new HashMap<String, MessageCallIn<SocketDataController>>();
         this.callOuts = new HashMap<String, MessageCallOut>();
         this.started = false;
+        this.maxCache = 10 * 1000;  // 10K
+    }
+
+    public int getMaxCache() {
+        return this.maxCache;
+    }
+
+    public void setMaxCache(int maxCache) {
+        this.maxCache = Math.min(2000000, Math.max(16, maxCache));  // 2M
     }
 
     @Override
@@ -212,6 +223,7 @@ public synchronized boolean tryConnect() {
                     this.ch,
                     this.manager,
                     this.protocol.createMonitor(this.aliasName));
+            this.controller.setMaxCache(this.maxCache);
             this.controller.start();
 
             if (this.clientPort > 0) {

diff --git a/uia.comm/src/main/java/uia/comm/SocketDataController.java b/uia.comm/src/main/java/uia/comm/SocketDataController.java
@@ -54,6 +54,8 @@ public class SocketDataController implements DataController {
 
     private long lastUpdate;
 
+    private int maxCache;
+
     /**
      *
      * @param name Name.
@@ -71,6 +73,15 @@ public class SocketDataController implements DataController {
         this.monitor = monitor;
         this.monitor.setController(this);
         this.lastUpdate = System.currentTimeMillis();
+        this.maxCache = 10 * 1000;  // 10K
+    }
+
+    public int getMaxCache() {
+        return this.maxCache;
+    }
+
+    public void setMaxCache(int maxCache) {
+        this.maxCache = Math.min(2000000, Math.max(16, maxCache));  // 2M
     }
 
     @Override
@@ -182,6 +193,9 @@ synchronized boolean receive() throws IOException {
                 byte[] value = (byte[]) buffer.flip().array();
                 value = Arrays.copyOf(value, len);
                 for (byte b : value) {
+                    if (this.monitor.getDataLength() > this.maxCache) {
+                        this.monitor.reset();
+                    }
                     this.monitor.read(b);
                 }
             }

diff --git a/uia.comm/src/main/java/uia/comm/SocketServer.java b/uia.comm/src/main/java/uia/comm/SocketServer.java
@@ -84,6 +84,8 @@ public enum ConnectionStyle {
 
     private int idleTime;
 
+    private int maxCache;
+
     public SocketServer(Protocol<SocketDataController> protocol, int port, MessageManager manager, String aliasName) throws Exception {
         this(protocol, port, manager, aliasName, ConnectionStyle.NORMAL);
     }
@@ -111,6 +113,15 @@ public SocketServer(Protocol<SocketDataController> protocol, int port, MessageMa
 
         this.idleTime = 60000;
         this.port = port;
+        this.maxCache = 10 * 1000;  // 10K
+    }
+
+    public int getMaxCache() {
+        return this.maxCache;
+    }
+
+    public void setMaxCache(int maxCache) {
+        this.maxCache = Math.min(2000000, Math.max(16, maxCache));  // 2M
     }
 
     public int getClientCount() {
@@ -656,6 +667,7 @@ private void clientConnected(SocketChannel client) {
                     client,
                     this.manager,
                     this.protocol.createMonitor(clientId));
+            controller.setMaxCache(this.maxCache);
 
             synchronized (this.controllers) {
                 this.controllers.put(clientId, controller);

diff --git a/uia.comm/src/main/java/uia/comm/protocol/AbstractProtocolMonitor.java b/uia.comm/src/main/java/uia/comm/protocol/AbstractProtocolMonitor.java
@@ -50,6 +50,7 @@ public void setProtocol(Protocol<C> protocol) {
         this.protocol = protocol;
     }
 
+    @Override
     public int getDataLength() {
         return this.data.size();
     }

diff --git a/uia.comm/src/main/java/uia/comm/protocol/MultiProtocolMonitor.java b/uia.comm/src/main/java/uia/comm/protocol/MultiProtocolMonitor.java
@@ -122,4 +122,13 @@ void reset(ProtocolMonitor<MultiProtocolMonitor<T>> monitor) {
             }
         }
     }
+
+    @Override
+    public int getDataLength() {
+        int dataLength = 0;
+        for (ProtocolMonitor<MultiProtocolMonitor<T>> pm : this.monitors) {
+            dataLength = Math.max(dataLength, pm.getDataLength());
+        }
+        return dataLength;
+    }
 }
diff --git a/uia.comm/src/main/java/uia/comm/protocol/ProtocolMonitor.java b/uia.comm/src/main/java/uia/comm/protocol/ProtocolMonitor.java
@@ -26,6 +26,12 @@
  */
 public interface ProtocolMonitor<C> {
 
+    /**
+     * Get data count in this monitor.
+     * @return Data count.
+     */
+    public int getDataLength();
+
     /**
      * Get protocol which creates this monitor.
      *