diff --git a/.github/workflows/bench.yaml b/.github/workflows/bench.yaml index 31dce62..e6aa6c9 100644 --- a/.github/workflows/bench.yaml +++ b/.github/workflows/bench.yaml @@ -49,7 +49,10 @@ jobs: components: native-image github-token: ${{ secrets.GITHUB_TOKEN }} - name: bench - run: java -jar benchmark.jar $GITHUB_STEP_SUMMARY + run: | + echo '```' >> $GITHUB_STEP_SUMMARY + java -jar benchmark.jar $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY test: runs-on: ubuntu-latest @@ -98,4 +101,6 @@ jobs: merge-multiple: true - name: result run: | + echo '```' >> $GITHUB_STEP_SUMMARY bash bench/result.sh out >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY diff --git a/bench/run.sh b/bench/run.sh index c21dbfa..0809f41 100644 --- a/bench/run.sh +++ b/bench/run.sh @@ -1,7 +1,7 @@ #!/bin/bash unknow_start() { - java -jar unknow-server-test/unknow-server-test-jar/target/server.jar > logs/unknow.log 2>&1 & + java -jar unknow-server-test/unknow-server-test-jar/target/server.jar --http-addr :8080 --https-addr :8443 --keystore store.jks --keystore-pass 123456 > logs/unknow.log 2>&1 & pid=$! } unknow_stop() { @@ -10,7 +10,7 @@ unknow_stop() { } native_start() { chmod a+x server-native - ./server-native > logs/native.log 2>&1 & + ./server-native --http-addr :8080 --https-addr :8443 --keystore store.jks --keystore-pass 123456 > logs/native.log 2>&1 & pid=$! } native_stop() { @@ -39,6 +39,8 @@ cxf_stop=tomcat_stop mkdir -p out trap '[[ "$pid" ]] && kill -9 $pid' EXIT +keytool -genkey -alias server -keyalg RSA -validity 365 -keystore store.jks -keypass 123456 -storetype JKS -dname "C=FR" + ${1}_start sleep 10 echo -e "\nWarming up" diff --git a/bench/server.xml b/bench/server.xml index 8ff270f..0a15cc5 100644 --- a/bench/server.xml +++ b/bench/server.xml @@ -13,40 +13,25 @@ - - - - - - + + + - - - - - - - - - - - - diff --git a/bench/test.jmx b/bench/test.jmx index 8b051ab..08acd99 100644 --- a/bench/test.jmx +++ b/bench/test.jmx @@ -48,6 +48,7 @@ ${host} ${port} + http HttpClient4 1000 2000 @@ -149,6 +150,43 @@ + + ${c} + 0 + ${t} + true + true + continue + + -1 + false + + false + + + + + false + + + + 8443 + https + /test + GET + false + false + true + false + false + false + false + 6 + false + 0 + + + ${c} 0