From 3672c2c7a6434bcf0451e0377350c30615440629 Mon Sep 17 00:00:00 2001
From: hengyunabc <hengyunabc@gmail.com>
Date: Tue, 27 Apr 2021 19:19:16 +0800
Subject: [PATCH] update lib name

---
 arthas-vmtool/pom.xml                         | 12 +++++-----
 .../src/main/java/arthas/Vmtool.java          | 24 +++++++++++++++++++
 .../src/test/java/arthas/VmtoolTest.java      |  2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/arthas-vmtool/pom.xml b/arthas-vmtool/pom.xml
index c13775d75..f7e8799ea 100644
--- a/arthas-vmtool/pom.xml
+++ b/arthas-vmtool/pom.xml
@@ -25,7 +25,7 @@
             <properties>
                 <os_name>macos</os_name>
                 <os_arch_option>-m64</os_arch_option>
-                <lib_name>libArthasJniLibrary.dylib</lib_name>
+                <lib_name>libArthasJniLibrary-x64.dylib</lib_name>
             </properties>
         </profile>
         <profile>
@@ -39,7 +39,7 @@
             <properties>
                 <os_name>macos</os_name>
                 <os_arch_option>-m64</os_arch_option>
-                <lib_name>libArthasJniLibrary.dylib</lib_name>
+                <lib_name>libArthasJniLibrary-amd64.dylib</lib_name>
             </properties>
         </profile>
 
@@ -55,7 +55,7 @@
             <properties>
                 <os_name>linux</os_name>
                 <os_arch_option>-m64</os_arch_option>
-                <lib_name>libArthasJniLibrary.so</lib_name>
+                <lib_name>libArthasJniLibrary-x64.so</lib_name>
             </properties>
         </profile>
         <profile>
@@ -69,7 +69,7 @@
             <properties>
                 <os_name>linux</os_name>
                 <os_arch_option>-m64</os_arch_option>
-                <lib_name>libArthasJniLibrary.so</lib_name>
+                <lib_name>libArthasJniLibrary-amd64.so</lib_name>
             </properties>
         </profile>
 
@@ -85,7 +85,7 @@
             <properties>
                 <os_name>windows</os_name>
                 <os_arch_option>-m64</os_arch_option>
-                <lib_name>ArthasJniLibrary.dll</lib_name>
+                <lib_name>libArthasJniLibrary-x64.dll</lib_name>
             </properties>
         </profile>
         <profile>
@@ -99,7 +99,7 @@
             <properties>
                 <os_name>windows</os_name>
                 <os_arch_option>-m64</os_arch_option>
-                <lib_name>ArthasJniLibrary.dll</lib_name>
+                <lib_name>libArthasJniLibrary-amd64.dll</lib_name>
             </properties>
         </profile>
     </profiles>
diff --git a/arthas-vmtool/src/main/java/arthas/Vmtool.java b/arthas-vmtool/src/main/java/arthas/Vmtool.java
index 1f0c21ab3..ad72fa649 100644
--- a/arthas-vmtool/src/main/java/arthas/Vmtool.java
+++ b/arthas-vmtool/src/main/java/arthas/Vmtool.java
@@ -2,6 +2,8 @@ package arthas;
 
 import java.util.ArrayList;
 
+import com.taobao.arthas.common.OSUtils;
+
 /**
  * @author ZhangZiCheng 2021-02-12
  * @author hengyunabc 2021-04-26
@@ -14,6 +16,24 @@ public class Vmtool implements VMtoolMXBean {
      */
     public final static String JNI_LIBRARY_NAME = "ArthasJniLibrary";
 
+    private static String libName = null;
+    static {
+        if (OSUtils.isMac()) {
+            libName = "libArthasJniLibrary-x64.dylib";
+        }
+        if (OSUtils.isLinux()) {
+            libName = "libArthasJniLibrary-x64.so";
+            if (OSUtils.isArm32()) {
+                libName = "libArthasJniLibrary-arm.so";
+            } else if (OSUtils.isArm64()) {
+                libName = "libArthasJniLibrary-aarch64.so";
+            }
+        }
+        if (OSUtils.isWindows()) {
+            libName = "libArthasJniLibrary-x64.dll";
+        }
+    }
+
     private static Vmtool instance;
 
     private Vmtool() {
@@ -38,6 +58,10 @@ public class Vmtool implements VMtoolMXBean {
         return instance;
     }
 
+    public static String detectLibName() {
+        return libName;
+    }
+
     /**
      * 检测jni-lib是否正常，如果正常，应该输出OK
      */
diff --git a/arthas-vmtool/src/test/java/arthas/VmtoolTest.java b/arthas-vmtool/src/test/java/arthas/VmtoolTest.java
index fe1592557..5a2b63553 100644
--- a/arthas-vmtool/src/test/java/arthas/VmtoolTest.java
+++ b/arthas-vmtool/src/test/java/arthas/VmtoolTest.java
@@ -27,7 +27,7 @@ public class VmtoolTest {
             String path = Vmtool.class.getProtectionDomain().getCodeSource().getLocation().getPath();
             System.err.println(path);
 
-            String libPath = new File(path, System.mapLibraryName(Vmtool.JNI_LIBRARY_NAME)).getAbsolutePath();
+            String libPath = new File(path, Vmtool.detectLibName()).getAbsolutePath();
             Vmtool vmtool = Vmtool.getInstance(libPath);
 
             //调用native方法，获取已加载的类，不包括小类型(如int)