Merge pull request #70 from KwaiAppTeam/dev

Release v1.1.0

CHANGELOG.md

@@ -6,4 +6,15 @@ Enhancement
 - Add custom root dir validity check.
 
 Bug fix
-- StripHprofHeapDumper bugfix.
+- StripHprofHeapDumper bugfix.
+
+# v1.1.0
+Enhancement
+- Add heap max ratio and force trigger.
+- Add support for x86.
+
+Bug fix
+- Hardcode cacheDir path on unpredictable case.
+- Add try-catch in abnormal start, delete abnormal json file.
+
+

README.md

@@ -31,7 +31,7 @@ Try to run the koom-demo project first, and have a general understanding of the
 
 ```gradle
 dependencies {
-    implementation 'com.kwai.koom:java-oom:1.0.7'
+    implementation 'com.kwai.koom:java-oom:1.1.0'
 }
 ```
 
@@ -117,4 +117,4 @@ If you are interested in contributing, check out the [CONTRIBUTING.md](./CONTRIB
 ## Feedback
 Welcome report [issues](https://github.com/KwaiAppTeam/KOOM/issues) or contact us in WeChat group.
 
-<img src=./doc/images/wechat8.png/>
+<img src=./doc/images/wechat.jpg/>

README.zh-CN.md

@@ -17,7 +17,7 @@ KOOM(Kwai OOM, Kill OOM)是快手性能优化团队在处理移动端OOM问题
 
 ```gradle
 dependencies {
-    implementation 'com.kwai.koom:java-oom:1.0.7'
+    implementation 'com.kwai.koom:java-oom:1.1.0'
 }
 ```
 
@@ -118,4 +118,4 @@ KOOM 以 Apache-2.0 证书开源，详情参见 [LICENSE](./LICENSE)。
 **项目核心成员**<br>
 [alhah(薛秋实)](https://github.com/alhah) <br>[AndroidInternal(李锐)](https://github.com/AndroidInternal)<br>
 **微信讨论群**
-<img src=./doc/images/wechat8.png/>。
+<img src=./doc/images/wechat.jpg/>。

java-oom/src/main/java/com/kwai/koom/javaoom/KOOMEnableChecker.java

@@ -45,7 +45,7 @@ public static KOOMEnableChecker get() {
    */
   public boolean isVersionPermit() {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-        && Build.VERSION.SDK_INT <= Build.VERSION_CODES.R;
+        && Build.VERSION.SDK_INT < Build.VERSION_CODES.R;
   }
 
   /**

java-oom/src/main/java/com/kwai/koom/javaoom/KOOMInternal.java

@@ -89,29 +89,33 @@ private void startInKOOMThread() {
   private boolean started;
 
   private void startInternal() {
-    if (started) {
-      KLog.i(TAG, "already started!");
-      return;
-    }
-    started = true;
-
-    heapDumpTrigger.setHeapDumpListener(this);
-    heapAnalysisTrigger.setHeapAnalysisListener(this);
-
-    if (KOOMEnableChecker.doCheck() != KOOMEnableChecker.Result.NORMAL) {
-      KLog.e(TAG, "koom start failed, check result: " + KOOMEnableChecker.doCheck());
-      return;
+    try {
+      if (started) {
+        KLog.i(TAG, "already started!");
+        return;
+      }
+      started = true;
+
+      heapDumpTrigger.setHeapDumpListener(this);
+      heapAnalysisTrigger.setHeapAnalysisListener(this);
+
+      if (KOOMEnableChecker.doCheck() != KOOMEnableChecker.Result.NORMAL) {
+        KLog.e(TAG, "koom start failed, check result: " + KOOMEnableChecker.doCheck());
+        return;
+      }
+
+      ReanalysisChecker reanalysisChecker = new ReanalysisChecker();
+      if (reanalysisChecker.detectReanalysisFile() != null) {
+        KLog.i(TAG, "detected reanalysis file");
+        heapAnalysisTrigger
+            .trigger(TriggerReason.analysisReason(TriggerReason.AnalysisReason.REANALYSIS));
+        return;
+      }
+
+      heapDumpTrigger.startTrack();
+    } catch (Exception e) {
+      e.printStackTrace();
     }
-
-    ReanalysisChecker reanalysisChecker = new ReanalysisChecker();
-    if (reanalysisChecker.detectReanalysisFile() != null) {
-      KLog.i(TAG, "detected reanalysis file");
-      heapAnalysisTrigger
-          .trigger(TriggerReason.analysisReason(TriggerReason.AnalysisReason.REANALYSIS));
-      return;
-    }
-
-    heapDumpTrigger.startTrack();
   }
 
   public void stop() {

java-oom/src/main/java/com/kwai/koom/javaoom/analysis/ReanalysisChecker.java

@@ -122,8 +122,8 @@ private HeapReport loadFile(File file) {
       }
       HeapReport heapReport = gson.fromJson(str, HeapReport.class);
       return heapReport == null ? new HeapReport() : heapReport;
-    } catch (IOException e) {
-      //e.printStackTrace();
+    } catch (Exception e) {
+      file.delete();
     } finally {
       KUtils.closeQuietly(fin);
     }