Merge pull request #623 from Tencent/feature/dev-2.0.0-beta

Fix several bugs

Author: gryamy

README.md

@@ -127,7 +127,7 @@ At this point, Matrix has been integrated into the app and is beginning to colle
 
 - **Trace Canary:**
 
-  FPS Monitor, Startup Performance, UI-Block / Slow Method Detection
+  FPS Monitor, Startup Performance, ANR, UI-Block / Slow Method Detection
 
 - **SQLite Lint:**
 
@@ -161,6 +161,7 @@ At this point, Matrix has been integrated into the app and is beginning to colle
 - **Accurate call stack of ui-block.** Provide informations such as call stack, function cost, execution times to solve the problem of ui-block quickly.
 - **Non-hack.** High compatibility to Android versions.
 - **More features.** Automatically covers multiple fluency indicators such as ui-block, startup time, activity switching, slow function detection.
+- **High-accuracy ANR detector.**  Detect ANRs accurately and give ANR trace file with high compatibility and high stability.
 
 #### SQLite Lint
 
@@ -520,7 +521,7 @@ curBuilder.pluginListener = <一个遵循 MatrixPluginListenerDelegate 的对象
 
 ## Demo
 
-至此，Matrix 已经集成到应用中并且开始收集崩溃、卡顿和爆内存数据，如仍有疑问，请查看示例：`samples/sample-apple/MatrixDemo`。
+至此，Matrix 已经集成到应用中并且开始收集崩溃、ANR、卡顿和爆内存数据，如仍有疑问，请查看示例：`samples/sample-apple/MatrixDemo`。
 
 
 # <a name='matrix_android_cn'>Matrix for Android </a>
@@ -531,7 +532,7 @@ Matrix-android 当前监控范围包括：应用安装包大小，帧率变化
 - Resource Canary:
   基于 WeakReference 的特性和 [Square Haha](https://github.com/square/haha) 库开发的 Activity 泄漏和 Bitmap 重复创建检测工具
 - Trace Canary:
-  监控界面流畅性、启动耗时、页面切换耗时、慢函数及卡顿等问题
+  监控ANR、界面流畅性、启动耗时、页面切换耗时、慢函数及卡顿等问题
 - SQLite Lint:
   按官方最佳实践自动化检测 SQLite 语句的使用质量
 - IO Canary:
@@ -560,6 +561,7 @@ Matrix-android 当前监控范围包括：应用安装包大小，帧率变化
 - 编译期动态修改字节码, 高性能记录执行耗时与调用堆栈
 - 准确的定位到发生卡顿的函数，提供执行堆栈、执行耗时、执行次数等信息，帮助快速解决卡顿问题
 - 自动涵盖卡顿、启动耗时、页面切换、慢函数检测等多个流畅性指标
+- 准确监控ANR，并且能够高兼容性和稳定性地保存系统产生的ANR Trace文件
 
 #### SQLite Lint
 
@@ -701,7 +703,7 @@ Matrix-android 当前监控范围包括：应用安装包大小，帧率变化
 6. 选择程序启动的位置对 Matrix 进行初始化，如在 Application 的继承类中， Init 核心逻辑如下：
 ``` java 
   Matrix.Builder builder = new Matrix.Builder(application); // build matrix
-  builder.patchListener(new TestPluginListener(this)); // add general pluginListener
+  builder.pluginListener(new TestPluginListener(this)); // add general pluginListener
   DynamicConfigImplDemo dynamicConfig = new DynamicConfigImplDemo(); // dynamic config
   
   // init plugin 

matrix/matrix-android/matrix-android-commons/src/main/cpp/libxhook/xh_core.c

@@ -312,6 +312,52 @@ static int xh_check_loaded_so(void *addr) {
     return dladdr(addr, &stack_info);
 }
 
+struct {
+    const char* reversed_suffix;
+    size_t reversed_suffix_len;
+} s_reversed_candidate_suffixes[] = {
+        {"os.", sizeof("os.") - 1},
+#ifdef __LP64__
+        {"46reknil/", sizeof("46reknil/") - 1},
+#else
+        {"reknil/", sizeof("reknil/") - 1},
+#endif
+};
+
+/**
+ * Judge if specified path is ** NOT ** ends with '.so' and '/linker', '/linker64'
+ * return 1 if such path should not be considered to do further parsing.
+ */
+static int xh_is_not_candidate_path(const char* pathname) {
+    if (pathname == NULL) {
+        return 1;
+    }
+    size_t pathname_len = strlen(pathname);
+    size_t reversed_suffix_count = sizeof(s_reversed_candidate_suffixes) / sizeof(s_reversed_candidate_suffixes[0]);
+
+    int idx = 0;
+    int not_match_all_suffixes = 1;
+    for (const char* ch = pathname + pathname_len - 1; ch != pathname; --ch, ++idx) {
+        not_match_all_suffixes = 1;
+        for (int suffix_idx = 0; suffix_idx < reversed_suffix_count; ++suffix_idx) {
+            size_t reversed_suffix_len = s_reversed_candidate_suffixes[suffix_idx].reversed_suffix_len;
+            if (idx >= reversed_suffix_len) {
+                not_match_all_suffixes = 0;
+                break;
+            }
+            const char* reversed_suffix = s_reversed_candidate_suffixes[suffix_idx].reversed_suffix;
+            if (reversed_suffix[idx] == *ch) {
+                not_match_all_suffixes = 0;
+                break;
+            }
+        }
+        if (not_match_all_suffixes) {
+            break;
+        }
+    }
+    return not_match_all_suffixes;
+}
+
 static void xh_core_refresh_impl()
 {
     char                     line[512];
@@ -364,6 +410,7 @@ static void xh_core_refresh_impl()
         }
         if(0 == pathname_len) continue;
         if('[' == pathname[0]) continue;
+        if (xh_is_not_candidate_path(pathname)) continue;
 
         //check pathname
         //if we need to hook this elf?

matrix/matrix-android/matrix-android-commons/src/main/cpp/libxhook/xh_elf.c

@@ -365,9 +365,12 @@ static int xh_elf_hash_lookup(xh_elf_t *self, const char *symbol, uint32_t *symi
 
         if(0 == strcmp(symbol, symbol_cur))
         {
-            *symidx = i;
-            XH_LOG_INFO("found %s at symidx: %u (ELF_HASH)\n", symbol, *symidx);
-            return 0;
+            ElfW(Sym)* sym = self->symtab + i;
+            if (ELF_ST_TYPE(sym->st_info) == STT_FUNC) {
+                *symidx = i;
+                XH_LOG_INFO("found %s at symidx: %u (ELF_HASH)\n", symbol, *symidx);
+                return 0;
+            }
         }
     }
 
@@ -399,9 +402,12 @@ static int xh_elf_gnu_hash_lookup_def(xh_elf_t *self, const char *symbol, uint32
 
         if((hash | (uint32_t)1) == (symhash | (uint32_t)1) && 0 == strcmp(symbol, symname))
         {
-            *symidx = i;
-            XH_LOG_INFO("found %s at symidx: %u (GNU_HASH DEF)\n", symbol, *symidx);
-            return 0;
+            ElfW(Sym)* sym = self->symtab + i;
+            if (ELF_ST_TYPE(sym->st_info) == STT_FUNC) {
+                *symidx = i;
+                XH_LOG_INFO("found %s at symidx: %u (GNU_HASH DEF)\n", symbol, *symidx);
+                return 0;
+            }
         }
 
         //chain ends with an element with the lowest bit set to 1
@@ -422,9 +428,12 @@ static int xh_elf_gnu_hash_lookup_undef(xh_elf_t *self, const char *symbol, uint
         const char *symname = self->strtab + self->symtab[i].st_name;
         if(0 == strcmp(symname, symbol))
         {
-            *symidx = i;
-            XH_LOG_INFO("found %s at symidx: %u (GNU_HASH UNDEF)\n", symbol, *symidx);
-            return 0;
+            ElfW(Sym)* sym = self->symtab + i;
+            if (ELF_ST_TYPE(sym->st_info) == STT_FUNC) {
+                *symidx = i;
+                XH_LOG_INFO("found %s at symidx: %u (GNU_HASH UNDEF)\n", symbol, *symidx);
+                return 0;
+            }
         }
     }
     return XH_ERRNO_NOTFND;

matrix/matrix-android/matrix-hooks/src/main/cpp/common/HookCommon.h

@@ -89,6 +89,7 @@
       xhook_ignore(".*/libmatrix-hookcommon\\.so$", nullptr); \
       xhook_ignore(".*/libmatrix-memoryhook\\.so$", nullptr); \
       xhook_ignore(".*/libmatrix-pthreadhook\\.so$", nullptr); \
+      xhook_ignore(".*/libmatrix-opengl-leak\\.so$", nullptr); \
     } while (0)
 
 #include <vector>

matrix/matrix-android/matrix-hooks/src/main/cpp/common/JNICommon.cpp

@@ -37,8 +37,10 @@ extern "C" {
 
 JavaVM *m_java_vm;
 
-static std::atomic_flag s_prehook_initialized(false);
-static std::atomic_flag s_finalhook_initialized(false);
+static volatile bool s_prehook_initialized = false;
+static std::mutex s_prehook_init_mutex;
+static volatile bool s_finalook_initialized = false;
+static std::mutex s_finalhook_init_mutex;
 jclass m_class_HookManager;
 jmethodID m_method_getStack;
 
@@ -72,8 +74,10 @@ static jmethodID GetStaticMethodID(JNIEnv* env, jclass clazz, const char* name,
     return mid;
 }
 
-JNIEXPORT jboolean Java_com_tencent_matrix_hook_HookManager_doPreHookInitializeNative(JNIEnv *env, jobject) {
-    if (s_prehook_initialized.test_and_set()) {
+JNIEXPORT jboolean Java_com_tencent_matrix_hook_HookManager_doPreHookInitializeNative(JNIEnv *env, jobject, jboolean /* debug */) {
+    std::lock_guard prehookInitLock(s_prehook_init_mutex);
+
+    if (s_prehook_initialized) {
         LOGE(TAG, "doPreHookInitializeNative was already called.");
         return true;
     }
@@ -107,22 +111,32 @@ JNIEXPORT jboolean Java_com_tencent_matrix_hook_HookManager_doPreHookInitializeN
 
     getStackMethodCleaner.Omit();
     jHookMgrCleaner.Omit();
+
+    s_prehook_initialized = true;
     return true;
 }
 
 JNIEXPORT void JNICALL
-Java_com_tencent_matrix_hook_HookManager_doFinalInitializeNative(JNIEnv *env, jobject thiz) {
-    if (s_finalhook_initialized.test_and_set()) {
+Java_com_tencent_matrix_hook_HookManager_doFinalInitializeNative(JNIEnv *env, jobject thiz, jboolean debug) {
+    std::lock_guard finalInitLock(s_finalhook_init_mutex);
+
+    if (s_finalook_initialized) {
         LOGE(TAG, "doFinalInitializeNative was already called.");
         return;
     }
 
     wechat_backtrace::notify_maps_changed();
+
+    xhook_enable_debug(debug ? 1 : 0);
+    xhook_enable_sigsegv_protection(debug ? 0 : 1);
+
     // This line only refresh xhook in matrix-hookcommon library now.
     int ret = xhook_refresh(0);
     if (ret != 0) {
         LOGE(TAG, "Fail to call xhook_refresh, ret: %d", ret);
     }
+
+    s_finalook_initialized = true;
 }
 
 #ifdef __cplusplus