15 implement network statistics (#17)

changxdevelop · web-flow · commit d45796c35fc0 · 2022-04-14T23:00:39.000+07:00
* #15 done * + fix and resolve to merge live code * + fix var1 to bytes
diff --git a/EzyClient.cs b/EzyClient.cs
@@ -6,6 +6,7 @@
 using com.tvd12.ezyfoxserver.client.config;
 using com.tvd12.ezyfoxserver.client.constant;
 using com.tvd12.ezyfoxserver.client.request;
+using com.tvd12.ezyfoxserver.client.statistics;
 
 namespace com.tvd12.ezyfoxserver.client
 {
@@ -74,5 +75,6 @@ public interface EzyClient
 
 		EzyHandlerManager getHandlerManager();
 
-	}
+        EzyStatistics getNetworkStatistics();
+    }
 }
diff --git a/EzyTcpClient.cs b/EzyTcpClient.cs
@@ -9,6 +9,7 @@
 using com.tvd12.ezyfoxserver.client.request;
 using com.tvd12.ezyfoxserver.client.socket;
 using static com.tvd12.ezyfoxserver.client.constant.EzyConnectionStatuses;
+using com.tvd12.ezyfoxserver.client.statistics;
 
 namespace com.tvd12.ezyfoxserver.client
 {
@@ -26,6 +27,7 @@ public class EzyTcpClient :
         protected readonly EzyClientConfig config;
         protected readonly EzyPingManager pingManager;
         protected readonly EzyHandlerManager handlerManager;
+        protected readonly EzyStatistics networkStatistics;
         protected readonly EzyRequestSerializer requestSerializer;
 
         protected EzyConnectionStatus status;
@@ -45,6 +47,7 @@ public EzyTcpClient(EzyClientConfig config)
             this.pingManager = new EzySimplePingManager(config.getPing());
 			this.pingSchedule = new EzyPingSchedule(this);
             this.handlerManager = new EzySimpleHandlerManager(this);
+            this.networkStatistics = new EzySimpleStatistics();
             this.requestSerializer = new EzySimpleRequestSerializer();
             this.settingUp = new EzySimpleSetup(handlerManager);
             this.unloggableCommands = newUnloggableCommands();
@@ -65,6 +68,7 @@ protected EzySocketClient newSocketClient()
             EzyTcpSocketClient client = newTcpSocketClient();
             client.setPingSchedule(pingSchedule);
             client.setPingManager(pingManager);
+            client.setNetworkStatistics(networkStatistics);
             client.setHandlerManager(handlerManager);
             client.setReconnectConfig(config.getReconnect());
             client.setUnloggableCommands(unloggableCommands);
@@ -308,6 +312,11 @@ public virtual void udpSend(EzyCommand cmd, EzyArray data)
         {
             throw new InvalidOperationException("only support TCP, use EzyUTClient instead");
         }
-	}
+
+        public EzyStatistics getNetworkStatistics()
+        {
+            return networkStatistics;
+        }
+    }
 
 }
diff --git a/socket/EzySocketAdapter.cs b/socket/EzySocketAdapter.cs
@@ -1,5 +1,7 @@
 ﻿using System;
 using System.Threading;
+
+using com.tvd12.ezyfoxserver.client.statistics;
 using com.tvd12.ezyfoxserver.client.util;
 namespace com.tvd12.ezyfoxserver.client.socket
 {
@@ -8,6 +10,7 @@ public abstract class EzySocketAdapter : EzyLoggable
         protected volatile bool active;
         protected volatile bool stopped;
         protected readonly Object adapterLock;
+        protected EzyStatistics networkStatistics;
 
         public EzySocketAdapter()
         {
@@ -84,5 +87,10 @@ public bool isStopped()
                 return stopped;
             }
         }
+
+        public void setNetworkStatistics(EzyStatistics networkStatistics)
+        {
+            this.networkStatistics = networkStatistics;
+        }
     }
 }
diff --git a/socket/EzySocketClient.cs b/socket/EzySocketClient.cs
@@ -9,6 +9,8 @@
 using com.tvd12.ezyfoxserver.client.handler;
 using com.tvd12.ezyfoxserver.client.manager;
 using com.tvd12.ezyfoxserver.client.util;
+using com.tvd12.ezyfoxserver.client.statistics;
+
 using static com.tvd12.ezyfoxserver.client.constant.EzySocketStatuses;
 
 namespace com.tvd12.ezyfoxserver.client.socket
@@ -31,6 +33,8 @@ public abstract class EzySocketClient : EzyLoggable , EzyISocketClient, EzySocke
         protected EzyDataHandlers dataHandlers;
         protected EzySocketReader socketReader;
         protected EzySocketWriter socketWriter;
+        protected EzyStatistics networkStatistics;
+
         protected EzyConnectionFailedReason connectionFailedReason;
         protected readonly EzyCodecFactory codecFactory;
         protected readonly EzyPacketQueue packetQueue;
@@ -101,6 +105,7 @@ protected void connect0(int sleepTime)
         {
             clearAdapters();
             createAdapters();
+            addNetworkStatisticsAdapers();
             updateAdapters();
             closeSocket();
             packetQueue.clear();
@@ -146,6 +151,17 @@ protected void connect1(int sleepTime)
 
         protected abstract void createAdapters();
 
+        public virtual void setNetworkStatistics(EzyStatistics networkStatistics)
+        {
+            this.networkStatistics = networkStatistics;
+        }
+
+        protected void addNetworkStatisticsAdapers()
+        {
+            socketReader.setNetworkStatistics(networkStatistics);
+            socketWriter.setNetworkStatistics(networkStatistics);
+        }
+
         protected void updateAdapters() 
         {
             Object decoder = codecFactory.newDecoder(EzyConnectionType.SOCKET);
diff --git a/socket/EzySocketReader.cs b/socket/EzySocketReader.cs
@@ -42,6 +42,9 @@ protected override void update()
                     return;
                 byte[] binary = EzyBytes.copyBytes(readBytes, bytesToRead);
                 decoder.decode(binary, decodeBytesCallback);
+
+                networkStatistics.getSocketStats().getNetworkStats().addReadBytes(binary.Length);
+                networkStatistics.getSocketStats().getNetworkStats().addReadPackets(1);
             }
 			
 		}
diff --git a/socket/EzySocketWriter.cs b/socket/EzySocketWriter.cs
@@ -1,4 +1,6 @@
-﻿namespace com.tvd12.ezyfoxserver.client.socket
+﻿using com.tvd12.ezyfoxserver.client.entity;
+
+namespace com.tvd12.ezyfoxserver.client.socket
 {
     public abstract class EzySocketWriter : EzySocketAdapter
 	{
@@ -14,9 +16,13 @@ protected override void update()
                 if (packet == null)
                     return;
                 int writtenBytes = writeToSocket(packet);
+                
                 packet.release();
                 if (writtenBytes <= 0)
                     return;
+
+                networkStatistics.getSocketStats().getNetworkStats().addWrittenPackets(1);
+                networkStatistics.getSocketStats().getNetworkStats().addWrittenBytes(writtenBytes);
             }
         }
 
diff --git a/socket/EzyUTSocketClient.cs b/socket/EzyUTSocketClient.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using com.tvd12.ezyfoxserver.client.entity;
 using com.tvd12.ezyfoxserver.client.constant;
+using com.tvd12.ezyfoxserver.client.statistics;
 
 namespace com.tvd12.ezyfoxserver.client.socket
 {
@@ -13,6 +14,12 @@ public EzyUTSocketClient() : base()
             this.udpClient = new EzyUdpSocketClient(codecFactory);
         }
 
+        public override void setNetworkStatistics(EzyStatistics networkStatistics)
+        {
+            base.setNetworkStatistics(networkStatistics);
+            this.udpClient.setNetworkStatistics(networkStatistics);
+        }
+
         public void udpConnect(int port)
         {
             udpConnect(host, port);
diff --git a/socket/EzyUdpSocketClient.cs b/socket/EzyUdpSocketClient.cs
@@ -10,6 +10,7 @@
 using com.tvd12.ezyfoxserver.client.constant;
 using com.tvd12.ezyfoxserver.client.exception;
 using static com.tvd12.ezyfoxserver.client.constant.EzySocketStatuses;
+using com.tvd12.ezyfoxserver.client.statistics;
 
 namespace com.tvd12.ezyfoxserver.client.socket
 {
@@ -25,6 +26,7 @@ public class EzyUdpSocketClient : EzyLoggable, EzyISocketClient
         protected readonly EzyResponseApi responseApi;
         protected readonly EzyCodecFactory codecFactory;
         protected readonly EzyValueStack<EzySocketStatus> socketStatuses;
+        protected EzyStatistics networkStatistics;
 
         public EzyUdpSocketClient(EzyCodecFactory codecFactory) {
             this.codecFactory = codecFactory;
@@ -76,6 +78,7 @@ protected void connect0()
             {
                 clearAdapters();
                 createAdapters();
+                addNetworkStatisticsAdapers();
                 updateAdapters();
                 closeSocket();
                 packetQueue.clear();
@@ -135,6 +138,17 @@ protected void createAdapters()
             this.socketWriter = new EzyUdpSocketWriter();
         }
 
+        public void setNetworkStatistics(EzyStatistics networkStatistics)
+        {
+            this.networkStatistics = networkStatistics;
+        }
+
+        protected void addNetworkStatisticsAdapers()
+        {
+            socketReader.setNetworkStatistics(networkStatistics);
+            socketWriter.setNetworkStatistics(networkStatistics);
+        }
+
         protected void updateAdapters()
         {
             Object decoder = codecFactory.newDecoder(EzyConnectionType.SOCKET);
diff --git a/socket/EzyUdpSocketReader.cs b/socket/EzyUdpSocketReader.cs
@@ -44,6 +44,9 @@ protected override void update()
                     if (bytesToRead <= 0)
                         return;
                     handleReceivedBytes(binary);
+
+                    networkStatistics.getSocketStats().getNetworkStats().addReadBytes(binary.Length);
+                    networkStatistics.getSocketStats().getNetworkStats().addReadPackets(1);
                 }
                 catch (SocketException e) {
                     logger.warn("I/O error at socket-reader: " + e.Message);
diff --git a/statistics/EzyComponentStatistics.cs b/statistics/EzyComponentStatistics.cs
@@ -0,0 +1,7 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyComponentStatistics
+    {
+        EzyNetworkStats getNetworkStats();
+    }
+}
diff --git a/statistics/EzyNetworkBytesStats.cs b/statistics/EzyNetworkBytesStats.cs
@@ -0,0 +1,9 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyNetworkBytesStats : EzyNetworkRoBytesStats
+    {
+        void addReadBytes(long bytes);
+
+        void addWrittenBytes(long bytes);
+    }
+}
diff --git a/statistics/EzyNetworkPacketsStats.cs b/statistics/EzyNetworkPacketsStats.cs
@@ -0,0 +1,9 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyNetworkPacketsStats : EzyNetworkRoPacketsStats
+    {
+        void addReadPackets(long bytes);
+
+        void addWrittenPackets(long bytes);
+    }
+}
diff --git a/statistics/EzyNetworkRoBytesStats.cs b/statistics/EzyNetworkRoBytesStats.cs
@@ -0,0 +1,9 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyNetworkRoBytesStats
+    {
+        long getReadBytes();
+
+        long getWrittenBytes();
+    }
+}
diff --git a/statistics/EzyNetworkRoPacketsStats.cs b/statistics/EzyNetworkRoPacketsStats.cs
@@ -0,0 +1,9 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyNetworkRoPacketsStats
+    {
+        long getReadPackets();
+
+        long getWrittenPackets();
+    }
+}
diff --git a/statistics/EzyNetworkRoStats.cs b/statistics/EzyNetworkRoStats.cs
@@ -0,0 +1,6 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyNetworkRoStats : EzyNetworkRoBytesStats, EzyNetworkRoPacketsStats
+    {
+    }
+}
diff --git a/statistics/EzyNetworkStats.cs b/statistics/EzyNetworkStats.cs
@@ -0,0 +1,6 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public interface EzyNetworkStats : EzyNetworkRoStats, EzyNetworkBytesStats, EzyNetworkPacketsStats
+    {
+    }
+}
diff --git a/statistics/EzySimpleComponentStatistics.cs b/statistics/EzySimpleComponentStatistics.cs
@@ -0,0 +1,22 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public class EzySimpleComponentStatistics : EzyComponentStatistics
+    {
+        protected EzyNetworkStats networkStats;
+
+        public EzyNetworkStats getNetworkStats()
+        {
+            return this.networkStats;
+        }
+
+        protected EzyNetworkStats newNetworkStats()
+        {
+            return new EzySimpleNetworkStats();
+        }
+
+        public EzySimpleComponentStatistics()
+        {
+            this.networkStats = newNetworkStats();
+        }
+    }
+}
diff --git a/statistics/EzySimpleNetworkStats.cs b/statistics/EzySimpleNetworkStats.cs
@@ -0,0 +1,50 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public class EzySimpleNetworkStats : EzyNetworkStats
+    {
+        protected long readBytes;
+        protected long writtenBytes;
+        protected long readPackets;
+        protected long writtenPackets;
+
+        public void addReadBytes(long bytes)
+        {
+            this.readBytes += bytes;
+        }
+
+        public void addWrittenBytes(long bytes)
+        {
+            this.writtenBytes += bytes;
+        }
+
+        public void addReadPackets(long packets)
+        {
+            this.readPackets += packets;
+        }
+
+        public void addWrittenPackets(long packets)
+        {
+            this.writtenPackets += packets;
+        }
+
+        public long getReadBytes()
+        {
+            return this.readBytes;
+        }
+
+        public long getWrittenBytes()
+        {
+            return this.writtenBytes;
+        }
+
+        public long getReadPackets()
+        {
+            return this.readPackets;
+        }
+
+        public long getWrittenPackets()
+        {
+            return this.writtenPackets;
+        }
+    }
+}
diff --git a/statistics/EzySimpleSocketStatistics.cs b/statistics/EzySimpleSocketStatistics.cs
@@ -0,0 +1,9 @@
+﻿namespace com.tvd12.ezyfoxserver.client.statistics
+{
+    public class EzySimpleSocketStatistics : EzySimpleComponentStatistics, EzySocketStatistics
+    {
+        public EzySimpleSocketStatistics()
+        {
+        }
+    }
+}
diff --git a/statistics/EzySimpleStatistics.cs b/statistics/EzySimpleStatistics.cs
diff --git a/statistics/EzySocketStatistics.cs b/statistics/EzySocketStatistics.cs
diff --git a/statistics/EzyStatistics.cs b/statistics/EzyStatistics.cs

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using com.tvd12.ezyfoxserver.client.config;`
`7`	`7`	`using com.tvd12.ezyfoxserver.client.constant;`
`8`	`8`	`using com.tvd12.ezyfoxserver.client.request;`
	`9`	`+using com.tvd12.ezyfoxserver.client.statistics;`
`9`	`10`
`10`	`11`	`namespace com.tvd12.ezyfoxserver.client`
`11`	`12`	`{`
`@@ -74,5 +75,6 @@ public interface EzyClient`
`74`	`75`
`75`	`76`	`EzyHandlerManager getHandlerManager();`
`76`	`77`
`77`		`- }`
	`78`	`+ EzyStatistics getNetworkStatistics();`
	`79`	`+ }`
`78`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading;`
	`3`	`+`
	`4`	`+using com.tvd12.ezyfoxserver.client.statistics;`
`3`	`5`	`using com.tvd12.ezyfoxserver.client.util;`
`4`	`6`	`namespace com.tvd12.ezyfoxserver.client.socket`
`5`	`7`	`{`
`@@ -8,6 +10,7 @@ public abstract class EzySocketAdapter : EzyLoggable`
`8`	`10`	`protected volatile bool active;`
`9`	`11`	`protected volatile bool stopped;`
`10`	`12`	`protected readonly Object adapterLock;`
	`13`	`+ protected EzyStatistics networkStatistics;`
`11`	`14`
`12`	`15`	`public EzySocketAdapter()`
`13`	`16`	`{`
`@@ -84,5 +87,10 @@ public bool isStopped()`
`84`	`87`	`return stopped;`
`85`	`88`	`}`
`86`	`89`	`}`
	`90`	`+`
	`91`	`+ public void setNetworkStatistics(EzyStatistics networkStatistics)`
	`92`	`+ {`
	`93`	`+ this.networkStatistics = networkStatistics;`
	`94`	`+ }`
`87`	`95`	`}`
`88`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ protected override void update()`
`42`	`42`	`return;`
`43`	`43`	`byte[] binary = EzyBytes.copyBytes(readBytes, bytesToRead);`
`44`	`44`	`decoder.decode(binary, decodeBytesCallback);`
	`45`	`+`
	`46`	`+ networkStatistics.getSocketStats().getNetworkStats().addReadBytes(binary.Length);`
	`47`	`+ networkStatistics.getSocketStats().getNetworkStats().addReadPackets(1);`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace com.tvd12.ezyfoxserver.client.socket`
	`1`	`+using com.tvd12.ezyfoxserver.client.entity;`
	`2`	`+`
	`3`	`+namespace com.tvd12.ezyfoxserver.client.socket`
`2`	`4`	`{`
`3`	`5`	`public abstract class EzySocketWriter : EzySocketAdapter`
`4`	`6`	`{`
`@@ -14,9 +16,13 @@ protected override void update()`
`14`	`16`	`if (packet == null)`
`15`	`17`	`return;`
`16`	`18`	`int writtenBytes = writeToSocket(packet);`
	`19`	`+`
`17`	`20`	`packet.release();`
`18`	`21`	`if (writtenBytes <= 0)`
`19`	`22`	`return;`
	`23`	`+`
	`24`	`+ networkStatistics.getSocketStats().getNetworkStats().addWrittenPackets(1);`
	`25`	`+ networkStatistics.getSocketStats().getNetworkStats().addWrittenBytes(writtenBytes);`
`20`	`26`	`}`
`21`	`27`	`}`
`22`	`28`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using com.tvd12.ezyfoxserver.client.entity;`
`3`	`3`	`using com.tvd12.ezyfoxserver.client.constant;`
	`4`	`+using com.tvd12.ezyfoxserver.client.statistics;`
`4`	`5`
`5`	`6`	`namespace com.tvd12.ezyfoxserver.client.socket`
`6`	`7`	`{`
`@@ -13,6 +14,12 @@ public EzyUTSocketClient() : base()`
`13`	`14`	`this.udpClient = new EzyUdpSocketClient(codecFactory);`
`14`	`15`	`}`
`15`	`16`
	`17`	`+ public override void setNetworkStatistics(EzyStatistics networkStatistics)`
	`18`	`+ {`
	`19`	`+ base.setNetworkStatistics(networkStatistics);`
	`20`	`+ this.udpClient.setNetworkStatistics(networkStatistics);`
	`21`	`+ }`
	`22`	`+`
`16`	`23`	`public void udpConnect(int port)`
`17`	`24`	`{`
`18`	`25`	`udpConnect(host, port);`