尝试修复一个内存泄漏问题

Author: aaasoft

Quick.Protocol.WebSocket.Client/WebSocketClientStream.cs

@@ -66,7 +66,7 @@ public override void Write(byte[] buffer, int offset, int count)
 
         public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
-            return client.SendAsync(new ArraySegment<byte>(buffer, offset, count), System.Net.WebSockets.WebSocketMessageType.Binary, true, CancellationToken.None);
+            return client.SendAsync(new ArraySegment<byte>(buffer, offset, count), System.Net.WebSockets.WebSocketMessageType.Binary, true, cancellationToken);
         }
 
         protected override void Dispose(bool disposing)

Quick.Protocol/QpChannel.cs

@@ -271,47 +271,39 @@ public async Task SendCommandRequest(object request)
             await SendCommandRequestPackage(CommandContext.GenerateNewId(), typeName, requestContent).ConfigureAwait(false);
         }
 
-        protected void BeginHeartBeat(CancellationToken cancellationToken)
+        protected async Task BeginHeartBeat(CancellationToken cancellationToken)
         {
-            if (options.HeartBeatInterval > 0)
-                _ = Task.Delay(options.HeartBeatInterval, cancellationToken).ContinueWith(t =>
+            if (options.HeartBeatInterval < 0)
+                return;
+            while (!cancellationToken.IsCancellationRequested)
+            {
+                await Task.Delay(options.HeartBeatInterval, cancellationToken);
+                if (QpPackageHandler_Stream == null)
+                    return;
+                var lastSendPackageToNowSeconds = (DateTime.Now - lastSendPackageTime).TotalMilliseconds;
+                //如果离最后一次发送数据包的时间大于心跳间隔，则发送心跳包
+                if (lastSendPackageToNowSeconds > options.HeartBeatInterval)
                 {
-                    if (t.IsCanceled)
-                        return;
-                    if (QpPackageHandler_Stream == null)
-                        return;
-
-                    var lastSendPackageToNowSeconds = (DateTime.Now - lastSendPackageTime).TotalMilliseconds;
-
-                    //如果离最后一次发送数据包的时间大于心跳间隔，则发送心跳包
-                    if (lastSendPackageToNowSeconds > options.HeartBeatInterval)
-                    {
-                        _ = SendHeartbeatPackage();
-                    }
-                    BeginHeartBeat(cancellationToken);
-                });
+                    await SendHeartbeatPackage();
+                }
+            }
         }
 
-        protected void BeginNetstat(CancellationToken cancellationToken)
+        protected async Task BeginNetstat(CancellationToken cancellationToken)
         {
             if (!options.EnableNetstat)
                 return;
-            if (cancellationToken.IsCancellationRequested)
-                return;
 
-            long preBytesReceived = BytesReceived;
-            long preBytesSent = BytesSent;
-
-            _ = Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ContinueWith(t =>
+            while (!cancellationToken.IsCancellationRequested)
             {
-                if (t.IsCanceled)
-                    return;
+                long preBytesReceived = BytesReceived;
+                long preBytesSent = BytesSent;
+                await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
                 if (QpPackageHandler_Stream == null)
                     return;
                 BytesReceivedPerSec = BytesReceived - preBytesReceived;
                 BytesSentPerSec = BytesSent - preBytesSent;
-                BeginNetstat(cancellationToken);
-            });
+            }
         }
 
 

Quick.Protocol/QpClient.cs

@@ -40,7 +40,7 @@ public async Task ConnectAsync()
             //开始读取其他数据包
             BeginReadPackage(token);
             //开始统计网络数据
-            BeginNetstat(token);
+            _ = BeginNetstat(token);
 
             var repConnect = await SendCommand(new Commands.Connect.Request()
             {
@@ -67,7 +67,7 @@ public async Task ConnectAsync()
             if (Options.HeartBeatInterval > 0)
             {
                 //定时发送心跳包
-                BeginHeartBeat(token);
+                _ = BeginHeartBeat(token);
             }
         }
         protected override void OnWriteError(Exception exception)

Quick.Protocol/QpServer.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -49,7 +48,7 @@ public QpServer(QpServerOptions options)
         public virtual void Start()
         {
             cts = new CancellationTokenSource();
-            beginAccept(cts.Token);
+            _ = beginAccept(cts.Token);
         }
 
         internal void RemoveChannel(QpServerChannel channel)
@@ -95,19 +94,12 @@ protected void OnNewChannelConnected(Stream stream, string channelName, Cancella
 
         protected abstract Task InnerAcceptAsync(CancellationToken token);
 
-        private void beginAccept(CancellationToken token)
+        private async Task beginAccept(CancellationToken token)
         {
-            if (token.IsCancellationRequested)
-                return;
-
-            InnerAcceptAsync(token).ContinueWith(task =>
+            while (!token.IsCancellationRequested)
             {
-                if (task.IsCanceled)
-                    return;
-                if (task.IsFaulted)
-                    return;
-                beginAccept(token);
-            });
+                await InnerAcceptAsync(token);
+            }
         }
 
         public virtual void Stop()

Quick.Protocol/QpServerChannel.cs

@@ -40,7 +40,7 @@ public QpServerChannel(Stream stream, string channelName, CancellationToken canc
             this.authedNoticeHandlerManagerList = options.NoticeHandlerManagerList;
 
             cts = new CancellationTokenSource();
-            cancellationToken.Register(() => Stop());
+            cancellationToken.Register(Stop);
 
             //初始化连接相关指令处理器
             var connectAndAuthCommandExecuterManager = new CommandExecuterManager();
@@ -56,7 +56,7 @@ public QpServerChannel(Stream stream, string channelName, CancellationToken canc
             //开始读取其他数据包
             BeginReadPackage(token);
             //开始统计网络数据
-            BeginNetstat(token);
+            _ = BeginNetstat(token);
 
             //如果认证超时时间后没有通过认证，则断开连接
             if (options.AuthenticateTimeout > 0)
@@ -71,13 +71,9 @@ public QpServerChannel(Stream stream, string channelName, CancellationToken canc
 
                     if (stream != null)
                     {
-                        try
-                        {
-                            stream.Close();
-                            stream.Dispose();
-                            stream = null;
-                        }
+                        try { stream.Dispose(); }
                         catch { }
+                        stream = null;
                     }
                     AuchenticateTimeout?.Invoke(this, EventArgs.Empty);
                 });
@@ -128,7 +124,7 @@ private Commands.HandShake.Response handShake(QpChannel handler, Commands.HandSh
 
             //开始心跳
             if (options.HeartBeatInterval > 0)
-                BeginHeartBeat(cts.Token);
+                _ = BeginHeartBeat(cts.Token);
             return new Commands.HandShake.Response();
         }
 
@@ -148,7 +144,6 @@ public void Stop()
             try
             {
                 cts?.Cancel();
-                stream?.Close();
                 stream?.Dispose();
             }
             catch { }