Enhance performance.

Author: aaasoft

Quick.Protocol/QpChannel.cs

@@ -49,7 +49,10 @@ public abstract class QpChannel
         private ICryptoTransform enc;
         private ICryptoTransform dec;
         private Encoding encoding = Encoding.UTF8;
-
+        //发送包锁对象
+        private object SEND_PACKAGE_LOCK_OBJ = new object();
+        //断开连接锁对象
+        private object DISCONNECT_LOCK_OBJ = new object();
         private Dictionary<string, Type> commandRequestTypeDict = new Dictionary<string, Type>();
         private Dictionary<string, Type> commandResponseTypeDict = new Dictionary<string, Type>();
         private Dictionary<Type, Type> commandRequestTypeResponseTypeDict = new Dictionary<Type, Type>();
@@ -118,15 +121,15 @@ protected set
         /// </summary>
         public virtual void Disconnect()
         {
-            lock (this)
+            lock (DISCONNECT_LOCK_OBJ)
             {
                 if (IsConnected)
                 {
-                    IsConnected = false;
-                    InitQpPackageHandler_Stream(null);
+                    IsConnected = false;                    
                     Disconnected?.Invoke(this, QpEventArgs.Empty);
                 }
             }
+            InitQpPackageHandler_Stream(null);
         }
 
         /// <summary>
@@ -232,16 +235,28 @@ public QpChannel(QpChannelOptions options)
 
         protected void InitQpPackageHandler_Stream(Stream stream)
         {
-            if (QpPackageHandler_Stream != null)
-                try { QpPackageHandler_Stream?.Dispose(); }
-                catch { }
+            var preStream = QpPackageHandler_Stream;
             QpPackageHandler_Stream = stream;
 
+            try { preStream?.Dispose(); }
+            catch { }
+
             options.InternalCompress = false;
             options.InternalEncrypt = false;
             ChangeTransportTimeout();
         }
 
+        /// <summary>
+        /// 当发送出错时
+        /// </summary>
+        protected virtual void OnWriteError(Exception exception)
+        {
+            LastException = exception;
+            LogUtils.Log("[WriteError]{0}: {1}", DateTime.Now, ExceptionUtils.GetExceptionString(exception));
+            InitQpPackageHandler_Stream(null);
+            Disconnect();
+        }
+
         /// <summary>
         /// 当读取出错时
         /// </summary>
@@ -337,7 +352,7 @@ private void sendPackage(Func<byte[], ArraySegment<byte>> getPackagePayloadFunc,
             if (stream == null)
                 return;
 
-            lock (this)
+            lock (SEND_PACKAGE_LOCK_OBJ)
             {
                 var ret = getPackagePayloadFunc(sendBuffer);
                 var packageTotalLength = ret.Count;
@@ -392,8 +407,7 @@ private void sendPackage(Func<byte[], ArraySegment<byte>> getPackagePayloadFunc,
                 }
                 catch (Exception ex)
                 {
-                    LastException = ex;
-                    LogUtils.Log("[SendPackage]" + ExceptionUtils.GetExceptionString(ex));
+                    OnWriteError(ex);
                     throw;
                 }
             }
@@ -940,7 +954,7 @@ protected void BeginReadPackage(CancellationToken token)
                         case QpPackageType.Heartbeat:
                             {
                                 if (LogUtils.LogHeartbeat)
-                                    LogUtils.Log("{0}: [Recv-HeartbetaPackage]", DateTime.Now);
+                                    LogUtils.Log("{0}: [Recv-HeartbeatPackage]", DateTime.Now);
                                 HeartbeatPackageReceived?.Invoke(this, QpEventArgs.Empty);
                                 break;
                             }

Quick.Protocol/QpClient.cs

@@ -74,6 +74,13 @@ public async Task ConnectAsync()
                 BeginHeartBeat(token);
             }
         }
+        protected override void OnWriteError(Exception exception)
+        {
+            base.OnWriteError(exception);
+            Options.Init();
+            cancellAll();
+            Disconnect();
+        }
 
         protected override void OnReadError(Exception exception)
         {
@@ -85,11 +92,8 @@ protected override void OnReadError(Exception exception)
 
         private void cancellAll()
         {
-            if (cts != null)
-            {
-                cts.Cancel();
-                cts = null;
-            }
+            cts?.Cancel();
+            cts = null;
         }
 
         /// <summary>

Quick.Protocol/QpServer.cs

@@ -114,11 +114,17 @@ public virtual void Stop()
         {
             cts?.Cancel();
             cts = null;
+
+            QpServerChannel[] channels;
             lock (channelList)
             {
+                channels = channelList.ToArray();
                 channelList.Clear();
-                Channels = channelList.ToArray();
+                Channels = new QpServerChannel[0];
             }
+            foreach (var channel in channels)
+                try { channel.Disconnect(); }
+                catch { }
         }
     }
 }

Quick.Protocol/QpServerChannel.cs

@@ -158,6 +158,11 @@ public void Stop()
             }
             catch { }
         }
+        protected override void OnWriteError(Exception exception)
+        {
+            Stop();
+            base.OnWriteError(exception);
+        }
 
         protected override void OnReadError(Exception exception)
         {