Merge branch 'TechEmpower:master' into master

Author: nigrosimone

frameworks/C/h2o/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.18.0)
-project(h2o_app)
+project(h2o-app)
 find_library(CRYPTO_LIB crypto REQUIRED)
 find_library(H2O_LIB h2o-evloop REQUIRED)
 find_library(MUSTACHE_C_LIB mustache_c REQUIRED)
@@ -19,7 +19,7 @@ include_directories(${PQ_INCLUDE} ${YAJL_INCLUDE})
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 add_compile_definitions(H2O_USE_LIBUV=0)
-set(COMMON_OPTIONS -flto -pthread)
+set(COMMON_OPTIONS -flto=auto -pthread)
 add_compile_options(-pedantic -Wall -Wextra ${COMMON_OPTIONS})
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_FORTIFY_SOURCE=2")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")

frameworks/C/h2o/h2o.dockerfile

@@ -1,26 +1,16 @@
-ARG UBUNTU_VERSION=24.04
+ARG UBUNTU_VERSION=25.10
 
-ARG H2O_APP_PREFIX=/opt/h2o_app
+ARG H2O_APP_PREFIX=/opt/h2o-app
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get -yqq update && \
-    apt-get -yqq install \
-      ca-certificates \
-      curl \
-      lsb-release && \
-    install -dm755 /usr/share/postgresql-common/pgdg && \
-    curl --fail -LSso /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc \
-      "https://www.postgresql.org/media/keys/ACCC4CF8.asc" && \
-    sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] \
-      https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > \
-      /etc/apt/sources.list.d/pgdg.list' && \
-    apt-get -yqq update && \
     apt-get -yqq install \
       autoconf \
       bison \
       cmake \
+      curl \
       flex \
       g++ \
       libbpfcc-dev \
@@ -50,7 +40,7 @@ RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
     cmake \
       -B build \
       -DCMAKE_AR=/usr/bin/gcc-ar \
-      -DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
+      -DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
       -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
       -DWITH_MRUBY=on \
       -G Ninja \
@@ -63,7 +53,8 @@ ARG MUSTACHE_C_REVISION=7fe52392879d0188c172d94bb4fde7c513d6b929
 WORKDIR /tmp/mustache-c-build
 RUN curl -LSs "https://github.com/x86-64/mustache-c/archive/${MUSTACHE_C_REVISION}.tar.gz" | \
       tar --strip-components=1 -xz && \
-    CFLAGS="-flto -march=native -mtune=native -O3" ./autogen.sh && \
+    CFLAGS="-flto=auto -march=native -mtune=native -O3 -Wno-implicit-function-declaration" \
+      ./autogen.sh && \
     make -j "$(nproc)" install
 
 ARG H2O_APP_PREFIX
@@ -82,25 +73,12 @@ RUN cmake \
 
 FROM "ubuntu:${UBUNTU_VERSION}"
 
-ARG POSTGRESQL_VERSION=17
-
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get -yqq update && \
-    apt-get -yqq install \
-      ca-certificates \
-      curl \
-      lsb-release && \
-    install -dm755 /usr/share/postgresql-common/pgdg && \
-    curl --fail -LSso /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc \
-      "https://www.postgresql.org/media/keys/ACCC4CF8.asc" && \
-    sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] \
-      https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > \
-      /etc/apt/sources.list.d/pgdg.list' && \
-    apt-get -yqq update && \
     apt-get -yqq install \
       libnuma1 \
-      libyajl2 \
-      "postgresql-client-${POSTGRESQL_VERSION}"
+      libpq5 \
+      libyajl2
 ARG H2O_APP_PREFIX
 COPY --from=compile "${H2O_APP_PREFIX}" "${H2O_APP_PREFIX}/"
 COPY --from=compile /usr/local/lib/libmustache_c.so "${H2O_APP_PREFIX}/lib/"
@@ -113,10 +91,10 @@ ARG TFB_TEST_NAME
 CMD ["taskset", \
      "-c", \
      "0", \
-     "/opt/h2o_app/bin/h2o_app", \
+     "/opt/h2o-app/bin/h2o-app", \
      "-a20", \
      "-d", \
      "dbname=hello_world host=tfb-database password=benchmarkdbpass sslmode=disable user=benchmarkdbuser", \
      "-f", \
-     "/opt/h2o_app/share/h2o_app/template", \
+     "/opt/h2o-app/share/h2o-app/template", \
      "-m1"]

frameworks/C/h2o/src/database.c

@@ -186,7 +186,7 @@ static int flush_connection(h2o_socket_cb cb, db_conn_t *conn)
 
 	if (send_status < 0)
 		LIBRARY_ERROR("PQflush", PQerrorMessage(conn->conn));
-	else if (send_status)
+	else if (send_status && !h2o_socket_is_writing(conn->sock))
 		h2o_socket_notify_write(conn->sock, cb);
 
 	return send_status < 0;

frameworks/CSharp/akazawayun.pro/README.md

@@ -0,0 +1 @@
+AkazawaYun.PRO(https://akazawayun.cn/#akzLearning#%E5%BF%AB%E9%80%9F%E5%85%A5%E9%97%A8)

frameworks/CSharp/akazawayun.pro/akazawayun.pro.dockerfile

@@ -0,0 +1,13 @@
+# 此阶段用于生成项目
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS publish
+WORKDIR /app
+COPY src .
+RUN dotnet publish -c Release -o /app/publish
+
+# 此阶段用于运行
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS runtime
+WORKDIR /app
+COPY --from=publish /app/publish .
+
+EXPOSE 2022
+ENTRYPOINT ["dotnet", "AkazawaYun.FrameworkBenchmarks.dll"]

frameworks/CSharp/akazawayun.pro/benchmark_config.json

@@ -0,0 +1,25 @@
+{
+    "framework": "akazawayun.pro",
+    "tests": [
+        {
+            "default": {
+                "display_name": "akazawayun.pro",
+                "framework": "akazawayun.pro",
+                "webserver": "akazawayun.pro",
+                "plaintext_url": "/post/plaintext",
+                "json_url": "/post/json",
+                "port": 2022,
+                "classification": "Micro",
+                "approach": "Realistic",
+                "platform": ".NET",
+                "language": "C#",
+                "flavor": "CoreCLR",
+                "os": "Linux",
+                "database_os": "Linux",
+                "database": "MySQL",
+                "orm": "Micro",
+                "notes": ""
+            }
+        }
+    ]
+}

frameworks/CSharp/akazawayun.pro/src/AkazawaYun.FrameworkBenchmarks.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="AkazawaYun.PRO" Version="1.13.25.727" />
+  </ItemGroup>
+
+</Project>

frameworks/CSharp/akazawayun.pro/src/Program.cs

@@ -0,0 +1,41 @@
+using AkazawaYun.PRO7;
+using AkazawaYun.PRO7.AkazawaYunWebInterceptor;
+using System.Text.Json.Serialization;
+
+namespace AkazawaYun.FrameworkBenchmarks;
+
+public class Program : IPostFunction
+{
+    static async Task Main()
+    {
+        akzJson.Config(null, Json.Default);
+        var server = await akzWebBuilder.Shared.Load().SetDefault().Build()
+            .Config<IWebReceptor, akzWebInterceptor>(itc =>
+            {
+                itc.AddInterceptor(new akzWebInterceptorNotOnlyPost());
+            }).Launch();
+        akzLog.Default = akzLog.Output.None;
+        await Task.Delay(-1);
+    }
+
+
+    public static ValueTask<HttpRes> plaintext(HttpReq _)
+    {
+        return HttpRes.HttpOK("Hello, World!", ".txt");
+    }
+    public static ValueTask<HttpRes> json(HttpReq _)
+    {
+        return HttpRes.HttpJson(new JsonResponse
+        {
+            message = "Hello, World!"
+        });
+    }
+}
+
+public class JsonResponse
+{
+    public string? message { get; set; }
+}
+
+[JsonSerializable(typeof(JsonResponse))]
+public partial class Json : JsonSerializerContext { }

frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 RUN apt-get update
 RUN apt-get -yqq install clang zlib1g-dev
 RUN apt-get update
@@ -8,7 +8,7 @@ COPY src .
 RUN dotnet publish -c Release -o out /p:Database=mysql
 
 # Construct the actual image that will run
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
 
 RUN apt-get update
 # The following installs standard versions unixodbc and pgsqlodbc
@@ -18,6 +18,7 @@ RUN apt-get update
 
 WORKDIR /odbc
 
+#TODOGITHUB
 RUN curl -L -o mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz https://downloads.mariadb.com/Connectors/odbc/connector-odbc-3.1.20/mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
 RUN tar -xvzf mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
 RUN cp mariadb-connector-odbc-3.1.20-debian-bookworm-amd64/lib/mariadb/libm* /usr/lib/
@@ -45,8 +46,10 @@ WORKDIR /app
 COPY --from=build /app/out ./
 
 RUN cp /usr/lib/libm* /app
-#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
+#TODOGITHUB
 RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
+#TODOLOCAL
+#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
 
 EXPOSE 8080
 

frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile

@@ -1,13 +1,13 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 RUN apt-get update
-RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
+RUN apt-get -yqq install clang zlib1g-dev
 
 WORKDIR /app
 COPY src .
 RUN dotnet publish -c Release -o out /p:Database=postgresql
 
 # Construct the actual image that will run
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
 
 RUN apt-get update
 RUN apt-get install -y unixodbc-dev unixodbc odbc-postgresql
@@ -27,9 +27,10 @@ ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
 
-#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
+#TODOGITHUB
 RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
-
+#TODOLOCAL
+#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
 
 EXPOSE 8080