vmtool command support forceGc action. alibaba#1781

paopaoteng · Apr 30, 2021 · 3499a30 · 3499a30
1 parent ac27ea3
commit 3499a30
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 10 deletions.
diff --git a/arthas-vmtool/src/main/java/arthas/VmTool.java b/arthas-vmtool/src/main/java/arthas/VmTool.java
@@ -41,6 +41,8 @@ public static synchronized VmTool getInstance(String libPath) {
      */
     private static native String check0();
 
+    private static native void forceGc0();
+
     /**
      * 获取某个class在jvm中当前所有存活实例
      */
@@ -78,6 +80,11 @@ public String check() {
         return check0();
     }
 
+    @Override
+    public void forceGc() {
+        forceGc0();
+    }
+
     @Override
     public <T> T[] getInstances(Class<T> klass) {
         return getInstances0(klass);

diff --git a/arthas-vmtool/src/main/java/arthas/VmToolMXBean.java b/arthas-vmtool/src/main/java/arthas/VmToolMXBean.java
@@ -19,6 +19,11 @@ public interface VmToolMXBean {
      */
     public String check();
 
+    /**
+     * https://docs.oracle.com/javase/8/docs/platform/jvmti/jvmti.html#ForceGarbageCollection
+     */
+    public void forceGc();
+
     /**
      * 获取某个class在jvm中当前所有存活实例
      */

diff --git a/arthas-vmtool/src/main/native/include/arthas_VmTool.h b/arthas-vmtool/src/main/native/include/arthas_VmTool.h
diff --git a/arthas-vmtool/src/main/native/src/jni-library.cpp b/arthas-vmtool/src/main/native/src/jni-library.cpp
@@ -19,12 +19,6 @@ JNIEXPORT jclass JNICALL getClass(JNIEnv *env) {
     return cachedClass;
 }
 
-extern "C"
-JNIEXPORT jstring JNICALL
-Java_arthas_VmTool_check0(JNIEnv *env, jclass thisClass) {
-    return env->NewStringUTF("OK");
-}
-
 extern "C"
 jvmtiEnv *getJvmtiEnv(JNIEnv *env) {
 
@@ -36,6 +30,19 @@ jvmtiEnv *getJvmtiEnv(JNIEnv *env) {
     return jvmti;
 }
 
+extern "C"
+JNIEXPORT void JNICALL
+Java_arthas_VmTool_forceGc0(JNIEnv *env, jclass thisClass) {
+    jvmtiEnv *jvmti = getJvmtiEnv(env);
+    jvmti->ForceGarbageCollection();
+}
+
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_arthas_VmTool_check0(JNIEnv *env, jclass thisClass) {
+    return env->NewStringUTF("OK");
+}
+
 extern "C"
 jobject createJavaInstance(JNIEnv *env, jclass javaClass) {
     //找到java类的构造方法

diff --git a/arthas-vmtool/src/test/java/arthas/VmToolTest.java b/arthas-vmtool/src/test/java/arthas/VmToolTest.java
@@ -43,7 +43,7 @@ public void testIsSnapshot() {
             System.out.println("sum size->" + vmtool.sumInstanceSize(VmTool.class));
             beforeInstances = null;
 
-            System.gc();
+            vmtool.forceGc();
             Thread.sleep(100);
             System.out.println(weakReference1.get() + " " + weakReference2.get());
             VmTool[] afterInstances = vmtool.getInstances(VmTool.class);
@@ -80,7 +80,7 @@ public void testGetInstancesMemoryLeak() {
             totalTime.addAndGet(cost);
             System.out.println(i + " instance size:" + (instances == null ? 0 : instances.length) + ", cost " + cost + "ms avgCost " + totalTime.doubleValue() / i + "ms");
             instances = null;
-            System.gc();
+            vmtool.forceGc();
         }
     }
 

diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/VmToolCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/VmToolCommand.java
@@ -46,7 +46,8 @@
 @Summary("jvm tool")
 @Description(Constants.EXAMPLE
         + "  vmtool --action getInstances --className demo.MathGame\n"
-        + "  vmtool --action getInstances --className demo.MathGame --express 'instances.size()'\n"
+        + "  vmtool --action getInstances --className demo.MathGame --express 'instances.length'\n"
+        + "  vmtool --action forceGc\n"
         + Constants.WIKI + Constants.WIKI_HOME + "vmtool")
 //@formatter:on
 public class VmToolCommand extends AnnotatedCommand {
@@ -123,7 +124,7 @@ public void setExpress(String express) {
     }
 
     public enum VmToolAction {
-        getInstances, load
+        getInstances, forceGc, load
     }
 
     @Override
@@ -178,8 +179,14 @@ public void process(final CommandProcess process) {
                     }
 
                     process.write(new ObjectView(value, this.expand).draw());
+                    process.write("\n");
                     process.end();
                 }
+            } else if (VmToolAction.forceGc.equals(action)) {
+                vmToolInstance().forceGc();
+                process.write("\n");
+                process.end();
+                return;
             }
 
             process.end();

diff --git a/lib/libArthasJniLibrary-x64.dylib b/lib/libArthasJniLibrary-x64.dylib
diff --git a/spy/src/main/java/arthas/VmTool.java b/spy/src/main/java/arthas/VmTool.java
@@ -41,6 +41,8 @@ public static synchronized VmTool getInstance(String libPath) {
      */
     private static native String check0();
 
+    private static native void forceGc0();
+
     /**
      * 获取某个class在jvm中当前所有存活实例
      */
@@ -78,6 +80,11 @@ public String check() {
         return check0();
     }
 
+    @Override
+    public void forceGc() {
+        forceGc0();
+    }
+
     @Override
     public <T> T[] getInstances(Class<T> klass) {
         return getInstances0(klass);

diff --git a/spy/src/main/java/arthas/VmToolMXBean.java b/spy/src/main/java/arthas/VmToolMXBean.java
@@ -19,6 +19,11 @@ public interface VmToolMXBean {
      */
     public String check();
 
+    /**
+     * https://docs.oracle.com/javase/8/docs/platform/jvmti/jvmti.html#ForceGarbageCollection
+     */
+    public void forceGc();
+
     /**
      * 获取某个class在jvm中当前所有存活实例
      */