Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks

Author: eastspire

.github/workflows/build.yml

@@ -155,7 +155,7 @@ jobs:
           # run-ci.py runs the diffing to see if github actions needs to test this framework. Ideally/eventually,
           # we'd like to try and do the diffing before github_actions_clean & setup.
           # This will run the tests exactly as you would in your own vm:
-          docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
+          docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --force-rm --test-dir $RUN_TESTS --results-environment Github-Actions;
   dependabot:
     needs: verify
     runs-on: ubuntu-latest

frameworks/CSharp/genhttp/Benchmarks/Benchmarks.csproj

@@ -2,14 +2,16 @@
 
     <PropertyGroup>
 
-        <TargetFramework>net9.0</TargetFramework>
-        <LangVersion>13.0</LangVersion>
+        <TargetFramework>net10.0</TargetFramework>
+        <LangVersion>14.0</LangVersion>
         <ImplicitUsings>true</ImplicitUsings>
         <OutputType>Exe</OutputType>
 
         <AssemblyTitle>GenHTTP Benchmarks</AssemblyTitle>
         <Description>Test suite to be executed with TechEmpower FrameworkBenchmarks.</Description>
 
+        <DefineConstants>$(DefineConstants);$(GENHTTP_ENGINE_NAME)</DefineConstants>
+
         <ServerGarbageCollection>true</ServerGarbageCollection>
         <TieredPGO>true</TieredPGO>
 
@@ -26,11 +28,12 @@
 
     <ItemGroup>
 
-        <PackageReference Include="GenHTTP.Core" Version="9.8.0" />
-        <PackageReference Include="GenHTTP.Modules.Webservices" Version="9.8.0" />
+        <PackageReference Include="$(GENHTTP_ENGINE_PACKAGE)" Version="10.1.0" />
+
+        <PackageReference Include="GenHTTP.Modules.Webservices" Version="10.1.0" />
 
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
 
     </ItemGroup>
 

frameworks/CSharp/genhttp/Benchmarks/Program.cs

@@ -1,7 +1,11 @@
 using Benchmarks.Tests;
 using Benchmarks.Utilities;
 
+#if INTERNAL
 using GenHTTP.Engine.Internal;
+#else
+using GenHTTP.Engine.Kestrel;
+#endif
 
 using GenHTTP.Modules.IO;
 using GenHTTP.Modules.Layouting;

frameworks/CSharp/genhttp/Benchmarks/Tests/JsonHandler.cs

@@ -1,10 +1,8 @@
-using System.Text.Json;
+using Benchmarks.Utilities;
 
 using GenHTTP.Api.Content;
 using GenHTTP.Api.Protocol;
 
-using GenHTTP.Modules.Conversion.Serializers.Json;
-
 namespace Benchmarks.Tests;
 
 public sealed class JsonResult
@@ -15,9 +13,7 @@ public sealed class JsonResult
 
 public sealed class JsonHandler : IHandler
 {
-    private static readonly FlexibleContentType _ContentType = new(ContentType.ApplicationJson, "utf-8");
-
-    private static readonly JsonSerializerOptions _Options = new();
+    private static readonly FlexibleContentType ContentType = new(GenHTTP.Api.Protocol.ContentType.ApplicationJson, "utf-8");
 
     public ValueTask PrepareAsync() => new();
 
@@ -29,8 +25,8 @@ public ValueTask<IResponse> HandleAsync(IRequest request)
         };
 
         var response = request.Respond()
-                              .Content(new JsonContent(result, _Options))
-                              .Type(_ContentType)
+                              .Content(new FixedLengthJsonContent(result))
+                              .Type(ContentType)
                               .Build();
 
         return new(response);

frameworks/CSharp/genhttp/Benchmarks/Utilities/FixedLengthJsonContent.cs

@@ -0,0 +1,31 @@
+using System.Text.Json;
+
+using GenHTTP.Api.Protocol;
+
+using Benchmarks.Tests;
+
+namespace Benchmarks.Utilities;
+
+public sealed class FixedLengthJsonContent : IResponseContent
+{
+    private readonly MemoryStream _buffer = new();
+
+    public ulong? Length => (ulong)_buffer.Length;
+
+    public FixedLengthJsonContent(JsonResult result)
+    {
+        JsonSerializer.SerializeAsync(_buffer, result);
+    }
+    
+    public ValueTask<ulong?> CalculateChecksumAsync() => throw new NotImplementedException();
+
+    public ValueTask WriteAsync(Stream target, uint bufferSize)
+    {
+        _buffer.Seek(0, SeekOrigin.Begin);
+        
+        _buffer.CopyTo(target);
+        
+        return ValueTask.CompletedTask;
+    }
+
+}

frameworks/CSharp/genhttp/benchmark_config.json

@@ -1,5 +1,6 @@
 {
-  "framework": "genhttp",
+  "framework": "genhttp",  
+  "maintainers": ["Kaliumhexacyanoferrat"],
   "tests": [{
     "default": {
       "plaintext_url": "/plaintext",
@@ -17,11 +18,33 @@
       "language": "C#",
       "orm": "Raw",
       "platform": ".NET",
-      "webserver": "Kestrel",
+      "webserver": "GenHTTP",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "GenHTTP",
+      "display_name": "genhttp [internal]",
       "notes": ""
+    },
+    "kestrel": {
+        "plaintext_url": "/plaintext",
+        "json_url": "/json",
+        "db_url": "/db",
+        "query_url": "/queries/",
+        "update_url": "/updates/",
+        "fortune_url": "/fortunes",
+        "cached_query_url": "/cached-worlds/",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Fullstack",
+        "database": "Postgres",
+        "framework": "GenHTTP",
+        "language": "C#",
+        "orm": "Raw",
+        "platform": ".NET",
+        "webserver": "Kestrel",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "genhttp [kestrel]",
+        "notes": ""
     }
   }]
 }

frameworks/CSharp/genhttp/config.toml

@@ -16,5 +16,23 @@ database_os = "Linux"
 os = "Linux"
 orm = "Raw"
 platform = ".NET"
+webserver = "GenHTTP"
+versus = "None"
+
+[kestrel]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+urls.db = "/db"
+urls.query = "/queries/"
+urls.update = "/updates/"
+urls.fortune = "/fortunes"
+urls.cached_query = "/cached-worlds/"
+approach = "Realistic"
+classification = "Fullstack"
+database = "Postgres"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = ".NET"
 webserver = "Kestrel"
 versus = "None"

frameworks/CSharp/genhttp/genhttp-kestrel.dockerfile

@@ -0,0 +1,33 @@
+FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
+WORKDIR /source
+
+ENV GENHTTP_ENGINE_NAME=KESTREL
+ENV GENHTTP_ENGINE_PACKAGE=GenHTTP.Core.Kestrel
+
+# copy csproj and restore as distinct layers
+COPY Benchmarks/*.csproj .
+RUN dotnet restore -r linux-musl-x64
+
+# copy and publish app and libraries
+COPY Benchmarks/ .
+RUN dotnet publish -c release -o /app -r linux-musl-x64 --no-restore --self-contained
+
+# final stage/image
+FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-alpine
+
+ENV DOTNET_GCDynamicAdaptationMode=0 \
+    DOTNET_EnableDiagnostics=0 \
+    COMPlus_EnableDiagnostics=0 \
+    COMPlus_DbgEnableMiniDump=0 \
+    COMPlus_DbgEnableMiniDumpCollection=0 \
+    COMPlus_DbgMiniDumpType=0 \
+    DOTNET_TieredPGO=0 \
+    DOTNET_TC_QuickJitForLoops=1 \
+    DOTNET_TC_QuickJit=1    
+
+WORKDIR /app
+COPY --from=build /app .
+
+ENTRYPOINT ["./Benchmarks"]
+
+EXPOSE 8080

frameworks/CSharp/genhttp/genhttp.dockerfile

@@ -1,6 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 WORKDIR /source
 
+ENV GENHTTP_ENGINE_NAME=INTERNAL
+ENV GENHTTP_ENGINE_PACKAGE=GenHTTP.Core
+
 # copy csproj and restore as distinct layers
 COPY Benchmarks/*.csproj .
 RUN dotnet restore -r linux-musl-x64
@@ -10,11 +13,17 @@ COPY Benchmarks/ .
 RUN dotnet publish -c release -o /app -r linux-musl-x64 --no-restore --self-contained
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-alpine
+FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-alpine
 
-ENV DOTNET_GCDynamicAdaptationMode=0
-ENV DOTNET_ReadyToRun=0
-ENV DOTNET_HillClimbing_Disable=1
+ENV DOTNET_GCDynamicAdaptationMode=0 \
+    DOTNET_EnableDiagnostics=0 \
+    COMPlus_EnableDiagnostics=0 \
+    COMPlus_DbgEnableMiniDump=0 \
+    COMPlus_DbgEnableMiniDumpCollection=0 \
+    COMPlus_DbgMiniDumpType=0 \
+    DOTNET_TieredPGO=0 \
+    DOTNET_TC_QuickJitForLoops=1 \
+    DOTNET_TC_QuickJit=1    
 
 WORKDIR /app
 COPY --from=build /app .

frameworks/CSharp/touchsocket/Benchmarks.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11109.219 d18.0-oob
+VisualStudioVersion = 18.0.11109.219
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchSocketWebApi", "src\TouchSocketWebApi\TouchSocketWebApi.csproj", "{6BD9363A-D77F-5D90-8444-2BC37495C920}"
 EndProject
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchSocketHttp31", "src\To
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchSocketWebApi31", "src\TouchSocketWebApi31\TouchSocketWebApi31.csproj", "{6B6A57CE-1F69-FA6E-7458-0A4B6AB60683}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchSocketHttpPlatform", "src\TouchSocketHttpPlatform\TouchSocketHttpPlatform.csproj", "{BC320C24-941D-2109-FBC8-92780569BBA4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{6B6A57CE-1F69-FA6E-7458-0A4B6AB60683}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B6A57CE-1F69-FA6E-7458-0A4B6AB60683}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B6A57CE-1F69-FA6E-7458-0A4B6AB60683}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC320C24-941D-2109-FBC8-92780569BBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC320C24-941D-2109-FBC8-92780569BBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC320C24-941D-2109-FBC8-92780569BBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC320C24-941D-2109-FBC8-92780569BBA4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE