Fix performance issue in logger.

.editorconfig

@@ -0,0 +1,5 @@
+[*.cs]
+
+
+# CA1031: Do not catch general exception types
+dotnet_diagnostic.CA1031.severity = none

Build/MQTTnet.nuspec

@@ -15,6 +15,7 @@
 * [Core] Renamed some topic filter relevant classes (BREAKING CHANGE!).
 * [Core] Improved task management for UWP connections (thanks to @xgstation).
 * [Core] Fixed broken logger which decreases overall performance.
+* [Core] Fixed issue in closed socket detection (fixes high CPU load issue).
 * [Client] Added method to trigger PING/PONG manually (connection check etc.).
 * [Client] Added support for certificate validation callback when using Web Sockets (requires netstandard2.1+).
 * [Client] Fixed a memory leak when web socket based connections trying to reconnect with an offline server.

MQTTnet.sln

@@ -27,6 +27,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3F60ECB-45BA-4C66-8903-8BB89CA67998}"
 	ProjectSection(SolutionItems) = preProject
 		.bettercodehub.yml = .bettercodehub.yml
+		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		LICENSE = LICENSE
 		README.md = README.md

Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj

@@ -14,7 +14,7 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj

@@ -14,7 +14,7 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj

@@ -14,7 +14,7 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>

Source/MQTTnet/Adapter/MqttChannelAdapter.cs

@@ -16,8 +16,8 @@ namespace MQTTnet.Adapter
 {
     public sealed class MqttChannelAdapter : Disposable, IMqttChannelAdapter
     {
-        const uint ErrorOperationAborted = 0x800703E3;
+        const uint _errorOperationAborted = 0x800703E3;
-        const int ReadBufferSize = 4096;  // TODO: Move buffer size to config
+        const int _readBufferSize = 4096;  // TODO: Move buffer size to config
 
         readonly IMqttNetScopedLogger _logger;
         readonly IMqttChannel _channel;
@@ -245,7 +245,7 @@ namespace MQTTnet.Adapter
 
                 var body = new byte[fixedHeader.RemainingLength];
                 var bodyOffset = 0;
-                var chunkSize = Math.Min(ReadBufferSize, fixedHeader.RemainingLength);
+                var chunkSize = Math.Min(_readBufferSize, fixedHeader.RemainingLength);
 
                 do
                 {
@@ -304,7 +304,7 @@ namespace MQTTnet.Adapter
 
             if (exception is COMException comException)
             {
-                if ((uint)comException.HResult == ErrorOperationAborted)
+                if ((uint)comException.HResult == _errorOperationAborted)
                 {
                     throw new OperationCanceledException();
                 }

Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs

@@ -277,7 +277,10 @@ namespace MQTTnet.Client.Options
 #else
                         Certificates = _tlsParameters.Certificates?.ToList(),
 #endif
+#pragma warning disable CS0618 // Type or member is obsolete
                         CertificateValidationCallback = _tlsParameters.CertificateValidationCallback,
+#pragma warning restore CS0618 // Type or member is obsolete
+
                         CertificateValidationHandler = _tlsParameters.CertificateValidationHandler,
                         IgnoreCertificateChainErrors = _tlsParameters.IgnoreCertificateChainErrors,
                         IgnoreCertificateRevocationErrors = _tlsParameters.IgnoreCertificateRevocationErrors

Source/MQTTnet/Diagnostics/MqttNetLogger.cs

@@ -5,8 +5,7 @@ namespace MQTTnet.Diagnostics
     public class MqttNetLogger : IMqttNetLogger
     {
         readonly string _logId;
-        readonly string _source;
+        
-
         public MqttNetLogger()
         {
         }
@@ -37,23 +36,20 @@ namespace MQTTnet.Diagnostics
                 return;
             }
 
-            if (parameters?.Length > 0)
+            try
             {
-                try
+                message = string.Format(message ?? string.Empty, parameters);
-                {
+            }
-                    message = string.Format(message, parameters);
+            catch (FormatException)
-                }
+            {
-                catch
+                message = "MESSAGE FORMAT INVALID: " + message;
-                {
-                    message = "MESSAGE FORMAT INVALID: " + message;
-                }
             }
 
             var logMessage = new MqttNetLogMessage
             {
                 LogId = _logId,
                 Timestamp = DateTime.UtcNow,
-                Source = _source,
+                Source = source,
                 ThreadId = Environment.CurrentManagedThreadId,
                 Level = level,
                 Message = message,

Source/MQTTnet/Implementations/MqttTcpChannel.cs

@@ -85,7 +85,12 @@ namespace MQTTnet.Implementations
                     }
                     catch
                     {
+#if NETSTANDARD2_1
+                        await sslStream.DisposeAsync().ConfigureAwait(false);
+#else
                         sslStream.Dispose();
+#endif
+
                         throw;
                     }
 
@@ -127,7 +132,8 @@ namespace MQTTnet.Implementations
             }
             catch (ObjectDisposedException)
             {
-                return -1;
+                // Indicate a graceful socket close.
+                return 0;
             }
             catch (IOException exception)
             {
@@ -190,15 +196,17 @@ namespace MQTTnet.Implementations
 
         bool InternalUserCertificateValidationCallback(object sender, X509Certificate x509Certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
         {
-            #region OBSOLETE
+#region OBSOLETE
 
+#pragma warning disable CS0618 // Type or member is obsolete
             var certificateValidationCallback = _options?.TlsOptions?.CertificateValidationCallback;
+#pragma warning restore CS0618 // Type or member is obsolete
             if (certificateValidationCallback != null)
             {
                 return certificateValidationCallback(x509Certificate, chain, sslPolicyErrors, _clientOptions);
             }
 
-            #endregion
+#endregion
 
             var certificateValidationHandler = _options?.TlsOptions?.CertificateValidationHandler;
             if (certificateValidationHandler != null)

Source/MQTTnet/MQTTnet.csproj

@@ -20,8 +20,8 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.212</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>

Tests/MQTTnet.Benchmarks/Configurations/AllowNonOptimized.cs

@@ -13,8 +13,8 @@ namespace MQTTnet.Benchmarks.Configurations
     {
         public AllowNonOptimized()
         {
-            Add(JitOptimizationsValidator.DontFailOnError); // ALLOW NON-OPTIMIZED DLLS
+            AddValidator(JitOptimizationsValidator.DontFailOnError); // ALLOW NON-OPTIMIZED DLLS
-            Add(Job.InProcess);
+            AddJob(Job.InProcess);
         }
     }
 }

Tests/MQTTnet.Benchmarks/Configurations/BaseConfig.cs

@@ -7,9 +7,9 @@ namespace MQTTnet.Benchmarks.Configurations
     {
         public BaseConfig()
         {
-            Add(DefaultConfig.Instance.GetLoggers().ToArray()); // manual config has no loggers by default
+            AddLogger(DefaultConfig.Instance.GetLoggers().ToArray()); // manual config has no loggers by default
-            Add(DefaultConfig.Instance.GetExporters().ToArray()); // manual config has no exporters by default
+            AddExporter(DefaultConfig.Instance.GetExporters().ToArray()); // manual config has no exporters by default
-            Add(DefaultConfig.Instance.GetColumnProviders().ToArray()); // manual config has no columns by default
+            AddColumnProvider(DefaultConfig.Instance.GetColumnProviders().ToArray()); // manual config has no columns by default
         }
     }
 }

Tests/MQTTnet.Benchmarks/Configurations/RuntimeCompareConfig.cs

@@ -9,8 +9,8 @@ namespace MQTTnet.Benchmarks.Configurations
     {
         public RuntimeCompareConfig()
         {
-            Add(Job.Default.With(ClrRuntime.Net472));
+            AddJob(Job.Default.WithRuntime(ClrRuntime.Net472));
-            Add(Job.Default.With(CoreRuntime.Core22).With(CsProjCoreToolchain.NetCoreApp22));
+            AddJob(Job.Default.WithRuntime(CoreRuntime.Core22).WithToolchain(CsProjCoreToolchain.NetCoreApp22));
         }
 
     }

Tests/MQTTnet.Core.Tests/Mockups/TestLogger.cs

@@ -12,18 +12,14 @@ namespace MQTTnet.Tests.Mockups
             return new MqttNetScopedLogger(this, source);
         }
 
-        public void Publish(MqttNetLogLevel logLevel, string message, object[] parameters, Exception exception)
+        public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
         {
             LogMessagePublished?.Invoke(this, new MqttNetLogMessagePublishedEventArgs(new MqttNetLogMessage
             {
                 Level = logLevel,
-                Message = message
+                Message = string.Format(message, parameters),
+                Exception = exception
             }));
         }
-
-        public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

Tests/MQTTnet.TestApp.UniversalWindows/JsonServerStorage.cs

@@ -6,16 +6,16 @@ using Newtonsoft.Json;
 
 namespace MQTTnet.TestApp.UniversalWindows
 {
-    public class JsonServerStorage : IMqttServerStorage
+    public sealed class JsonServerStorage : IMqttServerStorage
     {
-        private readonly string _filename = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "Retained.json");
+        readonly string _filename = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "Retained.json");
 
-        public async Task SaveRetainedMessagesAsync(IList<MqttApplicationMessage> messages)
+        public Task SaveRetainedMessagesAsync(IList<MqttApplicationMessage> messages)
         {
-            await Task.CompletedTask;
-
             var json = JsonConvert.SerializeObject(messages);
             File.WriteAllText(_filename, json);
+
+            return Task.CompletedTask;
         }
 
         public async Task<IList<MqttApplicationMessage>> LoadRetainedMessagesAsync()

Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj

@@ -105,6 +105,9 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
+    <None Include="..\..\.editorconfig">
+      <Link>.editorconfig</Link>
+    </None>
     <None Include="MQTTnet.TestApp.UniversalWindows_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>