async-profiler#1174: Address feedback

Author: Baraa-Hasheesh

src/vmEntry.cpp

@@ -107,21 +107,14 @@ static void* resolveMethodIdEnd() {
 }
 
 
-bool VM::init(JavaVM* vm, bool attach, bool attach_thread) {
+bool VM::init(JavaVM* vm, bool attach) {
     if (_jvmti != NULL) return true;
 
     _vm = vm;
     if (_vm->GetEnv((void**)&_jvmti, JVMTI_VERSION_1_0) != 0) {
         return false;
     }
 
-    if (attach_thread) {
-        JNIEnv* env = nullptr;
-        if (_vm->AttachCurrentThreadAsDaemon((void**)&env, NULL) != JNI_OK) {
-            return false;
-        }
-    }
-
     bool is_hotspot = false;
     bool is_zero_vm = false;
     char* prop;
@@ -417,7 +410,7 @@ Agent_OnLoad(JavaVM* vm, char* options, void* reserved) {
         }
     }
 
-    if (!VM::init(vm, false, false)) {
+    if (!VM::init(vm, false)) {
         Log::error("JVM does not support Tool Interface");
         return COMMAND_ERROR;
     }
@@ -437,7 +430,7 @@ Agent_OnAttach(JavaVM* vm, char* options, void* reserved) {
         return ARGUMENTS_ERROR;
     }
 
-    if (!VM::init(vm, true, false)) {
+    if (!VM::init(vm, true)) {
         Log::error("JVM does not support Tool Interface");
         return COMMAND_ERROR;
     }
@@ -459,7 +452,7 @@ Agent_OnAttach(JavaVM* vm, char* options, void* reserved) {
 
 extern "C" DLLEXPORT jint JNICALL
 JNI_OnLoad(JavaVM* vm, void* reserved) {
-    if (!VM::init(vm, true, false)) {
+    if (!VM::init(vm, true)) {
         return 0;
     }
 
@@ -494,5 +487,5 @@ void VM::tryAttach() {
     if (result != JNI_OK || nVMs != 1) {
         return;
     }
-    VM::init(jvm, true, true);
+    VM::init(jvm, true);
 }

src/vmEntry.h

@@ -118,7 +118,7 @@ class VM {
     static JVM_MemoryFunc _totalMemory;
     static JVM_MemoryFunc _freeMemory;
 
-    static bool init(JavaVM* vm, bool attach, bool attach_thread);
+    static bool init(JavaVM* vm, bool attach);
 
     static bool loaded() {
         return _jvmti != NULL;

test/one/profiler/test/Runner.java

@@ -91,7 +91,7 @@ private static Jvm detectJvm() {
         return Jvm.HOTSPOT;
     }
 
-    private static int detectJvmVersion() {
+    protected static int detectJvmVersion() {
         String prop = System.getProperty("java.vm.specification.version");
         if (prop.startsWith("1.")) {
             prop = prop.substring(2);

test/one/profiler/test/TestProcess.java

@@ -34,17 +34,7 @@ public class TestProcess implements Closeable {
     public static final String TESTBIN = "%testbin";
 
     private static final String JAVA_HOME = System.getProperty("java.home");
-    private static final String JAVA_VERSION;
-
-    static {
-        String[] javaVersionParts = System.getProperty("java.version").split("\\.");
-        // JAVA 8 & lower are reported as 1.X... while higher versions are reported as X....
-        if (javaVersionParts[0].equals("1")) {
-            JAVA_VERSION = javaVersionParts[1];
-        } else {
-            JAVA_VERSION = javaVersionParts[0];
-        }
-    }
+    private static final String JAVA_VERSION = Runner.detectJvmVersion() + "";
 
     private static final Pattern filePattern = Pattern.compile("(%[a-z]+)(\\.[a-z]+)?");
 

test/test/nonjava/non_java_app.cpp

@@ -9,41 +9,30 @@
 #include <iostream>
 #include <limits.h>
 #include "asprof.h"
+
+// detect arch for java 8
+#if defined(__x86_64__) || defined(_M_X64)
+#  define JAVA8_ARCH_PATH "amd64/"
+#elif defined(__i386) || defined(_M_IX86)
+#  define JAVA8_ARCH_PATH "i386/"
+#elif defined(__aarch64__) || defined(_M_ARM64)
+#  define JAVA8_ARCH_PATH "aarch64/"
+#elif defined(__arm__) || defined(_M_ARM)
+#  define JAVA8_ARCH_PATH "arm/"
+#else
+#  define JAVA8_ARCH_PATH "/"
+#endif
 
 #ifdef __linux__
 const char profiler_lib_path[] = "build/lib/libasyncProfiler.so";
 const char jvm_lib_path[] = "lib/server/libjvm.so";
-const char jvm8_lib_path[] = "lib/amd64/server/libjvm.so";
+const char jvm8_lib_path[] = "lib/" JAVA8_ARCH_PATH "server/libjvm.so";
 #else
 const char profiler_lib_path[] = "build/lib/libasyncProfiler.dylib";
 const char jvm_lib_path[] = "lib/server/libjvm.dylib";
 const char jvm8_lib_path[] = "lib/server/libjvm.dylib";
 #endif
 
-#ifndef JNI_VERSION_9
-#define JNI_VERSION_9   0x00090000
-#endif
-
-#ifndef JNI_VERSION_10
-#define JNI_VERSION_10  0x000a0000
-#endif
-
-#ifndef JNI_VERSION_19
-#define JNI_VERSION_19  0x00130000
-#endif
-
-#ifndef JNI_VERSION_20
-#define JNI_VERSION_20  0x00140000
-#endif
-
-#ifndef JNI_VERSION_21
-#define JNI_VERSION_21  0x00150000
-#endif
-
-#ifndef JNI_VERSION_24
-#define JNI_VERSION_24  0x00180000
-#endif
-
 typedef jint (*CreateJvm)(JavaVM **, void **, void *);
 
 asprof_init_t _asprof_init;
@@ -122,30 +111,6 @@ void loadJvmLib() {
     }
 }
 
-int getJniVersion() {
-    if (java_version == 8) {
-        return JNI_VERSION_1_8;
-    }
-
-    if (java_version == 9) {
-        return JNI_VERSION_9;
-    }
-
-    if (java_version >= 10 && java_version <= 18) {
-        return JNI_VERSION_10;
-    }
-
-    if (java_version == 19) {
-        return JNI_VERSION_19;
-    }
-
-    if (java_version >= 20 && java_version <= 23) {
-        return JNI_VERSION_20;
-    }
-
-    return JNI_VERSION_24;
-}
-
 void startJvm() {
     // Start JVM
     JavaVMInitArgs vm_args;
@@ -156,7 +121,7 @@ void startJvm() {
     //options[1].optionString = const_cast<char*>("-Xcheck:jni");
 
     // Configure JVM
-    vm_args.version = getJniVersion();;
+    vm_args.version = JNI_VERSION_1_6;
     vm_args.nOptions = 1;
     vm_args.options = options;
     vm_args.ignoreUnrecognized = true;