Merge pull request LesnyRumcajs#138 from LesnyRumcajs/update-java-benchs

Update java_grpc benchmarks
van76007 · May 10, 2021 · e52aca9 · e52aca9
2 parents cc8c28e + c84585f
commit e52aca9
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 30 deletions.
diff --git a/java_grpc_g1gc_bench/Dockerfile b/java_grpc_g1gc_bench/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:14.0.2_8-jre-hotspot-bionic
+FROM adoptopenjdk:16_36-jdk-hotspot
 
 WORKDIR /app
 COPY java_grpc_sgc_bench /app

diff --git a/java_grpc_pgc_bench/Dockerfile b/java_grpc_pgc_bench/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:14.0.2_8-jre-hotspot-bionic
+FROM adoptopenjdk:16_36-jdk-hotspot
 
 WORKDIR /app
 COPY java_grpc_sgc_bench /app

diff --git a/java_grpc_sgc_bench/Dockerfile b/java_grpc_sgc_bench/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:14.0.2_8-jre-hotspot-bionic
+FROM adoptopenjdk:16_36-jdk-hotspot
 
 WORKDIR /app
 COPY java_grpc_sgc_bench /app

diff --git a/java_grpc_sgc_bench/gradle/wrapper/gradle-wrapper.jar b/java_grpc_sgc_bench/gradle/wrapper/gradle-wrapper.jar
diff --git a/java_grpc_sgc_bench/gradle/wrapper/gradle-wrapper.properties b/java_grpc_sgc_bench/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java_grpc_sgc_bench/gradlew b/java_grpc_sgc_bench/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/java_grpc_sgc_bench/gradlew.bat b/java_grpc_sgc_bench/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/java_grpc_sgc_bench/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java b/java_grpc_sgc_bench/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java
@@ -76,7 +76,7 @@ private ServerBuilder<?> configureExecutor(ServerBuilder<?> sb) {
      * Use a Direct Executor by default (best performance) since the GRPC
      * service in this code is guaranteed non-blocking
      */
-    var value = System.getenv().getOrDefault("JVM_EXECUTOR_TYPE", "direct");
+    var value = System.getenv().getOrDefault("JVM_EXECUTOR_TYPE", "workStealing");
     switch (value) {
       case "direct" -> sb = sb.directExecutor();
       case "single" -> sb = sb.executor(Executors.newSingleThreadExecutor());

diff --git a/java_grpc_she_bench/Dockerfile b/java_grpc_she_bench/Dockerfile
@@ -1,12 +1,12 @@
-FROM adoptopenjdk:14.0.2_8-jre-hotspot-bionic
+FROM adoptopenjdk:16_36-jdk-hotspot
 
 WORKDIR /app
 COPY java_grpc_sgc_bench /app
 COPY proto/helloworld/helloworld.proto /app/src/main/proto/helloworld.proto
 
 RUN /app/gradlew installDist
 
-ENV GC "-XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC"
+ENV GC "-XX:+UseShenandoahGC"
 ENV JAVA_OPTS "${GC} -XX:MinRAMPercentage=70 -XX:MaxRAMPercentage=70"
 
 ENTRYPOINT [ "/app/build/install/examples/bin/hello-world-server" ]

diff --git a/java_grpc_zgc_bench/Dockerfile b/java_grpc_zgc_bench/Dockerfile
@@ -1,12 +1,12 @@
-FROM adoptopenjdk:14.0.2_8-jre-hotspot-bionic
+FROM adoptopenjdk:16_36-jdk-hotspot
 
 WORKDIR /app
 COPY java_grpc_sgc_bench /app
 COPY proto/helloworld/helloworld.proto /app/src/main/proto/helloworld.proto
 
 RUN /app/gradlew installDist
 
-ENV GC "-XX:+UnlockExperimentalVMOptions -XX:+UseZGC"
+ENV GC "-XX:+UseZGC"
 ENV JAVA_OPTS "${GC} -XX:MinRAMPercentage=70 -XX:MaxRAMPercentage=70"
 
 ENTRYPOINT [ "/app/build/install/examples/bin/hello-world-server" ]