Merge branch 'master' of https://github.com/TechEmpower/FrameworkBenc…

…hmarks

frameworks/C++/userver/userver-bare.dockerfile

@@ -6,7 +6,7 @@ RUN apt update && \
 
 WORKDIR /src
 RUN git clone https://github.com/userver-framework/userver.git && \
-    cd userver && git checkout ec1a3b07793f8d4cd0968cd61d8e6079d667a1e7
+    cd userver && git checkout bdd5e1e03921ff378b062f86a189c3cfa3d66332
 
 COPY userver_benchmark/ ./
 RUN mkdir build && cd build && \

frameworks/C++/userver/userver.dockerfile

@@ -6,7 +6,7 @@ RUN apt update && \
 
 WORKDIR /src
 RUN git clone https://github.com/userver-framework/userver.git && \
-    cd userver && git checkout ec1a3b07793f8d4cd0968cd61d8e6079d667a1e7
+    cd userver && git checkout bdd5e1e03921ff378b062f86a189c3cfa3d66332
 
 COPY userver_benchmark/ ./
 RUN mkdir build && cd build && \

frameworks/C++/userver/userver_configs/static_config.yaml

@@ -1,8 +1,7 @@
 # yaml
 components_manager:
     event_thread_pool:
-        threads: 9
-        dedicated_timer_threads: 1
+        threads: 8
     coro_pool:
         initial_size: 10000              # Preallocate 10000 coroutines at startup.
         max_size: 300000                 # Do not keep more than 300000 preallocated coroutines.
@@ -12,8 +11,9 @@ components_manager:
 
         main-task-processor:            # Make a task processor for CPU-bound couroutine tasks.
             thread_name: main-worker    # OS will show the threads of this task processor with 'main-worker' prefix.
-            worker_threads: 46
+            worker_threads: 48
             guess-cpu-limit: true
+            task-processor-queue: work-stealing-task-queue
 
         fs-task-processor:              # Make a separate task processor for filesystem bound tasks.
             thread_name: fs-worker

frameworks/C/h2o/h2o.dockerfile

@@ -109,4 +109,4 @@ CMD ["taskset", \
      "dbname=hello_world host=tfb-database password=benchmarkdbpass sslmode=disable user=benchmarkdbuser", \
      "-f", \
      "/opt/h2o_app/share/h2o_app/template", \
-     "-m2"]
+     "-m1"]

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

@@ -0,0 +1,51 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100 AS build
+RUN apt-get update
+RUN apt-get -yqq install clang zlib1g-dev
+RUN apt-get update
+
+WORKDIR /app
+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:8.0.0 AS runtime
+
+RUN apt-get update
+# The following installs standard versions unixodbc and pgsqlodbc
+# unixodbc still needs to be installed even if compiled locally
+RUN apt-get install -y unixodbc wget curl
+RUN apt-get update
+
+WORKDIR /odbc
+
+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/
+RUN cp -r /odbc/mariadb-connector-odbc-3.1.20-debian-bookworm-amd64/lib/mariadb /usr/local/lib/mariadb
+RUN rm mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
+#TODOLOCAL
+#RUN curl -L -o mariadb-connector-odbc-3.1.20-debian-bookworm-aarch64.tar.gz https://downloads.mariadb.com/Connectors/odbc/connector-odbc-3.1.20/mariadb-connector-odbc-3.1.20-debian-bookworm-aarch64.tar.gz
+#RUN tar -xvzf mariadb-connector-odbc-3.1.20-debian-bookworm-aarch64.tar.gz
+#RUN cp mariadb-connector-odbc-3.1.20-debian-bookworm-aarch64/lib/mariadb/libm* /usr/lib/
+#RUN cp -r /odbc/mariadb-connector-odbc-3.1.20-debian-bookworm-aarch64/lib/mariadb /usr/local/lib/mariadb
+#RUN rm mariadb-connector-odbc-3.1.20-debian-bookworm-aarch64.tar.gz
+
+ENV PATH=/usr/local/unixODBC/bin:$PATH
+
+WORKDIR /etc/
+COPY odbcinst.ini .
+
+# Full PGO
+ENV DOTNET_TieredPGO 1 
+ENV DOTNET_TC_QuickJitForLoops 1 
+ENV DOTNET_ReadyToRun 0
+
+ENV ASPNETCORE_URLS http://+:8080
+WORKDIR /app
+COPY --from=build /app/out ./
+
+RUN cp /usr/lib/libm* /app
+
+EXPOSE 8080
+
+ENTRYPOINT ["./appMpower"]

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

@@ -4,7 +4,7 @@ RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
 
 WORKDIR /app
 COPY src .
-RUN dotnet publish -c Release -o out /p:Driver=odbc
+RUN dotnet publish -c Release -o out /p:Database=postgresql
 
 # Construct the actual image that will run
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.0 AS runtime
@@ -18,6 +18,12 @@ ENV PATH=/usr/local/unixODBC/bin:$PATH
 WORKDIR /etc/
 COPY odbcinst.ini .
 
+# Full PGO
+ENV DOTNET_TieredPGO 1 
+ENV DOTNET_TC_QuickJitForLoops 1 
+ENV DOTNET_ReadyToRun 0
+
+ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
 

frameworks/CSharp/appmpower/appmpower.dockerfile

@@ -4,11 +4,17 @@ RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
 
 WORKDIR /app
 COPY src .
+#RUN dotnet publish appMpower/appMpower.csproj -c Release -o out
 RUN dotnet publish -c Release -o out
 
 # Construct the actual image that will run
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.0 AS runtime
+# Full PGO
+ENV DOTNET_TieredPGO 1 
+ENV DOTNET_TC_QuickJitForLoops 1 
+ENV DOTNET_ReadyToRun 0
 
+ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
 

frameworks/CSharp/appmpower/benchmark_config.json

@@ -39,11 +39,11 @@
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "appMpower [aot-no-reflection,odbc]",
+        "display_name": "appMpower [aot-no-reflection,pg,odbc]",
         "notes": "",
         "versus": "aspnetcore-minimal"
       },
-      "ado-pg": {
+      "odbc-my": {
         "db_url": "/db",
         "query_url": "/queries?c=",
         "update_url": "/updates?c=",
@@ -52,7 +52,7 @@
         "port": 8080,
         "approach": "Realistic",
         "classification": "Platform",
-        "database": "Postgres",
+        "database": "MySQL",
         "framework": "appmpower",
         "language": "C#",
         "orm": "Raw",
@@ -61,7 +61,7 @@
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "appMpower [aot-no-reflection,ado]",
+        "display_name": "appMpower [aot-no-reflection,my,odbc]",
         "notes": "",
         "versus": "aspnetcore-minimal"
       }

frameworks/CSharp/appmpower/config.toml

@@ -30,15 +30,15 @@ platform = ".NET"
 webserver = "Kestrel"
 versus = "aspnetcore-minimal"
 
-[ado-pg]
+[odbc-my]
 urls.db = "/db"
 urls.query = "/queries?c="
 urls.update = "/updates?c="
 urls.fortune = "/fortunes"
 urls.cached_query = "/cached-worlds?c="
 approach = "Realistic"
 classification = "Micro"
-database = "Postgres"
+database = "MySQL"
 database_os = "Linux"
 os = "Linux"
 orm = "Raw"

frameworks/CSharp/appmpower/odbcinst.ini

@@ -5,6 +5,7 @@ Pooling=0
 
 [ODBC Drivers]
 PostgreSQL = Installed
+MariaDB = Installed
 
 ;
 ;  odbcinst.ini
@@ -15,7 +16,16 @@ Description=ODBC for PostgreSQL
 ; in version 08.x. Note that the library can also be installed under an other
 ; path than /usr/local/lib/ following your installation.
 ; This is the standard location used by apt-get install -y unixodbc
+;ON SERVER
 Driver = /usr/lib/x86_64-linux-gnu/odbc/psqlodbcw.so
+;TODOLOCAL: ON MAC
+;Driver =/usr/lib/aarch64-linux-gnu/odbc/psqlodbcw.so
+
 ;Driver =/usr/local/pgsqlodbc/lib/psqlodbcw.so
 Threading = 0
 CPTimeout = 0
+
+[MariaDB]
+Description=MariaDB ODBC for MySQL
+Driver = /usr/lib/libmaodbc.so
+Threading   = 0