Merge branch 'TechEmpower:master' into tio-server

Author: litongjava

.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

.gitignore

@@ -69,3 +69,4 @@ benchmark.cfg
 
 # python
 .venv/
+frameworks/CSharp/akazawayun.pro/Dockerfile

Dockerfile

@@ -4,10 +4,11 @@ ARG DEBIAN_FRONTEND=noninteractive
 # WARNING: DON'T PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
 # One -q produces output suitable for logging (mostly hides
 # progress indicators)
-RUN apt-get -yqq update && \
-    apt-get -yqq install \
+RUN apt-get install \
+      --no-install-recommends \
       -o Dpkg::Options::="--force-confdef" \
       -o Dpkg::Options::="--force-confold" \
+      -qqUy \
       cloc \
       curl \
       gcc \

entrypoint.sh

@@ -4,4 +4,4 @@ set -eo pipefail -u
 
 chown -LR "$USER_ID" /var/run
 # Drop permissions of user to match those of the host system
-gosu "$USER_ID" python3 "${FWROOT}/toolset/run-tests.py" "$@"
+exec gosu "$USER_ID" python3 "${FWROOT}/toolset/run-tests.py" "$@"

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++/paozhu/paozhu_benchmark/CMakeLists.txt

@@ -197,9 +197,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
 
 if(${mode} AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
-  add_executable(paozhu ${CMAKE_CURRENT_SOURCE_DIR}/test/testbenchmark.cpp ${common_list} ${viewsrc_list} ${FRAMEWORK_CPP_PATH} ${orm_list} ${reflect_list} ${src_list} ${source_list} ${controller_list})
+  add_executable(paozhu ${CMAKE_CURRENT_SOURCE_DIR}/startup/main_docker.cpp ${common_list} ${viewsrc_list} ${FRAMEWORK_CPP_PATH} ${orm_list} ${reflect_list} ${src_list} ${source_list} ${controller_list})
 else()
-  add_executable(paozhu ${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp ${common_list} ${viewsrc_list} ${FRAMEWORK_CPP_PATH} ${orm_list} ${reflect_list} ${src_list} ${source_list} ${controller_list})
+  add_executable(paozhu ${CMAKE_CURRENT_SOURCE_DIR}/startup/main_dev.cpp ${common_list} ${viewsrc_list} ${FRAMEWORK_CPP_PATH} ${orm_list} ${reflect_list} ${src_list} ${source_list} ${controller_list})
 endif()
 
 if (ENABLE_WIN_VCPKG STREQUAL "ON")

frameworks/C/h2o/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.18.0)
 project(h2o-app)
+find_library(BPF_LIB bpf REQUIRED)
 find_library(CRYPTO_LIB crypto REQUIRED)
 find_library(H2O_LIB h2o-evloop REQUIRED)
 find_library(MUSTACHE_C_LIB mustache_c REQUIRED)
@@ -8,27 +9,56 @@ find_library(PQ_LIB pq REQUIRED)
 find_library(SSL_LIB ssl REQUIRED)
 find_library(YAJL_LIB yajl REQUIRED)
 find_library(Z_LIB z REQUIRED)
+find_path(ASM_INCLUDE asm/types.h REQUIRED)
+find_path(BPF_INCLUDE bpf/libbpf.h REQUIRED)
 find_path(H2O_INCLUDE h2o.h REQUIRED)
 find_path(MUSTACHE_C_INCLUDE mustache.h REQUIRED)
 find_path(NUMA_INCLUDE numaif.h REQUIRED)
 find_path(OPENSSL_INCLUDE openssl/ssl.h REQUIRED)
 find_path(PQ_INCLUDE postgresql/libpq-fe.h REQUIRED)
 find_path(YAJL_INCLUDE yajl/yajl_gen.h REQUIRED)
-include_directories(src ${H2O_INCLUDE} ${MUSTACHE_C_INCLUDE} ${NUMA_INCLUDE} ${OPENSSL_INCLUDE})
-include_directories(${PQ_INCLUDE} ${YAJL_INCLUDE})
+find_program(BPFTOOL_BIN bpftool REQUIRED)
+find_program(CLANG_BIN clang REQUIRED)
+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)
 set(COMMON_OPTIONS -flto=auto -pthread)
-add_compile_options(-pedantic -Wall -Wextra ${COMMON_OPTIONS})
+set(WARNING_OPTIONS -pedantic -Wall -Wextra)
+add_compile_options(${COMMON_OPTIONS} ${WARNING_OPTIONS})
 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")
-file(GLOB_RECURSE SOURCES "src/*.c")
-add_executable(${PROJECT_NAME} ${SOURCES})
+add_custom_command(
+  OUTPUT ${CMAKE_BINARY_DIR}/socket_load_balancer.h
+  COMMAND ${CLANG_BIN}
+            -c
+            -DNDEBUG
+            -g
+            -I ${ASM_INCLUDE}
+            -I ${BPF_INCLUDE}
+            -mcpu=v3
+            -o ${CMAKE_BINARY_DIR}/socket_load_balancer.o
+            -O3
+            -std=gnu11
+            -target bpf
+            ${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}/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}/socket_load_balancer.h)
+file(GLOB_RECURSE HANDLER_SOURCES "src/handlers/*.c")
+file(GLOB SOURCES "src/*.c")
+add_executable(${PROJECT_NAME} ${HANDLER_SOURCES} ${SOURCES})
+add_dependencies(${PROJECT_NAME} generated_headers)
 target_link_libraries(${PROJECT_NAME} ${COMMON_OPTIONS})
-target_link_libraries(${PROJECT_NAME} ${H2O_LIB} m ${MUSTACHE_C_LIB} ${NUMA_LIB} ${PQ_LIB})
-target_link_libraries(${PROJECT_NAME} ${SSL_LIB} ${CRYPTO_LIB} ${YAJL_LIB} ${Z_LIB})
+target_link_libraries(${PROJECT_NAME} ${BPF_LIB} ${H2O_LIB} m ${MUSTACHE_C_LIB} ${NUMA_LIB})
+target_link_libraries(${PROJECT_NAME} ${PQ_LIB} ${SSL_LIB} ${CRYPTO_LIB} ${YAJL_LIB} ${Z_LIB})
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 file(GLOB TEMPLATES "template/*")
 install(FILES ${TEMPLATES} DESTINATION share/${PROJECT_NAME}/template)

frameworks/C/h2o/README.md

@@ -1,13 +1,22 @@
-# h2o
+# h2o-app
 
 This is a framework implementation using the [H2O](https://h2o.examp1e.net) HTTP server. It
 builds directly on top of `libh2o` instead of running the standalone server.
 
 ## Requirements
 
-[CMake](https://cmake.org), [H2O](https://h2o.examp1e.net), [libpq](https://www.postgresql.org),
-[mustache-c](https://github.com/x86-64/mustache-c), [numactl](https://github.com/numactl/numactl),
-[OpenSSL](https://www.openssl.org), [YAJL](https://lloyd.github.io/yajl)
+[bpftool](https://bpftool.dev/),
+[Clang](https://clang.llvm.org/),
+[CMake](https://cmake.org/),
+[GNU C Library](https://www.gnu.org/software/libc),
+[H2O](https://h2o.examp1e.net/),
+[libbpf](https://github.com/libbpf/libbpf),
+[libpq](https://www.postgresql.org/),
+[Linux](https://kernel.org/),
+[mustache-c](https://github.com/x86-64/mustache-c),
+[numactl](https://github.com/numactl/numactl),
+[OpenSSL](https://www.openssl.org/),
+[YAJL](https://lloyd.github.io/yajl)
 
 ## Test implementations
 
@@ -30,4 +39,4 @@ options respectively.
 
 ## Contact
 
-Anton Kirilov <antonvkirilov@gmail.com>
+Anton Kirilov <antonvkirilov@proton.me>

frameworks/C/h2o/h2o.dockerfile

@@ -2,52 +2,53 @@ 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
-RUN apt-get -yqq update && \
-    apt-get -yqq install \
+RUN apt-get install \
+      --no-install-recommends \
+      -qqUy \
       autoconf \
+      automake \
       bison \
+      bpftool \
+      clang \
       cmake \
       curl \
       flex \
-      g++ \
-      libbpfcc-dev \
+      gcc \
+      libbpf-dev \
       libbrotli-dev \
       libcap-dev \
       libnuma-dev \
       libpq-dev \
       libssl-dev \
       libtool \
+      liburing-dev \
       libuv1-dev \
-      libwslay-dev \
       libyajl-dev \
       libz-dev \
-      llvm-dev \
       make \
-      ninja-build \
       pkg-config \
-      rsync \
       ruby \
       systemtap-sdt-dev
 
-ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
+RUN echo "[timing] Building H2O: $(date)"
+ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402
 
 WORKDIR /tmp/h2o-build
 RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
       tar --strip-components=1 -xz && \
     cmake \
       -B build \
-      -DCMAKE_AR=/usr/bin/gcc-ar \
       -DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
-      -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
       -DWITH_MRUBY=on \
-      -G Ninja \
       -S . && \
     cmake --build build -j && \
     cmake --install build
 
+RUN echo "[timing] Building mustache-c: $(date)"
 ARG MUSTACHE_C_REVISION=7fe52392879d0188c172d94bb4fde7c513d6b929
 
 WORKDIR /tmp/mustache-c-build
@@ -57,6 +58,7 @@ RUN curl -LSs "https://github.com/x86-64/mustache-c/archive/${MUSTACHE_C_REVISIO
       ./autogen.sh && \
     make -j "$(nproc)" install
 
+RUN echo "[timing] Building h2o-app: $(date)"
 ARG H2O_APP_PREFIX
 WORKDIR /tmp/build
 COPY CMakeLists.txt ../
@@ -66,19 +68,24 @@ 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 .
+RUN echo "[timing] Finished compiling: $(date)"
 
 FROM "ubuntu:${UBUNTU_VERSION}"
 
+RUN echo "[timing] Installing final system packages: $(date)"
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get -yqq update && \
-    apt-get -yqq install \
+RUN apt-get install \
+      --no-install-recommends \
+      -qqUy \
+      libbpf1 \
       libnuma1 \
       libpq5 \
+      liburing2 \
       libyajl2
+RUN echo "[timing] Copying h2o-app to its final location: $(date)"
 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/"
@@ -87,6 +94,7 @@ EXPOSE 8080
 ARG BENCHMARK_ENV
 ARG TFB_TEST_DATABASE
 ARG TFB_TEST_NAME
+RUN echo "[timing] Running h2o-app: $(date)"
 
 CMD ["taskset", \
      "-c", \

frameworks/C/h2o/src/bpf/socket_load_balancer.c

@@ -0,0 +1,58 @@
+/*
+ Copyright (c) 2025 Anton Valentinov Kirilov
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ associated documentation files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or
+ substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// TODO: Switch to the standard atomics (<stdatomic.h>) after
+// the system header file mess gets sorted for eBPF.
+#include <stdbool.h>
+#include <stddef.h>
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+
+// We need a finite number of iterations to keep the eBPF verifier happy.
+#define MAX_ITERATIONS 42
+
+static size_t thread_idx;
+size_t thread_num = 1;
+
+SEC("socket") int socket_load_balancer(void *skb)
+{
+	(void) skb;
+
+	// TODO: Use __atomic_load_n() after LLVM starts supporting it for eBPF.
+	size_t idx = *(const volatile size_t *) &thread_idx;
+	int ret = thread_num;
+
+	__atomic_thread_fence(__ATOMIC_RELAXED);
+
+	for (size_t i = 0; i < MAX_ITERATIONS; i++) {
+		const size_t new_idx = (idx + 1) % thread_num;
+
+		if (__atomic_compare_exchange_n(&thread_idx,
+		                                &idx,
+		                                new_idx,
+		                                false,
+		                                __ATOMIC_RELAXED,
+		                                __ATOMIC_RELAXED)) {
+			ret = idx;
+			break;
+		}
+	}
+
+	return ret;
+}