Dictionary benchmarks

Libraries/Opc.Ua.Server/Server/StandardServer.cs

@@ -3141,7 +3141,7 @@
                         ServerInternal.Status.Variable.ClearChangeMasks(ServerInternal.DefaultSystemContext, true);
 
                         // exit if all client connections are closed.
-                        var sessions = ServerInternal.SessionManager.GetSessions().Count;
+                        var sessions = ServerInternal.SessionManager.GetSessionCount();
                         if (sessions == 0)
                         {
                             break;

Libraries/Opc.Ua.Server/Session/SessionManager.cs

@@ -772,6 +772,12 @@
             }
         }
 
+        /// <inheritdoc/>
+        public int GetSessionCount()
+        {
+            return m_sessions.Count;
+        }
+
         /// <inheritdoc/>
         public IList<Session> GetSessions()
         {

Stack/Opc.Ua.Core/Stack/Bindings/BufferManager.cs

@@ -405,7 +405,7 @@ class Allocation
         private readonly object m_lock = new object();
         private int m_allocated;
         private int m_id;
-        private SortedDictionary<int, Allocation> m_allocations = new SortedDictionary<int, Allocation>();
+        private Dictionary<int, Allocation> m_allocations = new Dictionary<int, Allocation>();
 #else
         private const byte kCookieLength = 1;
 #endif

Tests/Common/Main.cs

@@ -28,19 +28,66 @@
  * ======================================================================*/
 
 using System;
+using System.Linq;
+using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Running;
+using BenchmarkDotNet.Validators;
+using Opc.Ua;
 
-static class Program
+[assembly: Config(typeof(BenchmarksDefaultConfig))]
+
+class BenchmarksDefaultConfig : ManualConfig
 {
-    // Main Method 
-    public static void Main(String[] args)
+    public BenchmarksDefaultConfig()
     {
-        IConfig config = ManualConfig.Create(DefaultConfig.Instance)
-            // need this option because of reference to nunit.framework
-            .WithOptions(ConfigOptions.DisableOptimizationsValidator)
-            ;
-        BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);
+        if (Program.CmdLineUsed)
+        {
+            var defaults = DefaultConfig.Instance;
+            foreach (var exporter in defaults.GetExporters())
+            {
+                AddExporter(exporter);
+            }
+            foreach (var logger in defaults.GetLoggers())
+            {
+                AddLogger(logger);
+            }
+            foreach (var analyser in defaults.GetAnalysers())
+            {
+                AddAnalyser(analyser);
+            }
+            foreach (var validator in defaults.GetValidators())
+            {
+                AddValidator(validator);
+            }
+            WithOptions(ConfigOptions.DisableOptimizationsValidator);
+        }
+        else
+        {
+            AddJob(Job.Dry);
+            AddLogger(ConsoleLogger.Default);
+            AddValidator(JitOptimizationsValidator.DontFailOnError);
+        }
     }
-}
 
+    static class Program
+    {
+        /// <summary>
+        /// Whether command line was used to start.
+        /// </summary>
+        public static bool CmdLineUsed = false;
+
+        // Main Method 
+        public static void Main(string[] args)
+        {
+            IConfig config = ManualConfig.Create(DefaultConfig.Instance)
+                // need this option because of reference to nunit.framework
+                .WithOptions(ConfigOptions.DisableOptimizationsValidator)
+                ;
+            CmdLineUsed = true;
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
+        }
+    }
+}

Tests/Opc.Ua.Client.ComplexTypes.Tests/Opc.Ua.Client.ComplexTypes.Tests.csproj

@@ -9,6 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="BenchmarkDotNet.TestAdapter" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit.Console" Version="3.19.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">

Tests/Opc.Ua.Client.Tests/Opc.Ua.Client.Tests.csproj

@@ -11,6 +11,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="BenchmarkDotNet.TestAdapter" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit.Console" Version="3.19.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">

Tests/Opc.Ua.Configuration.Tests/Opc.Ua.Configuration.Tests.csproj

@@ -20,6 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="BenchmarkDotNet.TestAdapter" Version="0.13.12" />    
     <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />

Tests/Opc.Ua.Core.Tests/Opc.Ua.Core.Tests.csproj

@@ -13,6 +13,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="BenchmarkDotNet.TestAdapter" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit.Console" Version="3.19.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
@@ -30,7 +32,7 @@
   <Choose>
     <When Condition="'$(TargetFramework)' == 'net462'">
     </When>
-    <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <When Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     </When>
     <Otherwise>
       <PropertyGroup Condition="'$(DisableECCTests)' != 'true'">