diff --git a/.gitignore b/.gitignore index 4f6a7c2..6eb1be1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Build Folders (you can keep bin if you'd like, to store dlls and pdbs) [Bb]in/ [Oo]bj/ +.idea/ +.vs/ # mstest test results TestResults @@ -12,7 +14,7 @@ TestResults *.suo *.user *.sln.docstates -.vs/ +*.secrets.cs # Build results [Dd]ebug/ @@ -100,6 +102,7 @@ ClientBin [Ss]tyle[Cc]op.* ~$* *.dbmdl + Generated_Code #added for RIA/Silverlight projects # Backup & report files from converting an old project file to a newer @@ -114,4 +117,4 @@ ssl/ *.pem results/ teststub.* -*.sqlite \ No newline at end of file +*.sqlite diff --git a/README.md b/README.md index 233aa4f..e51fd1f 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,26 @@ Http Benchmarks =============== -Source code for the HTTP Apache Benchmarks analyzer and exporter hosted at: https://httpbenchmarks.servicestack.net/ +Source code for the HTTP Apache Benchmarks analyzer and exporter. ### Example Benchmarks - - [Performance of different RDBMS within an ASP.NET Web Application](https://httpbenchmarks.servicestack.net/databases-in-asp-net?id=120) - - [Performance of different ServiceStack Hosts](https://httpbenchmarks.servicestack.net/servicestack-hosts) + - Performance of different RDBMS within an ASP.NET Web Application + - Performance of different ServiceStack Hosts > from a 2013 MacBook Pro with Windows 8 running [a ServiceStack impl](https://github.com/ServiceStack/HttpBenchmarks/blob/master/servers/Techempower.ServiceInterface/TechmeServices.cs) of the [Techempower benchmarks](http://www.techempower.com/benchmarks/#section=code) at localhost -## [Read the User Guide](https://httpbenchmarks.servicestack.net/about) - ### Upload your Apache Benchmarks -[![Upload Benchmarks](https://raw.githubusercontent.com/ServiceStack/HttpBenchmarks/master/src/BenchmarksAnalyzer/Content/img/AdminUI.png)](https://httpbenchmarks.servicestack.net/) +![Upload Benchmarks](https://raw.githubusercontent.com/ServiceStack/HttpBenchmarks/master/src/BenchmarksAnalyzer/Content/img/AdminUI.png) ### Visualize the Results -[![Visualize results](https://raw.githubusercontent.com/ServiceStack/HttpBenchmarks/master/src/BenchmarksAnalyzer/Content/img/benchmark-example-dbs.png)](https://httpbenchmarks.servicestack.net/databases-in-asp-net?id=120) +![Visualize results](https://raw.githubusercontent.com/ServiceStack/HttpBenchmarks/master/src/BenchmarksAnalyzer/Content/img/benchmark-example-dbs.png) ### Analyze and Export -[![Analyze and Export](https://raw.githubusercontent.com/ServiceStack/HttpBenchmarks/master/src/BenchmarksAnalyzer/Content/img/search-filter.png)](https://httpbenchmarks.servicestack.net/testplans/17/results) +![Analyze and Export](https://raw.githubusercontent.com/ServiceStack/HttpBenchmarks/master/src/BenchmarksAnalyzer/Content/img/search-filter.png) The gridview supports sorting of each column and the results can be further filtered with the filters provided. @@ -822,7 +820,7 @@ One challenge of maintaining publicly available source code that also gets deplo separate production settings with private connection strings and OAuth keys, whilst maintaining different public development environment optimized for requiring minimal infrastructure dependencies. -In this case [httpbenchmarks.servicestack.net](https://httpbenchmarks.servicestack.net/) is running on AWS with a +In this case httpbenchmarks.servicestack.net was running on AWS with a [PostgreSQL RDS](http://aws.amazon.com/rds/postgresql/) database backend, whilst during development we've opted for using an SQLite database which can be run locally without requiring users to have access to a PostgreSQL instance. diff --git a/servers/Perf.ServiceInterface/Perf.ServiceInterface.csproj b/servers/Perf.ServiceInterface/Perf.ServiceInterface.csproj index dc13f9a..f44247b 100644 --- a/servers/Perf.ServiceInterface/Perf.ServiceInterface.csproj +++ b/servers/Perf.ServiceInterface/Perf.ServiceInterface.csproj @@ -9,9 +9,10 @@ Properties Perf.SeviceInterface Perf.SeviceInterface - v4.5 + v4.7.2 512 + default true diff --git a/servers/Techempower.AspNet/Techempower.AspNet.csproj b/servers/Techempower.AspNet/Techempower.AspNet.csproj index 1498221..0944cba 100644 --- a/servers/Techempower.AspNet/Techempower.AspNet.csproj +++ b/servers/Techempower.AspNet/Techempower.AspNet.csproj @@ -13,12 +13,13 @@ Properties Techempower.AspNet Techempower.AspNet - v4.5 + v4.7.2 true + default true diff --git a/servers/Techempower.HttpListener.Pool/Techempower.HttpListener.Pool.csproj b/servers/Techempower.HttpListener.Pool/Techempower.HttpListener.Pool.csproj index b7b7522..2229e47 100644 --- a/servers/Techempower.HttpListener.Pool/Techempower.HttpListener.Pool.csproj +++ b/servers/Techempower.HttpListener.Pool/Techempower.HttpListener.Pool.csproj @@ -9,8 +9,9 @@ Properties Techempower.HttpListener.Pool Techempower.HttpListener.Pool - v4.5 + v4.7.2 512 + default AnyCPU diff --git a/servers/Techempower.HttpListener.SmartPool/Techempower.HttpListener.SmartPool.csproj b/servers/Techempower.HttpListener.SmartPool/Techempower.HttpListener.SmartPool.csproj index a3db370..a5e1c31 100644 --- a/servers/Techempower.HttpListener.SmartPool/Techempower.HttpListener.SmartPool.csproj +++ b/servers/Techempower.HttpListener.SmartPool/Techempower.HttpListener.SmartPool.csproj @@ -9,8 +9,9 @@ Properties Techempower.HttpListener.SmartPool Techempower.HttpListener.SmartPool - v4.5 + v4.7.2 512 + default AnyCPU diff --git a/servers/Techempower.HttpListener/Techempower.HttpListener.csproj b/servers/Techempower.HttpListener/Techempower.HttpListener.csproj index 126c2c4..25a28c9 100644 --- a/servers/Techempower.HttpListener/Techempower.HttpListener.csproj +++ b/servers/Techempower.HttpListener/Techempower.HttpListener.csproj @@ -9,8 +9,9 @@ Properties Techempower.HttpListener Techempower.HttpListener - v4.5 + v4.7.2 512 + default AnyCPU diff --git a/servers/Techempower.SelfHost/Techempower.SelfHost.csproj b/servers/Techempower.SelfHost/Techempower.SelfHost.csproj index a635354..0022aac 100644 --- a/servers/Techempower.SelfHost/Techempower.SelfHost.csproj +++ b/servers/Techempower.SelfHost/Techempower.SelfHost.csproj @@ -9,8 +9,9 @@ Properties Techempower.SelfHost Techempower.SelfHost - v4.5 + v4.7.2 512 + default AnyCPU diff --git a/servers/Techempower.ServiceInterface/Techempower.ServiceInterface.csproj b/servers/Techempower.ServiceInterface/Techempower.ServiceInterface.csproj index e63d525..d6a9832 100644 --- a/servers/Techempower.ServiceInterface/Techempower.ServiceInterface.csproj +++ b/servers/Techempower.ServiceInterface/Techempower.ServiceInterface.csproj @@ -9,8 +9,9 @@ Properties Techempower.ServiceInterface Techempower.ServiceInterface - v4.5 + v4.7.2 512 + default true diff --git a/src/BenchmarksAnalyzer.ServiceInterface/AuthenticatedServices.cs b/src/BenchmarksAnalyzer.ServiceInterface/AuthenticatedServices.cs index ddef90c..6df6d6e 100644 --- a/src/BenchmarksAnalyzer.ServiceInterface/AuthenticatedServices.cs +++ b/src/BenchmarksAnalyzer.ServiceInterface/AuthenticatedServices.cs @@ -170,13 +170,13 @@ private TestPlan AddMissingLabels(TestPlan testPlan) if (testPlan.TestLabels == null) testPlan.TestLabels = new Dictionary(); - var serverLabels = distinctResults.ConvertAll(x => x.Hostname + ":" + x.Port).ToHashSet(); + var serverLabels = new HashSet(distinctResults.Select(x => x.Hostname + ":" + x.Port)); serverLabels.Each(x => { if (!testPlan.ServerLabels.ContainsKey(x)) testPlan.ServerLabels[x] = ""; }); - var testLabels = distinctResults.ConvertAll(x => x.RequestPath).ToHashSet(); + var testLabels = new HashSet(distinctResults.Select(x => x.RequestPath)); testLabels.Each(x => { if (!testPlan.TestLabels.ContainsKey(x)) diff --git a/src/BenchmarksAnalyzer.ServiceInterface/BenchmarksAnalyzer.ServiceInterface.csproj b/src/BenchmarksAnalyzer.ServiceInterface/BenchmarksAnalyzer.ServiceInterface.csproj index b5e9e6b..26420a9 100644 --- a/src/BenchmarksAnalyzer.ServiceInterface/BenchmarksAnalyzer.ServiceInterface.csproj +++ b/src/BenchmarksAnalyzer.ServiceInterface/BenchmarksAnalyzer.ServiceInterface.csproj @@ -9,8 +9,9 @@ Properties BenchmarksAnalyzer.ServiceInterface BenchmarksAnalyzer.ServiceInterface - v4.5 + v4.7.2 512 + default true @@ -30,34 +31,6 @@ 4 - - ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll - True - - - ..\packages\ServiceStack.4.5.0\lib\net45\ServiceStack.dll - True - - - ..\packages\ServiceStack.Client.4.5.0\lib\net45\ServiceStack.Client.dll - True - - - ..\packages\ServiceStack.Common.4.5.0\lib\net45\ServiceStack.Common.dll - True - - - ..\packages\ServiceStack.Interfaces.4.5.0\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll - True - - - ..\packages\ServiceStack.OrmLite.4.5.0\lib\net45\ServiceStack.OrmLite.dll - True - - - ..\packages\ServiceStack.Text.4.5.0\lib\net45\ServiceStack.Text.dll - True - @@ -84,7 +57,13 @@ - + + + + + + + @@ -37,16 +45,20 @@ - + + - - + + @@ -55,6 +67,7 @@ + @@ -71,23 +84,19 @@ + - - - - - - - - - - + + + + + @@ -150,11 +159,11 @@ - + - - + + @@ -193,4 +202,4 @@ or access {your site}/Glimpse.axd for even more details and a Configuration Tool to support you. --> - + \ No newline at end of file diff --git a/src/BenchmarksAnalyzer/fonts/FontAwesome.otf b/src/BenchmarksAnalyzer/fonts/FontAwesome.otf index 681bdd4..401ec0f 100644 Binary files a/src/BenchmarksAnalyzer/fonts/FontAwesome.otf and b/src/BenchmarksAnalyzer/fonts/FontAwesome.otf differ diff --git a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.eot b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.eot index a30335d..e9f60ca 100644 Binary files a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.eot and b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.eot differ diff --git a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.svg b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.svg index 6fd19ab..855c845 100644 --- a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.svg +++ b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.svg @@ -1,640 +1,2671 @@ - - + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.ttf b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.ttf index d7994e1..35acda2 100644 Binary files a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.ttf and b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.ttf differ diff --git a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff index 6fd4ede..400014a 100644 Binary files a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff and b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff differ diff --git a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff2 b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff2 index 5560193..4d13fc6 100644 Binary files a/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff2 and b/src/BenchmarksAnalyzer/fonts/fontawesome-webfont.woff2 differ diff --git a/src/BenchmarksAnalyzer/packages.config b/src/BenchmarksAnalyzer/packages.config deleted file mode 100644 index 1c1d286..0000000 --- a/src/BenchmarksAnalyzer/packages.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/BenchmarksAnalyzer/sqlite3.dll b/src/BenchmarksAnalyzer/sqlite3.dll deleted file mode 100644 index 1058a2b..0000000 Binary files a/src/BenchmarksAnalyzer/sqlite3.dll and /dev/null differ diff --git a/tests/Perf.Tests/Perf.Tests.csproj b/tests/Perf.Tests/Perf.Tests.csproj index dd59a22..839def1 100644 --- a/tests/Perf.Tests/Perf.Tests.csproj +++ b/tests/Perf.Tests/Perf.Tests.csproj @@ -9,8 +9,9 @@ Properties Perf.Tests Perf.Tests - v4.5 + v4.7.2 512 + default true @@ -30,10 +31,6 @@ 4 - - ..\..\src\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll - True - ..\..\lib\ServiceStack.dll @@ -68,7 +65,7 @@ - +