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

Author: eastspire

frameworks/C++/ffead-cpp/benchmark_config.json

@@ -198,7 +198,7 @@
 			"display_name": "ffead-cpp [pg-raw-async-prof-pool-m]",
 			"notes": "async memory profiled",
 			"versus": "",
-			"tags": []
+			"tags": ["broken"]
 		},
 		"postgresql-raw-async-clibpqb-profiled": {
 			"db_url": "/t4/d",
@@ -301,7 +301,7 @@
 			"display_name": "ffead-cpp [pg-raw-async-qw-prof-pool-m]",
 			"notes": "async memory profiled",
 			"versus": "",
-			"tags": []
+			"tags": ["broken"]
 		}
 	}]
 }

frameworks/C/h2o/CMakeLists.txt

@@ -19,9 +19,8 @@ find_path(PQ_INCLUDE postgresql/libpq-fe.h REQUIRED)
 find_path(YAJL_INCLUDE yajl/yajl_gen.h REQUIRED)
 find_program(BPFTOOL_BIN bpftool REQUIRED)
 find_program(CLANG_BIN clang REQUIRED)
-include_directories(src ${CMAKE_BINARY_DIR}/generated-headers ${BPF_INCLUDE} ${H2O_INCLUDE})
-include_directories(${MUSTACHE_C_INCLUDE} ${NUMA_INCLUDE} ${OPENSSL_INCLUDE} ${PQ_INCLUDE})
-include_directories(${YAJL_INCLUDE})
+include_directories(src ${CMAKE_BINARY_DIR} ${BPF_INCLUDE} ${H2O_INCLUDE} ${MUSTACHE_C_INCLUDE})
+include_directories(${NUMA_INCLUDE} ${OPENSSL_INCLUDE} ${PQ_INCLUDE} ${YAJL_INCLUDE})
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 add_compile_definitions(H2O_USE_LIBUV=0)
@@ -32,7 +31,7 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_FORTIFY_SOURCE=2")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3")
 add_custom_command(
-  OUTPUT ${CMAKE_BINARY_DIR}/generated-headers/socket_load_balancer.h
+  OUTPUT ${CMAKE_BINARY_DIR}/socket_load_balancer.h
   COMMAND ${CLANG_BIN}
             -c
             -DNDEBUG
@@ -47,12 +46,12 @@ add_custom_command(
             ${WARNING_OPTIONS}
             ${CMAKE_CURRENT_SOURCE_DIR}/src/bpf/socket_load_balancer.c
   COMMAND ${BPFTOOL_BIN} gen skeleton ${CMAKE_BINARY_DIR}/socket_load_balancer.o >
-            ${CMAKE_BINARY_DIR}/generated-headers/socket_load_balancer.h
+            ${CMAKE_BINARY_DIR}/socket_load_balancer.h
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/bpf/socket_load_balancer.c
   VERBATIM)
 add_custom_target(
   generated_headers
-  DEPENDS ${CMAKE_BINARY_DIR}/generated-headers/socket_load_balancer.h)
+  DEPENDS ${CMAKE_BINARY_DIR}/socket_load_balancer.h)
 file(GLOB_RECURSE HANDLER_SOURCES "src/handlers/*.c")
 file(GLOB SOURCES "src/*.c")
 add_executable(${PROJECT_NAME} ${HANDLER_SOURCES} ${SOURCES})

frameworks/C/h2o/h2o.dockerfile

@@ -2,7 +2,7 @@ ARG UBUNTU_VERSION=25.10
 
 ARG H2O_APP_PREFIX=/opt/h2o-app
 
-FROM "ubuntu:${UBUNTU_VERSION}" AS compile
+FROM "buildpack-deps:${UBUNTU_VERSION}" AS compile
 
 RUN echo "[timing] Installing system packages: $(date)"
 ARG DEBIAN_FRONTEND=noninteractive
@@ -24,15 +24,12 @@ RUN apt-get install \
       libnuma-dev \
       libpq-dev \
       libssl-dev \
-      libstdc++-15-dev \
       libtool \
       liburing-dev \
       libuv1-dev \
-      libwslay-dev \
       libyajl-dev \
       libz-dev \
       make \
-      ninja-build \
       pkg-config \
       ruby \
       systemtap-sdt-dev
@@ -47,7 +44,6 @@ RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
       -B build \
       -DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
       -DWITH_MRUBY=on \
-      -G Ninja \
       -S . && \
     cmake --build build -j && \
     cmake --install build
@@ -72,7 +68,6 @@ RUN cmake \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_C_FLAGS="-march=native -mtune=native" \
       -DCMAKE_INSTALL_PREFIX="${H2O_APP_PREFIX}" \
-      -G Ninja \
       -S .. && \
     cmake --build . -j && \
     cmake --install .

frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.Platform/AkazawaYun.Benchmark.Platform.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AkazawaYun.PRO" Version="1.14.25.1105" />
+    <PackageReference Include="AkazawaYun.PRO" Version="1.14.25.1027-p" />
   </ItemGroup>
 
 </Project>

frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.Platform/MyBenchmarkReceptor.cs

@@ -1,12 +1,10 @@
 using AkazawaYun.PRO7;
-using System.Text;
 
 namespace AkazawaYun.Benchmark.Platform;
 
 class MyBenchmarkReceptor : akzWebReceptorBenchmark
 {
     readonly JsonModel JsonModel;
-    readonly ReadOnlyMemory<byte> JsonContentLength;
 
 
     public MyBenchmarkReceptor()
@@ -15,8 +13,6 @@ public MyBenchmarkReceptor()
         {
             message = "Hello, World!"
         };
-        akzJson.Text2Json(JsonModel, out ReadOnlyMemory<byte> json);
-        JsonContentLength = Encoding.UTF8.GetBytes($"{json.Length}\r\n\r\n");
     }
 
 
@@ -26,8 +22,7 @@ public override ValueTask SendPlaintext(IHttpContext http)
     }
     public override async ValueTask SendJson(IHttpContext http)
     {
-        await http.Slient.Send(DataJson_OnlyHeaderExceptContentLength);
-        await http.Slient.Send(JsonContentLength);
+        await http.Slient.Send(DataJson_OnlyHeader);
         akzJson.Text2Json(JsonModel, out ReadOnlyMemory<byte> json);
         await http.Slient.Send(json);
     }

frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.Platform/Program.cs

@@ -5,31 +5,16 @@ namespace AkazawaYun.Benchmark.Platform;
 class Program
 {
     static readonly akzWebBuilder builder;
-    const int port = 8080;
 
     static Program()
     {
         akzLog.War("AkazawaYun.PRO 平台压力测试特供版 ver2025.11.3, 只支持 /plaintext 和 /json");
-        akzJson.Config(null, AotJsonContext.Default);
-        builder = akzWebBuilder.Shared.SetPort(port).SetDev(true)
-            .Add<akzXmlSummary, akzXmlSummary>(() => null)
-            .Add<IWebReceptor, MyBenchmarkReceptor>(() => new MyBenchmarkReceptor())
-            .Add<IWebListener, akzHttpListenerVIBenchmark>(() => new(port))
-            .Build();
+        akzJson.Config(AotJsonContext.Default);
+        builder = akzWebBuilder.Shared.Build(new MyBenchmarkReceptor());
     }
     static async Task Main()
     {
         await builder.Launch();
-
-        Console.WriteLine("[API SELF-TEST]");
-        string url = $"http://localhost:{port}/plaintext";
-        Console.WriteLine(" REQ URL :" + url);
-        string res = await akzHttpClient.Shared.Get(url).FetchString();
-        Console.WriteLine(" RES LEN :" + res.Length);
-        Console.WriteLine(" RES BODY:" + res);
-        Console.WriteLine("[OK, I WORK FINE]");
-
-        akzLog.Default = akzLog.Output.NoneButWar;
         await Task.Delay(-1);
     }
 }

frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.WebApi/AkazawaYun.Benchmark.WebApi.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AkazawaYun.PRO" Version="1.14.25.1105" />
+    <PackageReference Include="AkazawaYun.PRO" Version="1.14.25.1110" />
     <PackageReference Include="MySql.Data" Version="9.4.0" />
   </ItemGroup>
 

frameworks/CSharp/aspnetcore-mono/benchmark_config.json

@@ -40,6 +40,7 @@
 			"database_os": "Linux",
 			"display_name": "ASP.NET Core [Platform, Mono, Pg]",
 			"notes": "",
+			"tags": ["broken"],
 			"versus": "aspcore-ado-pg"
 		},
 		"mw": {
@@ -123,4 +124,4 @@
 			"versus": "aspcore-mono-pg"
 		}
 	}]
-}
+}

frameworks/CSharp/embedio/Benchmarks/Benchmarks.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
   <PropertyGroup>
-    
-    <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    
+
+    <TargetFramework>net9.0</TargetFramework>
+    <LangVersion>13.0</LangVersion>
+
     <AssemblyTitle>EmbedIO Benchmarks</AssemblyTitle>
     <Description>Test suite to be executed with TechEmpower FrameworkBenchmarks.</Description>
-    
-    <StartupObject>Benchmarks.Program</StartupObject>    
+
+    <StartupObject>Benchmarks.Program</StartupObject>
     <OutputType>Exe</OutputType>
-    
+
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TieredCompilation>false</TieredCompilation>
-    
+
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="EmbedIO" Version="3.4.3" />
+    <PackageReference Include="EmbedIO" Version="3.5.2" />
   </ItemGroup>
-  
-</Project>
+
+</Project>

frameworks/CSharp/embedio/Benchmarks/Program.cs

@@ -1,10 +1,12 @@
-using EmbedIO;
-using Swan.Logging;
-using System;
+using System;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
+using EmbedIO;
+
+using Swan.Logging;
+
 namespace Benchmarks
 {
 
@@ -21,7 +23,7 @@ public class JsonResult
 
     public static class Program
     {
-        private static readonly ManualResetEvent _WaitEvent = new ManualResetEvent(false);
+        private static readonly ManualResetEvent WaitEvent = new(false);
 
         public static async Task<int> Main(string[] args)
         {
@@ -60,12 +62,12 @@ public static async Task<int> Main(string[] args)
             {
                 AppDomain.CurrentDomain.ProcessExit += (_, __) =>
                 {
-                    _WaitEvent.Set();
+                    WaitEvent.Set();
                 };
 
                 await server.RunAsync();
 
-                _WaitEvent.WaitOne();
+                WaitEvent.WaitOne();
 
                 return 0;
             }