Skip to content
Merged

aa #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
567e0d9
update to wildfly 23 and JDK16 (#6456)
codylerum Mar 17, 2021
bb3ee2e
PGO has been removed (#6457)
benaadams Mar 17, 2021
2dcee15
Lithium update. (#6460)
matt-42 Mar 17, 2021
e1ea02f
update smart-sockt to 1.5.7-SNAPSHOT (#6459)
smthing Mar 17, 2021
1d1f1ac
Fix display name for Ben (#6461)
benaadams Mar 18, 2021
3daee00
Update 2.3.0 (#6462)
redkale Mar 18, 2021
5dcfedc
Bump jinja2 from 2.11.1 to 2.11.3 in /frameworks/Python/responder (#6…
dependabot[bot] Mar 22, 2021
3a27fc5
Bump jinja2 from 2.10.1 to 2.11.3 in /frameworks/Python/flask (#6468)
dependabot[bot] Mar 22, 2021
98b169a
Bump jinja2 from 2.10.1 to 2.11.3 in /frameworks/Python/api_hour (#6471)
dependabot[bot] Mar 22, 2021
4769114
Update 2.3.0 (#6467)
redkale Mar 22, 2021
e764543
Bump jinja2 from 2.11.1 to 2.11.3 in /frameworks/Python/uvicorn (#6472)
dependabot[bot] Mar 22, 2021
0823ab0
Update node version for nodejs (#6479)
JHyeok Mar 22, 2021
a96fa1a
Update node version for nestjs (#6478)
JHyeok Mar 22, 2021
fa1e3f1
Update node version for fastify (#6477)
JHyeok Mar 22, 2021
6f2511d
Bump jinja2 from 2.11.1 to 2.11.3 in /frameworks/Python/starlette (#6…
dependabot[bot] Mar 22, 2021
e50121e
Bump jinja2 from 2.11.2 to 2.11.3 in /frameworks/Python/aiohttp (#6476)
dependabot[bot] Mar 22, 2021
bb53a07
Bump jinja2 from 2.10.1 to 2.11.3 in /frameworks/Python/morepath (#6473)
dependabot[bot] Mar 22, 2021
97dfc71
Bump jinja2 from 2.10.1 to 2.11.3 in /frameworks/Python/klein (#6470)
dependabot[bot] Mar 22, 2021
84db92b
Bump jinja2 from 2.10.1 to 2.11.3 in /frameworks/Python/turbogears (#…
dependabot[bot] Mar 22, 2021
2f80ec0
[Java] Update ActiveJ to v4.1 (#6481)
eduard-vasinskyi Mar 22, 2021
9e02db7
Adding framework as per Issue 6466 (#6483)
bdw429s Mar 22, 2021
5c696ef
racket: upgrade to 8.0 (#6480)
Bogdanp Mar 23, 2021
569cd53
build: update corert compiler (#6485)
hez2010 Mar 23, 2021
44772ad
ntex: use mimalloc for db (#6488)
fafhrd91 Mar 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions frameworks/C++/lithium/compile_libpq.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
#! /bin/sh

# Compile libpq
commit=b787d4ce6d910080065025bcd5f968544997271f

wget -nv https://github.com/postgres/postgres/archive/$commit.zip
unzip -q $commit.zip
cd postgres-$commit
if [ "$1" = "batchmode" ]; then

if [ "$1" = "batchmode_patch" ]; then
commit=b787d4ce6d910080065025bcd5f968544997271f
wget -nv https://github.com/postgres/postgres/archive/$commit.zip
unzip -q $commit.zip
cd postgres-$commit
wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
git apply ./v22-0001-libpq-batch.patch
else
commit=7f7f25f15edb6eacec58179ef5285e874aa4435b
wget -nv https://github.com/postgres/postgres/archive/$commit.zip
unzip -q $commit.zip
cd postgres-$commit
fi

./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
Expand Down
4 changes: 2 additions & 2 deletions frameworks/C++/lithium/lithium-postgres-batch-beta.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get install -yqq bison flex

COPY ./ ./

RUN ./compile_libpq.sh batchmode
RUN ./compile_libpq.sh
ENV LD_LIBRARY_PATH=/usr/lib

CMD ./compile-batch.sh TFB_PGSQL 16b3f43a2b292e5349b7b528fa9410b3239c15cb
CMD ./compile-batch.sh TFB_PGSQL 78ccb291a94679bf567ece2428d2763d80fc0029
2 changes: 1 addition & 1 deletion frameworks/C++/lithium/lithium-postgres-batch.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get install -yqq bison flex

COPY ./ ./

RUN ./compile_libpq.sh batchmode
RUN ./compile_libpq.sh batchmode_patch
ENV LD_LIBRARY_PATH=/usr/lib

EXPOSE 8080
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CFML/CFML/benchmark_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"approach": "Realistic",
"classification": "Platform",
"database": "Postgres",
"framework": "None",
"framework": "CFML",
"language": "CFML",
"flavor": "None",
"orm": "raw",
Expand All @@ -38,7 +38,7 @@
"approach": "Realistic",
"classification": "Platform",
"database": "Postgres",
"framework": "None",
"framework": "CFML",
"language": "CFML",
"flavor": "None",
"orm": "raw",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<!-- Opt out of the "easy mode" of the CoreRT compiler (http://aka.ms/OptimizeCoreRT) -->
<TrimMode>link</TrimMode>
<IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
<IlcOptimizationPreference>Speed</IlcOptimizationPreference>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,6 +21,6 @@

<ItemGroup>
<PackageReference Include="Utf8Json" Version="1.3.7" />
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-alpha.*" />
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-*" />
</ItemGroup>
</Project>
40 changes: 0 additions & 40 deletions frameworks/CSharp/aspnetcore/config.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
[framework]
name = "aspnetcore"

[pgo]
urls.plaintext = "/plaintext"
urls.json = "/json"
approach = "Stripped"
classification = "Platform"
database = "None"
database_os = "Linux"
os = "Linux"
orm = "Raw"
platform = ".NET"
webserver = "Kestrel"
versus = "aspcore"

[ado-pg]
urls.db = "/db"
urls.query = "/queries/"
Expand Down Expand Up @@ -69,18 +56,6 @@ platform = ".NET"
webserver = "Kestrel"
versus = "aspcore"

[pgo-pg-up]
urls.update = "/updates/"
approach = "Stripped"
classification = "Platform"
database = "Postgres"
database_os = "Linux"
os = "Linux"
orm = "Raw"
platform = ".NET"
webserver = "Kestrel"
versus = "aspcore-ado-pg-up"

[mvc]
urls.plaintext = "/mvc/plaintext"
urls.json = "/mvc/json"
Expand Down Expand Up @@ -246,21 +221,6 @@ platform = ".NET"
webserver = "Kestrel"
versus = "aspcore-ado-pg"

[pgo-pg]
urls.db = "/db"
urls.query = "/queries/"
urls.fortune = "/fortunes"
urls.cached_query = "/cached-worlds/"
approach = "Stripped"
classification = "Platform"
database = "Postgres"
database_os = "Linux"
os = "Linux"
orm = "Raw"
platform = ".NET"
webserver = "Kestrel"
versus = "aspcore-ado-pg"

[mvc-ef-pg-up]
urls.update = "/mvc/updates/ef?queries="
approach = "Realistic"
Expand Down
4 changes: 2 additions & 2 deletions frameworks/CSharp/ben/benchmark_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"approach": "Realistic",
"classification": "Micro",
"database": "Postgres",
"framework": "ASP.NET Core",
"framework": "Ben",
"language": "C#",
"orm": "micro",
"platform": ".NET",
"flavor": "CoreCLR",
"webserver": "Kestrel",
"os": "Linux",
"database_os": "Linux",
"display_name": "ASP.NET Core",
"display_name": "Ben",
"notes": "",
"versus": "aspcore"
}
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/activej/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>io.activej</groupId>
<artifactId>activej-launchers-http</artifactId>
<version>4.0</version>
<version>4.1</version>
</dependency>
<dependency>
<groupId>com.dslplatform</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package io.activej.http.benchmark;

import com.dslplatform.json.CompiledJson;

@CompiledJson
public final class HelloWorldObject {
private final String message;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ AsyncServlet jsonServlet(JsonWriter writer) {
return Promise.ofException(HttpError.ofCode(400, "Failed to serialize JSON", e));
}
return HttpResponse.ok200()
.withBody(ByteBuf.wrapForReading(writer.toByteArray()))
.withBody(ByteBuf.wrap(writer.getByteBuffer(), 0, writer.size()))
.withHeader(HttpHeaders.CONTENT_TYPE, JSON_CONTENT_TYPE_HEADER_VALUE)
.withHeader(HttpHeaders.SERVER, SERVER_HEADER_VALUE)
.withHeader(HttpHeaders.DATE, dateRef.get());
Expand Down
38 changes: 38 additions & 0 deletions frameworks/Java/redkale/benchmark_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,44 @@
"notes": "",
"versus": "Redkale"
},
"jdk16": {
"plaintext_url": "/plaintext",
"json_url": "/json",
"port": 8080,
"approach": "Realistic",
"classification": "Fullstack",
"database": "Postgres",
"framework": "Redkale",
"language": "Java",
"flavor": "None",
"orm": "Raw",
"platform": "Redkale",
"webserver": "Redkale",
"os": "Linux",
"database_os": "Linux",
"display_name": "redkale-io",
"notes": "",
"versus": "Redkale"
},
"zgc": {
"plaintext_url": "/plaintext",
"json_url": "/json",
"port": 8080,
"approach": "Realistic",
"classification": "Fullstack",
"database": "Postgres",
"framework": "Redkale",
"language": "Java",
"flavor": "None",
"orm": "Raw",
"platform": "Redkale",
"webserver": "Redkale",
"os": "Linux",
"database_os": "Linux",
"display_name": "redkale-io",
"notes": "",
"versus": "Redkale"
},
"io": {
"plaintext_url": "/plaintext",
"json_url": "/json",
Expand Down
3 changes: 2 additions & 1 deletion frameworks/Java/redkale/conf/application.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
<executor threads="0"/>
<properties>
<property name="system.property.convert.tiny" value="false"/>
<property name="system.property.http.response.header.server" value="redkale"/>
<property name="system.property.http.response.header.connection" value="none"/>
</properties>
</resources>

<server protocol="HTTP" iogroup="" lazy="true" port="8080">
<server protocol="HTTP" iogroup="client" lazy="true" port="8080">
<response>
<contenttype plain="text/plain" json="application/json"/>
<date period="1000"/>
Expand Down
1 change: 1 addition & 0 deletions frameworks/Java/redkale/conf/logging.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%m/log-warnerr-%d.log
java.util.logging.FileHandler.append = true

java.util.logging.ConsoleHandler.level = INFO

26 changes: 26 additions & 0 deletions frameworks/Java/redkale/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,29 @@ orm = "Raw"
platform = "Redkale"
webserver = "Redkale"
versus = "Redkale"

[jdk16]
urls.plaintext = "/plaintext"
urls.json = "/json"
approach = "Realistic"
classification = "Fullstack"
database = "None"
database_os = "Linux"
os = "Linux"
orm = "Raw"
platform = "Redkale"
webserver = "Redkale"
versus = "Redkale"

[zgc]
urls.plaintext = "/plaintext"
urls.json = "/json"
approach = "Realistic"
classification = "Fullstack"
database = "None"
database_os = "Linux"
os = "Linux"
orm = "Raw"
platform = "Redkale"
webserver = "Redkale"
versus = "Redkale"
15 changes: 15 additions & 0 deletions frameworks/Java/redkale/redkale-jdk16.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM maven:3.6.3-openjdk-16-slim as maven
WORKDIR /redkale
COPY src src
COPY conf conf
COPY pom.xml pom.xml
RUN mvn package -q

FROM openjdk:16-jdk-slim
WORKDIR /redkale
COPY conf conf
COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar

EXPOSE 8080

CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=160000", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
15 changes: 15 additions & 0 deletions frameworks/Java/redkale/redkale-zgc.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM maven:3.6.3-openjdk-16-slim as maven
WORKDIR /redkale
COPY src src
COPY conf conf
COPY pom.xml pom.xml
RUN mvn package -q

FROM openjdk:16-jdk-slim
WORKDIR /redkale
COPY conf conf
COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar

EXPOSE 8080

CMD ["java", "-server", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC", "-XX:AutoBoxCacheMax=160000", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
Loading