upgrade async-profiler to 1.8.1. alibaba#1478

paopaoteng · Sep 7, 2020 · fa45615 · fa45615
1 parent 41f86ac
commit fa45615
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/async-profiler/libasyncProfiler-linux-arm.so b/async-profiler/libasyncProfiler-linux-arm.so
diff --git a/async-profiler/libasyncProfiler-linux-x64.so b/async-profiler/libasyncProfiler-linux-x64.so
diff --git a/async-profiler/libasyncProfiler-mac-x64.so b/async-profiler/libasyncProfiler-mac-x64.so
diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/ProfilerCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/ProfilerCommand.java
@@ -231,7 +231,7 @@ private AsyncProfiler profilerInstance() {
     }
 
     /**
-     * https://github.com/jvm-profiling-tools/async-profiler/blob/v1.6/src/arguments.cpp#L34
+     * https://github.com/jvm-profiling-tools/async-profiler/blob/v1.8.1/src/arguments.cpp#L50
      *
      */
     public enum ProfilerAction {

diff --git a/site/src/site/sphinx/en/profiler.md b/site/src/site/sphinx/en/profiler.md
@@ -155,7 +155,7 @@ You can verify the number of samples by executing `profiler getSamples`.
 For example, start sampling:  
 
 ```bash
-profiler execute 'start'
+profiler execute 'start,framebuf=5000000'
 ```
 
 Stop sampling and save to the specified file:
@@ -164,7 +164,7 @@ Stop sampling and save to the specified file:
 profiler execute 'stop,file=/tmp/result.svg'
 ```
 
-Specific format reference: [arguments.cpp#L34](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.6/src/arguments.cpp#L34)
+Specific format reference: [arguments.cpp](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.8.1/src/arguments.cpp#L50)
 
 ### View all supported actions
 

diff --git a/site/src/site/sphinx/profiler.md b/site/src/site/sphinx/profiler.md
@@ -157,7 +157,7 @@ Started [cpu] profiling
 比如开始采样：
 
 ```bash
-profiler execute 'start'
+profiler execute 'start,framebuf=5000000'
 ```
 
 停止采样，并保存到指定文件里：
@@ -166,7 +166,7 @@ profiler execute 'start'
 profiler execute 'stop,file=/tmp/result.svg'
 ```
 
-具体的格式参考： [arguments.cpp#L34](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.6/src/arguments.cpp#L34)
+具体的格式参考： [arguments.cpp](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.8.1/src/arguments.cpp#L50)
 
 ### 查看所有支持的action
 

diff --git a/spy/src/main/java/one/profiler/AsyncProfiler.java b/spy/src/main/java/one/profiler/AsyncProfiler.java
@@ -166,7 +166,8 @@ public String dumpFlat(int maxMethods) {
     }
 
     /**
-     * Add the given thread to the set of profiled threads
+     * Add the given thread to the set of profiled threads.
+     * 'filter' option must be enabled to use this method.
      *
      * @param thread Thread to include in profiling
      */
@@ -175,7 +176,8 @@ public void addThread(Thread thread) {
     }
 
     /**
-     * Remove the given thread from the set of profiled threads
+     * Remove the given thread from the set of profiled threads.
+     * 'filter' option must be enabled to use this method.
      *
      * @param thread Thread to exclude from profiling
      */
@@ -201,4 +203,4 @@ private void filterThread(Thread thread, boolean enable) {
     private native void stop0() throws IllegalStateException;
     private native String execute0(String command) throws IllegalArgumentException, IOException;
     private native void filterThread0(Thread thread, boolean enable);
-}
+}
diff --git a/tutorials/katacoda/command-profiler-cn/profiler.md b/tutorials/katacoda/command-profiler-cn/profiler.md
@@ -191,10 +191,10 @@ Started [cpu] profiling
 
 比如开始采样：
 
-`profiler execute 'start'`{{execute T2}}
+`profiler execute 'start,framebuf=5000000'`{{execute T2}}
 
 ```bash
-profiler execute 'start'
+profiler execute 'start,framebuf=5000000'
 ```
 
 停止采样，并保存到指定文件里：
@@ -205,4 +205,4 @@ profiler execute 'start'
 profiler execute 'stop,file=/tmp/result.svg'
 ```
 
-具体的格式参考： [arguments.cpp#L34](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.6/src/arguments.cpp#L34)
+具体的格式参考： [arguments.cpp](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.8.1/src/arguments.cpp#L50)
diff --git a/tutorials/katacoda/command-profiler-en/profiler.md b/tutorials/katacoda/command-profiler-en/profiler.md
@@ -189,12 +189,12 @@ You can verify the number of samples by executing `profiler getSamples`.
 
 ### Use `execute` action to execute complex commands
 
-`profiler execute 'start'`{{execute T2}}
+`profiler execute 'start,framebuf=5000000'`{{execute T2}}
 
 For example, start sampling:  
 
 ```bash
-profiler execute 'start'
+profiler execute 'start,framebuf=5000000'
 ```
 
 Stop sampling and save to the specified file:
@@ -205,4 +205,4 @@ Stop sampling and save to the specified file:
 profiler execute 'stop,file=/tmp/result.svg'
 ```
 
-Specific format reference: [arguments.cpp#L34](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.6/src/arguments.cpp#L34)
+Specific format reference: [arguments.cpp](https://github.com/jvm-profiling-tools/async-profiler/blob/v1.8.1/src/arguments.cpp#L50)
-Original file line number
+Diff line change
@@ Expand Up / @@ -231,7 +231,7 @@ private AsyncProfiler profilerInstance() { @@
         }
         /**
-         * https://github.com/jvm-profiling-tools/async-profiler/blob/v1.6/src/arguments.cpp#L34
+         * https://github.com/jvm-profiling-tools/async-profiler/blob/v1.8.1/src/arguments.cpp#L50
          *
          */
         public enum ProfilerAction {
@@ Expand Down @@