Migrated to .NET 5.0

hallatore · Jun 1, 2020 · 81b56a7 · 81b56a7
1 parent 5ee3e2b
commit 81b56a7
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 19 deletions.
diff --git a/Netling.Benchmarks/Core/WorkerThreadResults.cs b/Netling.Benchmarks/Core/WorkerThreadResults.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Netling.Core;
+using Netling.Core.Models;
+using Netling.Core.SocketWorker;
+
+namespace Netling.Benchmarks.Core
+{
+    [MemoryDiagnoser]
+    public class WorkerThreadResults
+    {
+        private readonly WorkerThreadResult _result;
+        private IWorkerJob _worker;
+
+        public WorkerThreadResults()
+        {
+            _result = new WorkerThreadResult();
+            var socketWorker = new SocketWorkerJob(new Uri("http://localhost:5000"));
+            _worker = socketWorker.Init(0, _result).Result;
+        }
+
+        //[Benchmark]
+        public void Add()
+        {
+            for (var i = 0; i < 1000; i++)
+            {
+                _result.Add(i / 100, 1337, 10f, 200, false);
+            }
+        }
+
+        [Benchmark]
+        public async ValueTask SocketWorker()
+        {
+            await _worker.DoWork();
+        }
+    }
+}
diff --git a/Netling.Benchmarks/Netling.Benchmarks.csproj b/Netling.Benchmarks/Netling.Benchmarks.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Netling.Client/Netling.Client.csproj b/Netling.Client/Netling.Client.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>netling-icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OxyPlot.Wpf" Version="1.0.0" />
+    <PackageReference Include="OxyPlot.Wpf" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Netling.Client/ResultWindowItem.cs b/Netling.Client/ResultWindowItem.cs
@@ -19,7 +19,10 @@ public static ResultWindowItem Parse(WorkerResult result)
                 Median = result.Median,
                 StdDev = result.StdDev,
                 Min = result.Min,
-                Max = result.Max
+                Max = result.Max,
+                P99 = result.P99,
+                P95 = result.P95,
+                P50 = result.P50
             };
         }
 
@@ -30,6 +33,9 @@ public static ResultWindowItem Parse(WorkerResult result)
         public double ElapsedSeconds { get; set; }
         public double JobsPerSecond { get; set; }
         public double Max { get; set; }
+        public double P99 { get; set; }
+        public double P95 { get; set; }
+        public double P50 { get; set; }
         public double Min { get; set; }
         public double StdDev { get; set; }
         public double Median { get; set; }

diff --git a/Netling.ConsoleClient/Netling.ConsoleClient.csproj b/Netling.ConsoleClient/Netling.ConsoleClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Netling.Core.HttpClientWorker/Netling.Core.HttpClientWorker.csproj b/Netling.Core.HttpClientWorker/Netling.Core.HttpClientWorker.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Netling.Core.SocketWorker/Netling.Core.SocketWorker.csproj b/Netling.Core.SocketWorker/Netling.Core.SocketWorker.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Netling.Core/Models/WorkerResult.cs b/Netling.Core/Models/WorkerResult.cs
@@ -32,6 +32,9 @@ public WorkerResult(string name, int threads, TimeSpan elapsed)
         public double StdDev { get; private set; }
         public double Min { get; private set; }
         public double Max { get; private set; }
+        public double P99 { get; private set; }
+        public double P95 { get; private set; }
+        public double P50 { get; private set; }
         public int[] Histogram { get; private set; }
 
         public double Bandwidth => Math.Round(BytesPrSecond * 8 / 1024 / 1024, MidpointRounding.AwayFromZero);
@@ -57,6 +60,9 @@ public void Process(CombinedWorkerThreadResult wtResult)
             StdDev = responseTimes.GetStdDev();
             Min = responseTimes.First();
             Max = responseTimes.Last();
+            P99 = responseTimes[(int)(responseTimes.Length * 0.99)];
+            P95 = responseTimes[(int)(responseTimes.Length * 0.95)];
+            P50 = responseTimes[(int)(responseTimes.Length / 2)];
             Histogram = GenerateHistogram(responseTimes);
         }
 

diff --git a/Netling.Core/Models/WorkerThreadResult.cs b/Netling.Core/Models/WorkerThreadResult.cs
@@ -9,23 +9,33 @@ public class WorkerThreadResult
         public Dictionary<int, int> StatusCodes { get; set; }
         public Dictionary<Type,Exception> Exceptions { get; set; }
 
+        private Second _tmpSeconds;
+        private int _tmpElapsedSeconds = -1;
+
         public WorkerThreadResult()
         {
             Seconds = new Dictionary<int, Second>();
             StatusCodes = new Dictionary<int, int>();
             Exceptions = new Dictionary<Type, Exception>();
         }
 
-        public void Add(int elapsedSeconds, long bytes, float responsetime, int statusCode, bool trackResponseTime)
+        public void Add(int elapsedSeconds, long bytes, float responseTime, int statusCode, bool trackResponseTime)
         {
             AddOrUpdateStatusCode(statusCode);
-            GetItem(elapsedSeconds).Add(bytes, responsetime, trackResponseTime);
+
+            if (_tmpElapsedSeconds != elapsedSeconds)
+            {
+                _tmpSeconds = GetCurrentSecond(elapsedSeconds);
+                _tmpElapsedSeconds = elapsedSeconds;
+            }
+
+            _tmpSeconds.Add(bytes, responseTime, trackResponseTime);
         }
 
-        public void AddError(int elapsedSeconds, float responsetime, int statusCode, bool trackResponseTime, Exception exception = null)
+        public void AddError(int elapsedSeconds, float responseTime, int statusCode, bool trackResponseTime, Exception exception = null)
         {
             AddOrUpdateStatusCode(statusCode);
-            GetItem(elapsedSeconds).AddError(responsetime, trackResponseTime);
+            GetCurrentSecond(elapsedSeconds).AddError(responseTime, trackResponseTime);
 
             if (exception != null && !Exceptions.ContainsKey(exception.GetType()))
             {
@@ -48,7 +58,7 @@ private void AddOrUpdateStatusCode(int statusCode)
             StatusCodes[statusCode]++;
         }
 
-        private Second GetItem(int elapsedSeconds)
+        private Second GetCurrentSecond(int elapsedSeconds)
         {
             if (Seconds.ContainsKey(elapsedSeconds))
             {

diff --git a/Netling.Core/Netling.Core.csproj b/Netling.Core/Netling.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/Netling.Tests/Netling.Tests.csproj b/Netling.Tests/Netling.Tests.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Netling is a load tester client for easy web testing. It is extremely fast while using little CPU or memory.
 
 ## Requirements
-.NET Core 3.0
+.NET 5
 
 ## Usage