新的API一些调整

准备发3.3.6了
tianyayoucao126 · Jul 25, 2019 · c3647b2 · c3647b2
1 parent 0821ea0
commit c3647b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/core/src/main/java/org/tio/core/stat/ChannelStat.java b/src/core/src/main/java/org/tio/core/stat/ChannelStat.java
@@ -1,5 +1,6 @@
 package org.tio.core.stat;
 
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.tio.utils.SystemTimer;
@@ -82,7 +83,7 @@ public class ChannelStat implements java.io.Serializable {
 	/**
 	 * 心跳超时次数
 	 */
-	public int					heartbeatTimeoutCount		= 0;
+	public AtomicInteger		heartbeatTimeoutCount		= new AtomicInteger();
 
 	/**
 	 * 平均每次TCP接收到的字节数，这个可以用来监控慢攻击，配置PacketsPerTcpReceive定位慢攻击

diff --git a/src/core/src/main/java/org/tio/server/ServerGroupContext.java b/src/core/src/main/java/org/tio/server/ServerGroupContext.java
@@ -150,8 +150,7 @@ public void run() {
 							}
 
 							if (needRemove) {
-								channelContext.stat.heartbeatTimeoutCount++;
-								if (!serverAioListener.onHeartbeatTimeout(channelContext, interval, channelContext.stat.heartbeatTimeoutCount)) {
+								if (!serverAioListener.onHeartbeatTimeout(channelContext, interval, channelContext.stat.heartbeatTimeoutCount.incrementAndGet())) {
 									log.info("{}, {} ms没有收发消息", channelContext, interval);
 									channelContext.setCloseCode(CloseCode.HEARTBEAT_TIMEOUT);
 									Tio.remove(channelContext, interval + " ms没有收发消息");

diff --git a/src/core/src/main/java/org/tio/server/intf/ServerAioListener.java b/src/core/src/main/java/org/tio/server/intf/ServerAioListener.java
@@ -26,7 +26,7 @@ public interface ServerAioListener extends AioListener {
 	 * 服务器检查到心跳超时时，会调用这个函数
 	 * @param channelContext
 	 * @param interval 已经多久没有收发消息了，单位：毫秒
-	 * @param heartbeatTimeoutCount 心跳超时次数，第一次超时此值是1，以此类推
+	 * @param heartbeatTimeoutCount 心跳超时次数，第一次超时此值是1，以此类推。此值被保存在：channelContext.stat.heartbeatTimeoutCount
 	 * @return 返回true，那么服务器则不关闭此连接；返回false，服务器将按心跳超时关闭该连接
 	 */
 	public boolean onHeartbeatTimeout(ChannelContext channelContext, Long interva, int heartbeatTimeoutCount);