feat(build): support JDK 17 on x86

Author: halibobo1205

build.gradle

@@ -16,6 +16,7 @@ allprojects {
 def arch = System.getProperty("os.arch").toLowerCase(Locale.ROOT)
 def javaVersion = JavaVersion.current()
 def isArm64 = Architectures.AARCH64.isAlias(arch)
+def isCompatibleWith17 = JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)
 def archSource = isArm64 ? "arm" : "x86"
 def isMac = OperatingSystem.current().isMacOsX()
 
@@ -43,10 +44,10 @@ ext.archInfo = [
                 // https://github.com/grpc/grpc-java/pull/11371 , 1.64.x is not supported CentOS 7.
                 ProtocGenVersion: isArm64 || isMac ? '1.81.0' : '1.60.0'
         ],
-        VMOptions: isArm64 ? "${rootDir}/gradle/jdk17/java-tron.vmoptions" : "${rootDir}/gradle/java-tron.vmoptions"
+        VMOptions: isCompatibleWith17 ? "${rootDir}/gradle/jdk17/java-tron.vmoptions" : "${rootDir}/gradle/java-tron.vmoptions"
 ]
 
-if (!archInfo.java.is(archInfo.requires.JavaVersion)) {
+if (!javaVersion.isCompatibleWith(archInfo.requires.JavaVersion)) {
     throw new GradleException("Java ${archInfo.requires.JavaVersion} is required for ${archInfo.name}. Detected version ${archInfo.java}")
 }
 

framework/src/main/java/org/tron/program/FullNode.java

@@ -6,7 +6,6 @@
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
-import org.tron.common.arch.Arch;
 import org.tron.common.exit.ExitManager;
 import org.tron.common.log.LogService;
 import org.tron.common.parameter.CommonParameter;
@@ -23,7 +22,6 @@ public class FullNode {
    */
   public static void main(String[] args) {
     ExitManager.initExceptionHandler();
-    checkJdkVersion();
     Args.setParam(args, "config.conf");
     CommonParameter parameter = Args.getInstance();
 
@@ -66,13 +64,4 @@ public static void main(String[] args) {
     }
     appT.blockUntilShutdown();
   }
-
-  private static void checkJdkVersion() {
-    try {
-      Arch.throwIfUnsupportedJavaVersion();
-    } catch (UnsupportedOperationException e) {
-      System.err.println(e.getMessage());
-      throw new TronError(e, TronError.ErrCode.JDK_VERSION);
-    }
-  }
 }

framework/src/test/java/org/tron/core/exception/TronErrorTest.java

@@ -2,11 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.util.ContextInitializer;
@@ -32,7 +29,6 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.LoggerFactory;
 import org.tron.common.TestConstants;
-import org.tron.common.arch.Arch;
 import org.tron.common.log.LogService;
 import org.tron.common.parameter.RateLimiterInitialization;
 import org.tron.common.utils.ReflectUtils;
@@ -153,58 +149,4 @@ public void shutdownBlockTimeInitTest() {
     assertEquals(TronError.ErrCode.AUTO_STOP_PARAMS, thrown.getErrCode());
   }
 
-  @Test
-  public void testThrowIfUnsupportedJavaVersion() {
-    runArchTest("x86_64", "1.8", false);
-    runArchTest("x86_64", "11", true);
-    runArchTest("x86_64", "17", true);
-    runArchTest("aarch64", "17", false);
-    runArchTest("aarch64", "1.8", true);
-    runArchTest("aarch64", "11", true);
-  }
-
-  private void runArchTest(String osArch, String javaVersion, boolean expectThrow) {
-    try (MockedStatic<Arch> mocked = mockStatic(Arch.class)) {
-      boolean isX86 = "x86_64".equals(osArch);
-      boolean isArm64 = "aarch64".equals(osArch);
-
-      boolean isJava8 = "1.8".equals(javaVersion);
-      boolean isJava17 = "17".equals(javaVersion);
-
-      mocked.when(Arch::isX86).thenReturn(isX86);
-      mocked.when(Arch::isArm64).thenReturn(isArm64);
-
-      mocked.when(Arch::isJava8).thenReturn(isJava8);
-      mocked.when(Arch::isJava17).thenReturn(isJava17);
-
-      mocked.when(Arch::getOsArch).thenReturn(osArch);
-      mocked.when(Arch::javaSpecificationVersion).thenReturn(javaVersion);
-      mocked.when(Arch::withAll).thenReturn(String.format(
-          "Architecture: %s, Java Version: %s", osArch, javaVersion));
-
-      mocked.when(Arch::throwIfUnsupportedJavaVersion).thenCallRealMethod();
-
-      if (expectThrow) {
-        UnsupportedOperationException err = assertThrows(
-            UnsupportedOperationException.class,
-            Arch::throwIfUnsupportedJavaVersion);
-
-        String expectedJavaVersion = isX86 ? "1.8" : "17";
-        String expectedMessage = String.format(
-            "Java %s is required for %s architecture."
-                + " Detected version %s",
-            expectedJavaVersion, osArch, javaVersion);
-        assertEquals(expectedMessage, err.getMessage());
-        mocked.verify(Arch::withAll, times(1));
-      } else {
-        try {
-          Arch.throwIfUnsupportedJavaVersion();
-        } catch (Exception e) {
-          fail("Expected no exception, but got: " + e.getMessage());
-        }
-        mocked.verify(Arch::withAll, never());
-      }
-    }
-  }
-
 }

platform/src/main/java/common/org/tron/common/arch/Arch.java

@@ -62,27 +62,6 @@ public static boolean isArm64() {
     return osArch.contains("arm64") || osArch.contains("aarch64");
   }
 
-  public static boolean isX86() {
-    return !isArm64();
-  }
-
-  public static boolean isJava8() {
-    return javaSpecificationVersion().equals("1.8");
-  }
-
-  public static boolean isJava17() {
-    return javaSpecificationVersion().equals("17");
-  }
-
-  public static void throwIfUnsupportedJavaVersion() {
-    if ((isX86() && !isJava8()) || (isArm64() && !isJava17())) {
-      logger.info(withAll());
-      throw new UnsupportedOperationException(String.format(
-          "Java %s is required for %s architecture. Detected version %s", isX86() ? "1.8" : "17",
-          getOsArch(), javaSpecificationVersion()));
-    }
-  }
-
   public static void throwIfUnsupportedArm64Exception(String message) {
     if (isArm64()) {
       throw new UnsupportedOperationException(

…rm/org/tron/common/math/MathWrapper.java …on/org/tron/common/math/MathWrapper.javaplatform/src/main/java/arm/org/tron/common/math/MathWrapper.java renamed to platform/src/main/java/common/org/tron/common/math/MathWrapper.java platform/src/main/java/arm/org/tron/common/math/MathWrapper.java renamed to platform/src/main/java/common/org/tron/common/math/MathWrapper.java

@@ -29,6 +29,16 @@
 #
 ##############################################################################
 
+## Set TCMalloc as the memory allocator
+
+export LD_PRELOAD="/usr/lib64/libtcmalloc.so"
+export TCMALLOC_RELEASE_RATE=10
+
+# JDK
+ #export JAVA_HOME=/home/java-tron/jdk17
+ #export PATH=$JAVA_HOME/bin:$PATH
+ #export CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
+ #JDK
 
 # adjust JVM start
 # Set the maximum heap size to 9G, adjust as needed