Merge branch 'master' into dev

Author: txfelixzhou

matrix/matrix-android/matrix-gradle-plugin/src/main/java/com/tencent/matrix/trace/Configuration.java

@@ -30,7 +30,6 @@ public class Configuration {
 
     public int parseBlackFile(MappingCollector processor) {
         String blackStr = TraceBuildConstants.DEFAULT_BLACK_TRACE + FileUtil.readFileAsString(blackListFilePath);
-
         String[] blackArray = blackStr.trim().replace("/", ".").split("\n");
 
         if (blackArray != null) {

matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/config/TraceConfig.java

@@ -47,7 +47,6 @@ public class TraceConfig implements IDefaultConfig {
     public String splashActivities;
     public Set<String> splashActivitiesSet;
 
-
     private TraceConfig() {
 
     }
@@ -115,6 +114,7 @@ private static Set<String> createSplashHashSet(String rawString) {
             splashHashSet = new HashSet<>(Collections.<String>emptyList()) ;
         }
         return splashHashSet;
+
     }
 
 

matrix/matrix-android/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/core/AppMethodBeat.java

@@ -200,7 +200,7 @@ public static void i(int methodId) {
         }
 
         if (status == STATUS_DEFAULT) {
-            synchronized (statusLock) {
+            synchronized (statunnnnnnnsLock) {
                 if (status == STATUS_DEFAULT) {
                     realExecute();
                     status = STATUS_READY;

matrix/matrix-iOS/Matrix/WCMemoryStat/MemoryLogger/StackFrames/dyld_image_info.cpp

@@ -151,6 +151,7 @@ static void __add_info_for_image(const struct mach_header *header, intptr_t slid
 				}
 
 				image_info.is_app_image = (strstr(info.dli_fname, g_app_bundle_name) != NULL);
+
 			}
 		}
 	}

samples/sample-android/app/src/main/java/sample/tencent/matrix/MatrixApplication.java

@@ -18,6 +18,9 @@
 
 import android.app.Application;
 import android.content.Context;
+import android.os.Build;
+import android.os.Debug;
+import android.os.SystemClock;
 
 import com.tencent.matrix.Matrix;
 import com.tencent.matrix.iocanary.IOCanaryPlugin;
@@ -31,6 +34,8 @@
 import com.tencent.sqlitelint.SQLiteLintPlugin;
 import com.tencent.sqlitelint.config.SQLiteLintConfig;
 
+import java.util.HashSet;
+
 import sample.tencent.matrix.config.DynamicConfigImplDemo;
 import sample.tencent.matrix.listener.TestPluginListener;
 import sample.tencent.matrix.sqlitelint.TestSQLiteLintActivity;

samples/sample-android/app/src/main/java/sample/tencent/matrix/trace/TestTraceMainActivity.java

@@ -24,7 +24,9 @@
 import android.os.Debug;
 import android.os.SystemClock;
 import android.provider.Settings;
+
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 import android.webkit.PermissionRequest;
 import android.widget.Toast;
@@ -50,6 +52,7 @@ public class TestTraceMainActivity extends Activity implements IAppForeground {
     FrameDecorator decorator;
     private static final int PERMISSION_REQUEST_CODE = 0x02;
 
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -205,8 +208,37 @@ public void testInnerSleep() {
         SystemClock.sleep(6000);
     }
 
-    private void tryHeavyMethod() {
-        Debug.getMemoryInfo(new Debug.MemoryInfo());
+    private void A() {
+        B();
+        H();
+        I();
+        J();
+        SystemClock.sleep(800);
+    }
+
+    private void B() {
+        C();
+        G();
+        SystemClock.sleep(200);
+    }
+
+    private void C() {
+        D();
+        E();
+        F();
+        SystemClock.sleep(100);
+    }
+
+    private void D() {
+        SystemClock.sleep(20);
+    }
+
+    private void E() {
+        SystemClock.sleep(20);
+    }
+
+    private void F() {
+        SystemClock.sleep(20);
     }
 
     @Override
@@ -219,5 +251,14 @@ public void onForeground(boolean isForeground) {
         } else {
             decorator.show();
         }
+        isStop = !isStop;
+    }
+
+    public void testInnerSleep() {
+        SystemClock.sleep(6000);
+    }
+
+    private void tryHeavyMethod() {
+        Debug.getMemoryInfo(new Debug.MemoryInfo());
     }
 }